3102 commits

Author	SHA1	Message	Date
Michael Vogel	8b276e53c3	Merge remote-tracking branch 'upstream/develop' into 1507-redmatrix-network-name	2015-07-16 10:18:07 +02:00
Michael Vogel	fca8aecc9b	Show "Redmatrix" as network name.	2015-07-16 10:09:59 +02:00
Michael Vogel	05f8abcfa6	OStatus: Handling of unsupported verbs	2015-07-15 18:27:44 +02:00
Michael Vogel	52c4b8684b	OStatus: Support for "Favorite" (like)	2015-07-15 08:16:41 +02:00
Michael Vogel	2b3ebb9c3e	Follow/Unfollow now works from OStatus.	2015-07-13 23:50:33 +02:00
Michael Vogel	3457f85833	Salmon: Don't store contact data before the message was authenticated.	2015-07-13 14:34:28 +02:00
Michael Vogel	0398bb67be	Reworked salmon import	2015-07-13 08:06:51 +02:00
Tobias Diekershoff	179201d2bf	Merge pull request #1750 from annando/1507-contact-update ... Automatic contact update	2015-07-12 15:32:29 +02:00
Michael Vogel	f6352aa9c6	Remove a useless comment	2015-07-12 12:17:12 +02:00
Michael Vogel	65468bf202	Moved the needed include to a better place.	2015-07-12 12:03:39 +02:00
Michael Vogel	f48f7394e9	Only update communication relevant data. And only update if needed.	2015-07-12 11:46:08 +02:00
Michael Vogel	9106baf10f	Some more test code removed	2015-07-12 11:24:01 +02:00
Michael Vogel	cf663df69f	Testing code removed	2015-07-12 11:22:36 +02:00
Michael Vogel	0ac75deee1	Some precaution to avoid overwriting of existing data with blanks	2015-07-12 11:19:40 +02:00
Michael Vogel	d55275f211	GUID should be urlencoded in template since it is urlencoded in uri as well.	2015-07-11 14:37:02 +02:00
Michael Vogel	fe137a92ef	Automatically update contact data.	2015-07-11 14:36:04 +02:00
Michael Vogel	d6d51e0259	Don't deliver answers to OStatus messages to Diaspora	2015-07-05 16:27:03 +02:00
Michael Vogel	c356da2cad	Diaspora: Improved parsing of linefeeds	2015-07-05 02:33:28 +02:00
Michael Vogel	43f98bc854	When posting to Diaspora, now the contact names are containing the link to the user profile.	2015-07-04 23:49:52 +02:00
Tobias Diekershoff	3349bba665	Merge pull request #1722 from annando/1506-password-on-install ... Ability to enter a password when the first user is created	2015-07-01 07:53:25 +02:00
Michael Vogel	055ee962c9	Ability to enter a password when the first user is created	2015-06-30 23:37:31 +02:00
fabrixxm	5a23bd400c	Merge pull request #1715 from rabuzarus/theme_uid ... use local theme settings for visitors	2015-06-30 08:41:07 +02:00
fabrixxm	97161413e7	Merge pull request #1714 from annando/1506-mail-link-profile ... Show preselected mail receivers	2015-06-30 08:37:40 +02:00
fabrixxm	7a0f2b61ab	Merge pull request #1713 from annando/1506-ostatus-completion-timeframe ... There is now two different checks for the completion of conversations	2015-06-30 08:36:33 +02:00
fabrixxm	76737fbf7b	Merge pull request #1712 from annando/1506-ostatus-guid ... OStatus: Use the GUID format for the link to the item	2015-06-30 08:35:33 +02:00
fabrixxm	f121184158	Merge pull request #1716 from annando/1506-no-googlemap ... Removed Google Maps	2015-06-30 08:27:59 +02:00
Michael Vogel	06d446595e	OStatus: By using Qvitter, users can delete items. We can't handle that by now, so we ignore it.	2015-06-30 08:08:02 +02:00
Michael Vogel	836432bb9a	Removed Google Maps	2015-06-30 07:42:59 +02:00
Michael Vogel	ab074e200b	Mail link in profile page	2015-06-29 22:54:26 +02:00
Michael Vogel	bffe35ab71	There is now two different checks for the completion of conversations	2015-06-29 21:53:59 +02:00
Michael Vogel	fcb3cbffe4	OStatus: Use the GUID format for the link to the item	2015-06-29 21:49:42 +02:00
fabrixxm	28f0e9a2de	Merge pull request #1696 from rabuzarus/acl-var ... move jotnets to populate_acl	2015-06-29 13:53:37 +02:00
fabrixxm	1a1c2d74f6	Merge pull request #1698 from rabuzarus/identity ... move some identity related functions to identity.php	2015-06-29 13:52:07 +02:00
fabrixxm	17514e0d68	Merge pull request #1703 from rabuzarus/readable_bytes ... show maximagesize warning in a human readable format	2015-06-29 13:50:55 +02:00
fabrixxm	6c5b4b96a5	Merge pull request #1710 from rabuzarus/deactivate_log ... deactivate logger in acl_lookup	2015-06-29 13:48:42 +02:00
rabuzarus	eedf829d5c	deactivate logger in acl_lookup	2015-06-29 13:46:47 +02:00
rabuzarus	68e565889d	moved formatBytes() to /include/text.php	2015-06-29 11:22:29 +02:00
rabuzarus	a982320ba9	show maximagesize warning in a human readable format	2015-06-29 02:39:08 +02:00
Michael Vogel	b795bf2935	Merge pull request #1683 from fabrixxm/issue-1655 ... Deprecate RINO1 function, implements RINO2, remove unused crypro functions	2015-06-27 17:39:00 +02:00
rabuzarus	8cca849c2e	Merge acl-var into develop ... Conflicts: mod/settings.php	2015-06-27 15:23:19 +02:00
rabuzarus	729b7f0e72	restore jotplugins	2015-06-27 15:11:18 +02:00
rabuzarus	373bb0822b	get the themes settings of foreign profiles	2015-06-27 14:10:43 +02:00
Tobias Diekershoff	d0bf3c06a4	Merge pull request #1694 from annando/1506-ostatus-mention ... OStatus: Notifications now work - even if not mentioned in the post	2015-06-27 11:12:31 +02:00
rabuzarus	787604026f	move some identity based functions to identity.php	2015-06-26 18:57:20 +02:00
rabuzarus	5ce125d6e0	cleanup of some unused code	2015-06-26 15:13:52 +02:00
Michael Vogel	e0f6bd6c28	Merge pull request #1695 from strk/accepted ... Spelling error: "acepted" -> "accepted"	2015-06-26 13:51:22 +02:00
Sandro Santilli	904b76df85	Spelling error: "acepted" -> "accepted"	2015-06-26 12:03:32 +02:00
Michael Vogel	58b624f877	OStatus: Mentions should work now	2015-06-26 10:41:11 +02:00
Michael Vogel	6eebfb2e13	Merge pull request #1692 from fabrixxm/desktopnotifications ... Desktop notifications	2015-06-26 08:45:16 +02:00
rabuzarus	37501a883e	make notes work	2015-06-25 22:57:26 +02:00