4127 commits

Author	SHA1	Message	Date
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
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	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	b9da831138	Fallback for empty names	2016-07-10 09:27:40 +02:00
Michael Vogel	f27bc00464	Remove obsolote functions	2016-07-09 20:09:09 +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
Tobias Diekershoff	5b03db4a1b	adjust the rand bounderies to be within the allowed max value	2016-07-05 15:45:39 +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	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
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
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	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
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	2d72e2d932	Diaspora: Support for new fetch functionality (replacement for /p/)	2016-06-29 22:50:30 +02:00
Michael Vogel	230a645307	Diaspora: Another Bugfix for the new protocol	2016-06-29 20:37:04 +02:00
Michael Vogel	152efdaec5	Diaspora: Incompatibilities with signature check solved	2016-06-29 10:33:43 +02:00
Tobias Diekershoff	773517a734	Merge pull request #2638 from annando/1606-avatar-handling ... Imrpoved avatar handling when storing them/partly use of "micro"	2016-06-25 19:51:00 +02:00
rabuzarus	fd72f36ffe	move html from function micropro() to own templates	2016-06-25 18:46:47 +02:00
Michael Vogel	ad6b3f8815	Merge pull request #2636 from rabuzarus/2506_frio_strings ... add missing strings for frio	2016-06-25 14:03:34 +02:00
Michael Vogel	0b1188b7fe	Imrpoved avatar handling when storing them/partly use of "micro"	2016-06-25 13:56:55 +02:00
rabuzarus	073f520cee	add missing strings for frio	2016-06-25 12:21:13 +02:00
Michael Vogel	e2023b6667	Store the guid value as well.	2016-06-25 11:52:52 +02:00
Michael Vogel	ec5b3109e4	Support for the case when the guid and public key will vanish from webfinger	2016-06-25 00:38:47 +02:00
Tobias Diekershoff	f8a20a15d3	Merge pull request #2633 from annando/1606-author-id-update ... author-id/owner-id: Post update function/added database documentation	2016-06-24 07:03:46 +02:00
Michael Vogel	eabf8734a8	Merge pull request #2631 from rabuzarus/1906-event-test ... cal export && public calendar - fix permissions	2016-06-23 23:24:27 +02:00
Michael Vogel	c7373dcec4	author-id/owner-id: Post update function/added database documentation	2016-06-23 21:15:54 +02:00
rabuzarus	e352458ef0	pub calendar - permission clean up and docu	2016-06-23 10:07:13 +02:00
rabuzarus	cd92a0dc34	Merge pull request #2624 from annando/1606-contact-id ... Item: New fields for author id and owner id - avatar improvement with relocation	2016-06-22 14:26:39 +02:00
rabuzarus	2cac69ca86	cal export && public calendar - even better permissions testing	2016-06-22 13:50:47 +02:00
rabuzarus	8cc5dd35e8	cal export && public calendar - fix permissions	2016-06-22 00:39:52 +02:00
Michael Vogel	49c19a3c00	Merge pull request #2628 from rabuzarus/1906-event-test ... move the cal addon (exporting calendars) to core	2016-06-21 22:48:31 +02:00
Michael Vogel	266fea3874	Merge remote-tracking branch 'upstream/develop' into 1606-contact-id	2016-06-21 00:10:24 +02:00
rabuzarus	71c9f562ae	move the cal addon (exporting calendars) to core	2016-06-20 23:31:49 +02:00
Michael Vogel	a657377616	Diaspora: Try to fetch the uri if we already received the message	2016-06-20 22:48:55 +02:00
Michael Vogel	40a44f1571	Some manual revert ...	2016-06-20 22:48:09 +02:00
Michael Vogel	467176fa65	Diaspora: Ensure that we always store the correct URI	2016-06-20 22:43:14 +02:00
Michael Vogel	65b541413f	Merge remote-tracking branch 'upstream/develop' into 1606-contact-id	2016-06-20 07:28:47 +02:00
rabuzarus	7495a34b32	implement a public calendar for vistors of someones profile page	2016-06-19 22:04:34 +02:00
Michael Vogel	0adff6f6b8	Fix for author-thumb/owner-thumb - DFRN: Relocate stuff	2016-06-19 20:01:25 +02:00
Michael Vogel	91db7a549c	Optimised the amount of function for the item query	2016-06-19 08:32:38 +02:00
Michael Vogel	c3ed6f7d01	Improved default value handling	2016-06-19 01:22:32 +02:00
Michael Vogel	e512a83ecc	Massively updated avatar handling	2016-06-19 01:07:20 +02:00
Michael Vogel	bf2e23c205	Merge pull request #2616 from rabuzarus/1206-events-template ... use standard templates in events + frio templates for events	2016-06-18 15:01:00 +02:00
rabuzarus	b977efc95c	code highlight - some spacing for readability	2016-06-17 15:29:01 +02:00
rabuzarus	7dc5fc8b9f	Merge develop into 1206-events-template ... Conflicts: view/theme/frio/css/style.css	2016-06-17 14:33:08 +02:00
rabuzarus	4313982e02	frio - event - code clean up + docu	2016-06-17 14:27:33 +02:00
rabuzarus	8b4c416713	frio: events - split event form in different sections	2016-06-16 20:16:16 +02:00
rabuzarus	0167a2bd61	port of Hubzillas code highlight feature	2016-06-16 11:38:12 +02:00
Michael Vogel	8762fb671f	Merge remote-tracking branch 'upstream/develop' into 1606-contact-id	2016-06-16 10:48:52 +02:00
Michael Vogel	3c9a80a31c	dfrn relocate: addr field added, gcontact update added	2016-06-15 21:23:22 +02:00
Michael Vogel	0e35427dfc	New fields "author-id" and "owner-id" in the item table	2016-06-15 21:20:55 +02:00
Michael Vogel	7f5a2d5c23	Categories were missing	2016-06-14 09:50:17 +02:00
Michael Vogel	a05f0c39a6	Merge remote-tracking branch 'upstream/develop' into 1606-time-travel	2016-06-13 22:32:40 +02:00
Michael Vogel	81395fe385	Avoid time travel in posts (received before created)	2016-06-13 22:21:33 +02:00
Michael Vogel	2815173a52	Bugfix: Items weren't sorted correctly	2016-06-13 22:20:09 +02:00
Fabrixxm	6e28cdf2ee	Fix Config and PConfig ::get() on new keys	2016-06-13 10:28:40 +02:00
rabuzarus	5e98f27fcd	frio: events - work on event_form.tpl + datetime.php	2016-06-13 10:19:38 +02:00
rabuzarus	869a439466	Merge pull request #2595 from annando/1606-contact-priority ... Priority for native networks when searching by contact url	2016-06-13 09:28:54 +02:00
Michael Vogel	125d80292b	Some cleanup	2016-06-12 23:06:48 +02:00
Michael Vogel	c68f28bc77	Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup	2016-06-12 21:07:45 +02:00
Michael Vogel	c05898c57d	The queries for items are unified (a little bit)	2016-06-12 21:04:55 +02:00
rabuzarus	64753f474c	fix config & pconfig	2016-06-12 18:55:20 +02:00
Michael Vogel	6d50d18242	Merge pull request #2584 from rabuzarus/0906-profiles ... some restructure in profiles.php + frio template for profiles settings	2016-06-12 14:20:42 +02:00