Commit graph

3541 commits

Author SHA1 Message Date
Michael Vogel
88da58ed3e OStatus: Deactivated The resharing until it is tested completely. 2015-12-07 23:06:28 +01:00
root
e1c6d80c01 change api/user/group_* to api/friendica/group_* 2015-12-07 22:18:55 +01:00
Michael Vogel
bfc0857953 OStatus: Send even Friendica comments to OStatus 2015-12-07 21:52:42 +01:00
Gerhard Seeber
8128a28a6c new API calls for managing contact groups 2015-12-07 19:38:11 +01:00
d944b65253 Merge pull request #2151 from annando/1512-misconfigured-friendica
Workaround for misconfigured Friendica servers with probe_url
2015-12-07 06:37:37 +01:00
Michael Vogel
6b0b9481cb Bugfix for pull request #2147 (Fix for issue #2122) 2015-12-06 20:05:57 +01:00
Michael Vogel
fbbba6828b Some better logging 2015-12-06 20:04:33 +01:00
Michael Vogel
d06717798b Code beautification 2015-12-06 18:57:23 +01:00
Michael Vogel
f880bdd33b Workaround for misconfigured Friendica servers 2015-12-06 18:52:19 +01:00
Michael Vogel
9f8da37c99 Move the process check at the beginning of the script 2015-12-06 16:40:31 +01:00
Michael Vogel
54085508e5 Double check for maximum number of workers 2015-12-06 16:28:28 +01:00
Michael Vogel
7c7baa77d6 probe_url: Only cache successful results 2015-12-06 12:15:31 +01:00
Michael Vogel
b57ae80206 Issue 2122: Make sure to always return the correct number of entries 2015-12-05 23:05:48 +01:00
a8ab1bc947 Merge pull request #2146 from annando/1512-ostatus-picture-posts
Enhancements to picture posts to OStatus
2015-12-05 06:47:31 +01:00
root
37a70d3204 modified: include/dbstructure.php removed uneeded break; It causes errors with php 7.0. 2015-12-04 19:49:09 +00:00
Michael Vogel
25c2e219ee Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts 2015-12-04 07:07:34 +01:00
7ac7caef08 Merge pull request #2136 from annando/1512-diaspora-retractions
Support for a new Diaspora command for post retraction
2015-12-04 06:54:55 +01:00
eaf975faae Merge pull request #2130 from annando/1512-contact-rework
Some more contact rework
2015-12-04 06:53:29 +01:00
Michael Vogel
37bd03422b The preview picture can now be remote or local 2015-12-04 06:50:23 +01:00
Michael Vogel
540d217134 Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts 2015-12-04 06:05:12 +01:00
Michael Vogel
f82ce0de66 Merge branch '1512-ostatus-picture-posts' of github.com:annando/friendica into 1512-ostatus-picture-posts 2015-12-04 06:00:56 +01:00
Michael Vogel
bb45112544 OStatus: Picture posts are reformatted 2015-12-04 05:57:33 +01:00
rabuzarus
d94b96e546 ping: docu fix 2015-12-03 22:51:00 +01:00
rabuzarus
4b7f080c46 ping: further work 2015-12-03 22:42:53 +01:00
rabuzarus
c0406918ec ping: cleanup 2015-12-03 17:15:49 +01:00
Fabrixxm
95508bf4bb Allow multicolunn primary keys in dbstructure 2015-12-03 16:39:20 +01:00
Michael Vogel
1a170c8743 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
Conflicts:
	mod/contacts.php
	mod/crepair.php
