friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-26 12:16:06 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
22905 commits 3 branches 63 tags 249 MiB
Commit graph

22905 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philipp Holzer 758444a7d2
empty is better than isset 2019-02-24 15:48:30 +01:00
Philipp Holzer da4fc0411e
Fixing admin scheme-change in frio 2019-02-24 15:40:05 +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
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
Philipp Holzer a73235b6ee
Fixing DBA::(re-)connect() 2019-02-23 12:49:56 +01:00
Philipp Holzer c53f0a4382
Fixing DBA::reconnect() 2019-02-23 12:48:39 +01:00
Philipp Holzer 8760d89eb8
reverting back workerLogger to Logger 2019-02-23 10:24:22 +01:00
Tobias Diekershoff 5f84c7f3ad
Merge pull request #6727 from nupplaphil/issue/6472-nodeinfo 
Returning 404 if nodeinfo isn't enabled
 2019-02-23 10:24:16 +01:00
Tobias Diekershoff 26931f2301
Merge pull request #6728 from nupplaphil/issue/6337-warnings 
Fixing Update retval warning
 2019-02-23 10:23:46 +01:00
Philipp Holzer 5b2f394e3e
Fixing #issuecomment-456403983 2019-02-23 10:16:07 +01:00
Philipp Holzer 45cc8180b1
Return 404 if nodeinfo isn't enabled. 2019-02-23 10:10:33 +01:00
Hypolite Petovan c1896eee34
Merge pull request #6725 from nupplaphil/6691-rendertime-fix 
Addon loading fix
 2019-02-22 23:53:11 -05:00
Hypolite Petovan 98d584b737
Merge pull request #6724 from nupplaphil/issue/config_set 
Config Set Bugfix
 2019-02-22 21:29:26 -05:00
Philipp Holzer dddaf8ea1d
improve tests 2019-02-23 01:37:29 +01:00
Philipp Holzer 3aae84edd1
[rendertime] Timing problem during addon config read 2019-02-23 01:24:08 +01:00
Philipp Holzer 40e9bbeb88
cleanup 2019-02-23 00:53:31 +01:00
Philipp Holzer b23368b0ea
bugfixing test 2019-02-23 00:51:08 +01:00
Philipp Holzer 13807129aa
fixing preload adapter 2019-02-23 00:23:41 +01:00
Philipp Holzer 1dee89f215
fixing tests and preload config 2019-02-23 00:09:57 +01:00