21554 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	7389dc0b20	Merge pull request #6089 from annando/fix-6085 ... Fixes PR 6085	2018-11-06 15:01:36 +01:00
Michael	ffb03517b6	Fixes PR 6085	2018-11-06 14:00:31 +00:00
Hypolite Petovan	017f19d574	Merge pull request #6085 from zeroadam/TextToHTML ... Split text.php functions to HTML class	2018-11-06 08:30:32 -05:00
Adam Magness	4f07ebb52f	Rename properly ... rename function properly this time!	2018-11-06 06:34:32 -05:00
Adam Magness	3eecd108c5	rename function ... rename function and update calls.	2018-11-06 06:31:48 -05:00
Adam Magness	237fc30b4e	Missed use ... fix missing use statement	2018-11-05 21:45:44 -05:00
Adam Magness	591c00dd5c	bug fix ... fix variable	2018-11-05 21:26:58 -05:00
Adam Magness	9264059945	Missing Include ... missed use statement	2018-11-05 21:15:47 -05:00
Adam Magness	a71eb1d127	functions moved to HTML class ... update function calls to moved class.	2018-11-05 21:06:26 -05:00
Adam Magness	e31dde6084	Split text.php to HTML class ... move functions from text.php to src/Content/Text/HTML	2018-11-05 20:27:22 -05:00
Hypolite Petovan	e8891e9ba4	Merge pull request #6082 from annando/diasppora-delivery ... Improved delivery	2018-11-05 16:26:02 -05:00
Michael	3b565e80b6	Improved logger text	2018-11-05 20:35:17 +00:00
Hypolite Petovan	26acf3d78e	Merge pull request #6077 from nupplaphil/move_random_digits ... Move random digits	2018-11-05 15:23:24 -05:00
Philipp Holzer	6949841947	Removed unnecessary function	2018-11-05 21:17:46 +01:00
Philipp Holzer	47095d70a9	Using random_int directly	2018-11-05 21:16:18 +01:00
Philipp Holzer	049cd963f3	Using random_int directly	2018-11-05 21:15:30 +01:00
Philipp Holzer	c94936a149	copy/paste error	2018-11-05 21:03:55 +01:00
Philipp Holzer	6e10bdf361	Move random Digits to Crypto class	2018-11-05 21:02:54 +01:00
Michael	59d8cae805	Merge remote-tracking branch 'upstream/develop' into diasppora-delivery	2018-11-05 19:46:59 +00:00
Hypolite Petovan	0472c7b57d	Merge pull request #6070 from zeroadam/TextToXML ... split xml functions out of text.php	2018-11-05 13:50:09 -05:00
Hypolite Petovan	81e81bd8c8	Merge pull request #6079 from annando/issue-dir-15 ... Directory issue 15: Support the "account-type"	2018-11-05 13:49:28 -05:00
Hypolite Petovan	e53bba0457	Merge pull request #6080 from annando/issue-6074 ... Issue 6074: Language and "explicit" are now exported	2018-11-05 13:47:40 -05:00
Michael	b011e42ad2	Issue 6074: Language and "explicit" are now exported	2018-11-05 18:14:58 +00:00
Adam Magness	cace4a8991	Update and rename test class ... update and rename test class.	2018-11-05 13:08:33 -05:00
Adam Magness	186cd1d415	Revert "Move methods to new Util/Strings class" ... This reverts commit 97fcf23371.	2018-11-05 13:07:15 -05:00
Adam Magness	9e51be7554	Revert "Update function calls" ... This reverts commit 748fb8b946.	2018-11-05 13:07:07 -05:00
Michael	9d63c3eb01	Language is now transmitted as well	2018-11-05 18:03:26 +00:00
Michael	58ce0d799b	Directory issue 15: Support the "account-type"	2018-11-05 17:59:46 +00:00
Hypolite Petovan	0bfafc63cc	Merge pull request #6076 from nupplaphil/cache_test_fix ... Lock TTL fix	2018-11-05 10:01:06 -05:00
Adam Magness	119b4afddf	Create/Update tests ... create new test class and update old one.	2018-11-05 07:53:12 -05:00
Adam Magness	748fb8b946	Update function calls ... update function calls to new class	2018-11-05 07:40:18 -05:00
Adam Magness	97fcf23371	Move methods to new Util/Strings class ... move string methods from xml to strings class.	2018-11-05 07:31:45 -05:00
Adam Magness	b07d47b0f7	Update function calls ... update function calls to new names	2018-11-05 07:24:14 -05:00
Adam Magness	6cc339031a	Rename functions ... rename functions	2018-11-05 07:24:14 -05:00
Adam Magness	ae4aab872f	forgotten self ... forgotten self references	2018-11-05 07:24:14 -05:00
Adam Magness	61bc9facc8	Implement functions ... implement functions relocated to xml class	2018-11-05 07:24:14 -05:00
Adam Magness	84e900d96f	Move to XML ... move functions from text to xml	2018-11-05 07:24:14 -05:00
Philipp Holzer	c2bd69e351	Lock TTL fix	2018-11-05 08:51:35 +01:00
Michael	dc4a2aeab8	Merge remote-tracking branch 'upstream/develop' into diasppora-delivery	2018-11-04 23:19:34 +00:00
Michael	ef205878b6	Cleaned up the notifier	2018-11-04 23:17:41 +00:00
Hypolite Petovan	95a41699cf	Merge pull request #6072 from annando/fix-6071 ... Fixes #6071: We should use the correct variable ...	2018-11-04 15:45:38 -05:00
Michael	bd97215147	Merge remote-tracking branch 'upstream/develop' into diasppora-delivery	2018-11-04 18:54:49 +00:00
Michael	e759497af3	Fix small typo / Workerqueue count now only counts non deferred entries	2018-11-04 10:51:01 +00:00
Michael	ec3cec37eb	Fixes #6071: We should use the correct variable ...	2018-11-04 09:18:36 +00:00
Hypolite Petovan	62761e1099	Merge pull request #6071 from annando/ap-fetch-signed ... Support for fetching non-public content / preparations for forum posts	2018-11-04 01:56:09 -05:00
Michael	8f27e3aeb1	Support for fetching non-public content / preparations for forum posts	2018-11-03 21:37:08 +00:00
Hypolite Petovan	0a9dba005c	Merge pull request #6067 from annando/ap-relocation ... Preparations for a relocation message / fix for notice	2018-11-02 21:16:14 -04:00
Michael	1395bdc188	Preparations for a relocation message / fix for notice	2018-11-02 21:57:06 +00:00
Hypolite Petovan	d929e714df	Merge pull request #6065 from annando/fix-forum ... Fix for delivering forum posts again	2018-11-01 21:48:55 -04:00
Michael	1b43d459b6	Fix for delivering forum posts again	2018-11-01 23:52:06 +00:00