jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22920 commits 10 branches 58 tags 216 MiB
Commit graph

22920 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Hypolite Petovan
8c1db51a76 Improve Logger calls 
- Replace various deprecated Logger::log calls
- Reassign log level for verbose log calls
 2019-02-23 17:32:11 -05:00
Hypolite Petovan
1917f04153 Rewrite Term class 
- Move term type constants from TERM_* to Term::*
- Move term object type constants from TERM_OBJ_* to Term::OBJECT_TYPE_*
- Add Term::isType() method
- Add Strings::startsWith()  method
 2019-02-23 17:32:11 -05:00
Hypolite Petovan
cd53585101 Improve /itemsource display 
- Add Item Id
- Add Item Terms
 2019-02-23 17:32:10 -05:00
Hypolite Petovan
7320c5e8e8 Normalize Contact::magicLinkByContact method name 2019-02-23 17:32:10 -05:00
Michael
ed54345ce1 Only check once 2019-02-23 22:27:03 +00:00
Michael
28f7c72cc7 Don't allow calling the install page after the install had been processed 2019-02-23 21:58:35 +00:00
Hypolite Petovan
ae7115894f
Merge pull request #6734 from annando/fix-follow 
Fix: Following url with html entities now works again
 2019-02-23 16:49:19 -05:00
Michael
7e93355671 Fix: Following url with html entities now works again 2019-02-23 21:20:56 +00:00
Hypolite Petovan
b9bd7b4f10
Merge pull request #6731 from annando/undefined-property 
Fixes "Undefined property: Friendica\App::$queue"
 2019-02-23 12:04:12 -05:00
Michael
7703875b55 Fixes "Undefined property: Friendica\App::$queue" 2019-02-23 16:08:02 +00:00
Hypolite Petovan
44953f045e
Merge pull request #6730 from nupplaphil/dba_reconnect 
DBA::(re-)connect fix for basePath
 2019-02-23 08:45:31 -05:00
Hypolite Petovan
1a0398a5b3
Merge pull request #6723 from nupplaphil/issue/6658-worker_id 
Adding worker ID to log
 2019-02-23 08:38:08 -05:00
Philipp Holzer
5f17ce574f
Fixing DBA::(re-)connect() 2019-02-23 12:50:52 +01:00