Commit Graph

2401 Commits (8f7503d573ad90e8150b1f288b5e9c09f9479c2a)

Author SHA1 Message Date
Michael Vogel f65e8dac28 Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords 2016-09-15 09:56:39 +00:00
Michael Vogel 73e98a4814 Merge remote-tracking branch 'upstream/master' into 1609-ignorelist-rendertime
Conflicts:
	rendertime/rendertime.php
2016-09-15 09:55:58 +00:00
Michael Vogel 1ffa5387c5 Rendertime: Ignorelist for page where rendertime doesn't look good. 2016-09-15 09:52:30 +00:00
fabrixxm 48ee8b5c33 Merge pull request #371 from tobiasd/20160913-fr
FR translation of the openstreetmap addon, THX Damien Goutte-Gattat
2016-09-13 15:48:52 +02:00
Tobias Diekershoff 545e10bef5 FR translation of the openstreetmap addon, THX Damien Goutte-Gattat 2016-09-13 15:45:18 +02:00
Michael Vogel 2a6593d10d Merge pull request #370 from tobiasd/20160909-forumdir
only show address information when set
2016-09-09 23:05:29 +02:00
Tobias Diekershoff 184e9b56ce smarty3 variables with a dash need other notation 2016-09-09 17:54:48 +02:00
Tobias Diekershoff 9c3ea9d9f5 only show address information when set 2016-09-09 12:01:59 +02:00
Michael Vogel 64139d43c0 Merge pull request #369 from tobiasd/20160906-notify
notifyall in test mode
2016-09-09 11:53:06 +02:00
Tobias Diekershoff 9f845beffd when more then one users have the same email, only send the notification once 2016-09-09 11:01:37 +02:00
Tobias Diekershoff 08546e30f9 send mail to admin(s) in test more 2016-09-06 15:00:07 +02:00
Tobias Diekershoff b59f2fab49 if a sender_email for the system is set, use this, else use noreply@... 2016-09-06 13:37:26 +02:00
Tobias Diekershoff 3506b62ff6 Merge pull request #368 from annando/rendertime-db-write
Rendertime: We now additionally show the db write time.
2016-08-30 09:39:27 +02:00
Michael Vogel 00c15c8efc Rendertime: We now additionally show the db write time. 2016-08-27 09:13:44 +00:00
Michael Vogel b9be160fb0 Merge pull request #367 from tobiasd/20160819-ptbr
PT BR update translations for Twitter, qcomment and OpenStreetmap THX…
2016-08-23 07:53:47 +02:00
Tobias Diekershoff aa8c44dcc8 some more PT BR translations THX Beatriz Vital 2016-08-23 07:46:05 +02:00
Tobias Diekershoff 3844124d9c PT BR update translations for Twitter, qcomment and OpenStreetmap THX Beatriz Vital 2016-08-19 12:29:10 +02:00
Michael Vogel 5a47792217 Merge pull request #366 from tobiasd/20160817-ptbr
PT BR translations THX Beatriz Vital
2016-08-17 08:41:28 +02:00
Tobias Diekershoff 70beedf075 PT BR translations THX Beatriz Vital 2016-08-17 08:06:47 +02:00
Michael Vogel ca00d0d58d Merge pull request #365 from tobiasd/20160814-notifyallDE
added DE translation to the notifyall addon
2016-08-14 22:15:48 +02:00
Tobias Diekershoff 2e11cdc20c added DE translation to the notifyall addon 2016-08-14 21:42:17 +02:00
Michael Vogel f210a32093 Merge pull request #364 from tobiasd/20160814-notifyall
added messages.po file to notifyall addon
2016-08-14 21:23:46 +02:00
Tobias Diekershoff 46ef0be931 added meddages.po file to notifyall addon 2016-08-14 16:44:30 +02:00
Tobias Diekershoff abccb42ae6 Merge pull request #363 from rabuzarus/1308-notifyall
port hubzillas hubwall addon to friendica (notifyall)
2016-08-14 09:18:22 +02:00
rabuzarus 9b8b0d8e86 port hubzillas hubwall addon to friendica (notifyall) 2016-08-13 15:42:32 +02:00
Michael Vogel bf3e262072 Merge pull request #362 from tobiasd/20160806-fb
add a note to the FB connector README
2016-08-07 08:39:58 +02:00
Tobias Diekershoff 573ba4e739 added the note to fbsync and fbpost addons as well 2016-08-07 08:34:54 +02:00
Tobias Diekershoff 0deae05117 add a note to the FB connector README 2016-08-06 09:12:20 +02:00
Michael Vogel bf7922d05e Merge pull request #361 from tobiasd/20160728-piwik
Piwik addon, baseurl as variable name has problems with Friendica
2016-07-28 20:14:44 +02:00
Tobias Diekershoff 12777e0a87 Piwik addon, baseurl as variable name has problems with Friendica 2016-07-28 16:32:05 +02:00
Michael Vogel 3c044a30c6 Merge pull request #360 from tobiasd/20160721-nlappdotnet
IS translation for the blogger addon THX Sveinn í Felli
2016-07-26 16:57:52 +02:00
Tobias Diekershoff 9993d978bd IS translation for the blogger addon THX Sveinn í Felli 2016-07-26 11:19:42 +02:00
fabrixxm 1d511c666f Merge pull request #359 from tobiasd/20160721-nlappdotnet
NL translation for the app.net addon
2016-07-21 10:46:47 +02:00
Tobias Diekershoff b323fa5693 NL translation for the app.net addon 2016-07-21 10:42:48 +02:00
Michael Vogel 20b241738e Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords 2016-07-11 07:40:50 +02:00
Tobias Diekershoff f71faed2d0 Merge pull request #358 from annando/1607-twitter-loop
Twitter: Prevent posting loops
2016-07-11 07:25:49 +02:00
Michael Vogel cc0669a745 Twitter: Prevent posting loops 2016-07-11 06:44:36 +02:00
Michael Vogel 26354f5ab6 Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords 2016-07-02 20:25:00 +02:00
Michael Vogel 1b72c2ff51 Merge branch '1603-fromgplus-keywords' of github.com:annando/friendica-addons into 1603-fromgplus-keywords 2016-07-02 20:23:24 +02:00
Michael Vogel a9da0e9022 Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords 2016-07-02 20:22:41 +02:00
Tobias Diekershoff 3f6ed00ded Merge pull request #357 from annando/1607-pumpio
Pumpio now has a better contact management
2016-07-02 13:52:05 +02:00
Michael Vogel c5ff442c39 Make it work with master branch, part 2 2016-07-02 12:24:32 +02:00
Michael Vogel edbf318262 Make pumpio available for the master branch 2016-07-02 12:18:51 +02:00
Michael Vogel 2baf1090c3 Pumpio now has a better contact management 2016-07-02 11:22:31 +02:00
Michael Vogel 83e82163d7 Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords 2016-06-24 09:40:12 +02:00
Tobias Diekershoff b346e0e342 Merge pull request #356 from annando/1606-rendertime-session
Rendertime: Show the value for session creation
2016-06-23 20:45:31 +02:00
Tobias Diekershoff c719574a1a Merge pull request #355 from annando/1606-wppost-title
wppost: Better title detection
2016-06-23 20:44:48 +02:00
Michael Vogel b6a44a2339 Rendertime: Show the value for session creation 2016-06-23 20:26:50 +02:00
Michael Vogel 72089a2be8 wppost: Better title detection 2016-06-23 20:25:00 +02:00
fabrixxm 04db9c0bdc Merge pull request #354 from rabuzarus/2206-cal-unsuported
mark cal addon as unsupported becaus it was moved to core with https:…
2016-06-22 15:47:23 +02:00