Commit graph

10838 commits

Author SHA1 Message Date
3f2a55c267 Merge pull request #2118 from annando/1511-supported-networks
Only show supported networks in sidebar and contact list
2015-11-29 16:03:10 +01:00
69de262e97 Merge pull request #2117 from annando/1511-feed-remote
Bugfix: Only show the feed link for local profiles
2015-11-29 15:56:24 +01:00
Michael Vogel
2fabde5d2d Added the old Facebook addon for addon check 2015-11-29 13:42:31 +01:00
Michael Vogel
8b23e77171 Only show supported networks in sidebar and contact list 2015-11-29 13:37:24 +01:00
Michael Vogel
56e7b2002d Merge pull request #2116 from tobiasd/2110-followup
followup for #2110 putting the styling in less file and recompile css
2015-11-29 12:03:25 +01:00
Michael Vogel
1cd06df5fa Bugfix: Only show the feed link for local profiles 2015-11-29 12:02:14 +01:00
ba441789b9 followup for #2110 putting the styling in less file and recompile css 2015-11-29 11:18:32 +01:00
a770be3cb6 Merge pull request #2107 from annando/1511-duplicated-keywords
Duplicated tags shouldn't happen anymore when parsing a webpage.
2015-11-29 08:43:19 +01:00
b67f33f6d5 Merge pull request #2109 from annando/1511-duplicated-tags-diaspora
Avoid duplicated tags in postings to Diaspora
2015-11-29 08:42:10 +01:00
be40fb8186 Merge pull request #2110 from annando/1511-subscribe-feed
Issue 1779: Atom feed link under the connect link on the profile page
2015-11-29 08:40:39 +01:00
78858cb57d Merge pull request #2114 from rabuzarus/28.11_forumlist
forumlist - mark selected forum as selected
2015-11-29 08:21:37 +01:00
rabuzarus
f5597da059 forumlist - mark selected forum as selected 2015-11-28 23:52:12 +01:00
Michael Vogel
6e957c6c91 Merge pull request #2112 from rabuzarus/2811_group_side
group_side - unify look with forumlist
2015-11-28 21:12:56 +01:00
rabuzarus
a3059d02d4 group_side - unify look with forumlist 2015-11-28 20:09:28 +01:00
Michael Vogel
388847e1f3 Issue 1779: There is now an atom feed link under the connect link on the profile page 2015-11-28 18:11:34 +01:00
Michael Vogel
1c64090217 Avoid duplicated tags 2015-11-28 14:29:14 +01:00
Michael Vogel
20befee9ed Dupilcated tags shouldn't happen anymore when parsing a webpage. 2015-11-28 13:15:00 +01:00
Michael Vogel
9df70a6eed Merge pull request #2105 from rabuzarus/2811_forums_contact_pages
add missing info about if contact is forum to contact related pages
2015-11-28 10:14:21 +01:00
rabuzarus
226bda9f58 add missing info about if contact is forum to contact related pages 2015-11-28 03:50:45 +01:00
5fe8ae514b Merge pull request #2102 from annando/1511-unseen-forums
Bugfix: Now the unseen counter for forums work
2015-11-27 22:17:17 +01:00
Michael Vogel
3b6d3d1ade Merge pull request #2099 from rabuzarus/2611_new_user_addr
generate addr for new registered users
2015-11-27 21:35:46 +01:00
Michael Vogel
75710df61a Bugfix: Now the unseen counter works. 2015-11-27 21:18:54 +01:00
Michael Vogel
9c37fc320e Merge pull request #2095 from rabuzarus/unread_forums
count unread forum items for forumlist widget (ping.php)
2015-11-27 16:28:21 +01:00
1f543176cf Merge pull request #2101 from annando/1511-new-ostatus-delivery
New OStatus export
2015-11-27 08:30:09 +01:00
Michael Vogel
b1a9e9b6d4 OStatus: Commented out some "to-do" stuff 2015-11-27 08:09:19 +01:00
Michael Vogel
b45ca80656 Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery 2015-11-27 07:30:03 +01:00
3bf789d0e3 Merge pull request #2100 from annando/bugfix-scrape
Bugfix: There was an endless loop in the probe_url function ...
2015-11-27 06:44:54 +01:00
Michael Vogel
fa8b4738ee Bugfix: There was an endless loop in the probe_url function ... 2015-11-26 21:58:01 +01:00
rabuzarus
620299dc25 include friendica address in hcard 2015-11-26 17:46:38 +01:00
rabuzarus
84ec36d52c generate addr for new registered users 2015-11-26 14:08:32 +01:00
Michael Vogel
fc250bbc20 Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery 2015-11-26 11:46:58 +01:00
e146b42d15 Merge pull request #2098 from annando/1511-self-contact
Only update contact data for OStatus contacts
2015-11-26 09:59:19 +01:00
Michael Vogel
1203088c3e Only update contact data for OStatus contacts 2015-11-26 08:26:29 +01:00
fd10f70466 Merge pull request #2096 from annando/1511-scrape-addr
scrape_dfrn now scrapes the address as well.
2015-11-26 06:50:01 +01:00
Michael Vogel
602821279a scrape_dfrn now scrapes the address as well. 2015-11-25 18:46:02 +01:00
Michael Vogel
6b5ea74bbd Deactivated some attachment part in the old functions 2015-11-25 08:28:17 +01:00
rabuzarus
bc61d76b56 forumlist: little doxygen polishing 2015-11-24 22:34:23 +01:00
rabuzarus
ddf3589fc5 count unread forum items for forumlist widget (ping.php) 2015-11-24 22:14:26 +01:00
Michael Vogel
034f573374 Bugfix: Bookmarks doesn't federate well. 2015-11-24 21:03:06 +01:00
Michael Vogel
3b101c9d98 Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery 2015-11-24 09:38:46 +01:00
Michael Vogel
7d7e2e74f4 The generated XML is now valid and it seems to work. 2015-11-23 23:49:14 +01:00
b888382cc6 Merge pull request #2094 from annando/1511-api
API Improvements
2015-11-23 21:20:00 +01:00
Michael Vogel
64b3881e73 API: Show the remote profile so that AndStatus uses the correct webfinger address 2015-11-23 19:16:27 +01:00
Michael Vogel
75f1a17f7e New function for creating the OStatus messages 2015-11-23 18:44:47 +01:00
Michael Vogel
6d2a9e44a7 API: Improvements for fetching the nick name 2015-11-23 18:42:45 +01:00
fa4ac9515e Merge pull request #2092 from strk/do-not-notify-own-items
Do not notify own posts, closes #1032
2015-11-22 16:42:21 +01:00
Sandro Santilli
573a441d83 Do not notify own posts, closes #1032 2015-11-22 12:28:39 +01:00
1babf5a6d1 Merge pull request #2090 from annando/1511-document-ejabberd
Documentation for installing a synchronized ejabberd
2015-11-21 07:58:28 +01:00
Michael Vogel
63ec2bb9aa Added the german explanation 2015-11-21 00:11:29 +01:00
Michael Vogel
b1ad63cbce Added some more explanations about ejabberd 2015-11-21 00:09:39 +01:00