Commit graph

3236 commits

Author SHA1 Message Date
a95606a10a
Merge pull request #802 from tobiasd/20190202-cookienofilter
nofilter applied to fixed description
2019-02-02 13:49:46 -05:00
28e2f7a232 nofilter applied to fixed description 2019-02-02 17:44:28 +01:00
c1119bc640
Merge pull request #801 from tobiasd/20190202-lng
cookiemessage translation
2019-02-02 07:35:01 -05:00
3e202f8ee4
Merge pull request #790 from MrPetovan/task/6390-move-contact-constants-to-user
[forumdirectory] Move Contact::PAGE_* constants to User::PAGE_FLAGS_*
2019-02-02 09:19:54 +01:00
4ba379bde7 cookiemessage DE translation 2019-02-02 09:18:28 +01:00
2e143f27c5 cookienotice CS translation THX waldis 2019-02-02 08:34:54 +01:00
7d5e653243 cookienotice CS translation THX JeroenED 2019-02-02 08:34:09 +01:00
eba800e0fe cookienotice CS translation THX Aditoo 2019-02-02 08:32:48 +01:00
567d819810 added ZH-CN translation of cookiemessage addon 2019-02-02 08:32:11 +01:00
012cbaee66
Merge pull request #800 from JeroenED/task/cookienotice-tx
Updated transifex config
2019-01-30 08:24:39 -05:00
Jeroen De Meerleer
9c2ba3cf10 Updated transifex config
script:

cd /mnt/Git-Projects/Friendica/friendica/addon/

echo "[main]
host = https://www.transifex.com
"

for folder in * ; do
	if [[ -s ${folder}/lang/C/messages.po ]]; then

	echo "[friendica.addon_${folder}_messagespo]
file_filter = ${folder}/lang/<lang>/messages.po
source_file = ${folder}/lang/C/messages.po
source_lang = en
type = PO
"
	fi;
done;
2019-01-30 14:05:58 +01:00
717ca6fc82
Merge pull request #799 from JeroenED/task/cookienotice-tx
Cookienotice translation issue
2019-01-30 11:29:50 +01:00
Jeroen De Meerleer
6620d99273 Regenerated messages.po
Hope it helps, but I'm not sure at all :(
2019-01-30 10:50:46 +01:00
61920c83b7
Merge pull request #798 from tobiasd/20190129-lng
translation update
2019-01-29 10:50:14 -05:00
f20055c498 DE morechoice translation update THX copis 2019-01-29 16:43:44 +01:00
2c99f21b14 FR catavatar translations THX lapoubelle111 2019-01-29 16:41:59 +01:00
fdca7534f1 NL advancedcontentfilter translation THX Rik4 2019-01-29 16:39:43 +01:00
f6dce2be55 cookienotice CS translation THX Rik4 2019-01-29 16:37:21 +01:00
fb582a914d cookienotice CS translation THX waldis 2019-01-29 16:35:40 +01:00
6bdd292d18 cookienotice CS translation THX lapoubelle111 2019-01-29 16:34:48 +01:00
23d86c447e cookienotice CS translation THX Aditoo 2019-01-29 16:33:24 +01:00
e2d4846fb8
Merge pull request #797 from MrPetovan/bug/6386-fix-fatal-errors
[mailstream] Fix missing method App->get_curl_content_type()
2019-01-24 07:10:52 +01:00
47ab2d14e1 [mailstream] Fix missing method App->get_curl_content_type() 2019-01-23 22:04:15 -05:00
74f89673cb
Merge pull request #794 from Ixiter/develop
new addon - cookienotice - configure, show and handle a simple cookie…
2019-01-23 10:28:26 -05:00
Peter Liebetrau
174828070f cookienotice addon - fixes for changerequest #pullrequestreview-195527901 2019-01-23 16:01:28 +01:00
Peter Liebetrau
0d8a382f8d cookienotice addon - code styling fixes 2019-01-23 11:09:10 +01:00
Peter Liebetrau
145fb69eb6 cookienotice addon - added default values for config data 2019-01-23 11:00:52 +01:00
Peter Liebetrau
15b0b67dc8 Merge origin/develop into develop 2019-01-23 10:49:20 +01:00
Peter Liebetrau
e5cfe5b9a8 cookienotice addon - fixes for #pullrequestreview-195091211 2019-01-23 10:47:08 +01:00
Michael Vogel
04c9fd2991
Merge pull request #796 from tobiasd/20190123-lng
ES translation of the langfilter addon THX Abraham Pérez Hernández
2019-01-23 10:18:04 +01:00
fdf072e53c ES translation of the langfilter addon THX Abraham Pérez Hernández 2019-01-23 10:02:08 +01:00
Peter Liebetrau
308e093589 cookienotice addon - fixes for 2019.01 - Template loading and replace macros 2019-01-22 16:50:13 +01:00
08206fdcc0 Merge branch 'master' into develop 2019-01-21 10:04:26 +01:00
Peter Liebetrau
12c4fcfcae cookienotice addon - fixes from pull request reviews 2019-01-20 20:35:58 +01:00
Peter Liebetrau
efda326527 cookienotice addon - did the gettext jobs and added german language 2019-01-20 15:29:15 +01:00
Peter Liebetrau
f3a5f16fc1 convert spaces to tabs, removed netbeans project files 2019-01-20 14:20:20 +01:00
94ed7bf163
Merge pull request #795 from annando/twitter-notice
Avoid some notice in the Twitter addon
2019-01-20 07:57:42 -05:00
Peter Liebetrau
fa08109830 new addon - cookienotice - configure, show and handle a simple cookie usage notice 2019-01-20 10:04:25 +01:00
6d17d61c28
Merge pull request #793 from annando/nogplus
Google+ is closing soon, so we remove the first traces
2019-01-18 09:39:41 +01:00
c2c541cb10 Google+ is closing soon, so we remove the first traces 2019-01-18 06:57:11 +00:00
01bc547447
Merge pull request #792 from annando/notices
Avoiding notices
2019-01-13 19:30:08 +01:00
ffe0ba9c5b Avoiding notices 2019-01-13 18:05:37 +00:00
Michael Vogel
0322445360
Merge pull request #791 from tobiasd/20190112-lng
FR translatio update
2019-01-12 14:39:59 +01:00
b37c019322 FR translation blackout THX vladimir N 2019-01-12 11:13:00 +01:00
ecd783f33d FR translatio update blockem THX vladimir N 2019-01-12 11:11:39 +01:00
44a65c03ca FR translation update advancedcontentfilter THX vladimir N 2019-01-12 11:09:48 +01:00
Michael Vogel
292769e9ea
Merge pull request #788 from MrPetovan/bug/4708-twitter-show-original-url-share
[twitter] Use original URL for link display
2019-01-12 10:18:17 +01:00
8586795bea [forumdirectory] Move Contact::PAGE_* constants to User::PAGE_FLAGS_* 2019-01-06 23:38:21 -05:00
72b18e34e0 [twitter] Use original URL for link display 2019-01-06 00:05:20 -05:00
de5b67cceb
Merge pull request #787 from annando/lsr-pictures
LSR: Show preview pictures of videos (should be legally safe)
2019-01-04 11:27:00 -05:00