clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
23,641 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

23641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hypolite Petovan 6376293218 Merge /contactgroup module with Group module 2019-02-23 17:32:40 -05:00
Hypolite Petovan 7ab986bc97 Move group module to src/ 2019-02-23 17:32:40 -05:00
Hypolite Petovan b939faf4ef Add contact removal from all groups when blocked 2019-02-23 17:32:40 -05:00
Hypolite Petovan 7e499647e3 Add System::jsonError method for ajax call returns 2019-02-23 17:32:40 -05:00
Hypolite Petovan f4745c5936 Add doc to Model\Term 2019-02-23 17:32:13 -05:00
Hypolite Petovan 67aa188830 Improve Logger calls 
- Add context in various calls
- Remove deprecated Logger::log call in Processor
 2019-02-23 17:32:13 -05:00
Hypolite Petovan cb78e77850 Fix implicit mentions in outgoing ActivityPub posts 
- Add usage of system.disable_implicit_mentions to disable implicit mention behavior
- Add usage of item own implicit mentions to be prepended to the outgoing body
 2019-02-23 17:32:12 -05:00
Hypolite Petovan 3ac8576c8e Fix implicit mentions in incoming ActivityPub posts 
- Use thr-parent instead of parent-uri to retrieve implicit mentions to remove from body
- Add potential implicit mentions to 'tags' array for storage in Processor::convertImplicitMentionsInTags()
- Add usage of system.disable_implicit_mentions to disable implicit mention behavior
 2019-02-23 17:32:12 -05:00
Hypolite Petovan fc47a07801 Fix Diaspora outgoing implicit mention 
- Use name instead of nick for implicit mention
- Rename $parent to $toplevel_item in Diaspora::constructComment
- Use thread parent to retrieve the expected mention instead of the top level item
 2019-02-23 17:32:12 -05:00
Hypolite Petovan e51f2cea0d Add implicit mentions to explicit mentions default text 2019-02-23 17:32:12 -05:00
Hypolite Petovan c7dfc88c6c Add implicit mention gathering in local posts 
- Rename $parent_item to $toplevel_item in item_post()
- Add $thread_parent_id variable to distinguish from $parent_item
- Add item_add_implicit_mentions() function
 2019-02-23 17:32:12 -05:00
Hypolite Petovan 0cc0df9e3e Rename system.disable_mentions_removal config key to system.disable_implicit_mentions 
- Update configuration key description
 2019-02-23 17:32:11 -05:00
Hypolite Petovan 34bc0b0c97 Add potential debug display of implicit mentions in frio 
- Refactored conversation() by removing extraneous intermediary variables
 2019-02-23 17:32:11 -05:00