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
84248ac4c1
Grammar stuff
2018-05-16 03:54:08 +00:00
c9f55f6b3d
Show "Remove from your screen" or "delete" depending of the impact of the deletion
2018-05-15 21:06:34 +00:00
e77cd17495
We do the notify stuff now directly in the item class
2018-05-15 19:50:29 +00:00
fe8a4d50c8
Merge branch 'item-delete' of github.com:annando/friendica into item-delete
2018-05-15 19:31:05 +00:00
4a1bbd114c
Lower priority for "remote self"
2018-05-15 19:29:14 +00:00
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
fc60e23314
Added comments / hourly workerqueue deletion
2018-05-15 17:50:29 +00:00
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
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
4a7bf95926
Fix: Delete all item copies if it is an original item
2018-05-15 15:51:58 +00:00
0848cef605
Merge pull request #5055 from annando/worker-spawning
...
Fix for the slow spawning of workers
2018-05-15 08:22:33 +02:00
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
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
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
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
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
d0c7ba5257
Fixed parser error
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:21 +02:00
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
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
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
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
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
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
94a02f8572
Continued:
...
- return is a keyword, not a function, so don't add braces here
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
57e668d9e0
Continued:
...
- avoided else() block which reduces code complexibility
- used more x()
- added curly braces
- added known type-hints
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:05 +02:00
e0a07d5f27
Continued:
...
- used x() to make sure the array key is there, else an E_NOTICE is triggered
- added type-hints where it is safe
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:04 +02:00
17a39340b5
"pending" shouldn't be set as well by default ...
2018-05-14 22:50:04 +02:00
f28301e18f
Urgent bugfix: Public contacts had been blocked automatically when created
2018-05-14 22:50:04 +02:00
72f5b863d8
Reshares had been detected falsely so that were rejected by Diaspora
2018-05-14 22:50:04 +02:00
f19066c6cf
Ensure that the link will be displayed correctly on Diaspora
2018-05-14 22:50:04 +02:00
dcfd81e2ee
Some corrections
2018-05-14 22:50:04 +02:00
d54c79a772
Replace old database queries with the new ones
2018-05-14 22:50:04 +02:00
8bc565be74
Continued:
...
- ops, another rebase-leftover fixed
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
befb080b70
Continued:
...
- moved to Config class
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
a8e2c3a3ad
Continued:
...
- ops, did accidently modify composer.lock ... :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
15c570495b
Windows' CRLF are looking strange under Linux, let's get rid of them/
...
Also let's ignore addons/ as it is optional and depend on if the webmaster
wants it or not.
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
3868d830e7
General project change:
...
- cleaned up vendor/ as it is a "build" (means being locally recreated)
directory and therefor should *NOT* be committed.
- updated composer.lock
- that is what would be updated now if vendor/ would be ignored, instead a lot
files has been changed in vendor/
- people running `composer install` regulary will get (with the old way) a dirty
working copy (version-controlled files being modified) and then cannot update
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
cdc24a73ca
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 Haeder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
2fd14eac70
Opps, cutted this out by accident ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:50:03 +02:00
