keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19737 commits 4 branches 0 tags 179 MiB
Commit graph

19737 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan
c9bca54228
Merge pull request #5069 from Quix0r/tickets/4965 
Changed tooltip from #4965
 2018-05-16 21:02:46 -04:00
Roland Häder
dd18cf8de5
Fixes for #4965: 
- updated messages.po file

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-17 02:27:30 +02:00
Roland Häder
d1783e9aeb
Fixes for #4965: 
- better descriptive tooltip for adding/removing contact from/to group

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-17 02:24:42 +02:00
Hypolite Petovan
b1c38641cd
Merge pull request #5068 from Quix0r/fixes/rc-openid-login 
OpenId possibly fixed
 2018-05-16 18:42:43 -04:00
Roland Häder
6129eb1623
OpenId possibly fixed: 
- The LightOpenId class' constructor now requires the hostname from where the
  requested started, added it now
- sometimes need to invoke get_app() as $a was not around

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-17 00:24:25 +02:00
Hypolite Petovan
ce75177d4e
Merge pull request #5022 from Rudloff/feature/test_api 
Add API tests
 2018-05-16 08:25:11 -04:00
Michael Vogel
e8e93768db
Merge pull request #5065 from tobiasd/2018.05-rc 
added link to the TOS page if it is activated
 2018-05-16 14:21:24 +02:00
Tobias Diekershoff
f285d9c7eb add link to TOS in frios registration template if enabled 2018-05-16 13:41:56 +02:00
Pierre Rudloff
e7fceb8e61 Make DatabaseTest::getConnection() return the correct database name to PHPUnit 2018-05-16 13:15:28 +02:00
Pierre Rudloff
f3ca3b2bd5 Add some explanation in DatabaseTest::getConnection() 2018-05-16 13:14:50 +02:00
Pierre Rudloff
f7064be41f Remove useless line breaks in DatabaseTest 2018-05-16 13:09:05 +02:00
Pierre Rudloff
5ece452a32 Remove unused class import in DatabaseTest 2018-05-16 13:08:17 +02:00
Tobias Diekershoff
eec0826750 added link to the TOS page if it is activated 2018-05-16 11:57:06 +02:00
Tobias Diekershoff
dcc8274353
Merge pull request #5064 from annando/followup-pr-5060 
Follow up to PR 5060: Missing index update
 2018-05-16 11:12:17 +02:00
Michael
3b2752c2fe Follow up to PR 5060: Missing index update 2018-05-16 08:59:15 +00:00
Hypolite Petovan
f11b6c131e
Merge pull request #5061 from AndyHee/2018.05-rc 
Update sample-nginx.config
 2018-05-16 00:26:20 -04:00
Andy H3
e22f7a3c31
Update sample-nginx.config 
Updated default path to PHP7.0

PHP5.0 is not considered standard any more.
 2018-05-16 11:10:19 +07:00
Hypolite Petovan
c3a532a9f6
Merge pull request #5060 from annando/item-delete 
item deletion now works again
 2018-05-15 23:56:23 -04:00
Michael
84248ac4c1 Grammar stuff 2018-05-16 03:54:08 +00:00
Michael
c9f55f6b3d Show "Remove from your screen" or "delete" depending of the impact of the deletion 2018-05-15 21:06:34 +00:00
Michael
e77cd17495 We do the notify stuff now directly in the item class 2018-05-15 19:50:29 +00:00
Michael
fe8a4d50c8 Merge branch 'item-delete' of github.com:annando/friendica into item-delete 2018-05-15 19:31:05 +00:00
Michael
4a1bbd114c Lower priority for "remote self" 2018-05-15 19:29:14 +00:00
Michael
82937189ba Only delete undeleted items 2018-05-15 19:25:35 +00:00
Hypolite Petovan
db3bcd8ac6
Merge pull request #5059 from tobiasd/20180515-fixdev 
revertig file movements
 2018-05-15 13:53:31 -04:00
