Commit Graph

19416 Commits

Author SHA1 Message Date
Tobias Diekershoff 9041bacebf exchange help text 2018-05-25 20:32:48 +02:00
Hypolite Petovan d51a98b3fe
Merge pull request #5122 from tobiasd/20180525-4146
applying changes to mods/sample-nginx.config from #5019
2018-05-25 11:10:16 -04:00
Hypolite Petovan 4aa46272a9
Merge pull request #5123 from rabuzarus/20180526_-_load_correct_theme
Bugfix: compute the current theme each time we want to know which theme is beeing used
2018-05-25 08:14:03 -04:00
Tobias Diekershoff 6e02c0e908 hopefully fixing indentation... 2018-05-25 13:56:54 +02:00
Hypolite Petovan 3f133292eb
Merge pull request #5124 from tobiasd/20180525-lng
IS and PL translation updates
2018-05-25 07:05:48 -04:00
rabuzarus c66d1f01a3 add missing database use statements 2018-05-25 09:05:16 +02:00
Tobias Diekershoff 5c6b9cb64a update IS translations THX Sveinn í Felli 2018-05-25 08:58:00 +02:00
Tobias Diekershoff 22e78c1bed update PL translations THX waldis 2018-05-25 08:56:34 +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
Tobias Diekershoff 132653ac56 applying changes to mods/sample-nginx.config from #5019 2018-05-25 08:22:49 +02:00
Tobias Diekershoff e814e805c5
Merge pull request #5119 from MrPetovan/task/5116-remove-dns-get-record-from-dba
Remove obsolete DNS test from include/dba
2018-05-24 07:53:25 +02:00
Hypolite Petovan b0155fe37b Remove obsolete DNS test from include/dba 2018-05-24 01:31:03 -04:00
Hypolite Petovan e9dbf55400
Merge pull request #5117 from annando/issue-5010
Issue 5010: Don't show removed users
2018-05-24 00:51:31 -04:00
Michael 4a67919be7 Issue 5010: Don't show removed users 2018-05-24 04:44:02 +00:00
Hypolite Petovan 44caf05f06
Merge pull request #5110 from annando/nodeinfo
Nodeinfo: The number of comments is now calculated more reliable
2018-05-22 17:20:06 -04:00
Hypolite Petovan e1fcebe791
Merge pull request #5112 from annando/issue-5111
Issue 5111: missing "use DBM" in "removeme"
2018-05-22 17:16:03 -04:00
Michael 5430354f54 Issue 5111: missing "use DBM" in "removeme" 2018-05-22 20:17:32 +00:00
Michael 89a20ddbd7 Nodeinfo: The number of comments is now calculated more reliable 2018-05-22 20:10:18 +00:00
Tobias Diekershoff 3e51a23bd5
Merge pull request #5109 from rabuzarus/20180522_-_frio_nav_about_instance
frio - add "info about the instance" link into the navbar for non-authed users
2018-05-22 15:10:44 +02:00
Michael Vogel ddf5bd6093
Merge pull request #5108 from tobiasd/20180522-lng
update DE translations THX hauke
2018-05-22 13:04:27 +02:00
rabuzarus 0d7d688649 frio - add "info about the instance" link into the navbar for non-authed users 2018-05-22 12:44:35 +02:00
Tobias Diekershoff 5de562d381 update DE translations THX hauke 2018-05-22 07:12:43 +02:00
Hypolite Petovan 8779f22b5f
Merge pull request #5106 from tobiasd/20180521-en
EN US and GB translation updates THX AndyH3
2018-05-21 10:55:36 -04:00
Tobias Diekershoff 8fd9916aa5 EN US and GB translation updates THX AndyH3 2018-05-21 16:08:07 +02:00
Tobias Diekershoff df17038ee2
Merge pull request #5105 from annando/dont-proxy
Don't proxy pictures when they are sent to other networks
2018-05-21 13:00:49 +02:00
Michael df531cd400 Don't proxy pictures when they are sent to other networks 2018-05-21 10:15:50 +00:00
Michael Vogel f7e6178fd3
Merge pull request #5103 from tobiasd/20180521-ru
RU translations THX pztrn
2018-05-21 08:47:42 +02:00
Michael Vogel 458c0511f2
Merge pull request #5102 from tobiasd/20180521-tos
forgot to rename vars in TOS template
2018-05-21 08:46:47 +02:00
Tobias Diekershoff 1d78fa9645 RU translations THX pztrn 2018-05-21 07:31:35 +02:00
Tobias Diekershoff becd9b4879 forgot to rename vars in TOS template 2018-05-21 06:02:49 +02:00
Hypolite Petovan a0a4074de6
Merge pull request #5098 from tobiasd/20180520-msg
translation update DE, FR, FI, PL
2018-05-20 12:34:48 -04:00
Tobias Diekershoff a4d11db74e update PL translations THX waldis 2018-05-20 18:11:42 +02:00
Tobias Diekershoff 56f7fe636a update FI translations THX kris 2018-05-20 18:09:09 +02:00
Tobias Diekershoff 9a860984d6 update FR translations THX vindarel 2018-05-20 18:08:07 +02:00
Tobias Diekershoff 99b8947c0b update DE translations 2018-05-20 18:05:50 +02:00
Hypolite Petovan cfeace3e40
Merge pull request #5097 from tobiasd/20180520-credits
regen credits
2018-05-20 09:16:27 -04:00
Tobias Diekershoff b6e02e2f0f cleanup 2018-05-20 15:02:44 +02:00
Tobias Diekershoff 48aafe4662 fixing the base path detection 2018-05-20 14:56:33 +02:00
Tobias Diekershoff 5419ae93a1 regen credits 2018-05-20 14:56:03 +02:00
Hypolite Petovan 0ba6c5ec07
Merge pull request #5094 from tobiasd/2018.05-rc
regen master messages.po
2018-05-20 08:27:49 -04:00
Tobias Diekershoff 5f2951cdda regen master messages.po 2018-05-20 14:25:07 +02:00
Hypolite Petovan c41332364f
Merge pull request #5089 from tobiasd/20180519-tos
privacy statement
2018-05-20 08:20:16 -04:00
Tobias Diekershoff 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
Tobias Diekershoff f7c24a20ae cite: just some small styling thing 2018-05-20 08:43:43 +02:00
Michael 9d0ed1a2af Issue 4956: Don't fail during installation because of a missing theme configuration 2018-05-20 05:44:20 +00:00
Hypolite Petovan cb1b182f7c
Merge pull request #5090 from annando/issue-3412
Issue-3412 related: Don't send connection posts anymore
2018-05-19 16:12:52 -04:00
Michael c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
Tobias Diekershoff 2798d4ea4d missing sign 2018-05-19 19:08:50 +02:00
Tobias Diekershoff 4f8530070b removed one line too much 2018-05-19 19:07:13 +02:00