23304 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Diekershoff	8a6c75eab3	adding changes till 2019-02-25	2019-02-26 06:50:36 +01:00
Tobias Diekershoff	c62a3700ea	Merge pull request #6759 from MrPetovan/task/composer ... [Composer] Update npm-asset/fullcalendar to version 3.10.0	2019-02-26 06:28:23 +01:00
Hypolite Petovan	39ff7de065	[Composer] Update npm-asset/fullcalendar to version 3.10.0 ... - Add now required explicit npm-asset/moment dependency for npm-asset/fullcalendar to work	2019-02-25 21:06:18 -05:00
Tobias Diekershoff	c3b7ce349d	Merge pull request #6758 from MrPetovan/bug/notices ... Fix various notice messages	2019-02-25 14:33:42 +01:00
Hypolite Petovan	97eb2ba053	Fix possibly undefined after index in Text\BBCode	2019-02-25 07:12:01 -05:00
Hypolite Petovan	05d8bf6b54	Fix wrong use of array_shift in Core\Worker	2019-02-25 07:11:35 -05:00
Philipp	4f300e41b4	Merge pull request #6755 from MrPetovan/bug/notices ... Protect access to rel attribute in Network\Probe	2019-02-25 10:10:41 +01:00
Hypolite Petovan	f597f3b378	Protect access to rel attribute in Network\Probe	2019-02-25 03:39:40 -05:00
Michael Vogel	230c0a50e8	Merge pull request #6753 from MrPetovan/bug/notices ... Add missing author contact in ActivityPub\Processor	2019-02-25 09:31:31 +01:00
Hypolite Petovan	3e290da8c2	Code standards: Add missing space in ActivityPub\Processor	2019-02-25 03:16:18 -05:00
Philipp	119bf0dc6a	Merge pull request #6754 from tobiasd/20190225-fr ... update FR translations THX hypolite	2019-02-25 08:25:00 +01:00
Tobias Diekershoff	7a73b63fc8	update FR translations THX hypolite	2019-02-25 07:49:33 +01:00
Hypolite Petovan	1f6e0f168c	Add missing author contact in ActivityPub\Processor ... - Add logging for future occurrences - Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-466812104	2019-02-24 15:52:03 -05:00
Michael Vogel	4c6c5786ad	Merge pull request #6752 from MrPetovan/bug/notices ... Fix various notices	2019-02-24 21:30:07 +01:00
Michael Vogel	69777c275b	Merge pull request #6751 from MrPetovan/bug/fatal-errors ... Add missing use statement in Model\Term	2019-02-24 21:07:13 +01:00
Hypolite Petovan	f95f6eced9	Add scheme input protection in frio/config.php ... - Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-464912016	2019-02-24 14:32:51 -05:00
Hypolite Petovan	e66768a058	Add empty entry author if contact query fails in DFRN ... - Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-462722599	2019-02-24 14:00:40 -05:00
Hypolite Petovan	0888850702	Fix missing avatar key in DFRN ... - Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-456839092	2019-02-24 13:40:04 -05:00
Hypolite Petovan	42c06506ce	Stop appending entry when parent is missing in OStatus ... - Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-455785854	2019-02-24 13:36:37 -05:00
Hypolite Petovan	82072bae46	Add missing use statement in Model\Term	2019-02-24 13:33:11 -05:00
Hypolite Petovan	458064ddde	Merge pull request #6749 from nupplaphil/6386-php_fatal ... Fixing appending child at DFRN without a parent id.	2019-02-24 12:55:34 -05:00
Philipp Holzer	5d13b94761	update phpdoc	2019-02-24 16:31:16 +01:00
Hypolite Petovan	8adc761da0	Merge pull request #6747 from nupplaphil/issue/6677-frio_admin ... Fixing frio theme customization for admin	2019-02-24 10:30:37 -05:00
Philipp Holzer	bf6a765beb	Fixing appending child at DFRN without a parent id.	2019-02-24 16:30:09 +01:00
Philipp Holzer	758444a7d2	empty is better than isset	2019-02-24 15:48:30 +01:00
Michael Vogel	efe358c617	Merge pull request #6746 from nupplaphil/issue/6338-notices ... Fixing notices	2019-02-24 15:44:54 +01:00
Michael Vogel	fa5525d084	Merge pull request #6726 from MrPetovan/task/6676-fix-implicit-mentions ... Fix last batch of implicit mentions issues	2019-02-24 15:40:11 +01:00
Philipp Holzer	da4fc0411e	Fixing admin scheme-change in frio	2019-02-24 15:40:05 +01:00
Philipp Holzer	5b932867c3	Fixing https://github.com/friendica/friendica/issues/6338#issuecomment-466749280	2019-02-24 15:22:14 +01:00
Philipp Holzer	fe74db6311	Fixing https://github.com/friendica/friendica/issues/6338#issuecomment-458030934	2019-02-24 15:15:25 +01:00
Michael Vogel	df5ea1fab0	Merge pull request #6732 from MrPetovan/bug/1777-fix-blocked-contact-group ... Allow to remove blocked contact from groups	2019-02-24 14:30:36 +01:00
Michael Vogel	a51c6549ad	Merge pull request #6744 from nupplaphil/task/namespace_to_class ... Replace string namespace with *::class	2019-02-24 14:27:48 +01:00
Philipp Holzer	e48c608db0	removed silent fail of logfile permission (should get fixed with #6745 )	2019-02-24 13:57:17 +01:00
Philipp Holzer	5fc42a744e	Replace string namespaces with ::class	2019-02-24 13:40:54 +01:00
Hypolite Petovan	4e3f780621	Merge pull request #6740 from nupplaphil/issue/6503-force_update ... Fixing force-flag for lock-release	2019-02-24 07:04:54 -05:00
Philipp Holzer	d1c7815c4e	added whitespace	2019-02-24 12:51:58 +01:00
Tobias Diekershoff	b93ed18253	Merge pull request #6741 from annando/worker-db-update ... Ensure that the database update will be processed anyway	2019-02-24 12:24:11 +01:00
Philipp Holzer	aae58815a8	Adjust update parameters: ... -f|--force Force the update command (Even if the database structure matches) -o|--override Override running or stalling updates	2019-02-24 12:24:09 +01:00
Michael	4bad2645e5	We should execute the worker job for normal situations ;-)	2019-02-24 10:52:40 +00:00
Michael	ee300a7db6	Ensure that the database update will be processed anyway	2019-02-24 10:43:29 +00:00
Philipp Holzer	7ce549c294	fixing delete	2019-02-24 10:27:56 +01:00
Philipp Holzer	9b07132b80	Fixing force-flag for lock-releasing	2019-02-24 10:08:28 +01:00
Michael Vogel	9f11476ca0	Merge pull request #6737 from MrPetovan/bug/6630-fix-empty-label-profile ... Fix "EMPTY" label in profile	2019-02-24 06:34:48 +01:00
Hypolite Petovan	cd363291c6	Update base translation strings	2019-02-23 19:40:05 -05:00
Hypolite Petovan	dbcca9cfac	Hide "never" on profile	2019-02-23 18:37:51 -05:00
Hypolite Petovan	b2e41e3298	Replace EMPTY value by empty value in profile selectors	2019-02-23 18:37:48 -05:00
Hypolite Petovan	38a4e12cf3	Merge pull request #6735 from annando/install ... Don't allow calling the install page after the install	2019-02-23 18:17:28 -05:00
Hypolite Petovan	102c44e8ee	Fix typo in mod/profiles	2019-02-23 18:11:48 -05:00
Hypolite Petovan	486de602ff	Delete mod/contactgroup and mod/group files	2019-02-23 17:32:41 -05:00
Hypolite Petovan	0a58e4c952	Improve contactgroupChangeMember() javascript function ... - Add usage of new /group/123/add|remove/123 URL - Add checkbox revert in case of error	2019-02-23 17:32:41 -05:00