clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,760 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

3806 Commits

Author SHA1 Message Date
Michael Vogel d04e1bdf69 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import 2016-01-30 16:38:06 +01:00
Michael Vogel 3ea5706d16 Resolved namespace trouble 2016-01-30 16:37:18 +01:00
Michael Vogel eb17fe7324 Some missing parts added 2016-01-30 14:13:58 +01:00
rabuzarus 088b075bba event_form: use [map] tag to embedd a map 2016-01-30 05:12:27 +01:00
Michael Vogel 4e513d3885 DFRN: Deletions should work now as well 2016-01-30 03:17:46 +01:00
Michael Vogel 69457a4a5b DFRN import seems to work. Improvements are possible :-) 2016-01-30 02:57:40 +01:00
rabuzarus 8e0f04026c vier: some fixes for mobile view 2016-01-30 01:53:21 +01:00
Michael Vogel cd1f3cde00 DFRN Deletions should now work too 2016-01-30 01:20:43 +01:00
Michael Vogel decaac6c31 DFRN-Import is now nearly complete, changed namespace constants 2016-01-29 23:14:01 +01:00
Michael Vogel 1cdcb9fc2e DFRN: Entry import could work now, first steps for mails 2016-01-29 17:42:38 +01:00
Michael Vogel 8412eb7066 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import 2016-01-29 10:59:06 +01:00
fabrixxm 863d49ccd0 Merge pull request #2300 from annando/1601-gcontact-guessing 
gcontact-id now depends on the owner, not the author of a post
 2016-01-29 05:27:58 +01:00
fabrixxm fdb864157d Merge pull request #2299 from annando/1601-contact-photos 
Improved avatar storage in contacts
 2016-01-29 05:26:26 +01:00
Michael Vogel 56687f5bc8 Check the body for notifications as well 2016-01-29 03:46:43 +01:00
Michael Vogel e4c4b8e13e It's better to ask the connectors for their profile data 2016-01-29 03:02:15 +01:00
Michael Vogel 8767ea5f52 Improved check against profile 2016-01-29 01:18:18 +01:00
Michael Vogel b3e86f4e6b There is now a central function for item notifications 2016-01-28 22:58:05 +01:00
Michael Vogel a93d35bfda gcontact-id now depends on the owner, not the author of a post 2016-01-28 18:06:17 +01:00
Michael Vogel 410ebb4cbf Added documentation 2016-01-28 12:35:07 +01:00
Michael Vogel eba9f15daa Removed some more work 2016-01-28 11:18:57 +01:00
Michael Vogel 04725d1283 Reverted some work ... 2016-01-28 11:14:13 +01:00
Michael Vogel 78e79de7c9 New central function to store avatar data in contacts 2016-01-28 11:09:08 +01:00
Michael Vogel 6f662b8c74 New avatar picture fields to better cope with changing avatars 2016-01-28 01:26:19 +01:00
Michael Vogel 613f6b9b32 Just some more code :-) 2016-01-27 20:06:23 +01:00
Michael Vogel 1d4de96960 Next steps to add all fields 2016-01-27 15:57:11 +01:00
Michael Vogel afed5f3afc Test code for the DFRN import 2016-01-27 11:30:12 +01:00
Michael Vogel 828cec27dd Do not notify on "likes" - update only OStatus contacts 2016-01-27 10:44:15 +01:00
Michael Vogel 45a5f63d35 The object-type is now transmitted as well 2016-01-27 02:38:52 +01:00
Michael Vogel c0eb7b10a3 Some new fields for the protocol 2016-01-26 12:18:57 +01:00
Michael Vogel 4208acf4b6 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-25 23:51:11 +01:00
Michael Vogel 9b2582e066 API: Only allow repeating of public items 2016-01-25 22:35:18 +01:00
Michael Vogel 778d9250c6 Still some more documentation 2016-01-25 22:10:26 +01:00
Michael Vogel 62de6be495 Switched to static methods for DFRN 2016-01-25 15:20:58 +01:00
Matthew Exon 4ff8c9e3a1 Document new redirect_url return value 2016-01-25 11:38:36 +01:00
Matthew Exon 930da0aa44 Return redirect_url as part of the return array from z_fetch_url instead of via global state 2016-01-25 11:05:17 +01:00
Matthew Exon 50d4d37609 Merge remote branch 'upstream/develop' into mat/pullrequest5 2016-01-25 10:58:18 +01:00
fabrixxm 0e6f3e6122 Merge pull request #2293 from mexon/mat/pullrequest4 
Use more cookies to allow processing of the NYT feed
 2016-01-25 10:52:48 +01:00
