5854 commits

Author	SHA1	Message	Date
Michael	ee1cb93f3a	Use the new relation functions	2020-08-03 18:21:56 +00:00
Michael	879c30d4fa	Merge remote-tracking branch 'upstream/develop' into contact-tabs	2020-08-03 18:00:51 +00: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
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
Michael	88d406004c	Removed now ununsed functions	2020-08-02 18:15:03 +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	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
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
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	05bc59e445	Direytory sync: Update contact when it already exists	2020-07-31 14:30:33 +00: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	cc85bc4156	Replace "gcontact" with "contact" - imroved suggestions	2020-07-30 14:08:32 +00:00
Michael	7441bd90c8	Possibly fix a fatal error	2020-07-29 19:48:26 +00:00
Michael	4fbec33af0	Asynchronous contact relation check	2020-07-29 15:39:45 +00:00
Michael	a3ba0ccc93	Simplified code	2020-07-29 14:59:55 +00:00
Michael	2a243b747d	Improved functionality to fetch the admin user	2020-07-29 14:55:55 +00:00
Michael	e06d9f20cf	AP: Always sign requests	2020-07-29 05:12:16 +00:00
Michael	71b6226909	Some more avatar function replacements	2020-07-28 19:30:55 +00:00
Michael Vogel	701dbdf7fc	Merge pull request #8939 from MrPetovan/task/8906-frio-viewas-redesign ... Move "View As" form at the bottom of the profile page	2020-07-28 18:00:17 +02:00
Hypolite Petovan	418c2edb50	Merge pull request #8938 from annando/get-avatar ... Fetch photo fields, ensuring that they are filled	2020-07-28 11:41:48 -04:00
Hypolite Petovan	ab3106a129	Move "View As" form at the bottom of the profile page	2020-07-28 11:40:14 -04:00
Michael	d5a3ef6c2a	Removed unused "use"	2020-07-28 15:04:39 +00:00
Michael	b79bb0d2cb	Fetch photo fields, ensuring that they are filled	2020-07-28 12:58:19 +00:00
Michael	d72d59bf9e	Logging and check for network added	2020-07-28 06:42:12 +00:00
Michael	e6cd5a4d66	Merge remote-tracking branch 'upstream/develop' into personal-copy	2020-07-28 05:40:37 +00:00