23402 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	0d49d0593d	Don't show a reshare in the top of a message if we know the author	2019-04-19 07:47:00 +00:00
Philipp	a65a30b303	Merge pull request #6993 from annando/cron-interval ... Added missing "cron_interval" default value	2019-04-10 11:14:42 +02:00
Michael	2711284827	Added missing "cron_interval" default value	2019-04-10 06:41:57 +00:00
Hypolite Petovan	20bc12157e	Merge pull request #6992 from annando/fix-warning ... Fix warnings	2019-04-09 15:03:05 -04:00
Michael	4e9316fc15	Fix warnings	2019-04-09 17:58:28 +00:00
Hypolite Petovan	3aa8a255c9	Merge pull request #6988 from annando/fetchprofile ... Fetch profile data from different contact tables	2019-04-09 09:06:11 -04:00
Hypolite Petovan	4b80b7caea	Merge pull request #6784 from nupplaphil/task/image_to_model ... Delete deprecated method Image::storePhoto()	2019-04-09 09:01:39 -04:00
Michael	8748aff110	Avoid some more warning	2019-04-09 11:44:35 +00:00
Michael	d58147413f	Avoid update of non native contacts, fix most warnings	2019-04-09 11:28:45 +00:00
Michael	00071abf51	Merge remote-tracking branch 'upstream/develop' into fetchprofile	2019-04-09 10:29:53 +00:00
Michael	84a6e390ab	Fetch data from the given contact number, if already present	2019-04-09 08:47:57 +00:00
Michael	bca7419987	Avoid overwriting existing contacts with bad data	2019-04-09 08:35:29 +00:00
Philipp Holzer	ac57f55868	Delete deprecated method for photo	2019-04-09 08:52:21 +02:00
Michael	e268b50890	Updated database structure file	2019-04-09 05:50:51 +00:00
Hypolite Petovan	6ea531d2f8	Merge pull request #6990 from annando/fix-warning ... Fix warning	2019-04-09 01:29:00 -04:00
Michael	1b339547f3	Fix warning	2019-04-09 05:17:02 +00:00
Michael	90eea919a4	New contact field "updated", fix warnings	2019-04-09 05:15:23 +00:00
Michael	a2ca14def4	Removed a worker call - this needs more work	2019-04-08 21:35:00 +00:00
Michael	a25fd7713b	Added Worker	2019-04-08 21:06:15 +00:00
Michael	c088249e1b	Update the contact in the background	2019-04-08 21:05:33 +00:00
Michael	f387d85cdb	Fetch profile data from different contact tables when we won't or can't probe via network	2019-04-08 20:41:18 +00:00
Philipp	2005df97c1	Merge pull request #6987 from tobiasd/20190408-dbupdateemail ... Add subject to DB Update email	2019-04-08 12:30:20 +02:00
Tobias Diekershoff	c4fef79f32	Add subject to DB Update email	2019-04-08 10:55:18 +02:00
Philipp	df0e2c959a	Merge pull request #6985 from tobiasd/20190408-vierprvmailmobile ... vier mobile: private mail width	2019-04-08 10:23:45 +02:00
Philipp	594dd5a503	Merge pull request #6986 from annando/composer-lock ... Updated composer.lock	2019-04-08 10:22:57 +02:00
Tobias Diekershoff	686f67fb90	vier mobile: private mail width	2019-04-08 07:27:19 +02:00
Philipp Holzer	7e061e0cae	replacing direct query with User model call	2019-04-07 21:18:04 +02:00
Michael	49ba44d1e4	Updated composer.lock	2019-04-07 17:50:35 +00:00
Hypolite Petovan	9ed3f3d6d0	Merge pull request #6978 from annando/no-queue ... Remove the queue from the core	2019-04-07 08:05:51 -04:00
Philipp	f69d73b5ff	Merge pull request #6969 from MrPetovan/task/router ... Add rule-based router	2019-04-06 11:00:00 +02:00
Hypolite Petovan	d6d31f43a1	Add App\Router dependency injection to App ... - Moved collectRoutes method from App to App\Router	2019-04-05 23:16:12 -04:00
Michael	b30d01bea0	Remove converted queue entries	2019-04-05 20:24:49 +00:00
Michael	911ad99e61	Table definition removed	2019-04-05 19:27:32 +00:00
Michael	46a99a05a1	Remove the queue from the core	2019-04-05 18:04:39 +00:00
Philipp	bd13a73b2b	Merge pull request #6977 from annando/fix-reshare ... Fix: Only use reshare information for the top level post	2019-04-05 11:44:01 +02:00
Michael	4a30490ac9	Fix: Only use reshare information for the top level post	2019-04-05 08:59:39 +00:00
Philipp Holzer	76fd2a4aa0	some renamings	2019-04-05 08:00:34 +02:00
Philipp Holzer	b4a59f32c7	code standards	2019-04-05 07:54:53 +02:00
Philipp Holzer	2daadb8c36	code standards	2019-04-05 07:54:41 +02:00
Philipp Holzer	2aeea55f3f	bugfix	2019-04-05 07:54:19 +02:00
Philipp Holzer	0098f97c4a	Moving Model call outside Object Namespace	2019-04-05 07:54:11 +02:00
Philipp Holzer	09c44f96fd	Moving Model call outside Object Namespace	2019-04-05 07:53:54 +02:00
Philipp	6be2951b4e	Merge pull request #6975 from tobiasd/20190405-sv ... SV update to the strings THX Bjoessi	2019-04-05 07:50:54 +02:00
Tobias Diekershoff	c36f02e08e	Merge pull request #6974 from annando/avoid-flooding ... Avoid repeated transmitting of profile updates	2019-04-05 07:33:55 +02:00
Philipp	9e8134f949	Merge pull request #6973 from tobiasd/20190405-pleroma ... beautification of pleroma stats	2019-04-05 07:20:34 +02:00
Tobias Diekershoff	a3b0fc7b5e	SV update to the strings THX Bjoessi	2019-04-05 06:59:20 +02:00
Michael	01bb05b502	Avoid repeated transmitting of profile updates	2019-04-05 04:42:04 +00:00
Tobias Diekershoff	1db0a29291	beautification of pleroma stats	2019-04-05 06:39:34 +02:00
Hypolite Petovan	26c2290fed	Merge pull request #6972 from annando/queue-to-worker ... Use deferred workers instead of the queue mechanism	2019-04-04 17:29:16 -04:00
Michael	e3caf0f4f5	Use deferred workers instead of the queue mechanism	2019-04-04 20:51:12 +00:00