2843 commits

Author	SHA1	Message	Date
Michael Vogel	9d920033e8	Just removing unused codelines	2015-02-16 22:28:24 +01:00
Michael Vogel	8b1b886797	Improved probe_url, fixed wrong network detection.	2015-02-16 22:11:51 +01:00
Michael Vogel	2dafc9eac1	Merge remote-tracking branch 'upstream/develop' into 1502-poco-generation-counter	2015-02-15 10:54:41 +01:00
Michael Vogel	d1d794f1ab	The global contacts now contain a "generation" value that defines how we know this contact	2015-02-15 10:52:45 +01:00
Tobias Diekershoff	d39612ac25	Merge pull request #1393 from annando/1502-cleaned-item-storage-code ... Additional check for notifications	2015-02-14 15:40:35 +01:00
Michael Vogel	75797c61f2	Improved logging with receiving mails	2015-02-13 08:09:27 +01:00
Johannes Schwab	12d7ca9b84	improved infinite scrollling	2015-02-13 00:40:59 +01:00
Michael Vogel	3c8fc863a8	The "share a post" notification is now sent based upon mentions as well.	2015-02-11 07:19:48 +01:00
Michael Vogel	9287a0521a	Merge remote-tracking branch 'upstream/develop' into 1502-cleaned-item-storage-code	2015-02-11 07:07:31 +01:00
Matthew Exon	2bb8b77123	Close cURL handle before recursing, so that cookie file is flushed	2015-02-11 03:42:07 +00:00
Fabrixxm	135869fd1c	Merge branch 'release-3.3.3' into develop	2015-02-10 16:04:22 +01:00
Fabrixxm	87f9258834	Merge branch 'mat/mergerequest' of https://github.com/mexon/friendica into mexon-mat/mergerequest	2015-02-10 10:57:26 +01:00
Michael Vogel	1a75503b1c	Relocated the cache code.	2015-02-10 08:22:21 +01:00
Matthew Exon	d12b929c96	Accept lowercase location header	2015-02-10 03:14:08 +00:00
Michael Vogel	2dc5f1aefc	Removed cache code, since it was superfluous.	2015-02-09 23:04:18 +01:00
Michael Vogel	091c3e75ca	Rearranged code in item storage.	2015-02-09 21:52:08 +01:00
Tobias Diekershoff	e051da8203	Merge pull request #1382 from fabrixxm/localize-activity-poke ... Fix localization of poke activity + update IT strings	2015-02-09 13:25:50 +01:00
Fabrixxm	5d19b21298	fix translation of poke activity body	2015-02-09 11:54:50 +01:00
Matthew Exon	1c31dca5d6	Support feeds without XML headers	2015-02-09 10:21:27 +00:00
Fabrixxm	ff41cc24bd	Emailer: fix text-only email	2015-02-09 11:21:10 +01:00
Michael Vogel	136626c199	Just a little bit more code clean up.	2015-02-08 21:03:04 +01:00
Michael Vogel	7e9ae24511	Moved several settings from .htconfig.php to the admin settings page.	2015-02-08 20:35:40 +01:00
Michael Vogel	a97d4383a1	Searching for items now always searches public entries from the central item storage with uid=0.	2015-02-08 15:59:22 +01:00
fabrixxm	f620834d97	Merge branch 'release-3.3.3' into develop	2015-02-07 12:57:12 +01:00
Michael Vogel	d87ab3cd97	Correct the contact data if it was changed although the system don't thinks so.	2015-02-06 21:02:33 +01:00
Johannes Schwab	1114ae4c81	fix urls for pager	2015-02-06 17:04:48 +01:00
fabrixxm	aa720eb277	Merge pull request #1357 from annando/1502-html-poco-2 ... html to bbcode convertion in poco - 2nd try	2015-02-05 11:21:23 +01:00
Michael Vogel	9641436996	The relocate message hadn't changed the "nurl" value.	2015-02-04 20:22:05 +01:00
Michael Vogel	742a6dcf6e	Due to some git problems, just the same stuff again (html to bbcode conversation in poco)	2015-02-04 19:49:43 +01:00
Tobias Diekershoff	710bd08c30	adopting red matrix iconography for red#	2015-02-04 08:47:57 +01:00
Michael Vogel	226b551c85	Only some code beautification.	2015-02-03 07:00:01 +01:00
Michael Vogel	9851965090	Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage	2015-02-03 00:30:37 +01:00
Michael Vogel	86a968002d	Look for links to diaspora posts and try to fetch them if they aren't on the system.	2015-02-03 00:29:21 +01:00
Michael Vogel	8d0030c9d5	Revert some stuff from another pull request. I like git ...	2015-02-02 22:24:21 +01:00
Michael Vogel	8490bedefe	Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage	2015-02-02 22:15:39 +01:00
Michael Vogel	62b32e7c93	Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup	2015-02-02 22:08:40 +01:00
Tobias Diekershoff	b41d14afe3	Merge pull request #1343 from annando/1502-diaspora-guid-links ... Diaspora internal GUID links are now converted correctly	2015-02-02 22:03:09 +01:00
Tobias Diekershoff	2efc789aee	Merge pull request #1339 from annando/1502-bugfix-friend-notification-diaspora ... Improvement for the "new friend" notification with Diaspora and "remote self"	2015-02-02 21:51:35 +01:00
Michael Vogel	46dd453e5b	Diaspora internal GUID links are now converted correctly.	2015-02-02 20:26:05 +01:00
Michael Vogel	80ee58f8aa	Just an added to-do comment	2015-02-02 20:24:19 +01:00
Michael Vogel	9d155a62f9	New function to fetch and store an item based on the guid.	2015-02-01 21:54:44 +01:00
Michael Vogel	75c60b2595	The alias can - or can not - be an SSL link.	2015-02-01 16:32:58 +01:00
Michael Vogel	d1dd50e9b0	Diaspora: The "new friend" notification now respects the corresponding setting/"new friend" notification isn't send via "remote self" anymore.	2015-02-01 16:04:16 +01:00
Michael Vogel	b95d34f9db	Aliases are now handled correctly. The public item copy gets a "real" contact id as well.	2015-02-01 13:32:05 +01:00
Michael Vogel	e02b982f77	Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage	2015-02-01 13:28:32 +01:00
Michael Vogel	e3da549ab5	Reshared diaspora items that aren't on this server are now stored with uid=0	2015-02-01 10:26:35 +01:00
Michael Vogel	6eb4254d06	The query after an API post was improved to make it faster.	2015-01-31 23:13:21 +01:00
Michael Vogel	a7e190b0cb	Bugfix: The portable contacts send data as html but was expected to be bbcode. Now the html is converted to bbcode.	2015-01-31 22:57:05 +01:00
Silke Meyer	61a227dbaa	Changed the "From" field for system emails from product to sitename.	2015-01-31 18:44:30 +01:00
Silke Meyer	bb2413ddaf	deleted my comment of the original line	2015-01-31 18:41:05 +01:00