Commit graph

10961 commits

Author SHA1 Message Date
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
Michael Vogel
5eb6f9add9 Documentation: Configure bosh 2015-11-20 00:20:32 +01:00
Michael Vogel
cbae0874d6 Documentation for installing a synchronized ejabberd 2015-11-19 23:56:56 +01:00
Michael Vogel
ec9c4ea9e3 Merge pull request #2089 from tobiasd/20151119-NL
NL update to the strings, thx Ralph
2015-11-19 07:41:59 +01:00
Michael Vogel
5f810452e4 Merge pull request #2087 from tobiasd/20151118-docevents
documentation of the not/maybe/attent feature for events
2015-11-19 07:41:41 +01:00
1f583c9657 NL update to the strings, thx Ralph 2015-11-19 07:30:27 +01:00
cc2e2abb85 linefeeds 2015-11-19 06:45:56 +01:00
c409c66a7a Merge pull request #2088 from annando/1511-endless-loop
Prevention of endless loops in the conversation
2015-11-19 06:44:04 +01:00
4a656b0942 typo 2015-11-19 06:41:40 +01:00
Michael Vogel
37f466d16e Prevention of endless loops in the conversation 2015-11-18 23:57:53 +01:00
9649386c8d documentation of the not/maybe/attent feature for events 2015-11-18 14:41:16 +01:00
fabrixxm
a4f66ea4ca Merge pull request #2085 from annando/1511-forumlist-fix
This is a quick fix for the the forumlist.
2015-11-18 09:04:10 +01:00
Michael Vogel
41fe07e128 Merge remote-tracking branch 'upstream/develop' into 1511-forumlist-fix 2015-11-17 21:34:01 +01:00
Michael Vogel
edb303d44a Merge pull request #2086 from rabuzarus/0711_forumlist
0711 forumlist
2015-11-17 21:33:25 +01:00
rabuzarus
9123cb0fa3 forumlist: oh forgot to raise $visible_forums after testing 2015-11-17 20:59:12 +01:00
rabuzarus
a07a0fd1d7 forumlist: fix id conflict and js show-more 2015-11-17 20:57:12 +01:00
Michael Vogel
5a1f763de0 The mobile.css seems to only work for mobiles at the moment. 2015-11-17 20:39:30 +01:00
Michael Vogel
cd059aa68f Some SQL fixes 2015-11-17 20:31:40 +01:00
Michael Vogel
a9444ec774 The mobile.css was commented out ... 2015-11-17 20:11:06 +01:00
Michael Vogel
4b21512f56 This is a quick fix for the the forumlist. 2015-11-17 19:56:32 +01:00
fabrixxm
d1319d97a2 Merge pull request #2081 from annando/1511-avatar-fix
The own avatar was (sometimes?) changed back when it was changed
2015-11-17 09:13:08 +01:00
Michael Vogel
e43c7a4447 Merge pull request #2061 from rabuzarus/0711_forumlist
move forumlist addon to core
2015-11-17 08:46:15 +01:00
Michael Vogel
b53ae0d42a Bugfix: The own avatar was (sometimes?) changed back when it was changed. 2015-11-17 08:39:09 +01:00
49bf4ab47a Merge pull request #2077 from annando/1511-plugin-order
Sort the plugin configuration on the admin page by name
2015-11-14 12:19:45 +01:00
Michael Vogel
47d6e43642 Sort the plugin configuration on the admin page by name 2015-11-14 09:27:24 +01:00
53c10aaef1 Merge pull request #2076 from annando/issue-2060
Fix for issue 2060: Redirection after registration
2015-11-14 09:08:26 +01:00
83cb32d637 Merge pull request #2075 from annando/1511-bugfix-bbcode
Bugfix: Avoid error messages because of an already used function
2015-11-14 08:09:52 +01:00
Michael Vogel
830870c58e Fix for issue 2060: When password is provided during the register process now the user is redirected correctly. 2015-11-14 08:07:09 +01:00