31292 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	83e50385a8	Hopefully this fixes the workflow	2017-05-02 21:06:56 +00:00
Michael	99a54df8d8	Follow up for PR 3421 - some improvements	2017-05-02 19:48:11 +00:00
Hypolite Petovan	f77632378b	Merge pull request #3421 from annando/1705-diaspora-comment ... Comments from unknown people never reached us	2017-05-02 15:42:41 -04:00
Michael	f639a86d02	Comments from unknown people never reached us	2017-05-02 18:42:01 +00:00
Tobias Diekershoff	6882b5cda9	Merge pull request #3420 from annando/issue-3419 ... PR 3419: Avoid problems with PHP7 and dba.php	2017-05-02 13:17:53 +02:00
Michael	b767a47527	PR 3419: Avoid problems with PHP7 and dba.php	2017-05-02 10:47:53 +00:00
Tobias Diekershoff	5ef44ad71b	Merge pull request #3415 from annando/1704-db-relation ... New function to recursively delete data	2017-05-02 08:37:06 +02:00
gerhard6380	38f476eedb	end code with exception where cause is not clear should better be thrown as 500 InternalServerError instead of 400 BadRequest as the request was ok (all checks before passed).	2017-05-02 01:16:54 +02:00
Michael	d106ff5086	Error reporting hadn't worked for the new functions	2017-05-01 21:38:37 +00:00
gerhard6380	6a4d1fca88	change line endings to unix	2017-05-01 22:19:48 +02:00
gerhard6380	cd2ed72b37	coding convention applied	2017-05-01 22:16:22 +02:00
gerhard6380	a2ccdf1fec	coding conventions applied	2017-05-01 22:05:33 +02:00
Michael	0241a88c0d	Avoid duplicated queries	2017-05-01 19:54:08 +00:00
Michael	b9b43e30e6	Delete queries are now split into chunks.	2017-05-01 17:42:37 +00:00
fabrixxm	588f87bf79	Standards	2017-05-01 18:25:56 +02:00
Hypolite Petovan	63428f9028	Merge pull request #3416 from tobiasd/20170501-de ... DE translations	2017-05-01 11:55:42 -04:00
gerhard6380	8d95e4ffc8	remove "not implemented by now" comment for update_profile_image	2017-05-01 16:48:45 +02:00
gerhard6380	2275fecec0	line breaks by mistake reversed	2017-05-01 16:47:17 +02:00
gerhard6380	e267d07c91	change line endings from VS	2017-05-01 16:45:22 +02:00
gerhard6380	5b35901716	new api calls for photo management within clients	2017-05-01 16:38:39 +02:00
Michael	e90ae79d35	The number of queries is reduced dramatically	2017-05-01 09:34:15 +00:00
Michael	e6cbe3be11	This is better	2017-05-01 06:35:41 +00:00
Tobias Diekershoff	2c0e76f2cc	DE translations	2017-05-01 08:23:01 +02:00
Michael	0d7996d852	Only fetch the rows when needed	2017-05-01 05:45:36 +00:00
Michael	f1c53530a1	Add a missing relation	2017-04-30 20:19:47 +00:00
Michael	c2820c452f	Delete now works	2017-04-30 19:54:41 +00:00
Hypolite Petovan	b6945a46b6	Merge pull request #3414 from beardyunixer/dlogger ... Dlogger	2017-04-30 08:10:07 -04:00
Thomas Willingham	7177cc3858	Accidentally included a self-loathing verb.	2017-04-30 11:16:04 +01:00
Thomas Willingham	6eff506cdd	Add the dlogger	2017-04-30 11:14:38 +01:00
Michael	44beb62e5a	Added information about table relations	2017-04-29 23:33:02 +00:00
Hypolite Petovan	9ff4fed7d2	Merge pull request #3408 from annando/1704-conversation-2 ... Conversation data is stored for own posts as well/improved function dba:update	2017-04-29 16:37:53 -04:00
Hypolite Petovan	f3a64ebfcb	Merge pull request #3411 from annando/1704-ping-order ... Unread notifications are now always on top	2017-04-29 16:36:03 -04:00
Michael	1088e51d69	Remove commented code.	2017-04-29 20:21:54 +00:00
Hypolite Petovan	9ee79270ae	Merge pull request #3410 from annando/1704-poller-memory ... There is now a memory limit for the poller	2017-04-29 16:01:05 -04:00
Michael	9d9909cf10	Some more places were we check now	2017-04-29 17:45:09 +00:00
Michael	715e15cbe1	There is now a memory limit for the poller	2017-04-29 17:36:46 +00:00
Michael	96afaaa0d5	Unread notifications are now always on top	2017-04-29 14:22:49 +00:00
Michael	55c39a80fa	Description added	2017-04-29 12:19:49 +00:00
Michael	10ea759282	Don't update the conversation only because the source changed	2017-04-29 08:30:43 +00:00
Michael	fa14096ea8	Added documentation	2017-04-29 08:11:54 +00:00
Michael	0e4cd900d5	Improved dba:update function.	2017-04-29 07:50:09 +00:00
rabuzarus	46371242e5	Merge pull request #3407 from Hypolite/issue/#3406 ... frio: Fix typo in various button callbacks	2017-04-29 09:08:33 +02:00
Michael	edbbdf9761	Store conversation data for self created posts as well	2017-04-29 05:44:13 +00:00
Hypolite Petovan	2c9c867393	frio: Fix typo in various button callbacks	2017-04-28 21:50:09 -04:00
Michael	c0b5339691	There is now a function to store conversations	2017-04-28 16:35:53 +00:00
Tobias Diekershoff	2172a162f9	Merge pull request #3405 from annando/1704-remove-discard ... Remove the "discard" button for contact requests from Diaspora.	2017-04-28 12:42:10 +02:00
Michael	ba5780c4a1	Remove the "discard" button for contact requests from Diaspora.	2017-04-28 08:36:10 +00:00
Michael Vogel	62b6bbeef0	Merge pull request #3403 from tobiasd/20170428-typo ... a typo	2017-04-28 10:10:46 +02:00
Tobias Diekershoff	50da541860	Merge pull request #3402 from annando/1704-conversation ... OStatus improvements (Mastodon) and new SQL functions	2017-04-28 10:00:12 +02:00
Tobias Diekershoff	06f5ce89b0	a typo	2017-04-28 09:48:07 +02:00