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 |
|
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 |
|
Michael
|
fc60e23314
|
Added comments / hourly workerqueue deletion
|
2018-05-15 17:50:29 +00:00 |
|
Michael
|
3e475f3b82
|
Delete the shadow post when it is the last one
|
2018-05-15 16:40:13 +00: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
|
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 |
|
Hypolite Petovan
|
dd4af5aba7
|
Merge pull request #5045 from tobiasd/20180514-msg
regenerated master messages.po file
|
2018-05-14 08:15:01 -04:00 |
|
Tobias Diekershoff
|
348ed5d1ba
|
regenerated master messages.po file
|
2018-05-14 07:12:04 +02:00 |
|
Michael
|
f1b5e828db
|
Fix for the slow spawning of workers
|
2018-05-14 05:02:18 +00:00 |
|
Hypolite Petovan
|
f937dabc9e
|
Merge pull request #5044 from annando/no-feed-reshare
We mustn't reshare a feed item (only DFRN and Diaspora)
|
2018-05-13 18:31:58 -04:00 |
|
Michael Vogel
|
24ef818d0d
|
Merge pull request #5038 from tobiasd/20180519-3834
dont delete but remove from your stream
|
2018-05-13 22:24:59 +02:00 |
|
Michael
|
57bd073ffd
|
We mustn't reshare a feed item (only DFRN and Diaspora)
|
2018-05-13 18:31:01 +00:00 |
|
Hypolite Petovan
|
288b508e2a
|
Merge pull request #5041 from M-arcus/patch-1
[TASK] Automatic installation: Install theme
|
2018-05-13 10:03:11 -04:00 |
|
Hypolite Petovan
|
cc7ce61e2d
|
Merge pull request #5040 from tobiasd/20180513-lng
FI and PL translation updates
|
2018-05-13 09:59:29 -04:00 |
|
Marcus Müller
|
64a799198a
|
[TASK] Automatic installation: Install theme
|
2018-05-13 12:50:53 +02:00 |
|
Tobias Diekershoff
|
2a75c7aa00
|
update FI translations THX Kris
|
2018-05-13 12:02:09 +02:00 |
|
Tobias Diekershoff
|
78330c44a8
|
update PL translations THX waldis
|
2018-05-13 12:01:25 +02:00 |
|
Tobias Diekershoff
|
17dda0fc43
|
dont delete but remove from your stream
|
2018-05-13 11:10:34 +02:00 |
|
Hypolite Petovan
|
ec626fb76c
|
Merge pull request #5036 from Alkarex/fix-constants
Fix wrong use of class constants
|
2018-05-13 04:38:32 -04:00 |
|
Alexandre Alapetite
|
736c76d068
|
Simplify constant names
https://github.com/friendica/friendica/pull/5036#discussion_r187792865
|
2018-05-13 10:34:33 +02:00 |
|
Alexandre Alapetite
|
41a8c62bee
|
Fix wrong use of class constants
http://php.net/manual/language.oop5.constants.php
|
2018-05-13 10:07:15 +02:00 |
|
Hypolite Petovan
|
97ef838abe
|
Merge pull request #5035 from annando/no-optimize
Automatic table optimisation is deactivated by default now
|
2018-05-13 01:55:09 -04:00 |
|
Michael
|
249d84c0b3
|
Automatic table optimisation is deactivated by default now
|
2018-05-13 05:41:05 +00:00 |
|
Hypolite Petovan
|
37da0ccf9e
|
Merge pull request #5032 from tobiasd/20180512-lng
DE, FI and PL translation updates
|
2018-05-12 05:45:38 -04:00 |
|
Tobias Diekershoff
|
f34ee8f858
|
update FI translations THX Kris
|
2018-05-12 10:36:59 +02:00 |
|
Tobias Diekershoff
|
75982db524
|
update PL translations THX waldis
|
2018-05-12 10:36:18 +02:00 |
|
Tobias Diekershoff
|
2435388aa7
|
update DE translations
|
2018-05-12 10:35:32 +02:00 |
|
Hypolite Petovan
|
ee143e32d1
|
Merge pull request #5031 from annando/fix-sql
Avoid SQL error with empty "bd" field
|
2018-05-11 15:43:23 -04:00 |
|
Michael
|
926c9719e0
|
Avoid SQL error with empty "bd" field
|
2018-05-11 15:27:19 +00:00 |
|
Hypolite Petovan
|
d4e3f3f4bb
|
Merge pull request #5030 from annando/fix-sql
Fix SQL error during postupdate
|
2018-05-11 11:20:30 -04:00 |
|
Michael
|
79a343a69a
|
Only set the "updated" value when it contains a value
|
2018-05-11 10:44:28 +00:00 |
|
Michael
|
f9c695e78d
|
Fix SQL error during postupdate
|
2018-05-11 09:20:59 +00:00 |
|
Tobias Diekershoff
|
a2dbf17a3d
|
Merge pull request #5028 from annando/probe-insert
Insert a gcontact on probing, but not insert a contact
|
2018-05-11 10:26:32 +02:00 |
|
Michael
|
8d8f2a1845
|
Change the community value as well
|
2018-05-11 08:04:01 +00:00 |
|