21012 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	f8b74033a4	Avoid a notice	2018-10-06 18:44:42 +00:00
Michael	192c6c8d4f	Preparation for suggestions under AP	2018-10-06 18:42:26 +00:00
Tobias Diekershoff	1551570b7f	Merge pull request #5843 from annando/guid-like ... Transmit the Diaspora GUID with activities (Like, Dislike, ...)	2018-10-06 16:49:16 +02:00
Michael	389a651005	Transmit the Diaspora GUID with activities (Like, Dislike, ...)	2018-10-06 14:02:23 +00:00
Hypolite Petovan	2341ce353d	Merge pull request #5842 from annando/ap-distribution ... Improved AP distribution / Only process trusted content	2018-10-06 09:35:44 -04:00
Michael	a413ce15aa	"name" must be plaintext	2018-10-06 13:28:17 +00:00
Michael	6b374c32a2	Improved AP distribution / Only process trusted content	2018-10-06 13:16:52 +00:00
Hypolite Petovan	58c6ef2bc0	Merge pull request #5841 from JonnyTischbein/issue_profile_edit_sexual_marital ... Fix (short) profile editing showing 'e' for martial and sexual preferences	2018-10-06 07:13:04 -04:00
Tobias Diekershoff	8860c1055e	Merge pull request #5840 from annando/like-owner ... Ensure that the owner of an activity is always the author	2018-10-06 11:48:52 +02:00
Michael	acf31ab64b	Additional check to ensure that the owner of an activity is always the author	2018-10-06 09:38:51 +00:00
Jonny Tischbein	17019772a4	Fix (short) profile editing showing 'e' for martial and sexual preference	2018-10-06 11:37:15 +02:00
Tobias Diekershoff	5014779052	Merge pull request #5839 from annando/like-owner ... The owner of a "like" should be the author	2018-10-06 11:09:42 +02:00
Michael Vogel	c7bbe08a48	Merge pull request #5838 from tobiasd/20181006-lng ... CS, DE and PL translation update	2018-10-06 11:04:52 +02:00
Michael	510032444f	The owner of a "like" should be the author	2018-10-06 08:51:52 +00:00
Tobias Diekershoff	632dd93145	DE translation update	2018-10-06 10:12:37 +02:00
Tobias Diekershoff	f361947044	CS translation update THX Aditoo	2018-10-06 10:03:04 +02:00
Tobias Diekershoff	4a7aad3ec8	PL translation update THX waldis	2018-10-06 10:02:14 +02:00
Tobias Diekershoff	ce4204e81a	Merge pull request #5836 from annando/ap4 ... No @brief anymore	2018-10-06 09:19:28 +02:00
Tobias Diekershoff	3b41535dfe	Merge pull request #5835 from annando/ap3 ... Some more AP stuff ...	2018-10-06 09:18:30 +02:00
Michael	41123162f1	No @brief anymore	2018-10-06 04:18:40 +00:00
Hypolite Petovan	13c5bc807b	Merge pull request #5829 from annando/develop ... Cache the AP delivery process	2018-10-06 00:06:47 -04:00
Michael	09302367d5	Include AP in the contact search	2018-10-06 03:17:44 +00:00
Michael	f69c80b9e2	AP delivery is relocated to the top of the notifier	2018-10-06 03:16:38 +00:00
Michael	9dbf8d0b9d	Spaces	2018-10-06 02:09:27 +00:00
Hypolite Petovan	dc49ad090e	Merge pull request #5833 from MrPetovan/develop ... Replace remaining $a->isInstallMode() instances	2018-10-05 20:32:26 -04:00
Hypolite Petovan	3ed9e7fe1d	Replace remaining $a->isInstallMode() instances	2018-10-05 20:31:32 -04:00
Hypolite Petovan	3564daf24d	Merge pull request #5828 from nupplaphil/mode_class ... Creating Friendica\App\Mode for encapsulating the App Mode	2018-10-05 20:07:39 -04:00
Hypolite Petovan	7ac652e20d	Merge pull request #5831 from nupplaphil/addon_check ... moving boot::check_addons to Friendica\Core\Addon::check	2018-10-05 19:45:04 -04:00
Hypolite Petovan	f287d76264	Merge pull request #5827 from annando/follow-on-switch ... Send a follow request upon contact switch to AP	2018-10-05 19:39:38 -04:00
Philipp Holzer	eb1a257224	Used new select function	2018-10-06 01:21:05 +02:00
Philipp Holzer	d72473fd51	moving boot::check_addons to Friendica\Core\Addon::check ... And extending Addon from BaseObject because of self::getApp()	2018-10-06 01:13:29 +02:00
Michael	8dc1d19381	Merge remote-tracking branch 'upstream/develop' into develop	2018-10-05 21:04:17 +00:00
Michael	51dbffd396	Cache the AP delivery process	2018-10-05 21:00:40 +00:00
Philipp Holzer	947cc98cc4	delete unused use	2018-10-05 22:41:11 +02:00
Philipp Holzer	065340dc32	Creating Friendica\App\Mode for encapsulating the App Mode	2018-10-05 22:36:09 +02:00
Michael	5d7968bdf3	Avoid to do the follow stuff for the public user	2018-10-05 20:10:10 +00:00
Michael	5ed1c12349	Send a follow request upon contact switch to AP	2018-10-05 19:48:48 +00:00
Hypolite Petovan	3c7d41c388	Merge pull request #5826 from annando/network-name ... We now can show "Friendica (AP)" as network name	2018-10-05 15:43:16 -04:00
Michael	9fbaaa1481	We now can show "Friendica (AP)" as network name	2018-10-05 19:26:20 +00:00
Hypolite Petovan	e1ba9e0538	Merge pull request #5825 from nupplaphil/friendica-5820 ... Adding "FRIENDICA_URL_PATH" to the automatic installation	2018-10-05 14:05:34 -04:00
Philipp Holzer	924b21623c	Fixing tests for AutomaticInstallation	2018-10-05 19:51:14 +02:00
Philipp Holzer	fe6e600dc5	Adding "FRIENDICA_URL_PATH" to the automatic installation	2018-10-05 19:42:08 +02:00
Hypolite Petovan	be7bd10678	Merge pull request #5824 from annando/fix-follow ... Following a soapbox now works / rapid follow/unfollow should work now	2018-10-05 07:49:36 -04:00
Michael	fa7cddc669	AP Bugfix: Following a soapbox now works / rapid follow/unfollow should work now	2018-10-05 06:35:50 +00:00
Hypolite Petovan	253ac95ca0	Merge pull request #5823 from annando/ap-attach ... Changed attachment handling to improve Mastodon compatibility	2018-10-05 00:21:41 -04:00
Michael	3d74d412b2	Changed attachment handling to improve Mastodon compatibility	2018-10-05 04:04:37 +00:00
Hypolite Petovan	2e98b6873a	Merge pull request #5821 from JonnyTischbein/issue_rss_test ... [frio] Submit button for RSS Frequency	2018-10-04 18:33:11 -04:00
Jonny Tischbein	5a5a281ed2	css for submit button	2018-10-05 00:11:13 +02:00
Jonny Tischbein	2802f031d4	Submit button for rss poll	2018-10-05 00:08:16 +02:00
Hypolite Petovan	0589d9ed2d	Merge pull request #5819 from JonnyTischbein/issue_install_db_inuse ... Install: After detecting DB already in use, go back to db_stettings with error	2018-10-04 15:51:14 -04:00