Michael
fc60e23314 Added comments / hourly workerqueue deletion 2018-05-15 17:50:29 +00:00
Tobias Diekershoff
b74f9e07bc revertig file movements 2018-05-15 19:23:13 +02:00
Hypolite Petovan
f6d4d83bd1
Merge pull request #5058 from M-arcus/patch-2 
[DOCS] Environment variables: Add explanation
 2018-05-15 12:53:17 -04:00
Marcus Müller
44a5fe95d4 [DOCS] Environment variables: Add explanation 
Resolves https://github.com/friendica/friendica/issues/4791
 2018-05-15 18:49:40 +02:00
Michael
3e475f3b82 Delete the shadow post when it is the last one 2018-05-15 16:40:13 +00:00
Hypolite Petovan
973d62c087
Merge pull request #5057 from M-arcus/patch-2 
[BUGFIX] .htaccess: Add file
 2018-05-15 12:13:34 -04:00
Marcus Müller
38666fa7fa [BUGFIX] .htaccess: Rename file 2018-05-15 18:09:24 +02:00
Marcus Müller
c17db5e26f Revert "[BGUFIX] .htaccess: Add file" 
This reverts commit 7e099bf9c0.
 2018-05-15 18:06:54 +02:00
Marcus Müller
7e099bf9c0
[BGUFIX] .htaccess: Add file 
Fixes https://github.com/friendica/friendica/pull/5042#issuecomment-389218702
 2018-05-15 18:00:12 +02:00
Michael
4a7bf95926 Fix: Delete all item copies if it is an original item 2018-05-15 15:51:58 +00:00
Tobias Diekershoff
0848cef605
Merge pull request #5055 from annando/worker-spawning 
Fix for the slow spawning of workers
 2018-05-15 08:22:33 +02:00
Tobias Diekershoff
ba4f9b6136
Merge pull request #5054 from annando/diaspora-comments 
Fix: public comments weren't distributed to the followers.
 2018-05-15 07:30:34 +02:00
Michael
8564eeec4e Fix: public comments weren't distributed to the followers. 2018-05-15 04:33:28 +00:00
Hypolite Petovan
abbe213fef
Merge pull request #5042 from Quix0r/rewrites/curly-braces-is-result-usage-002 
Rewrites/curly braces is result usage 002
 2018-05-14 22:51:07 -04:00
Hypolite Petovan
5e2d2e15d6
Merge pull request #5053 from Quix0r/latest-rc 
Fix for "Illegal string offset 'success'"
 2018-05-14 21:39:25 -04:00
Roland Häder
e409001dfb
Fixed "constant" result, maybe there is a $ missing? 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-15 03:26:20 +02:00
Roland Häder
5a7bcd4725
Added empty line after if() block (convention) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:22 +02:00
Roland Häder
f34d72c143
Fixes: 
- used empty() instead of x()
- removed superflous count()

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:22 +02:00
Roland Häder
d0c7ba5257
Fixed parser error 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:21 +02:00
Roland Häder
debcdea82a
Continued: 
- merged 2 if() into one with &&
- added TODO for possible rewrite (avoid "complex" code)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder
bacb7b70f6
Cleanups: 
- added empty lines
- removed old-lost commented out line

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder
538760d9da
No direct $a->config['foo'] needed when Config::get() is around ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder
751394fc1d
Redis: 
- added support for redis server:

// Required to actually have this cache driver active:
$a->config['system']['cache_driver'] = 'redis';

// ---- OPTIONAL/DEFAULT: ----
$a->config['system']['redis_host'] = '127.0.0.1';
$a->config['system']['redis_port'] = 6379;

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder
69ac6feff7
Continued: 
- you can directly use constant($var) instead of this switch()

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder
fe1e7b92f2
Continued: 
- system,worker_dont_fork may not be set, always set default to "false" to
  have it properly set as Config::get() may one day behave differently

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00