Commit graph

24171 commits

Author SHA1 Message Date
Hypolite Petovan fe8a53425a
Revert "Changed unavailable to in a relation" 2019-07-08 15:55:08 -04:00
Hypolite Petovan 8e2d1fad17
Merge pull request #7347 from JeroenED/task/relationship-status
Changed unavailable to in a relation
2019-07-08 13:02:36 -04:00
Hypolite Petovan e5a29cf979
Merge pull request #7352 from annando/ap-probe
Add ActivityPub related fields to the "uri" function
2019-07-08 13:00:56 -04:00
Michael d1435bef61 Add ActivityPub related fields to the "uri" function 2019-07-08 12:00:11 +00:00
Jeroen De Meerleer 0b2f5be1c0 code style 2019-07-08 09:35:32 +02:00
Jeroen De Meerleer 9af20096a3 Added return Update::Success 2019-07-08 09:34:25 +02:00
Jeroen De Meerleer 98b6764bfd Fixed DB_UPDATE_VERSION in database.sql
thanks @nupplaphil
2019-07-08 08:11:53 +02:00
Jeroen De Meerleer 6811ee5d16 Merge remote-tracking branch 'friendica.github.com/develop' into task/relationship-status 2019-07-08 07:48:07 +02:00
Jeroen De Meerleer 898fd0353b Updated DB_UPDATE_VERSION
request by mrpetovan
2019-07-08 07:45:59 +02:00
Jeroen De meerleer e33733f297 not needed update contacts as marital status is not there 2019-07-08 00:00:48 +02:00
Hypolite Petovan 8146ff1505
Merge pull request #7348 from annando/item-received
Use "received" instead of "created" for sorting items
2019-07-07 17:57:45 -04:00
Michael 6bb418c5a7 Use "received" instead of "created" when displaying posts in creation order 2019-07-07 21:30:33 +00:00
Jeroen De Meerleer 884638c093 Whoops 2019-07-07 23:14:03 +02:00
Jeroen De Meerleer 9c8051ef64 Created updatescript 2019-07-07 23:10:35 +02:00
Jeroen De meerleer dea0bfd01f changed unavailable to In a relation, deleted available 2019-07-07 22:51:05 +02:00
Hypolite Petovan 9b8b2b36cd
Merge pull request #7339 from annando/gcontact-update
Restructured Contact/GContact handling
2019-07-07 13:28:20 -04:00
Michael Vogel 0d27d410b0
Merge pull request #7343 from MrPetovan/bug/notices
Various small fixes
2019-07-06 08:19:42 +02:00
Michael Vogel e6ac576903
Merge pull request #7342 from MrPetovan/bug/fatal-errors
Ensure $link_item variable type when calling get_responses() in mod/photos
2019-07-06 08:16:06 +02:00
Hypolite Petovan a58e90fa12 Display correct total blocked contact count in accordion header 2019-07-05 13:42:22 -04:00
Hypolite Petovan 27c7d233ac [frio] Add expected "none.png" background image 2019-07-05 13:41:48 -04:00
Hypolite Petovan f92752c9b4 Ensure $link_item variable type when calling get_responses() in mod/photos
- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-508622668
2019-07-05 13:40:33 -04:00
Michael dda86f6dfc Basepath function now uses the contact field 2019-07-05 06:41:48 +00:00
Michael be0a102333 Simplified the Contact update 2019-07-04 21:19:23 +00:00
Michael c9666a9f1d We don't update inside the probing anymore 2019-07-04 19:40:48 +00:00
Michael 8d6aa9914c We now handling the contact type 2019-07-04 19:31:42 +00:00
Michael ef5be9668f New fields in contact table / don't update on probe 2019-07-04 04:08:55 +00:00
Philipp f60792348a
Merge pull request #7336 from MrPetovan/bug/globalcommunity-silence-getidforurl
Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup
2019-07-03 16:47:37 +02:00
Michael 7b0a9ffd89 Update gcontact when public contact is updated 2019-07-03 05:46:35 +00:00
Hypolite Petovan 50fa6b7e02 Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup
- Address https://forum.friendi.ca/display/0b6b25a8-215d-1bab-29c9-77a221796252
- Normalize quote style
- Remove deprecated get_app() call
2019-07-02 19:25:24 -04:00
Michael 80c3a81618 Use the term-date as archive date 2019-07-02 14:46:04 +00:00
Michael 1d7154a7d1 Update the gcontact entry when the public contact entry has changed 2019-07-02 09:06:48 +00:00
Hypolite Petovan a248da8f2e
Merge pull request #7334 from annando/federated-protocol
New constant for federated protocols
2019-07-01 21:52:55 -04:00
Michael ee8baf00ce Now without array_merge 2019-07-01 22:14:34 +00:00
Michael 9e3aff9ade Removed comment line 2019-07-01 18:09:40 +00:00
Michael 6041f74df6 New constant for federated protocols 2019-07-01 18:00:55 +00:00
Michael Vogel 8af45c1dd8
Merge pull request #7332 from MrPetovan/bug/fatal-errors
Fix missing App object in Worker\OnePoll
2019-06-30 18:23:33 +02:00
Hypolite Petovan 7abc42700c Fix missing App object in Worker\OnePoll 2019-06-30 12:16:18 -04:00
Hypolite Petovan 4bb7a8c342
Merge pull request #7329 from annando/issue-4815
Issue 4815: Silently ignoring trailing @ at follow requests
2019-06-29 16:56:49 -04:00
Michael 6cd6fa889b leading, trailing, all the same :-) 2019-06-29 20:09:23 +00:00
Michael 644c08a035 Issue 4815: Silently ignoring trailing @ at follow requests 2019-06-29 19:01:07 +00:00
Hypolite Petovan 541593fd4d
Merge pull request #7328 from annando/fix-delivery
Item delivery data must only be stored when there is data
2019-06-29 05:01:29 -04:00
Michael 3121d967c5 Item delivery data must only be stored when there is data 2019-06-29 08:30:48 +00:00
Hypolite Petovan c5d8d82bd2
Merge pull request #7324 from annando/delivery-statistics
Collect data about used protocols for delivery
2019-06-28 19:03:15 -04:00
Michael 9bf065c9d8 Merge remote-tracking branch 'upstream/develop' into delivery-statistics 2019-06-28 14:08:54 +00:00
Hypolite Petovan 7b4bba66db
Merge pull request #7323 from annando/contact-discovery
Removing functionality from OnePoll.php
2019-06-28 07:08:57 -04:00
Michael 0a15222576 Collect data about used protocols for delivery 2019-06-28 09:03:58 +00:00
Michael e48fbeda0a restore updating of the public contact 2019-06-28 04:34:01 +00:00
Michael 8838a1f2d1 Avoid overwriting of avatars for feeds 2019-06-28 04:26:49 +00:00
Michael 96651ae76d Fix a missing variable 2019-06-28 02:46:56 +00:00
Michael d552db5c55 Polling functions are split into several functions 2019-06-27 20:38:09 +00:00