14344 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	49b22de705	Changes from previous pull request applied again	2017-03-12 21:57:09 +00:00
Michael	77e8c44016	Merge remote-tracking branch 'upstream/develop' into 1702-only-worker ... Conflicts: include/onepoll.php include/queue.php	2017-03-12 21:03:44 +00:00
Tobias Diekershoff	7d1e54664a	Merge pull request #3133 from mexon/mat/cidfix ... Allow cid URLs for images	2017-03-12 15:44:22 +01:00
Tobias Diekershoff	7275319eb6	Merge pull request #3214 from Hypolite/get_contact-rewrite ... Reformatted get_contact()	2017-03-12 15:42:17 +01:00
Tobias Diekershoff	1bf089e424	Merge pull request #3216 from annando/1701-performance ... Better network handling, improved structure	2017-03-12 15:40:56 +01:00
Tobias Diekershoff	e29d7f19d1	Merge pull request #3222 from Hypolite/issue/#3220 ... Diaspora: Normalize line endings instead of adding <br> before Markdown()	2017-03-12 15:35:42 +01:00
Tobias Diekershoff	30d82f4391	mark the develop version in the version string	2017-03-12 14:40:08 +01:00
Tobias Diekershoff	4cddb74f27	Merge branch 'master' into develop	2017-03-12 14:39:09 +01:00
Tobias Diekershoff	2bfa870c47	Friendica Version 3.5.1	2017-03-12 14:38:01 +01:00
Hypolite Petovan	2310bf994a	Normalize line endings instead of adding <br> before Markdown()	2017-03-12 03:55:22 -04:00
Hypolite Petovan	3fa4605ace	Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop	2017-03-09 21:11:14 -05:00
fabrixxm	3f6fd8ee69	Merge pull request #3208 from Hypolite/issue/#3194 ... Strip @hubzilla.server part from guid for autoscrolling purpuses	2017-03-09 09:37:21 +01:00
Michael	2d2a35af73	Make Hypolite happy	2017-03-08 18:03:41 +00:00
Hypolite Petovan	37b15995d8	Add pump.io network to probing supported networks ... - Remove useless condition	2017-03-07 16:43:22 -05:00
Hypolite Petovan	d7f62e82b9	Fix behavior regression ... Reverted quitting get_contact if Probe::uri didn’t yield an url for “nick@server.tld” form.	2017-03-07 16:28:15 -05:00
Michael	f7f23038db	Merge remote-tracking branch 'upstream/develop' into 1701-performance	2017-03-07 21:24:20 +00:00
Hypolite Petovan	97378893cd	Switch nurl and addr lookups ... - nurl lookup is more frequent than addr lookup, saves queries	2017-03-06 16:26:04 -05:00
Hypolite Petovan	89f0b85905	Split slow catch-all query into three fast queries ... Thanks @annando for the tip.	2017-03-06 16:19:12 -05:00
Hypolite Petovan	116b9e1c1f	Use Probe::uri instead of probe_url() ... - Moved file inclusion to enable lazy loading	2017-03-06 06:01:08 -05:00
Hypolite Petovan	ff64beeb4e	Reformatted get_contact() ... - Resolved one `@todo` (the catch-all contact query) - Improved code readability by naming variables - Code standards compliance	2017-03-06 05:37:01 -05:00
Tobias Diekershoff	9cbab5cd7a	Merge pull request #3212 from annando/followup2-profile ... Second followup for profile issue	2017-03-05 13:29:48 +01:00
Michael Vogel	7867f6fcef	Merge pull request #3211 from tobiasd/3.5.1rc ... DE translation and one solved issue for the CHANGELOG	2017-03-05 13:09:28 +01:00
Tobias Diekershoff	67dda52f4b	issue solved	2017-03-05 12:41:02 +01:00
Tobias Diekershoff	5097c74d21	DE translations	2017-03-05 12:40:31 +01:00
Michael	2775adfdf5	Second followup for profile issue	2017-03-05 11:07:10 +00:00
Tobias Diekershoff	ad9303868b	Merge pull request #3209 from annando/followup-3196 ... Follow up for issue 3196: We need an index hint for performance issues	2017-03-04 09:41:00 +01:00
Michael	8690b97c27	Follow up for issue 3196: We need an index hint for performance issues	2017-03-04 08:25:47 +00:00
Hypolite Petovan	3ea830e221	Strip @hubzilla.server part from guid for autoscrolling purpuses	2017-03-03 21:45:36 -05:00
Michael Vogel	9ccb6072b8	Merge pull request #3205 from tobiasd/20170226-issue3187 ... Bugfix issue 3187	2017-03-03 21:36:37 +01:00
Tobias Diekershoff	1d667d7a45	tag change	2017-03-03 17:18:09 +01:00
Tobias Diekershoff	0d83082343	regenerated master messages.po file	2017-03-03 10:31:10 +01:00
Tobias Diekershoff	2fa9f76e67	better wording and placeholder for name	2017-03-03 10:28:29 +01:00
Michael Vogel	372b660aa1	Merge pull request #3201 from tobiasd/20170302-changelog ... issues solved	2017-03-02 10:16:14 +01:00
Tobias Diekershoff	3476820529	issues solved	2017-03-02 09:05:24 +01:00
Tobias Diekershoff	e66ad9d6bd	Merge pull request #3199 from annando/issue-3196 ... Bugfix Issue 3196: Not all forum posts weren't shown	2017-03-02 07:29:45 +01:00
Michael	5c92e97173	Added index for performance issues	2017-03-02 05:46:44 +00:00
Michael	3ab845dcf3	Issue 3196: Not all forum posts weren't shown	2017-03-01 21:47:10 +00:00
Michael Vogel	c23298b4c9	Merge pull request #3193 from tobiasd/20170228-CHANGELOG ... this line is superfluous by now	2017-02-28 09:30:35 +01:00
Tobias Diekershoff	59bfc3f4a8	this line is superfluous by now	2017-02-28 08:21:33 +01:00
Michael	4de057804c	Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-only-worker	2017-02-28 06:49:21 +00:00
Tobias Diekershoff	1046f2573c	Merge pull request #3192 from annando/gstools-isnt-anymore ... The service at gstools.org doesn't exist anymore.	2017-02-28 07:35:04 +01:00
Michael	c829dc8e71	The service at gstools.org doesn't exist anymore.	2017-02-28 06:26:50 +00:00
Michael	3c220dd40c	Queue.php is now reworked	2017-02-27 21:07:32 +00:00
Michael	df6913f7e1	pidfile.php is in use by two addons. So we restore it here.	2017-02-27 06:31:49 +00:00
Michael	99fb15037b	Removed some more unneeded stuff	2017-02-27 06:27:22 +00:00
Michael	46308fa1ef	Removed worker config stuff	2017-02-26 23:27:10 +00:00
Michael	733caa5669	Removed admin settings	2017-02-26 23:19:13 +00:00
Michael	48209f0ecd	Now there is only the worker.	2017-02-26 23:16:49 +00:00
Tobias Diekershoff	7442ce3d6d	change Fan/Admirer to Subscriber	2017-02-26 16:47:11 +01:00
Tobias Diekershoff	86c6c48bd8	Merge pull request #3190 from annando/bugfix-dbstructure ... Bugfix: "ALTER IGNORE" was missing on structure and index alteration	2017-02-26 10:05:02 +01:00