Michael Vogel 77c6020dc2 Removed useless get_app function call 2016-01-25 10:38:38 +01:00
Matthew Exon 0ae83e41a2 Use get_temppath() instead of hard-coded '/tmp' to store cookiejar 2016-01-25 10:38:30 +01:00
Matthew Exon 3ada0093f9 Note the final URL used to retrieve content after all redirects 2016-01-25 07:41:56 +01:00
Tobias Diekershoff 662a9f5b16 Merge pull request #2287 from annando/1601-duplicate-contacts 
Remove duplicated contacts with uid=0
 2016-01-25 07:33:55 +01:00
Matthew Exon 4007876b84 Use more cookies to allow processing of the NYT feed 
Conflicts:

	include/Scrape.php
 2016-01-25 03:34:53 +01:00
Matthew Exon 677903b316 Report errors during cURL fetch 2016-01-25 02:56:47 +01:00
Michael Vogel ffd8f1234e Some more documentation 2016-01-25 01:15:10 +01:00
Michael Vogel acd7e816eb Added documentation 2016-01-25 01:06:46 +01:00
Michael Vogel a2d025232b Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-24 18:21:09 +01:00
Michael Vogel b409132f86 Avoid a warning if a user hadn't subscribed to any forum. 2016-01-24 17:56:34 +01:00
Michael Vogel 16b3758deb Removed to do bullet point 2016-01-24 17:42:47 +01:00
Michael Vogel ca64c7f7cd Remove duplicated contacts with uid=0 2016-01-24 17:40:31 +01:00
Michael Vogel 937196d6ee Poco fields now moved to the header, function to create formatted location string 2016-01-24 14:30:57 +01:00
Michael Vogel c1f2b3a55e Improved documentation 2016-01-24 10:34:39 +01:00
Michael Vogel 1471385157 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-24 08:18:38 +01:00
Tobias Diekershoff a447839c50 Merge pull request #2281 from annando/1601-repair-database 
Frequently repair of database entries
 2016-01-24 08:08:50 +01:00
Michael Vogel 41dacf4b37 To-Do bullets can now be listed in doxygen 2016-01-24 07:57:36 +01:00
Tobias Diekershoff b77dfb5737 Merge pull request #2283 from annando/1601-worker-stuff 
The worker now kills processes that run longer than 3 hours
 2016-01-24 06:42:06 +01:00
Michael Vogel 275f7b2660 The worker now kills processes that run longer than 3 hours 2016-01-24 02:53:21 +01:00
Michael Vogel 74ed37aa87 Some more removed code 2016-01-24 00:21:58 +01:00
Michael Vogel 44091aa631 Removed unused functions 2016-01-24 00:11:16 +01:00
Michael Vogel 60470cfafa New handling for filling the gcontact table / duplicate prevention 2016-01-23 22:36:15 +01:00
Michael Vogel b76dc8b129 Frequently repair of database entries 2016-01-23 22:05:27 +01:00
Michael Vogel 7371318376 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-23 18:50:14 +01:00
Michael Vogel 2bb3c1aec8 DFRN: Mails had an empty body 2016-01-23 13:18:18 +01:00
Michael Vogel 61cebdb75e Workaround for the case when items are stored without a contact id 2016-01-23 12:39:37 +01:00
Michael Vogel 444b417de0 New routines are now enabled 2016-01-23 02:44:30 +01:00
Michael Vogel 1406d7cbec Added documentation, completed the functions 2016-01-23 01:07:51 +01:00
Michael Vogel c66b4387bf dfrn functions could now work/Removed unused code 2016-01-22 20:26:11 +01:00
Michael Vogel ea9a42259d First version of dfrn.php - unfinished 2016-01-22 01:58:36 +01:00
Michael Vogel fe5705e547 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-21 23:05:02 +01:00
Michael Vogel 1d502116a8 Search for GNU Social users in the background 2016-01-21 19:00:08 +01:00
Michael Vogel e1bc0b4ff8 Likes are now federated again through Diaspora 2016-01-21 16:01:46 +01:00
Michael Vogel e00c091540 Small fix for empty signatures 2016-01-21 13:57:21 +01:00
Michael Vogel 54f42cb706 removed some test code 2016-01-21 13:38:30 +01:00
Michael Vogel d768074afd Comments from Hubzilla weren't federated properly 2016-01-21 13:21:47 +01:00
Michael Vogel 1c84054322 Queue delivery should be now more reliable 2016-01-21 03:21:33 +01:00
Michael Vogel 98ccefebcf Reworked check for double encoded Diaspora signatures 2016-01-20 16:00:43 +01:00
Fabrixxm 7e83ba090f Merge branch 'hotfix_diaspora' into develop 2016-01-20 08:50:18 +01:00
Michael Vogel c6b0e57aa4 Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change 2016-01-20 08:40:04 +01:00
Michael Vogel 5a6950bace Auto discovery of contacts from GNU Social 2016-01-19 15:12:18 +01:00
Michael Vogel 32c7896c5d Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 18:49:04 +01:00
Tobias Diekershoff 2ef63b6593 Merge pull request #2262 from annando/1601-http-timeouts 
Timeout problems while fetching image data
 2016-01-18 18:34:15 +01:00
