csolisr/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests 1 Activity
2571 commits 4 branches 38 tags 83 MiB
Commit graph

2571 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy H 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
Tobias Diekershoff f0ca59e4ee yourls: added NL translation THX Karel Vandecandelaere 2018-03-21 07:01:21 +01:00
Hypolite Petovan 1d32d790fa
Merge pull request #555 from tobiasd/20180320-securemailDE 
securemail: added DE translation THX Richard Zsemberi
 2018-03-20 09:08:55 -04:00
Tobias Diekershoff 3ce1c8cf2e securemail: added DE translation THX Richard Zsemberi 2018-03-20 14:00:54 +01:00
Tobias Diekershoff 3b0decec7f
Merge pull request #553 from annando/osm-cache 
Results are now cached, format limits to other networks are respected
 2018-03-20 08:48:02 +01:00
Tobias Diekershoff ecd62d5927
Merge pull request #554 from fabrixxm/3.6-rc-it 
Update IT strings for securemail and viewsrc
 2018-03-20 08:46:01 +01:00
fabrixxm d1d526001c Update IT strings for securemail and viewsrc 2018-03-20 08:36:20 +01:00
Michael 987b53c6e6 Removed tab 2018-03-20 06:55:00 +00:00
Michael 0f4052ace9 OSM: Results are now cached, format limits to other networks are respected 2018-03-20 06:43:03 +00:00
Hypolite Petovan 43ef381c80
Merge pull request #552 from fabrixxm/3.6-rc-it 
Update IT strings
 2018-03-19 16:53:04 -04:00
fabrixxm bfd8e37fb8 Update IT strings 2018-03-19 21:28:00 +01:00
fabrixxm 7bfa963a56 Update .tx/config 
Remove deleted addons, add missing ones
 2018-03-19 21:26:27 +01:00
Tobias Diekershoff b0c8a4e197
Merge pull request #550 from MrPetovan/task/add-console 
Update documentation about po2php console command
 2018-03-19 15:35:56 +01:00
Tobias Diekershoff ccd4d1420b
Merge pull request #551 from MrPetovan/task/4629-move-executable-to-bin 
Updated documentation about bin/composer
 2018-03-19 15:35:47 +01:00
Hypolite Petovan d53a0d41e2 Updated documentation about bin/composer 2018-03-18 23:59:11 -04:00
Hypolite Petovan 37963d62d3 Update documentation about po2php console command 2018-03-18 23:57:25 -04:00
Hypolite Petovan d2efac0b77
Merge pull request #549 from tobiasd/20180316-translations 
translation work for some addons
 2018-03-16 16:32:58 -04:00
Tobias Diekershoff 904a8aec88 EN-US translation added for nsfw 2018-03-16 21:28:13 +01:00
Tobias Diekershoff fa18e1c4a4 EN-US translation added for blockem 2018-03-16 21:26:01 +01:00
Tobias Diekershoff 493b89572a EN-GB translation added for nsfw 2018-03-16 21:23:47 +01:00
Tobias Diekershoff cdf5a5db8b EN-GB translation update for blockem 2018-03-16 21:20:07 +01:00
Tobias Diekershoff fb299ed231 DE translation update for NSFW 2018-03-16 21:08:20 +01:00
Hypolite Petovan ebfd4defd3
Merge pull request #548 from tobiasd/20180316-detrans 
DE translation for mailstream and pageheader addon translated
 2018-03-16 03:56:11 -04:00
Tobias Diekershoff 1efd543aa8 pageheader: update the DE translation 2018-03-16 08:50:25 +01:00
Tobias Diekershoff b918eda458 mailstream: update the DE translation 2018-03-16 08:50:03 +01:00
Hypolite Petovan 460b25ed6c
Merge pull request #547 from AndyHee/patch-20180315 
Patch 20180315
 2018-03-15 08:57:03 -04:00
Andy H 01af92077a
Update nsfw.php 
rm empty line
 2018-03-15 18:05:30 +07:00
Andy H bcb5101677 modified: nsfw.phpw 
gen   lang/C/messages.po
 2018-03-15 17:57:11 +07:00
Andy H f0b5acc702 updated nsfw/nsfw.phpw 2018-03-15 16:00:09 +07:00
Andy H a263e4520f updated nsfw.php 2018-03-15 15:47:51 +07:00
Andy H 3bf2c3ca07 Updated nsfw.php 2018-03-15 15:44:00 +07:00
Hypolite Petovan 46a6f55247
Merge pull request #543 from annando/nsfw-cw 
nsfw now ignores content warning posts and the code has been reformatted
 2018-03-14 18:47:10 -04:00
Michael 93c1914cad nsfw now ignores content warning posts and the code has been reformatted 2018-03-14 22:33:58 +00:00
Michael Vogel 6d3608eec7
Merge pull request #542 from tobiasd/20180311-mailstream 
bugfix: mailstream addon was missing open/close settings header
 2018-03-11 19:18:02 +01:00
Tobias Diekershoff a477adfc68 added missing open/close for settings header 2018-03-11 19:14:19 +01:00
Tobias Diekershoff 61d078d124 regen mailstream messages.po 2018-03-11 19:13:59 +01:00
Hypolite Petovan 688daf435b
Merge pull request #541 from tobiasd/20180311-pageheader 
[pageheader] bugfix: missing open/close of settings block
 2018-03-11 14:02:19 -04:00
Tobias Diekershoff 83425a7f26 indentation 2018-03-11 18:58:33 +01:00
Tobias Diekershoff b0e0821d07 addon should be commited as well 2018-03-11 18:54:01 +01:00
Tobias Diekershoff 5c64ee11cf moved pageheader settings to template 2018-03-11 18:53:21 +01:00
Tobias Diekershoff eec360c9c8 regen pageheader messages.po 2018-03-11 18:52:47 +01:00