Commit graph

4327 commits

Author SHA1 Message Date
Tobias Diekershoff
15eeb603ce Merge pull request #348 from annando/1604-gplus-coord
Fromgplus: Add location and coordinates to posts
2016-04-11 14:35:21 +02:00
Michael Vogel
3239c375fb Fromgplus: Add location and coordinates to posts 2016-04-10 20:06:19 +02:00
Michael Vogel
593d531a24 Merge pull request #347 from tobiasd/20160318-dewetter
DE update strings for curweather
2016-03-19 08:10:24 +01:00
Tobias Diekershoff
a73286c0d0 DE update strings for curweather 2016-03-18 21:09:03 +01:00
Tobias Diekershoff
4b47bcc884 Merge pull request #346 from annando/1603-remove-unsupported
Removed addons that are unsupported for a long time
2016-03-14 14:36:56 +01:00
Michael Vogel
e6b170da7d Merge pull request #345 from tobiasd/20160312-degree
encode the degree for the translation
2016-03-13 11:54:29 +01:00
Tobias Diekershoff
4c0914712a encode the degree for the translation 2016-03-12 08:12:19 +01:00
Michael Vogel
70b5cefb74 Removed addons that are unsupported for a long time 2016-03-12 08:06:52 +01:00
Michael Vogel
b3eb963a2b fromgplus: Add keywords to imported posts 2016-03-12 07:42:57 +01:00
Tobias Diekershoff
f0310f6275 Merge pull request #344 from annando/1602-notifications
App.net/Pump.io/GNU Social/Twitter: Support for new notifications
2016-02-13 15:09:03 +01:00
Michael Vogel
91757d72d8 App.net/Pump.io/GNU Social/Twitter: Support for new notifications 2016-02-13 13:44:57 +01:00
Tobias Diekershoff
cb28355e04 Merge pull request #343 from shtrom/master
[ldapauth] More logging in the connection phase, and use cn for fullname by default
2016-02-11 07:34:06 +01:00
Olivier Mehani
d6f727974b Full name in LDAP is usually cn; compare ldap_connect() to false
Signed-off-by: Olivier Mehani <shtrom+friendica@ssji.net>
2016-02-10 11:08:40 +00:00
Olivier Mehani
bba50284ca [ldapauth] Add some early connect debug log
Signed-off-by: Olivier Mehani <shtrom+friendica@ssji.net>
2016-02-10 04:55:57 +00:00
Tobias Diekershoff
be899bd4da Merge pull request #342 from rabuzarus/0502_smileybutton
make smileybutton part of the div profile-smiley-wrapper
2016-02-06 07:26:58 +01:00
rabuzarus
4fe0910337 make smileybutton part of the div profile-smiley-wrapper 2016-02-05 21:25:50 +01:00
fabrixxm
fba810a8fd Merge pull request #341 from mexon/pr/retriever1.0
Retriever version 1.0
2016-02-03 12:08:14 +01:00
Matthew Exon
022c0fdebd Merge remote branch 'upstream/master' into pr/retriever1.0 2016-02-03 10:28:12 +01:00
fabrixxm
0ee3e65177 Merge pull request #340 from mexon/pr/mailstream1.0
Mailstream version 1.0
2016-02-03 10:22:24 +01:00
Matthew Exon
45cc7c6cd1 Retriever version 1.0 2016-02-03 10:13:09 +01:00
Matthew Exon
6f8e2b0313 Mailstream version 1.0 2016-02-02 15:11:13 +01:00
Michael Vogel
381e23da12 Merge pull request #339 from rabuzarus/1801_defaultfeatures
defaultfeatures: mark addon as unsupported because the functionality …
2016-01-18 15:59:51 +01:00
rabuzarus
02ad67def2 defaultfeatures: mark addon as unsupported because the functionality moved to core 2016-01-18 15:38:43 +01:00
Tobias Diekershoff
050f885f48 Merge pull request #338 from annando/1601-rendertime
Rendertime: Optionally show the callstack
2016-01-17 15:04:02 +01:00
Tobias Diekershoff
80ccdf0083 Merge pull request #337 from annando/1601-xmpp-federation
XMPP: Don't show the addon on the federation page.
2016-01-17 15:03:17 +01:00
Michael Vogel
bc578db2b3 Rendertime: Optionally show the callstack 2016-01-17 14:56:05 +01:00
Michael Vogel
6d3c0f1305 XMPP: Don't show the addon on the federation page. 2016-01-17 14:54:31 +01:00
Michael Vogel
ca464db466 Merge pull request #336 from tobiasd/20160112-jappixmini
re-added jappixmini.tgz to provide the sources of JappixMini
2016-01-15 08:32:00 +01:00
Tobias Diekershoff
6b24880df1 re-added jappixmini.tgz to provide the sources of JappixMini (see friendica/#2249) 2016-01-12 16:55:05 +01:00
Tobias Diekershoff
4676ff5554 Merge pull request #335 from annando/1601-gcontact
Preparation for new core function for storing contact data
2016-01-10 10:54:20 +01:00
Michael Vogel
f51e9d94ce Merge remote-tracking branch 'upstream/master' into 1601-gcontact 2016-01-09 08:17:28 +01:00
fabrixxm
0249534f5d Merge pull request #334 from annando/1601-converse-update
XMPP: Update to Converse 0.10.0
2016-01-08 14:33:26 +01:00
Michael Vogel
e59e019fa1 Merge remote-tracking branch 'upstream/master' into 1601-gcontact 2016-01-08 13:20:04 +01:00
Michael Vogel
3853a8323c XMPP: Update to Converse 0.10.0 2016-01-08 13:15:48 +01:00
Michael Vogel
bed435d76a Updated function call for updating the global contacts. 2016-01-06 15:10:22 +01:00
Michael Vogel
3b54203d80 The gcontact table will now be filled instead of the unique_contacts 2016-01-05 15:35:49 +01:00
fabrixxm
b4184c2773 Merge pull request #333 from tobiasd/20160103-ptbr
PT BR translations
2016-01-03 13:55:00 +01:00
Tobias Diekershoff
fa646956bd PT-BR translation of buffer addon 2016-01-03 12:25:12 +01:00
Tobias Diekershoff
dfe600bab4 PT-BR translation of appnetpost addon 2016-01-03 12:24:48 +01:00
fabrixxm
73055c250a Merge pull request #332 from tobiasd/20151214-translations
update to the translations of some addons
2015-12-14 20:30:27 +01:00
Tobias Diekershoff
3f6b454175 update to the translations of some addons 2015-12-14 19:57:45 +01:00
Michael Vogel
c7791a4058 Merge pull request #331 from rebeka-catalina/nsfw_input
Nsfw input
2015-12-12 21:09:30 +01:00
rebeka-catalina
4aea294776 Update nsfw.php 2015-12-12 16:39:27 +01:00
rebeka-catalina
29c44ec92f nsfw-words input to textarea for more comfortable usage 2015-12-12 16:01:11 +01:00
Tobias Diekershoff
5270552a08 Merge pull request #329 from annando/1511-statusnet-contact
Needed changes for a changed core function
2015-12-05 06:48:34 +01:00
Michael Vogel
4f5390c09e Needed changes for a changed core function 2015-12-05 02:02:13 +01:00
Tobias Diekershoff
e548c572d9 Merge pull request #328 from annando/1511-statusnet-contact
Bugfix: The Statusnet connector destroyed the avatar and the name
2015-11-29 08:24:26 +01:00
Michael Vogel
37094047a1 Bugfix: The Statusnet connector destroyed the avatar and the name 2015-11-28 19:33:41 +01:00
Tobias Diekershoff
699fa4c44f Merge pull request #327 from rabuzarus/forumlist
mark forumlist as unsupported because the functionality moved to core.
2015-11-26 06:48:58 +01:00
rabuzarus
79b509ff5e mark forumlist as unsupported because the functionality moved to core. 2015-11-25 14:49:01 +01:00