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

19912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rabuzarus 02d96623f2 port hubzillas OpenWebAuth - don't initiate magic auth if the contact is allready authentificated 2018-06-21 02:08:54 +02:00
Hypolite Petovan a5550b4702
Merge pull request #5253 from rabuzarus/20180616_-_magic_auth_test_2 
Port hubzillas OpenWebAuth - remote authentification
 2018-06-20 17:46:04 -04:00
rabuzarus 04fe3acb69 port hubzillas OpenWebAuth - fix method call 2018-06-20 23:29:36 +02:00
Hypolite Petovan dd1e6dd4a5
Merge pull request #5258 from Quix0r/rewrites/curly-braces-is-result-usage-002-split1 
Curly braces, whitespaces and duplicate method invocation fixed
 2018-06-20 16:51:22 -04:00
Roland Häder 8ad523fbc8
Continued a bit: 
- removed/fixed whitespaces and mixture of spaces/tabs (some)
- added new-line character at end of files (POSIX-compilant)
- reverted some code which I had messed up (compared to upstream/develop)
- removed duplicate dba::update() invocation in src/Protocol/DFRN.php
- also removed no longer valid TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:19:54 +02:00
Michael f806fa91b1
Replace old database queries with the new ones 2018-06-20 22:02:17 +02:00
Roland Haeder 6cb26f884e
Fixes for composer: 
- ./vendor/ is being prepared by executing `utils/composer.phar install`, no
  need to have it around
- converted .gitignore to LF line-ending (more common over the whole project)
- no need to have them around ...

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:02:17 +02:00
Roland Haeder 7c048b5077
Opps, cutted this out by accident ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:17 +02:00
Roland Haeder 593d1feca6
was a bit confusing for me or I was not sleeping to much ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:17 +02:00
Roland Haeder 2d744fa189
PHP5 does not support native type-hints, except array + used dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:17 +02:00
Roland Haeder 506657ec42
removed TODO, one day this all needs refacturizing ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:17 +02:00
Roland Haeder 4ca26fd3bc
fixed comment and explained one 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:16 +02:00
Roland Häder 1567eb0791
fixed another left-over ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:02:16 +02:00
Roland Haeder a5dba628c4
old behaviour restored 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:16 +02:00
Roland Haeder 0e5daa86df
added curely branches + reverted back to old behaviour (may come back one day) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:16 +02:00
Roland Haeder ad9bd7bb72
better comment added by @Hypolite 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:16 +02:00
Roland Häder 852ef4021b
more spaces + some curly spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:02:16 +02:00
Roland Häder fe77e1b538
added more curly braces + a bit more usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:02:16 +02:00
Roland Haeder f89b999659
was a bit confusing for me or I was not sleeping to much ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:15 +02:00
Roland Haeder f0b05838cb
fixed comment and explained one 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:15 +02:00
Roland Haeder 22bbfdadd0
added more curly braces + spaces for #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:15 +02:00
Roland Haeder a95db714ca
added curely branches + reverted back to old behaviour (may come back one day) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:15 +02:00
Roland Haeder 63f5598766
better comment added by @Hypolite 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:15 +02:00
Roland Häder f2f12d6f50
Minor improvements: 
- added spaces and curly braces
- added more TODOs as there really more to be done
- removed redundant braces from "return" keyword (no function)
- merged 2 nested if() into one single

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:02:15 +02:00
Roland Haeder 9cc0d5479b
old behaviour restored 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-06-20 22:02:15 +02:00
rabuzarus 3d1822996a port hubzillas OpenWebAuth - fix another code standards violation 2018-06-20 20:16:36 +02:00
rabuzarus 9f493357f4 port hubzillas OpenWebAuth - fix wrong table name + fix wrong method name 2018-06-20 20:11:26 +02:00
rabuzarus e4aaf8eb16 port hubzillas OpenWebAuth - fix some code standards violations 2018-06-20 19:32:26 +02:00
rabuzarus 149142b4bc port hubzillas OpenWebAuth - rename Verify class to OpenWebAuthToken 2018-06-20 19:24:02 +02:00
rabuzarus d5afbd3357 port hubzillas OpenWebAuth - rename verify table to openwebauth-token 2018-06-20 19:18:41 +02:00
rabuzarus 1ab3f7bfc8 port hubzillas OpenWebAuth - HTTPSignature - comment out some ActivityPub parts 2018-06-20 19:05:33 +02:00
rabuzarus 863a49d8e7 port hubzillas OpenWebAuth - rework the HTTPHeaders class 2018-06-20 18:52:37 +02:00
rabuzarus 1148c29916 port hubzillas OpenWebAuth - use random_bytes() in crypto class + bugfixes 2018-06-20 18:45:37 +02:00
rabuzarus f0235c4a98 port hubzillas OpenWebAuth - rename some methods and classes 2018-06-20 18:38:23 +02:00
Hypolite Petovan 9feb5fb0f6
Merge pull request #5256 from miqrogroove/patch-1 
Filter Removed Users From Directory
 2018-06-20 12:07:26 -04:00
Hypolite Petovan 718258f500
Merge pull request #5255 from tobiasd/20180620-de 
update DE translations
 2018-06-20 12:06:30 -04:00
miqrogroove b9a1e2e97f
Need the count conditions to match. 2018-06-20 11:59:13 -04:00
miqrogroove 7243dcfb09
Filter Removed Users From Directory 2018-06-20 11:50:09 -04:00
Tobias Diekershoff dbe1d5adc7 update DE translations 2018-06-20 17:34:23 +02:00
Hypolite Petovan 1e00efdb99
Merge pull request #5251 from miqrogroove/patch-1 
Unify Worker Load Formulas
 2018-06-20 08:55:19 -04:00
miqrogroove f7e197c26e
Clarify 0 Value of Worker Exponent 2018-06-20 06:52:53 -04:00
miqrogroove 12d0f4bf3c
Add Comments to Worker Exponent Implementation 2018-06-20 06:43:57 -04:00
miqrogroove 3f69568365
Revise Description of New Worker Config 2018-06-20 06:29:52 -04:00
miqrogroove 9cde4aa109
Make Load Exponent Configurable 2018-06-20 06:22:53 -04:00
miqrogroove 97cabcecf2
Unify Worker Load Formulas 2018-06-20 06:06:20 -04:00
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