27473 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	fa8eb101d4	Merge pull request #2981 from rabuzarus/20161129_-_small_dfrn_request_polish ... dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries	2016-11-29 19:33:57 +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	4566ad81fd	protocol.md - fix typo	2016-11-29 16:10:32 +01:00
rabuzarus	a68735b725	update contact request $ confirmation graphics	2016-11-29 16:00:07 +01:00
rabuzarus	54f3867ebd	dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries	2016-11-29 15:52:12 +01: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
Michael Vogel	86665d47a6	Merge pull request #2980 from rabuzarus/20161129_-_small_dfrn_request_polish ... dfrn_request: added $blocked and $pending as variable to make code mo…	2016-11-29 09:42:26 +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
rabuzarus	0d223aa6f1	dfrn_request: added $blocked and $pending as variable to make code more understandable	2016-11-29 03:08:46 +01: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	0ef764b167	Merge pull request #2970 from Hypolite/improvement/ping-php-json ... ping.php: Ensure data structure consistency	2016-11-28 21:08:36 +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	6c0bc15ecb	docu fix: insert line break	2016-11-28 20:18:28 +01:00
rabuzarus	3cb9324072	frio: some css work for help docs	2016-11-28 18:40:25 +01:00
Michael Vogel	4ff49807ca	Merge pull request #2976 from rabuzarus/20161128_-_fix_posible_double_request ... Bugfix: better detection dfrn_request of double connection requests	2016-11-28 18:19:20 +01:00
rabuzarus	36e4aea7ef	docs: add documentation about used protocols	2016-11-28 17:55:56 +01:00
rabuzarus	76ca015497	update link in the docs to dfrn specs + h3 headings (instead of h2 headings) in message_flow doc	2016-11-28 16:59:23 +01:00
rabuzarus	14c84b92cc	restructure some links in the help docs to have a better seperation between admin and developer docu	2016-11-28 16:57:50 +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	a7fbc994e0	update spec file	2016-11-28 15:49:21 +01:00
rabuzarus	d0cdf863a1	fix accidentally deleted line with local_user()	2016-11-28 15:30:36 +01:00
rabuzarus	743378129b	legacy support for function parseurl_getsiteinfo_cached()	2016-11-28 15:26:51 +01:00
rabuzarus	5458f40f6a	Bugfix: better detection dfrn_request of double connection requests	2016-11-28 01:13:47 +01:00
Michael	8d8faa8b7b	Set the time limit of the deamon.	2016-11-27 23:58:26 +00:00
Michael	d96b827e32	Changed documentation	2016-11-27 22:52:21 +00:00
rabuzarus	f229d65f85	ParseUrl: some docu work	2016-11-27 23:41:55 +01:00
Michael	80d2210895	We can now start the poller from a daemon as well.	2016-11-27 20:57:18 +00: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	df0d33c138	Try to get more execution time	2016-11-27 10:01:24 +00: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
rabuzarus	c96a53b4b4	parse_url: fix typo	2016-11-26 04:10:50 +01:00
Tobias Diekershoff	425bd83c8d	Merge pull request #2974 from rabuzarus/2511_frio_fix_default_js_arg ... Frio Bugfix: correct wrong use of default arg 'title' in modal.js	2016-11-25 23:29:26 +01:00
rabuzarus	5068563cf5	small code formatting correction	2016-11-25 19:18:01 +01:00
rabuzarus	a194c44de9	Frio Bugfix: correct wrong use of default arg 'title' in modal.js	2016-11-25 19:13:40 +01:00
rabuzarus	26664c22e0	parse_url: add some docu	2016-11-25 16:59:31 +01:00
rabuzarus	5e466aade0	Merge pull request #2972 from annando/1611-term-date ... Delivery to other systems was needlessly deferred.	2016-11-24 22:14:09 +01: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
Hypolite Petovan	50d3c49297	main.js: Remove debug	2016-11-23 10:06:42 -05:00
Michael Vogel	4eeb5a0a17	Merge pull request #2969 from gerhard6380/develop ... Develop	2016-11-23 05:13:31 +01:00
Hypolite Petovan	0f33311f65	pig.php: remove debug	2016-11-22 23:04:00 -05:00