Commit graph

3361 commits

Author SHA1 Message Date
Hypolite Petovan
f73e083928 [showmore] Regenerate master messages.po file 2018-04-01 11:15:49 -04:00
Hypolite Petovan
de9652f5c0 [nsfw] Regenerate master messages.po file 2018-04-01 11:15:41 -04:00
Hypolite Petovan
09f1aeaced [langfilter] Regenerate master messages.po file 2018-04-01 11:15:32 -04:00
Hypolite Petovan
eb359340fe [blockem] Regenerate master messages.po file 2018-04-01 11:15:23 -04:00
Hypolite Petovan
facfd74288 [fromgplus] Remove empty call to L10n::t()
- Regenerate master messages.po
2018-04-01 11:15:08 -04:00
Hypolite Petovan
057a5e9a9f
Merge pull request #567 from ben-utzer/patch-1
Just a spelling mistake
2018-04-01 10:44:02 -04:00
Tobias Diekershoff
fe31514837 curweather PL translation 2018-04-01 11:54:05 +02:00
Tobias Diekershoff
9696091547 randplace PL translation 2018-04-01 11:52:42 +02:00
Tobias Diekershoff
312930bc22 dav PL translation 2018-04-01 11:51:02 +02:00
Tobias Diekershoff
b0cec9f613 tictac PL translation 2018-04-01 11:49:39 +02:00
Tobias Diekershoff
a1769362aa blogger PL translation 2018-04-01 11:48:26 +02:00
Tobias Diekershoff
1601c5b4fb libravatar PL translation 2018-04-01 11:44:46 +02:00
ben-utzer
9d02744c21
Just a spelling mistake
Vvogel changed to Vogel
2018-04-01 15:13:49 +05:30
Tobias Diekershoff
ad0e796186 dwpost PL translation 2018-04-01 11:43:21 +02:00
Tobias Diekershoff
5519a2f656 planets PL translation 2018-04-01 11:41:43 +02:00
Tobias Diekershoff
ec38e11389 tumblr PL translation 2018-04-01 11:39:09 +02:00
Tobias Diekershoff
1f2f820226 qcomment PL translation 2018-04-01 11:37:36 +02:00
Tobias Diekershoff
2fe45ed3d3 langfilter DE translation 2018-04-01 11:36:02 +02:00
Tobias Diekershoff
db50609508 krynn PL translation 2018-04-01 11:35:30 +02:00
Hypolite Petovan
31e55d6d5a [blockem] Use content_filter hook 2018-04-01 02:40:42 -04:00
Hypolite Petovan
02eb1b74f7 [showmore] Prevent use with content filters 2018-04-01 02:39:29 -04:00
Hypolite Petovan
635bea65f7 [nsfw] Use content_filter hook
- Remove check on content-warning item field
2018-04-01 02:39:29 -04:00
Hypolite Petovan
05a0e445ab [langfilter] Use content_filter hook 2018-04-01 02:39:28 -04:00
Hypolite Petovan
35628d9229
Merge pull request #565 from annando/twitter-exception
Improved timeout values/Posting local files
2018-03-31 17:31:00 -04:00
Michael
34ee3b9a28 Improved timeout values/Posting local files 2018-03-31 18:55:17 +00:00
Tobias Diekershoff
0dfe67ca3e
Merge pull request #564 from annando/twitter-exception
Handle exception when posting pictures to twitter
2018-03-31 14:37:19 +02:00
Michael
c7aac4178c Handle exception when posting pictures to twitter 2018-03-31 06:03:56 +00:00
Hypolite Petovan
5152eb4cd4
Merge pull request #563 from AndyHee/20180329-patch
Language Filter descriptions
2018-03-29 11:48:05 -04:00
Andy Hee
d298f3c19c modified: lang/C/messages.po
modified:   langfilter.php
2018-03-29 22:45:42 +07:00
Andy Hee
51c5650a20 modified: lang/C/messages.po
modified:   langfilter.php
2018-03-29 20:22:05 +07:00
Andy Hee
80ad83eec0 Merge remote-tracking branch 'upstream/develop' into develop 2018-03-29 20:21:10 +07:00
Michael Vogel
61c5ed4863
Merge pull request #562 from tobiasd/20180328-pl
PL translation of the blackout addon updated THX waldis
2018-03-28 07:40:58 +02:00
Tobias Diekershoff
01c7705050 PL translation of the blackout addon updated THX waldis 2018-03-28 07:13:21 +02:00
Andy Hee
2343c5d529 Merge remote-tracking branch 'upstream/develop' into develop 2018-03-27 11:05:24 +07:00
Hypolite Petovan
1a001a95df
Merge pull request #561 from annando/jix-jappix
Fix for jappix - (some copy & paste error)
2018-03-26 14:58:25 -04:00
Michael
1eb17b8ec6 Fix for jappix - (some copy & paste error) 2018-03-26 18:09:24 +00:00
Andy Hee
a406fbc9e4 Merge remote-tracking branch 'upstream/develop' into develop 2018-03-26 11:49:57 +07:00
Michael Vogel
ebde1616e9
Merge pull request #560 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding
[nsfw] Add hashtag-only hiding
2018-03-26 06:12:23 +02:00
Hypolite Petovan
567028f1bd Add hashtag-only search 2018-03-25 00:20:16 -04:00
Hypolite Petovan
b9c38e9ac3 [nsfw] Fix formatting in nsfw.php 2018-03-25 00:08:19 -04:00
Andy Hee
3ff318b4c2 Merge remote-tracking branch 'upstream/develop' into develop 2018-03-25 10:33:25 +07:00
Hypolite Petovan
a9312d4140
Merge pull request #559 from tobiasd/20180324-zhcn
securemail translation by 朱陈锬
2018-03-24 11:34:41 -04:00
Tobias Diekershoff
85f4be55ab securemail translation by 朱陈锬 2018-03-24 16:19:06 +01:00
fabrixxm
3f7685d8a8 Merge branch 'master' into develop 2018-03-23 11:52:12 +01:00
fabrixxm
dbe8118e40 Merge branch '3.6-release'
To fix wrong merge of 3.6-rc
2018-03-23 11:40:22 +01:00
Fabio
8f7503d573 Merge commit '5360f08' into 3.6 2018-03-23 11:10:00 +01:00
Tobias Diekershoff
39dd3dffe0 Merge branch '3.6-rc' 2018-03-23 08:00:37 +01:00
Hypolite Petovan
67c1273e08
Merge pull request #556 from tobiasd/20180321-nl
added some NL translations
2018-03-21 02:17:21 -04:00
Tobias Diekershoff
38bf5d4a5a xmpp added NL translation THX Karel Vandecandelaere 2018-03-21 07:05:33 +01:00
Tobias Diekershoff
63020e48fa langfilter added NL translation THX Karel Vandecandelaere 2018-03-21 07:03:41 +01:00