Michael Vogel 5ec2c7e965 When a server isn't reachable there were timeout problems with fetching image data 2016-01-18 15:38:38 +01:00
Michael Vogel 6c7cf2a766 Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 00:53:18 +01:00
rabuzarus c1ed2bd975 feature management for admins: Merge branch 'devolop' 2016-01-17 03:25:17 +01:00
Michael Vogel 228ce9e27e Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-16 17:39:45 +01:00
Michael Vogel 2275203917 Just some improved queries 2016-01-16 12:32:11 +01:00
Tobias Diekershoff 20fe67f378 removed remote update functionality from admin panel 2016-01-16 11:52:21 +01:00
Michael Vogel 092c2e5433 Removed some test code 2016-01-15 23:32:13 +01:00
Michael Vogel 90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
Michael Vogel 268467fe04 Add the creation date to the cache tables 2016-01-15 00:58:57 +01:00
Michael Vogel d5e1f33506 OEmbed and parse_url are now cached in dedicated tables 2016-01-14 23:59:51 +01:00
Michael Vogel c4ba035ee3 Add some analysing stuff, rendered value is written now more often 2016-01-14 21:56:37 +01:00
Michael Vogel 9b5c6ed580 Twitter shortening should now work even the shortening would be in the link 2016-01-14 19:38:59 +01:00
Michael Vogel 86da77e8ee Added two to-dos to do. 2016-01-13 10:53:38 +01:00
Michael Vogel d1d7ab799c Added some more documentation 2016-01-11 20:21:42 +01:00
Michael Vogel 01c2eacd46 Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total 2016-01-11 14:25:48 +01:00
Michael Vogel 941b5fd11e Some added logging 2016-01-11 14:24:54 +01:00
Michael Vogel 8d9a905c80 Bugfix: Public posts to Diaspora could fail 2016-01-10 23:08:25 +01:00
Michael Vogel 6b85fa17bb Added some documentation 2016-01-10 19:06:34 +01:00
Michael Vogel b4631cebed Fixed SQL problems 2016-01-10 17:10:56 +01:00
Michael Vogel 23731fc9aa Bugfix: The display hadn't fetched the correct contact for the uid. 2016-01-10 15:44:23 +01:00
Michael Vogel 885dc1df81 gcontact update script, rebuilt follow page, query speedup for community and network groups 2016-01-10 09:19:00 +01:00
Michael Vogel 358a9fd6fd Notify and alias will be fetched via OStatus 2016-01-08 00:35:46 +01:00
Michael Vogel 9521cdc18f notify and alias are now in gcontact as well - the contact expansion in mod/item.php is renewed 2016-01-07 23:43:16 +01:00
Michael Vogel fdb31abdfa Use gcontact when adressing contacts in editor 2016-01-07 08:19:28 +01:00
Michael Vogel 5ab2786c00 Get rid of the table "unique_contacts" 2016-01-06 22:23:12 +01:00
Michael Vogel 2bad2cdd91 More fields in gcontact, contact search respects "hide" setting 2016-01-06 14:13:59 +01:00
Michael Vogel 75e2ec01fe The gcontact will now be connected to the items 2016-01-05 15:34:27 +01:00
Michael Vogel c8449e6019 Code cleanup 2016-01-04 20:41:24 +01:00
fabrixxm fcf7a791f1 Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget" 
This reverts commit 83e54f70d3, reversing
changes made to ecf576bdd0.
 2016-01-04 11:46:19 +01:00
