21072 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Michael Vogel	99f94edc9c	New class to probe urls	2016-07-03 22:27:16 +02:00
Tobias Diekershoff	c6a348d3dc	Merge pull request #2662 from rabuzarus/0307_frio-fix_contact-url ... frio: fix url variable for textcomplete in contact_template	2016-07-03 10:40:41 +02:00
rabuzarus	1cf4924e20	frio: fix url variable for textcomplete in contact_template	2016-07-03 09:50:34 +02:00
Tobias Diekershoff	c772edc313	Merge pull request #2661 from annando/1607-refresh ... Automatically refresh after two minutes when system is overloaded	2016-07-03 06:24:27 +02:00
Michael Vogel	0ed93df91f	Automatically refresh after two minutes when system is overloaded	2016-07-03 00:26:00 +02:00
Tobias Diekershoff	aba590b4c4	Merge pull request #2660 from annando/1607-worker-admin ... Site settings: some settings are disabled when the worker is active	2016-07-02 23:17:26 +02:00
Michael Vogel	2ef50cb7e6	Site settings: some settings are disabled when the worker is active	2016-07-02 23:08:33 +02:00
Tobias Diekershoff	ce64955fe0	Merge pull request #2659 from annando/1607-bugfix-scrape-diaspora ... Bugfix: The notify value for Diaspora wasn't assigned	2016-07-02 22:07:41 +02:00
Tobias Diekershoff	598a9f76a6	Merge pull request #2658 from annando/1607-maxload ... Central Backend/Frontend detection when checking for overload	2016-07-02 21:52:48 +02:00
Michael Vogel	34475ad262	Bugfix: The notify value for Diaspora wasn't assigned	2016-07-02 21:14:21 +02:00
Tobias Diekershoff	7cda169f24	Merge pull request #2657 from annando/1607-share-contact ... Only use the profile data in shares if there is data	2016-07-02 20:06:20 +02:00
Tobias Diekershoff	14f606957f	Merge pull request #2656 from annando/1607-is-result2 ... Moves the function "is_result" from the dba class to the dbm class	2016-07-02 19:29:43 +02:00
Michael Vogel	f1af0fe360	Obly use the profile data in shares if there is data	2016-07-02 17:51:16 +02:00
Michael Vogel	c7f10bacb5	Merge remote-tracking branch 'upstream/develop' into 1607-is-result2	2016-07-02 14:01:52 +02:00
Michael Vogel	e4c6cfd2d8	Moves the function "is_result" from dba to dbm.	2016-07-02 14:00:42 +02:00
Tobias Diekershoff	b580a338f6	Merge pull request #2654 from annando/1607-thumb-micro ... use thumb avatar size instead of micro size in the contact list	2016-07-02 13:53:35 +02:00
Tobias Diekershoff	90f98414cf	Merge pull request #2655 from annando/develop ... Fixed pull request 2390	2016-07-02 13:53:20 +02:00
Michael Vogel	91e20f2f9b	Remove unused function	2016-07-02 13:42:42 +02:00
Michael Vogel	ddfd425cd7	Merge branch 'Quix0r-rewrites/is_filled_array_introduced' into develop	2016-07-02 13:38:39 +02:00
Michael Vogel	7d531afd00	Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced ... Conflicts: boot.php	2016-07-02 13:38:23 +02:00
Michael Vogel	e67554924a	use thumb avatar size instead of micro size in the contact list	2016-07-02 09:32:42 +02:00
Michael Vogel	c549ae939c	Added the new function to the poller.	2016-07-02 09:31:28 +02:00
Michael Vogel	b3c8ff836d	Backend/Frontend detection when checking for overload	2016-07-02 08:54:57 +02:00
Tobias Diekershoff	0344d26896	Merge pull request #2653 from rabuzarus/0107_frio_jot_textcomplete ... frio: fix textcomplete for jot	2016-07-01 17:18:25 +02:00
rabuzarus	9170955f80	frio: fix textcomplete for jot	2016-07-01 17:03:40 +02:00
rabuzarus	9262afef93	Merge pull request #2652 from annando/1606-diaspora-fetch3 ... Diaspora: Support for reading the /fetch/post/ functionality	2016-07-01 12:39:36 +02:00
Michael Vogel	c1ce7059b6	If it doesn't work with the new method, try the old one	2016-06-30 22:58:56 +02:00
Michael Vogel	e5dd67121f	Some logging added.	2016-06-30 22:42:46 +02:00
Michael Vogel	97abbe83f4	Diaspora: Support for reading the /fetch/post/ functionality	2016-06-30 22:18:48 +02:00
rabuzarus	b2e21ca7b8	Merge pull request #2651 from annando/1606-fetch-loop ... Avoid redirection loops at /fetch/ and /p/	2016-06-30 15:21:28 +02:00
Michael Vogel	a7ee8a8bc9	Avoid redirection loops at /fetch/ and /p/	2016-06-30 12:02:35 +02:00
Tobias Diekershoff	cb3704ab43	Merge pull request #2650 from annando/1606-diaspora-fetch ... Diaspora: Support for new fetch functionality (replacement for /p/)	2016-06-30 09:47:40 +02:00
Michael Vogel	6f203b0a75	urlencode is better	2016-06-30 08:58:36 +02:00
Michael Vogel	5341223617	Do a redirect when the post doesn't come from our system but we know where it comes from.	2016-06-30 08:55:26 +02:00
Michael Vogel	24e0fffa2e	Small bugfix	2016-06-30 07:56:06 +02:00
Michael Vogel	d125939888	Just some more centralised functionality	2016-06-30 07:46:00 +02:00
Michael Vogel	99f0746660	Cleaned up the code	2016-06-30 07:32:07 +02:00
Michael Vogel	2c7fd1cb3c	It should be now valid	2016-06-30 01:18:44 +02:00
Michael Vogel	c0669d365b	The key_id was added	2016-06-30 00:22:42 +02:00
Michael Vogel	2d72e2d932	Diaspora: Support for new fetch functionality (replacement for /p/)	2016-06-29 22:50:30 +02:00
Tobias Diekershoff	3a5d98507d	Merge pull request #2649 from annando/1606-diaspora-sign2 ... Diaspora: Another Bugfix for the new protocol	2016-06-29 21:51:48 +02:00
Michael Vogel	230a645307	Diaspora: Another Bugfix for the new protocol	2016-06-29 20:37:04 +02:00
Tobias Diekershoff	ee7ca9cf71	Merge pull request #2648 from annando/1606-diaspora-signature ... Diaspora: Incompatibilities with signature check solved	2016-06-29 11:54:13 +02:00
Michael Vogel	152efdaec5	Diaspora: Incompatibilities with signature check solved	2016-06-29 10:33:43 +02:00