4383 commits

Author	SHA1	Message	Date
Tobias Diekershoff	6ef69ad2da	Merge pull request #2983 from annando/issue-2915-2918 ... Disable richtext editor for frio - followup for #2938	2016-12-01 14:10:08 +01:00
Tobias Diekershoff	1fc35d5f44	Merge pull request #2979 from annando/issue-2772 ... Issue 2772: Pending contacts should now be displayed	2016-12-01 08:51:04 +01:00
Michael	57c95c93e1	The frontend worker is now working as a full replacement for the crontab.	2016-11-30 19:24:58 +00:00
Michael	63389ba23d	Pending or blocked - that's the question ...	2016-11-30 04:30:48 +00:00
Michael	cc5eebd173	The frontend worker can now fork background processes	2016-11-29 22:40:19 +00:00
Michael	624fabf884	Somehow the changes of pull request 2748 got vanished	2016-11-29 20:25:27 +00:00
Michael	d49325d177	Disable richtext editor for frio - followup for #2938	2016-11-29 20:04:31 +00:00
Michael Vogel	efb2df41ba	Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing ... Add protocol docu to the help docs	2016-11-29 19:38:31 +01:00
Michael	af3549fa01	The first check for "pending" isn't neccessary.	2016-11-29 18:31:37 +00:00
Michael	b2302f6290	Maybe we shouldn't count pending contacts	2016-11-29 18:23:34 +00:00
rabuzarus	250f978872	Merge pull request #2978 from annando/issue-2518 ... Issue 2518: Remove contact data in the background	2016-11-29 14:59:00 +01:00
Tobias Diekershoff	d55d500e35	Merge pull request #2975 from annando/1611-frontend-worker ... The worker can now run from the frontend as well	2016-11-29 09:40:59 +01:00
Michael	fd28ecaacc	Pending contacts shouldn't be displayed in the sidebar	2016-11-29 06:40:35 +00:00
Michael	eede89f537	Some brackets added	2016-11-28 22:18:37 +00:00
Michael	3a76a6766f	Issue 2772: Pending contacts should now be displayed	2016-11-28 22:11:13 +00:00
Michael	e7ef34298a	remove "blubb"	2016-11-28 21:48:06 +00:00
Michael	a38a5019d0	Issue 2518: Remove contact data in the background	2016-11-28 21:44:04 +00:00
Michael Vogel	9894f7cea7	Merge pull request #2965 from tobiasd/20161122-cpActiveResponse ... active response	2016-11-28 21:14:42 +01:00
Michael Vogel	37e8f6b442	Merge pull request #2973 from rabuzarus/berlin_parse_url ... parse_url: recognize image/video/audio files + move functions into own class	2016-11-28 21:05:31 +01:00
rabuzarus	ac39928e5d	upload connection graphics & update doxygen headers to insert link to the spec	2016-11-28 16:23:47 +01:00
rabuzarus	f229d65f85	ParseUrl: some docu work	2016-11-27 23:41:55 +01:00
rabuzarus	85b51ee41c	xml:php - some code standard work	2016-11-27 20:42:40 +01:00
rabuzarus	56e38dd6bd	move function deletenode() to the xml class	2016-11-27 20:19:43 +01:00
Michael	636a033364	Added documentation, config stuff, ...	2016-11-27 09:02:08 +00:00
Michael	d71321c834	Some added documentation	2016-11-27 01:11:22 +00:00
Michael	e856ab9a09	The worker can now run from the frontend as well	2016-11-27 00:55:05 +00:00
Michael	ba1a304589	Delivery to other systems was needlessly deferred.	2016-11-24 03:34:11 +00:00
rabuzarus	e9226eaf45	parse_url: recognize image/video/audio files + move functions into own class	2016-11-24 01:11:22 +01:00
Michael Vogel	4eeb5a0a17	Merge pull request #2969 from gerhard6380/develop ... Develop	2016-11-23 05:13:31 +01:00
Hypolite Petovan	4937a3b7d8	Add the self property to conversation responses ... - Add a condition to check if the current user is amongst the responses - Populate the responses array with the self attribute	2016-11-22 18:35:19 +01:00
Michael	edbdd0e34a	Bugfix: We should only search in the current database for MyISAM tables	2016-11-22 16:47:08 +00:00
Michael Vogel	46ba1a46f5	Merge pull request #2896 from rabuzarus/0311_fix_photo_albums ... chache: check for valid serialized data + uncomment caching of contac…	2016-11-21 04:04:36 +01:00
Michael	3de862712d	Issue 2772: Posts from pending contacts should be displayed as well.	2016-11-20 16:52:57 +00:00
rabuzarus	721ac5fb9e	cache: use unserialize(false)	2016-11-20 17:32:37 +01:00
Tobias Diekershoff	914330bb8f	Merge pull request #2940 from annando/1611-dead-contacts ... Mark contacts as dead or undead while transmitting and receiving messages	2016-11-19 22:59:57 +01:00
Michael	89d5aa64ba	Mark contacts as dead or undead while transmitting and receiving messages	2016-11-19 20:10:29 +00:00
Tobias Diekershoff	b95bf00e89	Additional info in registration request	2016-11-19 18:22:49 +01:00
Tobias Diekershoff	a7dae15e82	added return value to doxygen header	2016-11-19 14:34:06 +01:00
Tobias Diekershoff	32c0a9ef43	added return value to doxygen header	2016-11-19 14:32:01 +01:00
Tobias Diekershoff	f4c52f5a0e	send email confirming pending registration #2916	2016-11-18 20:16:22 +01:00
Michael	ccd484643d	Polling feeds is now done with a higher priority.	2016-11-17 23:06:22 +00:00
rabuzarus	0f81411b26	Bugfix: avatar images for activty like was not shown notifications page	2016-11-16 13:21:13 +01:00
rabuzarus	e4a625ad12	Bugfix: seen status was not handled correcty on the notifications page	2016-11-16 04:57:55 +01:00
Tobias Diekershoff	b628e82465	Merge pull request #2910 from annando/1611-slinky ... Several shorteners doesn't work anymore	2016-11-15 09:53:38 +01:00
Tobias Diekershoff	44d79cbc27	Merge pull request #2911 from annando/1611-well-formatted-uri ... URI of "remote self" are looking better now.	2016-11-15 09:53:14 +01:00
Michael	d4e3bc1924	Added documentation	2016-11-15 07:05:43 +00:00
rabuzarus	9878974e1f	fix photos page permissions	2016-11-14 18:49:51 +01:00
Jens Tautenhahn	31ad26aae2	Merge remote-tracking branch 'upstream/develop' into develop	2016-11-14 09:52:01 +01:00
Michael	88d073f3d9	URI of "remote self" are looking better now.	2016-11-14 06:55:17 +00:00
Michael	5ef688f1d2	Case correction	2016-11-14 05:44:18 +00:00