fabrixxm 83e54f70d3 Merge pull request #2223 from rabuzarus/2912_photo_widget 
photo aside widget for profile page
 2016-01-04 10:06:07 +01:00
Michael Vogel ba9054d8a3 Bugfix: The table name was wrong 2016-01-03 08:12:00 +01:00
Tobias Diekershoff 9015b081ee Merge pull request #2234 from annando/1601-bugfix-duplicate-like 
Bugfix: Duplicate check for likes wasn't reliable
 2016-01-03 07:51:41 +01:00
Michael Vogel fba08409b4 Some more places that need to be adjusted 2016-01-03 00:28:11 +01:00
Michael Vogel 6c3d0f82c2 Bugfix: The duplicate check for likes wasn't reliable 2016-01-03 00:17:28 +01:00
fabrixxm 20809cf725 API: fix itemactivities count 
api_format_items_likes() has now uses builtin_activity_puller() to correctly count activities
 2016-01-02 12:54:57 +01:00
fabrixxm 5758302f21 small doxigen comment fix 2016-01-02 12:53:42 +01:00
Michael Vogel 38ee2def5d Don't send messages to contacts that are archived 2016-01-01 13:05:05 +01:00
Tobias Diekershoff 9d4d29ad9e Merge pull request #2228 from fabrixxm/issue_api 
Fix small bug in api
 2015-12-31 09:49:28 +01:00
Tobias Diekershoff 8a5fada863 Merge pull request #2138 from fabrixxm/dbstructure_multicolumn_primarykey 
Allow multicolumn primary keys in dbstructure
 2015-12-31 09:49:00 +01:00
fabrixxm 2a9affe818 Fix small bug in api 2015-12-31 09:46:59 +01:00
rabuzarus 3366e530cd photo aside widget: little polish 2015-12-30 00:37:24 +01:00
rabuzarus 20fbf670db photo aside widget for profile page 2015-12-30 00:26:50 +01:00
Tobias Diekershoff 99861b9fa6 Merge pull request #2216 from fabrixxm/feature-api-like 
Works on API and a small refractor, updated docs
 2015-12-28 18:39:21 +01:00
fabrixxm 6da04d16bd get rid of unwanted <br>s in items with oembed 
fix video thumbnail in quattro, vier, duepuntozero themes
 2015-12-28 18:07:31 +01:00
