Commit graph

1294 commits

Author SHA1 Message Date
81c002370e Only redirections to the same host do make sense 2018-06-02 08:42:46 +00:00
723b5ae803 Use MagicLinkbyId when possible 2018-06-02 08:28:01 +00:00
8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
885f2b52d1 Merge remote-tracking branch 'upstream/develop' into public-redir 2018-06-02 06:18:45 +00:00
2b25bd48d4 Improved distinction between delete and remove 2018-06-02 12:40:41 +07:00
a75d28e521 Rewording label 2018-06-02 11:23:27 +07:00
047c02371a Small corrections to the database descriptions 2018-06-01 22:12:35 +00:00
b5b172500d Merge remote-tracking branch 'upstream/develop' into public-redir 2018-06-01 12:32:51 +00:00
Hypolite Petovan
93daf7883e Merge branch 'master' into develop
- Updated new develop version label
- Incremented database build number
2018-06-01 07:30:04 -04:00
ae8d7267a0 "redir" is now centralized and works with the public contact 2018-06-01 06:46:34 +00:00
9ea6d4b26d the detected language was not stored during user creation 2018-05-31 08:27:27 +02:00
c86111d193 Coding standards 2018-05-29 19:00:26 +00:00
Pascal Deklerck
1853c5623b 4419 Update the comments in src/Database/DBStructure.php from doc/database/* 2018-05-29 10:24:36 +02:00
8329705eba New function to delete items for users 2018-05-29 05:22:57 +00:00
deb015be12 Changed documentation 2018-05-27 10:42:47 +00:00
c5a22f86c7 Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item 2018-05-27 10:38:49 +00:00
rabuzarus
32c3762989
Merge pull request #5138 from annando/optimize-workerqueue
Possibly fixes 5137: Only execute "optimize table" when allowed
2018-05-27 10:10:11 +02:00
04fd6eff01 Possibly fixes 5137: Only execute "optimize table" when allowed 2018-05-27 06:23:18 +00:00
708ddf2b02 Preparation for new deletion functionality 2018-05-26 20:23:49 +00:00
a6396dde55 Removed useless line 2018-05-26 20:08:42 +00:00
a50805c371 Grammar fix 2018-05-26 20:07:30 +00:00
bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
rabuzarus
c66d1f01a3 add missing database use statements 2018-05-25 09:05:16 +02:00
rabuzarus
f013625382 fix typo in comment 2018-05-25 08:52:03 +02:00
rabuzarus
8174bfeb2b Bugfix: compute the current theme each time we want to know which theme is beeing used 2018-05-25 08:44:01 +02:00
4a67919be7 Issue 5010: Don't show removed users 2018-05-24 04:44:02 +00:00
89a20ddbd7 Nodeinfo: The number of comments is now calculated more reliable 2018-05-22 20:10:18 +00:00
df531cd400 Don't proxy pictures when they are sent to other networks 2018-05-21 10:15:50 +00:00
Hypolite Petovan
c41332364f
Merge pull request #5089 from tobiasd/20180519-tos
privacy statement
2018-05-20 08:20:16 -04:00
d78b1f5191
Merge pull request #5091 from annando/issue-4956
Don't fail during installation because of a missing theme configuration
2018-05-20 08:50:28 +02:00
f7c24a20ae cite: just some small styling thing 2018-05-20 08:43:43 +02:00
9d0ed1a2af Issue 4956: Don't fail during installation because of a missing theme configuration 2018-05-20 05:44:20 +00:00
c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
2798d4ea4d missing sign 2018-05-19 19:08:50 +02:00
4f8530070b removed one line too much 2018-05-19 19:07:13 +02:00
e02093c7ea text of the priv. statement can now be shown outside of the module 2018-05-19 18:55:29 +02:00
3fe07cca57 Issue 2880: Editing post doesn't destroy mentions or hashtags anymore 2018-05-19 14:55:27 +00:00
5ae9193aa7
Merge pull request #5084 from annando/dead-subscriber
End subscription for unreachable subscribers
2018-05-19 07:07:00 +02:00
e9848d7b8f End subscription for unreachable subscribers 2018-05-19 03:56:29 +00:00
5d708fd9a9 Avaoid warning when no valid data could be read 2018-05-18 16:07:55 +00:00
Hypolite Petovan
83ff57777f
Merge pull request #5079 from annando/fix-self
Fix: Sometimes the contact endpoints seem to be wrong
2018-05-18 08:54:00 -04:00
8983c61023 Fix: Sometimes the contact endpoints seem to be wrong 2018-05-18 12:26:10 +00:00
feb3d76a5b Fix: Subscriptions from GNU Social partially don't work 2018-05-18 12:18:12 +00:00
Hypolite Petovan
1d2b0c0a81
Merge pull request #5077 from annando/fix-blocking-ostatus
Fix to OStatus delivery to be not so blocking to other tasks
2018-05-17 19:59:08 -04:00
4355014492 Now it should work ... 2018-05-17 23:47:15 +00:00
f4a71b76dd Dynamic priority handling 2018-05-17 23:43:44 +00:00
61824119e4 Moved functionality in new model class 2018-05-17 23:30:49 +00:00
5a1e1c1ec9 Fix to OStatus delivery to be not so blocking to other tasks 2018-05-17 22:17:03 +00:00
41b7d75cca
Merge pull request #5072 from Alkarex/ru-plural-intval-bug
i18n ru intval bug
2018-05-17 09:43:25 +02:00
Alexandre Alapetite
f980516545 Fix PoToPhp
https://github.com/friendica/friendica/pull/5072#issuecomment-389754406
2018-05-17 08:12:55 +02:00