Commit graph

3364 commits

Author SHA1 Message Date
softmetz
fab23ae2a9
remove invalid call to composer 2019-02-18 19:10:16 +01:00
Hypolite Petovan
cb6acce661
Merge pull request #808 from Quix0r/fixes/rendertime
[rendertime] Ported to new Profiler class
2019-02-18 12:40:08 -05:00
Roland Häder
35974aced9
Fixed parser error 2019-02-18 18:28:55 +01:00
Roland Häder
e1fdf03f02
Fixes:
- `$a->performance['id']` is outdated, there is now `$a->getProfiler()->get('id')`
- `AS` is no constant but a keyword (see `foreach()`)
- added curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
2019-02-18 18:20:00 +01:00
Hypolite Petovan
fd1b155120
Merge pull request #807 from rabuzarus/20190219_-_frio_support_for_forumdirectory
forumdirectory: use the directory template from friendica core
2019-02-18 08:01:29 -05:00
rabuzarus
fb34a16c39 forumdirectory: remove logger call 2019-02-18 13:06:30 +01:00
rabuzarus
728b390d83 forumdirectory: use the directory template from friendica core 2019-02-18 03:01:24 +01:00
Hypolite Petovan
f42601ffac
Merge pull request #806 from nupplaphil/config_followup
Moved method names & class
2019-02-17 21:00:31 -05:00
Philipp Holzer
2e33d99f18
Moved method names & class 2019-02-18 01:22:09 +01:00
Michael Vogel
50dc31de87
Merge pull request #805 from tobiasd/20190214-newmemberwidget
Updated documentation of the newmemberwidget
2019-02-14 16:37:08 +01:00
Tobias Diekershoff
523adff231 Updated documentation of the newmemberwidget 2019-02-14 16:12:57 +01:00
Tobias Diekershoff
c818eab21c
Merge pull request #804 from MrPetovan/task/6629-securemail-update-composer-dependencies
[securemail] Update Composer dependencies
2019-02-14 15:15:29 +01:00
Hypolite Petovan
313aeb76ba [securemail] Use explicit path for addon autoloader 2019-02-10 10:06:45 -05:00
Hypolite Petovan
c885f3c7ab [securemail] Use composer autoload 2019-02-10 08:45:40 -05:00
Hypolite Petovan
a465e7dcd9 [securemail] Fix formatting 2019-02-10 08:45:14 -05:00
Hypolite Petovan
af672ecd1b [securemail] Update Composer dependencies
- Update phpseclib/phpseclib to version 2.0.4
- Update singpolyma/openpgp-php to version 0.3.0
2019-02-10 08:44:29 -05:00
Hypolite Petovan
37dd8a938b
Merge pull request #803 from nupplaphil/config_refact
Config Refactoring
2019-02-06 10:52:02 -05:00
Philipp Holzer
7aa0760742
Refactoring ConfigCacheLoader methods 2019-02-05 22:27:56 +01:00
Hypolite Petovan
dfbab2de7e
Merge pull request #750 from nupplaphil/goaway_to_redirectto
Replaced goaway() with System::redirect()
2019-02-03 20:36:21 -05:00
Philipp Holzer
2ba4c95f4b
Bugfixing Addon-config 2019-02-04 02:07:58 +01:00
Philipp Holzer
c3d51338e0
Bugfixing calls 2019-02-04 01:52:03 +01:00
Philipp Holzer
9cf3d38e76
Split goaway to System::externalRedirectTo() and App->internalRedirect() 2019-02-04 01:50:41 +01:00
Philipp Holzer
0e264465ac
Split goaway to System::externalRedirectTo() and App->internalRedirect() 2019-02-04 01:50:39 +01:00
Philipp Holzer
e825cbc7a1
renamed System::redirectTo to System::redirect 2019-02-04 01:50:30 +01:00
Philipp Holzer
a1254b4c85
wrong indent 2019-02-04 01:50:17 +01:00
Philipp Holzer
3d3a11fa46
Replaced goaway() with System::redirectTo() 2019-02-04 01:50:15 +01:00
Philipp Holzer
b8a492c80e
4) Adding Factories to other entrypoints 2019-02-03 22:46:49 +01:00
Philipp Holzer
b541efc5e6
3) Introducing ConfigFactory 2019-02-03 22:22:03 +01:00
Hypolite Petovan
a95606a10a
Merge pull request #802 from tobiasd/20190202-cookienofilter
nofilter applied to fixed description
2019-02-02 13:49:46 -05:00
Tobias Diekershoff
28e2f7a232 nofilter applied to fixed description 2019-02-02 17:44:28 +01:00
Hypolite Petovan
c1119bc640
Merge pull request #801 from tobiasd/20190202-lng
cookiemessage translation
2019-02-02 07:35:01 -05:00
Tobias Diekershoff
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
Tobias Diekershoff
4ba379bde7 cookiemessage DE translation 2019-02-02 09:18:28 +01:00
Tobias Diekershoff
2e143f27c5 cookienotice CS translation THX waldis 2019-02-02 08:34:54 +01:00
Tobias Diekershoff
7d5e653243 cookienotice CS translation THX JeroenED 2019-02-02 08:34:09 +01:00
Tobias Diekershoff
eba800e0fe cookienotice CS translation THX Aditoo 2019-02-02 08:32:48 +01:00
Tobias Diekershoff
567d819810 added ZH-CN translation of cookiemessage addon 2019-02-02 08:32:11 +01:00
Hypolite Petovan
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
Tobias Diekershoff
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
Hypolite Petovan
61920c83b7
Merge pull request #798 from tobiasd/20190129-lng
translation update
2019-01-29 10:50:14 -05:00
Tobias Diekershoff
f20055c498 DE morechoice translation update THX copis 2019-01-29 16:43:44 +01:00
Tobias Diekershoff
2c99f21b14 FR catavatar translations THX lapoubelle111 2019-01-29 16:41:59 +01:00
Tobias Diekershoff
fdca7534f1 NL advancedcontentfilter translation THX Rik4 2019-01-29 16:39:43 +01:00
Tobias Diekershoff
f6dce2be55 cookienotice CS translation THX Rik4 2019-01-29 16:37:21 +01:00
Tobias Diekershoff
fb582a914d cookienotice CS translation THX waldis 2019-01-29 16:35:40 +01:00
Tobias Diekershoff
6bdd292d18 cookienotice CS translation THX lapoubelle111 2019-01-29 16:34:48 +01:00
Tobias Diekershoff
23d86c447e cookienotice CS translation THX Aditoo 2019-01-29 16:33:24 +01:00
Tobias Diekershoff
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