Michael Vogel 4c08b0ceb6 code cleanup 2015-12-28 17:09:22 +01:00
Michael Vogel 3476e21b28 Scrape the public key from the hcard if not present in webfinger 2015-12-28 16:49:19 +01:00
fabrixxm 79c32105fc datasize not meaningful when all size are returned in api/friendica/photo 2015-12-28 10:23:06 +01:00
fabrixxm 6b60560ea2 Changes in api 
- Api functions can define an HTTP method to use to call them. "405 Method Not Allowed" is returned on error
- Api function that modify data accepts only POST as method.
- A list of HTTP return code related exception is added
- Api functions throw HTTP exceptions instead of return false or die()
- api_call() catches HTTP exceptions and return error message with corret HTTP response code
- api_format_items() returns also item activities count (# of like/dislike etc)
- api/friendica/photos/list return more info about photos. xml format added.
- api/friendica/photo/detail return more info, links to all sizes, no data except if 'size' parameter is passed. xml format added.
- new api api/friendica/activity/<verb> and api/friendica/activity/un<verb> to add or remove like/dislike/attend status
 2015-12-28 10:23:06 +01:00
fabrixxm 835ad28d83 do_like() return false if verb is invalid 2015-12-28 10:23:06 +01:00
fabrixxm f27fad7b47 Move Like/Dislike/Attend add/remove code to include/like.php 2015-12-28 10:23:06 +01:00
fabrixxm 44afff9514 Merge pull request #2198 from rabuzarus/2312_code_cleanup 
boot.php - code cleanup + doxygen
 2015-12-27 18:20:48 +01:00
Tobias Diekershoff 8d8dc2d060 Merge pull request #2197 from annando/1512-ostatus-comment 
Reworked delivery and notifier process - changed OStatus behaviour
 2015-12-27 15:58:32 +01:00
Tobias Diekershoff 06defed4cb Merge pull request #2206 from annando/1512-diaspora-sql 
Diaspora: Fixed possible SQL injection
 2015-12-27 07:02:21 +01:00
Michael Vogel 7825704bd6 Diaspora: Fixed possible SQL injection 2015-12-27 03:54:20 +01:00
rabuzarus 3df5c17124 reformat todo according to doxygen style 2015-12-25 23:17:34 +01:00
Michael Vogel 5b94c4fe41 Yes is no and no is yes ... 2015-12-25 19:57:38 +01:00
rabuzarus 64989781ff add custom tag @hooks to boot.php & identity.php 2015-12-25 18:36:13 +01:00
rabuzarus 839895e434 identity.php - code cleanup + doxygen 2015-12-25 17:26:04 +01:00
Michael Vogel 0c924d36cb Bugfix: The location wasn't parsed through bbcode 2015-12-24 12:56:27 +01:00
Michael Vogel 61956e1098 There is now a config value for the session management to not use the database 2015-12-22 22:11:08 +01:00
Michael Vogel 307beb47fd Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment 
Conflicts:
	include/ostatus.php
 2015-12-22 11:25:37 +01:00
Fabrixxm 7f76c3dd41 Merge branch 'master' into develop 2015-12-22 10:50:52 +01:00
Michael Vogel 7ee1eb2978 Code clean up. 2015-12-20 10:44:03 +01:00
Michael Vogel 33f354a68c Bugfix for the maximum load check in worker. 2015-12-16 00:14:53 +01:00
Michael Vogel 6e03477598 Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround. 2015-12-15 23:26:58 +01:00
Michael Vogel f42a7a3469 Just one more place where we had forgotten to use the bbcode function for the about text 2015-12-15 00:11:19 +01:00
Michael Vogel d077dbbcde Bugfix: The bbcode conversion of the profile was inconsistent 2015-12-14 23:53:35 +01:00
Michael Vogel 2e0ebcd1c8 The "about" in feed has to be rendered as HTML 2015-12-14 23:02:49 +01:00
Michael Vogel b9abfd24f0 Rearrangements 2015-12-14 22:39:52 +01:00
rabuzarus e61d6e030e fix account_type 2015-12-14 14:12:56 +01:00
Michael Vogel bc8f753900 Only optical stuff 2015-12-14 00:42:36 +01:00
Michael Vogel a1a7bce603 Completely reworked delivery process. 2015-12-14 00:39:20 +01:00
Michael Vogel e0b53aa0ac OStatus: Make sure that mentions are always accepted 2015-12-13 14:10:18 +01:00
Michael Vogel 15063c8d5b Code cleanup and first steps for a better comment distribition with DFRN and OStatus 2015-12-13 12:15:45 +01:00
Michael Vogel 169088b243 Maybe this solves the slapper problems ... 2015-12-13 12:12:32 +01:00
Tobias Diekershoff b0f55ca9f2 Merge pull request #2176 from annando/1512-warning 
Bugfix: Notice because of undefined constant
 2015-12-13 10:22:13 +01:00
Michael Vogel 143e1a4a83 Bugfix: Warning because of undefined constant 2015-12-13 09:43:47 +01:00
Michael Vogel ec9b1b7afd There is now a fragmentation level for the table optimisation 2015-12-12 17:46:24 +01:00
Michael Vogel 02022b62a4 Some more work to make reshares work. 2015-12-12 10:41:42 +01:00
fabrixxm e44b831a21 Merge pull request #2156 from gerhard6380/develop 
new API calls for managing contact groups
 2015-12-11 12:37:26 +01:00
Michael Vogel 6dd39760ac Support for real repeated messages 2015-12-10 18:16:16 +01:00
Michael Vogel 45f4af66e7 OStatus: Basic support for groups, new function to detect reshared items 2015-12-10 01:10:54 +01:00
fabrixxm f97e20acd3 add support to schema modification with multi-column primary key 2015-12-08 10:35:08 +01:00
Michael Vogel a2fa791bbd Always include the direct parent in the mentions 2015-12-07 23:35:33 +01:00
fabrixxm f359731fc1 Merge pull request #2159 from annando/1512-worker-processes 
Better control for the number of workers
 2015-12-07 23:20:02 +01:00
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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff f45a8f1a03 Merge pull request #2106 from annando/1511-ostatus-bookmark-design 
Small OStatus changes
 2015-11-29 23:19:12 +01:00
Tobias Diekershoff 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
Tobias Diekershoff 93fd6dce84 Merge pull request #2111 from annando/issue-1925 
Issue 1925 - display nickname@hostname.com
 2015-11-29 19:48:08 +01:00
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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