2015-12-03 14:38:04 +01:00
Michael Vogel
24f1a24208 Support for a new Diaspora command for post retraction 2015-12-03 08:35:47 +01:00
rabuzarus
3af7cff281 remove unneeded function page_type_translate() 2015-12-03 00:08:43 +01:00
rabuzarus
d963cdfe48 photos-albms widget: add some classes 2015-12-02 20:01:22 +01:00
rabuzarus
cd7ec72b20 unify hcard and vcard: make $pdesc available in hcard&vcard 2015-12-01 19:47:23 +01:00
rabuzarus
39b37281a7 Merge develop into 3011_hcard_vcard 2015-12-01 18:34:13 +01:00
rabuzarus
89c5989cfb unify hcard and vcard 2015-12-01 18:31:08 +01:00
Michael Vogel
107204f405 Diaspora comments/likes: The contact id and the network is now taken from the contact 2015-12-01 15:36:32 +01:00
146f386e37 Merge pull request #2126 from annando/1511-duplicates
Bugfix: The duplicate check sometimes seemed to have scrambled the posts
2015-12-01 06:07:18 +01:00
Michael Vogel
712b3c7593 Merge pull request #2121 from rabuzarus/3011_viewcontactstitle
make viewcontacts part of the profile tab
2015-11-30 23:29:35 +01:00
Michael Vogel
b0898cc461 Bugfix: The duplicate check sometimes seemed to have scrambled the posts 2015-11-30 23:13:56 +01:00
Michael Vogel
0278e60664 Merge pull request #2104 from rabuzarus/2611_contacts_directory
display contact information in contact and directory according to the…
2015-11-30 18:07:35 +01:00
rabuzarus
2ce64c2496 change shortcut for viewcontacts + shortcut docu 2015-11-30 16:23:03 +01:00
fabrixxm
2753e62483 Merge pull request #2119 from annando/1511-contact-evolution
Refurbished contact settings/contact posts
2015-11-30 14:45:23 +01:00
rabuzarus
45c2a4868e make viewcontacts part of the profile tab 2015-11-30 03:25:23 +01:00
Michael Vogel
42d903dd68 Redesign of the contact pages, new tab for contact statuses 2015-11-29 23:22:05 +01:00
f45a8f1a03 Merge pull request #2106 from annando/1511-ostatus-bookmark-design
Small OStatus changes
2015-11-29 23:19:12 +01:00
d3d0647ff8 Merge pull request #2108 from annando/1511-optimize-tables
Optimize tables on a daily base that are written very often
2015-11-29 23:18:06 +01:00
93fd6dce84 Merge pull request #2111 from annando/issue-1925
Issue 1925 - display nickname@hostname.com
2015-11-29 19:48:08 +01:00
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
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
1cd06df5fa Bugfix: Only show the feed link for local profiles 2015-11-29 12:02:14 +01:00
Michael Vogel
583a2f709b Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design 2015-11-29 10:25:44 +01:00
Michael Vogel
00cc409461 The photo menu now respects if the local users differs from the contact owner 2015-11-29 09:35:35 +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
rabuzarus
f5597da059 forumlist - mark selected forum as selected 2015-11-28 23:52:12 +01:00
rabuzarus
a3059d02d4 group_side - unify look with forumlist 2015-11-28 20:09:28 +01:00
Michael Vogel
cd16eb14af Show the name instead of the nick in the feed 2015-11-28 19:42:18 +01:00
Michael Vogel
25c0c5d4ad Issue 1925 - display nickname@hostname.com 2015-11-28 18:49:37 +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
3f66e0a9f6 Automatically optimize tables that are smaller than a definable size 2015-11-28 15:43:25 +01:00
Michael Vogel
a34dbf76a4 Maybe it would take too long to optimize the photo table on larger systems 2015-11-28 14:35:59 +01:00
Michael Vogel
1c64090217 Avoid duplicated tags 2015-11-28 14:29:14 +01:00
Michael Vogel
c3068c8925 Optimize tables on a daily base that are written very often 2015-11-28 13:19:09 +01:00
Michael Vogel
32fa5d185c Before the comparism the entities must be removed 2015-11-28 10:28:14 +01:00
Michael Vogel
59242d7932 Forgotten file 2015-11-28 07:37:56 +01:00
Michael Vogel
643e228d6b Bookmark links are now looking again like bookmark links 2015-11-28 07:37:02 +01:00
rabuzarus
9189971cb8 display contact information in contact and directory according to the other contact related pages 2015-11-28 02:56:36 +01:00
Michael Vogel
79092f149c Requests for soapbox and freelove accounts are automatically accepted 2015-11-28 01:03:26 +01:00
Michael Vogel
a9b2b48d08 Some small improvements to the OStatus export 2015-11-27 23:16:54 +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
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
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
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
root
c73d961198 Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop 2015-11-24 02:56:35 +01:00
root
2c89a43286 Test 2015-11-24 02:49:29 +01:00
Michael Vogel
7d7e2e74f4 The generated XML is now valid and it seems to work. 2015-11-23 23:49:14 +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
Michael Vogel
37f466d16e Prevention of endless loops in the conversation 2015-11-18 23:57:53 +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
cd059aa68f Some SQL fixes 2015-11-17 20:31:40 +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
Michael Vogel
e1774acbde Bugfix: Avoid error messages because of an already used function 2015-11-13 23:55:01 +01:00
rabuzarus
cec5afe2c9 forumlist: don't raise db version in dbstructure.php 2015-11-13 23:49:37 +01:00
a552845d8f Merge pull request #2072 from fabrixxm/issue_2066
Remove anonymous function, 5.2 is still minimal requirement
2015-11-13 12:51:17 +01:00
009b3364e5 Merge pull request #2074 from fabrixxm/issue_2071
Use static css in install procedure
2015-11-13 12:50:41 +01:00
Fabrixxm
6605e30cf2 pass to all templates by default 2015-11-13 10:56:37 +01:00
Michael Vogel
6ddf62bdf7 Merge remote-tracking branch 'upstream/develop' into 1511-avatar 2015-11-13 09:48:34 +01:00
Michael Vogel
c951123b76 Cleaned code 2015-11-13 09:45:15 +01:00
Fabrixxm
fa4ee05312 Remove anonymous function, 5.2 is still minimal requirement 2015-11-13 09:36:22 +01:00
fabrixxm
98f524db67 Merge pull request #2067 from annando/1511-optimize-sql
Optimized SQL queries to reduce the amount of write operations
2015-11-13 09:16:52 +01:00
Michael Vogel
11905c0bec The avatar picture wasn't updated at the contact table 2015-11-13 08:45:14 +01:00
rabuzarus
86e720c99d forumlist: some more doxygen for plugin.php 2015-11-13 00:33:32 +01:00
Michael Vogel
1ea82ea355 Only allow non top level posts to soap boxes 2015-11-12 21:55:33 +01:00
Michael Vogel
3648094927 Local delivery of comments to soap boxes are working now 2015-11-12 21:43:42 +01:00
Michael Vogel
c95afa525e Some SQL queries were optimized to reduce the amount of write operations. 2015-11-12 08:59:29 +01:00
rabuzarus
902735f6d4 forumlist: dbupdate 2015-11-11 23:39:14 +01:00
rabuzarus
862ccb95d2 forumlist: doxygen corrections 2015-11-11 22:41:44 +01:00
rabuzarus
7bba9c783f forumlist: function get_feature_default() 2015-11-11 22:36:14 +01:00
rabuzarus
215205d376 forumlist: nodeinfo_plugin_enabled() is now plugin_enabled() 2015-11-11 21:31:26 +01:00
rabuzarus
dac6f39f41 forumlist: use a more unique identifier 2015-11-11 01:29:31 +01:00
rabuzarus
a67710bc7c forumlist: some little code unification 2015-11-10 20:31:13 +01:00
rabuzarus
dd58a713d8 forumlist: move include to header 2015-11-10 19:23:45 +01:00
rabuzarus
96b764425e move forumlist addon to core 2015-11-09 15:56:20 +01:00
Michael Vogel
1c5eaa646c Only show valid contacts on the group side 2015-11-08 16:41:00 +01:00
d9e56e0450 Merge pull request #2047 from annando/1511-ostatus-warning
This is a bugfix for pull request 2040
2015-11-08 15:43:53 +01:00
Michael Vogel
ea0397b676 This is a bugfix for pull request 2040 2015-11-08 15:32:16 +01:00
c0e87b2bea Merge pull request #2045 from annando/1511-dirfind-addr
You can now discover previously unknown users via the dirsearch
2015-11-08 15:19:11 +01:00
Michael Vogel
e12b0d27bb You can now search for @username@domain.tld in dirfind and the search will resolve that. 2015-11-08 14:48:47 +01:00
fabrixxm
ae9c9829fa Remove language selectors from themes
This is now a user setting
2015-11-08 14:42:54 +01:00
fabrixxm
fb3ac68cc0 Add user language in settings, use that field as language for UI 2015-11-08 14:23:49 +01:00
Michael Vogel
27b166caf6 Bugfix for not working pagination in GNU Social 2015-11-08 11:10:20 +01:00
294b4ecf5e Merge pull request #2034 from fabrixxm/issue_1986
fix the contact photo menu
2015-11-07 20:29:20 +01:00
fabrixxm
35302d4274 fix the contact photo menu
fix "should open a new tab" attribute
fix javascript deletion dialog (fix #1986)
2015-11-07 18:25:35 +01:00
fabrixxm
d5a32ef214 cron: move update_suggestions in separated thread
Move the call in  discover_poco.php.
This should fix expiration and other cron related issues
2015-11-07 17:52:52 +01:00
Michael Vogel
88e1ac9654 API Bugfix: This fixes the problem that posts to AndStatus appeared as empty posts 2015-11-07 14:36:00 +01:00
fabrixxm
80b62071e1 Use old style array declaration 2015-11-07 12:21:54 +01:00
fabrixxm
0aa69f134f Fix template_var hook
move it to smarty3 replate_macro, pass the theme name in $b
2015-11-06 19:52:00 +01:00
fabrixxm
545a7a80e4 Add 'template_vars' hook 2015-11-06 19:33:14 +01:00
Michael Vogel
0f563525bd Optical adjustments for contacts/set "last_failure" when inaccessible 2015-11-06 09:15:20 +01:00
Michael Vogel
f42a3c9bc6 Update the contact table as well. 2015-11-06 01:19:37 +01:00
Michael Vogel
0f41f35041 The contact template now displays the address if available 2015-11-06 00:47:54 +01:00
Michael Vogel
2e81d0a2b3 Fetch the "addr" value whenever it is empty 2015-11-05 10:55:00 +01:00
Michael Vogel
d6080f4c76 The "addr" field is now in the global contacts as well. 2015-11-05 08:37:00 +01:00
Michael Vogel
a193a482cd Friendica contacts where detected as OStatus contacts when they should be Diaspora contacts 2015-11-05 00:42:38 +01:00
Michael Vogel
3b11436b02 Merge pull request #1989 from rabuzarus/allfriends
template-rework: let common friends and allfriends use viewcontact_te…
2015-11-03 23:27:24 +01:00
rabuzarus
e785759a8b template-rework:make use of get_contact_details_by_url() 2015-11-03 14:31:15 +01:00
Michael Vogel
6a15dded0e Bugfix: The timeout value of z_fetch_url couldn't be set manually 2015-11-03 00:48:49 +01:00
Michael Vogel
b87d7ef1af Return the contact id at "all_friends" and "common_contacts" 2015-11-01 08:54:44 +01:00
Michael Vogel
09ff2f0dd5 Renamed the function 2015-10-31 00:01:33 +01:00
Michael Vogel
f3ce812a9e New function for fetching contact data 2015-10-30 01:30:42 +01:00
bb4efb01a7 Merge pull request #1980 from annando/1510-coord-ostatus
OStatus: send the coordinates in an additional field
2015-10-25 16:53:17 +01:00
12d9c46ec5 Merge pull request #1979 from annando/1510-gnusocial
Statusnet is now GNU Social
2015-10-25 16:52:38 +01:00
4e78d439e2 Merge pull request #1978 from annando/1510-bad-servers
Workaround for bad configured servers
2015-10-25 16:52:10 +01:00