Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-15 06:53:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
18722 commits 3 branches 64 tags 246 MiB
Commit graph

18722 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
2e02e88cf8
Merge pull request #4536 from MrPetovan/bug/fix-countable-warning 
[PHP 7.2] Fix missing Countable warning
 2018-03-03 15:39:28 +01:00
Tobias Diekershoff
8004a1bd93
Merge pull request #4538 from MrPetovan/bug/4535-user-not-found 
Fix missing logical not in admin/users
 2018-03-03 15:36:54 +01:00
Hypolite Petovan
9a13e67943 Fix missing logical not in admin/users 2018-03-03 09:34:48 -05:00
Hypolite Petovan
9cf2183524
Merge pull request #4537 from rabuzarus/20180303_-_fix_directory_search 
Bugfix: search in local directory didn't work
 2018-03-03 09:18:41 -05:00
Hypolite Petovan
b8fca5efe7 [PHP 7.2] Fix missing Countable warning 2018-03-03 08:48:30 -05:00
rabuzarus
c78572bf47 directory.php - code beautification (PSR) 2018-03-03 14:40:16 +01:00
Michael
194da423e0 An array with fieldnames as keys is important for the "insert" in the "update" function 2018-03-03 13:26:23 +00:00
rabuzarus
2efd4ba780 fix local directory search 2018-03-03 14:06:42 +01:00
Hypolite Petovan
ab544e1e9f Add missing dba::close() call in Contact::pruneUnavailable 2018-03-03 07:41:49 -05:00
Hypolite Petovan
1907a5dbe7
Rename Acl.php to ACL.php 2018-03-03 07:40:18 -05:00
Hypolite Petovan
cd3ff100ab Rename Acl.php to ACL.php 2018-03-03 07:38:15 -05:00
Michael Vogel
aa36d7ff75
Merge pull request #4534 from tobiasd/20180303-zhcn 
update to the zh-cn  translation THX 朱陈锬
 2018-03-03 11:44:53 +01:00
Michael Vogel
1f314b44ce
Merge pull request #4533 from tobiasd/20180303-typo 
tyoi, found by 朱陈锬 thanks for that!
 2018-03-03 11:44:37 +01:00
Tobias Diekershoff
a5049c7304 update to the zh-cn THX 朱陈锬 2018-03-03 11:13:14 +01:00
Tobias Diekershoff
1510b3d948 tyoi, found by 朱陈锬 thanks for that! 2018-03-03 11:02:40 +01:00
Michael Vogel
45a9902c83
Merge pull request #4531 from tobiasd/20180303-FAQ 
added support channels to the FAQ
 2018-03-03 09:55:42 +01:00
Tobias Diekershoff
80976e28d5 removed dead link 2018-03-03 09:50:42 +01:00
Michael
5bda6c7f6d We now accept array as condition parameters 2018-03-03 08:47:13 +00:00
Tobias Diekershoff
6ca6193e04 added support channels to the FAQ 2018-03-03 08:13:46 +01:00
Tobias Diekershoff
fab9cb6825 Version 3.6-rc for the RC branch 2018-03-03 07:36:58 +01:00
Hypolite Petovan
a7db21c8fd Rename Core\Acl to Core\ACL 2018-03-02 18:41:24 -05:00
Hypolite Petovan
35d09fdad1 Fix query mistake in Acl::getSuggestContactSelectHTML 2018-03-02 18:40:09 -05:00
Hypolite Petovan
dca0fa3f1d Fix wrong variable type in mod/message 2018-03-02 18:40:09 -05:00
Hypolite Petovan
a6c785f693 Prettify mod/acl 
- Replace obsolete x() and killme() calls
- Simplify ternary operators with defaults()
- Restore list alignment
- Extract variable initialization from else conditions
 2018-03-02 18:40:09 -05:00
Hypolite Petovan
2f463dfb17 Remove include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan
09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan
207eac4a16 Move navbar_complete to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
824262b824 Move populate_acl to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
2b35938e34 Move get_acl_permissions to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
ce9e0f3649 Move prune_deadguys to Contact 2018-03-02 18:40:08 -05:00
Hypolite Petovan
113ea38d50 Move contact_select to Acl 
- Simplify Acl::getMessageContactSelectHTML parameters
 2018-03-02 18:40:08 -05:00
Hypolite Petovan
eef25a3259 Move contact_selector() 2018-03-02 18:40:08 -05:00
Hypolite Petovan
e2de86de46 Update references in acl_selectors to new functions 2018-03-02 18:40:08 -05:00
Hypolite Petovan
eeafb59c31 Add new class/functions 
- Create class Core\Acl
- Add Contact::pruneUnavailable
- Add mod_content
 2018-03-02 18:40:08 -05:00
Hypolite Petovan
38e5e64532
Merge pull request #4530 from annando/db-timestamp 
Some more performance measuring for database stuff
 2018-03-02 14:11:32 -05:00
Michael
1be5275eef Some more performance measuring for database stuff 2018-03-02 13:37:49 +00:00
Michael Vogel
26c1926f1f
Merge pull request #4529 from tobiasd/20180302-msg 
regenerated master messages.po file
 2018-03-02 13:10:11 +01:00
Michael Vogel
9b18379b2a
Merge pull request #4528 from tobiasd/20180302-transl 
translation updates for DE and ZH CN
 2018-03-02 13:09:54 +01:00
Tobias Diekershoff
ac435126dd regenerated master messages.po file 2018-03-02 12:02:54 +01:00
Tobias Diekershoff
eac13dea7a update for DE translation THX hoergen oostende 2018-03-02 11:51:39 +01:00
Tobias Diekershoff
945c9ed802 update to the zh-cn THX 朱陈锬 2018-03-02 11:50:22 +01:00
Tobias Diekershoff
b5f8d73833
Merge pull request #4527 from annando/fix-no-constant-update 
Bugfix: No constant update in "getIdForUrl"
 2018-03-02 10:58:17 +01:00
Michael Vogel
e96bcb8512
Merge pull request #4526 from MrPetovan/task/4522-postpone-contact-update 
Postpone contact update in Contact::getIdForURL
 2018-03-02 05:43:04 +01:00
Michael
361af7bc78 Bugfix: No constant update in "getIdForUrl" 2018-03-02 03:55:24 +00:00
Hypolite Petovan
41678ec3cd Add no_update flag to speed up Contact::getIdForURL instances 2018-03-01 19:54:45 -05:00
Hypolite Petovan
9f21e7f34f Use default value for uid parameter in Contact::getIdForURL 2018-03-01 19:54:12 -05:00
Hypolite Petovan
01c7945b7a
Merge pull request #4525 from annando/fix-dfrn-delee 
Bugfix: Deleting comments via DFRN had only partly worked
 2018-03-01 16:58:35 -05:00
Michael
0cc121cf44 Bugfix: Deleting comments via DFRN had only partly worked 2018-03-01 21:52:36 +00:00
Hypolite Petovan
e54a7e7834
Merge pull request #4523 from annando/invitation-code 
"Invitation ID" is now "invitation code" to unify the description
 2018-03-01 15:53:10 -05:00
Hypolite Petovan
b088ef83c5
Merge pull request #4524 from annando/delete-dfrn 
When deleting, don't send the parent via DFRN
 2018-03-01 15:52:51 -05:00