mirror
/
friendica
kopia lustrzana https://github.com/friendica/friendica
1
0
Forkuj 1
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
27 750 Commity
3 Gałęzie
64 Tagi
227 MiB
Wykres commitów

27750 Commity (879c30d4facb040d8579b9e378fbdd3ea14b8d88)

Autor SHA1 Wiadomość Data
Michael 879c30d4fa Merge remote-tracking branch 'upstream/develop' into contact-tabs 2020-08-03 18:00:51 +00:00
Michael Vogel fc8acf13c8
Merge pull request #8963 from MrPetovan/task/8918-move-mod-common 
Add common relationship methods to Model\ContactRelation
 2020-08-03 19:53:40 +02:00
Hypolite Petovan a74c547af4 Move ContactRelation class to Contact\Relation 
- Update references in GContact
 2020-08-03 13:38:26 -04:00
Hypolite Petovan 24a82110fd Add common relationship methods to Model\ContactRelation 
- Introduce DBA::mergeConditions method
- Replace GContact relationship method contents with Model\ContactRelation method calls
 2020-08-03 13:34:10 -04:00
Hypolite Petovan a6a23802b7
Merge pull request #8965 from annando/notice 
Fix Notice: " Undefined index: urls in /src/Worker/UpdateServerDirectory.php on line 64"
 2020-08-03 13:00:08 -04:00
Michael Vogel 22db644295
Update src/Worker/UpdateServerDirectory.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-08-03 18:58:12 +02:00
Michael 748ddb7ad2 Merge remote-tracking branch 'upstream/develop' into contact-tabs 2020-08-03 16:06:07 +00:00
Michael cdf8a2f374 Fix Notice: " Undefined index: urls in /src/Worker/UpdateServerDirectory.php on line 64" 2020-08-03 16:03:51 +00:00
Hypolite Petovan e033bcd2d3
Merge pull request #8960 from annando/remove-poco 
Poco and gcontact (mostly) removed
 2020-08-03 11:01:40 -04:00
Michael 88d406004c Removed now ununsed functions 2020-08-02 18:15:03 +00:00
Michael b026901dbc Added additional field 2020-08-02 15:44:41 +00:00
Michael ff7b72cca3 Renamed function 2020-08-02 13:37:43 +00:00
Michael 91c360638a Ensure contact tabs will use the correct id 2020-08-02 13:34:49 +00:00
Michael bb1517a74c Random profiles now moved away from "gcontact" as well 2020-08-02 08:07:31 +00:00
Michael c03cf39c26 "gcontact" removed in the themes as well 2020-08-02 07:54:18 +00:00
Michael d53f46b958 Removed temporary code 2020-08-02 01:38:10 +00:00
Michael 03e2cbbf3d Merge remote-tracking branch 'upstream/develop' into remove-poco 2020-08-02 01:28:47 +00:00
Hypolite Petovan 76ae210527
Merge pull request #8957 from annando/server-peers 
Discovery of peers of other servers
 2020-08-01 15:16:32 -04:00
Hypolite Petovan 5d8505b5c9
Merge pull request #8955 from annando/ignore-gcign 
"gcign" is removed
 2020-08-01 15:14:34 -04:00
Michael 0c73531da1 Poco and gcontact (mostly) removed 2020-08-01 16:15:18 +00:00
Tobias Diekershoff a22a9de585
Merge pull request #8959 from annando/nextcloud-stats 
Add "Nextcloud" to the statisrics
 2020-08-01 16:21:24 +02:00
Michael 2976211992 Add "Nextcloud" to the statisrics 2020-08-01 09:26:41 +00:00
Michael a9a9f7d51d Update the last query at a single place 2020-08-01 08:56:07 +00:00
Michael bb70258d48 Discovery of peers of other servers 2020-08-01 05:55:27 +00:00
Hypolite Petovan ca2267a4a6
Merge pull request #8954 from annando/sync-update 
Directory sync: Update contact when it already exists
 2020-07-31 19:10:19 -04:00
Michael 5b8961a88e Removed unused stuff 2020-07-31 19:00:34 +00:00
Michael 86c924b820 Fix description 2020-07-31 18:59:41 +00:00
Michael 4c089a1f87 "gcign" is removed 2020-07-31 17:58:25 +00:00
Michael 05bc59e445 Direytory sync: Update contact when it already exists 2020-07-31 14:30:33 +00:00
Hypolite Petovan 152842633f
Merge pull request #8953 from annando/sync-directory 
Synchronize contacts with the directory server
 2020-07-31 05:56:25 -04:00
Michael d9a9876ddd Synchronize contacts with the directory server 2020-07-31 09:08:51 +00:00
Hypolite Petovan 2b9ef97adc
Merge pull request #8952 from annando/contact-template 
Use a single function to create the template data for contacts
 2020-07-31 03:26:51 -04:00
Michael 71415094cb Removed unused template variables 2020-07-31 06:00:43 +00:00
Michael 45aff10ff8 Replaced with general function 2020-07-31 04:50:24 +00:00
Michael ce7f192f35 "id" is not needed as a parameter 2020-07-31 04:28:26 +00:00
Michael a4b5536d17 The local directory is now using the template function as well 2020-07-31 04:19:20 +00:00
Michael 4842433449 Unused "use" removed 2020-07-31 03:58:19 +00:00
Michael 893f6bd692 Use the function from the contact template instead 2020-07-31 03:55:01 +00:00
Hypolite Petovan 869329c972
Merge pull request #8948 from annando/remove-gcontact 
Replace "gcontact" with "contact" - improved suggestions
 2020-07-30 21:25:22 -04:00
Michael dcf6926a08 Some indentation 2020-07-30 21:23:54 +00:00
Michael 91b0f2c486 Use a single function to create the template data for contacts 2020-07-30 21:16:15 +00:00
Hypolite Petovan 7aa43dc2f4
Merge pull request #8944 from annando/signed-requests 
AP: Always sign HTTP requests
 2020-07-30 17:09:22 -04:00
Michael Vogel 43b4841fa6
Update src/Model/Contact.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-07-30 22:39:09 +02:00
Michael Vogel 113e8d910b
Update src/Model/Contact.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-07-30 22:39:01 +02:00
Michael c260471de1 Remove unused "use" 2020-07-30 14:14:30 +00:00
Michael cc85bc4156 Replace "gcontact" with "contact" - imroved suggestions 2020-07-30 14:08:32 +00:00
Hypolite Petovan f4e1acedfc
Merge pull request #8946 from annando/fix-fatal 
Possibly fix a fatal error
 2020-07-29 16:49:35 -04:00
Michael 7441bd90c8 Possibly fix a fatal error 2020-07-29 19:48:26 +00:00
Hypolite Petovan ddb6029add
Merge pull request #8945 from annando/asynchronous-relation 
Asynchronous contact relation check
 2020-07-29 12:50:17 -04:00
Michael 4fbec33af0 Asynchronous contact relation check 2020-07-29 15:39:45 +00:00