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

20268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel 3eca4bdb57
Merge pull request #5250 from tobiasd/20180620-msg 
regen master messages.po
 2018-06-20 08:51:56 +02:00
Tobias Diekershoff 4da9395075 regen master messages.po 2018-06-20 08:17:50 +02:00
Tobias Diekershoff 73b365d422
Merge pull request #5249 from annando/linear-load-optional 
Makes the linear load calculation optional
 2018-06-20 08:00:12 +02:00
Michael e40b247118 Increase default number of workers in config 2018-06-20 04:50:15 +00:00
Michael 00124f9ac0 Makes the linear load calculation optional 2018-06-20 04:38:50 +00:00
Hypolite Petovan 533fedf9b8
Merge pull request #5248 from miqrogroove/patch-2 
Fix logic errors in tooMuchWorkers()
 2018-06-19 20:18:59 -04:00
miqrogroove 0dbddb240c
Update Worker.php 2018-06-19 18:55:55 -04:00
miqrogroove 7e4d7b9aac
Fix logic errors in tooMuchWorkers() 
There are probably a dozen different ways to do this, so this is not necessarily the "right" way.
 2018-06-19 18:53:02 -04:00
Hypolite Petovan 43ab1b2cf2
Merge pull request #5246 from annando/abstraction-encore 
Urgent bugfix: Non existing field / double "network" in field list
 2018-06-19 17:58:50 -04:00
Hypolite Petovan a863a73e08
Merge pull request #5245 from miqrogroove/patch-1 
Add Missing Fifth Argument to mail() Function Call
 2018-06-19 17:55:24 -04:00
Michael c540154f8e "shadow" does not exist 2018-06-19 21:41:38 +00:00
Michael 962fbc9166 Many "fetch_first" had been replaced 2018-06-19 21:33:07 +00:00
Michael 139d35438d Fix: network had been empty 2018-06-19 21:32:42 +00:00
miqrogroove b6f2f92dde
Update htconfig.md 2018-06-19 17:07:16 -04:00
miqrogroove 79446a625d
Update Emailer.php 2018-06-19 16:58:06 -04:00
miqrogroove f5229a3cb7
Update htconfig.md 2018-06-19 16:42:15 -04:00
miqrogroove 5b8619f501
Add Missing Fifth Argument to mail() Function Call 
This is desperately needed to fix Issue #5190.  In case of any unexpected problem, the admin can use

`$a->config['system']['sendmail_params'] = false;`
 2018-06-19 16:23:42 -04:00
Michael ab5669e091 Some more direct SQL calls had been replaced 2018-06-19 19:06:17 +00:00
Hypolite Petovan 82d55f120f
Merge pull request #5238 from annando/more-abstraction 
Even more replaced item calls ...
 2018-06-19 14:02:43 -04:00
Michael 92650f9634 Null - not false 2018-06-19 17:58:28 +00:00
Michael a9a19cb8e6 Display is reworked 2018-06-19 17:57:45 +00:00
Michael e4adaa9900 Standards and variable renaming 2018-06-19 17:11:59 +00:00
Hypolite Petovan a566d50e91
Merge pull request #5242 from rabuzarus/20180619_-fix_some_elements_shouldnt_be_visitable_for_visitors 
Bugfix: hide savedsearch button and subthread button for non local_users
 2018-06-19 12:32:18 -04:00
rabuzarus 0a97a3f822 Bugfix: hide savedsearch butten and subthread button for non local_users 2018-06-19 18:27:54 +02:00
rabuzarus b65e4b278b port hubzillas OpenWebAuth - use Contact::getIdForURL to query for contact entry 2018-06-19 16:15:28 +02:00
Michael a5ca724fd3 Merge remote-tracking branch 'upstream/develop' into more-abstraction 2018-06-19 13:48:19 +00:00
Michael ed00b63613 Typo 2018-06-19 13:26:03 +00:00
Hypolite Petovan fc06980dcd
Merge pull request #5240 from rabuzarus/20180619_-_fix_missing_use_statement 
worker.php - fix missing use statement
 2018-06-19 08:59:19 -04:00
rabuzarus ffd3ff4c69 worker.php - fix missing use statement 2018-06-19 14:45:43 +02:00
rabuzarus 9195ea26b1 port hubzillas OpenWebAuth - add some notes to the doxygen to refer to hubzilla's source code 2018-06-19 13:30:55 +02:00
rabuzarus af9116635b port hubzillas OpenWebAuth - readd some ActivityPup code to HTTPSig 2018-06-19 13:18:35 +02:00
Michael ebd76285d8 New item functions, improved feed cache behaviour 2018-06-19 05:39:56 +00:00
rabuzarus 35480fe4f9 xrd.php - fix coding style 2018-06-18 23:15:52 +02:00
rabuzarus 1c7f4e3c63 port hubzillas OpenWebAuth - remote authentification 2018-06-18 23:05:44 +02:00
Michael 4714cb746b Use the item functions at many more places 2018-06-18 20:36:34 +00:00
Michael Vogel 80d7ee1442
Merge pull request #5237 from tobiasd/20180618-zhcn 
update to the zh-cn translation THX 朱陈锬
 2018-06-18 12:16:09 +02:00
Michael Vogel f828350ba2
Merge pull request #5234 from fabrixxm/fix/api 
API: fix sender/recipient of PMs
 2018-06-18 12:03:53 +02:00
fabrixxm e3ee9ee501 API: fix sender/recipient of PMs: check api_user before get user info. 
To throw ForbiddenException and pass tests
 2018-06-18 11:55:02 +02:00
Tobias Diekershoff ca85fa2272 update to the zh-cn translation THX 朱陈锬 2018-06-18 11:41:29 +02:00
Hypolite Petovan be2af7487e
Merge pull request #5236 from tobiasd/develop 
CS and NL translation update
 2018-06-18 04:05:26 -04:00
Hypolite Petovan 4a0176f3d6
Merge pull request #5235 from tobiasd/20180618-doc 
missing markdown formatting added
 2018-06-18 04:05:17 -04:00
Tobias Diekershoff 7a84252233 NL translation update 2018-06-18 08:24:00 +02:00
Tobias Diekershoff c39a5f6faa CS translation update 2018-06-18 08:23:05 +02:00
Tobias Diekershoff 0de3d96cd3 missing markdown formatation added 2018-06-18 08:17:21 +02:00
Michael 68ab3764e9 Merge remote-tracking branch 'upstream/develop' into more-abstraction 2018-06-18 05:20:47 +00:00
Michael 507956818d Use the item classes where possible 2018-06-18 05:19:28 +00:00
Hypolite Petovan af39296f06
Merge pull request #5232 from annando/no-author-link 
Separate functions for fetching items for the system and for users
 2018-06-17 18:41:46 -04:00
Michael 2a76290d19 Using the constants 2018-06-17 21:55:01 +00:00
Michael 23aa9dffa0 New item functions are now used in the delivery process as well 2018-06-17 21:35:33 +00:00
fabrixxm c015bb1b77 API: fix sender/recipient of PMs 2018-06-17 19:57:32 +02:00