Commit graph

2060 commits

Author SHA1 Message Date
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
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
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
rabuzarus
abf2f079c5 mark cal addon as unsupported becaus it was moved to core with https://github.com/friendica/friendica/pull/2628 2016-06-22 14:14:27 +02:00
fabrixxm
c900d8ea86 Merge pull request #353 from annando/master
frio_hovercard is now in the core. Rendertime has a changed description.
2016-06-03 19:00:53 +02:00
Michael Vogel
118d086e32 frio_hovercard is now in the core. Rendertime has a changed description. 2016-05-31 22:12:19 +02:00
Michael Vogel
06af9e017c Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords 2016-05-28 13:53:05 +02:00
Michael Vogel
63eda5ce9f Merge pull request #352 from rabuzarus/frio
Frio
2016-05-26 07:37:11 +02:00
rabuzarus
6d6e73096a Merge branch 'master' of ../../save/merge/frio_hovercard into frio 2016-05-25 11:18:27 +02:00
rabuzarus
128b116f25 preparing file structure for pr for friendica addon repository 2016-05-25 11:03:46 +02:00
rabuzarus
1866ccd76a README: Add link to commit history 2016-05-25 08:43:45 +02:00
rabuzarus
9db0338d5c small README polish 2016-05-25 08:28:28 +02:00
rabuzarus
edcc9f3246 mark frio hovercard addon as experimental 2016-05-25 08:25:27 +02:00
db53afa85f Merge pull request #351 from annando/1605-pumpio-videos
Pump.io: Posted videos look better now
2016-05-16 07:55:56 +02:00
Michael Vogel
aee1165eb1 Pumpio: Posted videos look better now 2016-05-15 23:18:18 +02:00
rabuzarus
22d567a28e prevent that contact actions are shown to not logged in users 2016-05-10 17:11:51 +02:00
rabuzarus
2b40687e36 hovercard: output template as clean text 2016-05-10 00:31:57 +02:00
rabuzarus
e6e44e02e0 commit nurl in the result to have an identifier + some cleanup 2016-05-06 16:36:05 +02:00
rabuzarus
f6403049f6 revert because of wrong description 2016-05-06 16:08:59 +02:00
rabuzarus
6e2ed86758 poke: fix poke dialog - js tests now if there is already a questionmark in the url 2016-05-06 16:07:53 +02:00
rabuzarus
93ca995bb2 Provide some further informations at the README 2016-05-05 21:33:14 +02:00
rabuzarus
6ef16de400 hovercard for the frio theme (initial commit) 2016-05-05 20:59:29 +02:00
rabuzarus
86a2de815c Initial commit 2016-05-03 19:32:18 +02:00
Michael Vogel
f630051afb Merge pull request #350 from tobiasd/master
ES translation thx TupambaeNet
2016-04-23 00:22:18 +02:00
a7a5d9b9aa ES translation thx TupambaeNet 2016-04-22 17:42:52 +02:00
8ca008780f Merge pull request #349 from rabuzarus/1404_showmore
showmore: add css classes to elements
2016-04-14 07:33:27 +02:00
rabuzarus
16315e876f showmore: add css classes to elements 2016-04-14 01:28:04 +02:00
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
a73286c0d0 DE update strings for curweather 2016-03-18 21:09:03 +01:00
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
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
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
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
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