27416 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
fabrixxm	eb1ba8934c	Merge pull request #2676 from tobiasd/20160713-lighttpdconfig ... added configuration reg. curl and lighttpd with error code 417	2016-07-13 10:17:19 +02:00
Tobias Diekershoff	263c9f30a1	added configuration reg. curl and lighttpd with error code 417	2016-07-13 09:33:28 +02:00
Tobias Diekershoff	57762a8038	Merge pull request #2674 from annando/1607-warning-theme-info ... Bugfix: Avoid a warning if "theme_info" isn't an array	2016-07-12 16:16:19 +02:00
Michael Vogel	fdd679636b	Bugfix: Avoid a warning if "theme_info" isn't an array	2016-07-12 12:59:34 +02:00
rabuzarus	4e4580f326	Merge pull request #2669 from annando/1607-new-probe ... New probing mechanism	2016-07-11 21:42:48 +02:00
rabuzarus	566f237f4a	Merge pull request #2673 from annando/1607-mail-avatar ... Bugfix: Avatar pictures of mail contacts weren't displayed correctly	2016-07-11 21:41:23 +02:00
Michael Vogel	a64db18731	Merge remote-tracking branch 'upstream/develop' into 1607-new-probe	2016-07-11 20:45:56 +02:00
Michael Vogel	0a46a3d10e	Bugfix: Avatar pictures of mail contacts weren't displayed correctly	2016-07-11 20:42:18 +02:00
Michael Vogel	ee7f10f130	Some more little documentation	2016-07-11 19:48:37 +02:00
Michael Vogel	2a088d27d0	Merge pull request #2672 from rabuzarus/1007-page_template ... add possibility to load custom page templates + none.php pagetemplate…	2016-07-11 15:20:10 +02:00
rabuzarus	15471f3835	add possibility to load custom page templates + none.php pagetemplate is part of core now	2016-07-11 10:33:39 +02:00
Michael Vogel	aad3fb2d32	Some more documentation	2016-07-10 18:44:48 +02:00
Michael Vogel	19d820a9c4	Added fcontact doc	2016-07-10 14:08:27 +02:00
Michael Vogel	230bfcebea	Merge remote-tracking branch 'upstream/develop' into 1607-new-probe	2016-07-10 14:03:10 +02:00
Tobias Diekershoff	26098fa263	Merge pull request #2671 from annando/1607-diaspora-soapbox-connect ... Bugfix: Diaspora connect requests to soapbox account work now	2016-07-10 13:55:56 +02:00
Michael Vogel	9ac26802ce	Diaspora: Send the profile data after a successful connect	2016-07-10 13:11:09 +02:00
Michael Vogel	19377f2a9c	Just make the bugfix a little bit simpler	2016-07-10 12:18:10 +02:00
Michael Vogel	84aa01b377	Bugfix: Diaspora connects to a Soapbox account weren't established correctly	2016-07-10 12:09:58 +02:00
Michael Vogel	8a11a60932	Small text correction	2016-07-10 09:29:43 +02:00
Michael Vogel	3cb38a8fff	Merge pull request #2670 from tobiasd/20160709-credits ... regen credits.txt	2016-07-10 09:28:41 +02:00
Michael Vogel	b9da831138	Fallback for empty names	2016-07-10 09:27:40 +02:00
Tobias Diekershoff	fd105609a4	Merge pull request #2668 from annando/1607-diaspora-retraction ... Diaspora: Relayed retraction hadn't worked.	2016-07-10 08:15:56 +02:00
Michael Vogel	94478bc366	Merge pull request #2667 from tobiasd/20160709-messages ... regen messages.po	2016-07-09 20:39:03 +02:00
Michael Vogel	f27bc00464	Remove obsolote functions	2016-07-09 20:09:09 +02:00
Tobias Diekershoff	080b567860	regen credits.txt	2016-07-09 12:10:22 +02:00
Tobias Diekershoff	cacd07a5ea	regen messages.po	2016-07-09 07:20:48 +02:00
Michael Vogel	058c93a64c	Changed documentation	2016-07-08 22:55:39 +02:00
Michael Vogel	f86dac652f	OStatus now has "location" and "about", probing for urls added	2016-07-08 22:31:11 +02:00
Michael Vogel	0ccb171449	Probing now has a Twitter detection.	2016-07-08 21:15:20 +02:00
Michael Vogel	e43a90252c	Diaspora: Relayed retraction hadn't worked.	2016-07-08 20:39:14 +02:00
Michael Vogel	b954714464	If the nick is missing then take the first part of the name	2016-07-08 20:37:10 +02:00
Michael Vogel	edfee710fe	To-Do added	2016-07-07 23:35:44 +02:00
Michael Vogel	db1d8caaf2	Merge remote-tracking branch 'upstream/develop' into 1607-new-probe	2016-07-07 23:35:14 +02:00
Michael Vogel	a65547c578	Added documentation	2016-07-07 23:04:30 +02:00
Michael Vogel	c625b6aba8	If a page contains a feed url then follow it.	2016-07-07 22:37:16 +02:00
Tobias Diekershoff	b4b2a6d5b8	Merge pull request #2666 from annando/1607-more-logging ... Logging for feeds improved, new "process id" for logging	2016-07-07 22:36:20 +02:00
Michael Vogel	2e37234a41	Merge remote-tracking branch 'upstream/develop' into 1607-new-probe	2016-07-07 21:57:10 +02:00
Michael Vogel	fc25e605cb	Logging for feeds improved, new "process id" for logging	2016-07-07 20:32:13 +02:00
fabrixxm	0bfcd1fe63	Merge pull request #2665 from tobiasd/20160705-mime ... adjust the rand bounderies to be within the allowed max value	2016-07-05 16:09:44 +02:00
Tobias Diekershoff	5b03db4a1b	adjust the rand bounderies to be within the allowed max value	2016-07-05 15:45:39 +02:00
Michael Vogel	1cc5d08def	Merge remote-tracking branch 'upstream/develop' into 1607-new-probe	2016-07-05 09:49:19 +02:00
rabuzarus	6e7f7210a8	Merge pull request #2664 from annando/1607-remote-auth ... Bugfix: Remote auth and picture permissions should now work again.	2016-07-05 09:30:00 +02:00
Michael Vogel	e006bc24d7	Bugfix: Remote auth and picture permissions should now work again.	2016-07-05 08:51:28 +02:00
rabuzarus	8a988d3f31	Merge pull request #2663 from annando/1607-photos-session ... Bugfix: On "photos" the session management has to work	2016-07-04 23:10:38 +02:00
Michael Vogel	e3fb9155f0	Bugfix: On "photos" the session management has to work	2016-07-04 22:36:24 +02:00
Michael Vogel	585c893456	You can now prove with an uid (important for mails)	2016-07-04 22:34:35 +02:00
Michael Vogel	4e5d335492	Removed the legacy function calls, removed unused functions	2016-07-04 08:05:30 +02:00
Michael Vogel	e1c0b4fe03	Warnings removed	2016-07-04 00:49:38 +02:00
Michael Vogel	f5593b1981	Removed old code	2016-07-04 00:14:08 +02:00
Michael Vogel	b124b94288	Support for noscrape when probing.	2016-07-03 23:11:21 +02:00