1
1
Fork 0
Commit graph

4940 commits

Author SHA1 Message Date
Michael 132688d663 Standards, what else? 2017-03-19 08:04:04 +00:00
Michael 1a436264cd Some standards 2017-03-18 12:13:43 +00:00
Michael 222550e784 From now on we are using 0001-01-01 as lowest date 2017-03-18 11:42:54 +00:00
Michael 62ccb4499a Some more unneeded changes reverted 2017-03-18 08:54:25 +00:00
Michael a2a171af06 "dob" is not a date field, so the changes are reverted 2017-03-18 08:50:27 +00:00
Michael e301fa0832 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 2017-03-18 08:31:43 +00:00
Michael f3bcf63d46 Standards and some logging improvements 2017-03-17 19:25:01 +00:00
Michael 87771cf617 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
Conflicts:
	include/discover_poco.php
2017-03-17 15:53:19 +00:00
rabuzarus 3cef98caf6 Merge pull request #3226 from annando/1702-only-worker
The worker is now the only background processing system
2017-03-17 13:22:23 +01:00
Michael 24a57020b9 Better version transformation for nodeinfo and statistics.json 2017-03-16 21:34:53 +00:00
Michael 58bf1c50af Bugfix: When a query fails we mustn't use the result value. 2017-03-16 09:23:12 +00:00
Michael 4812f4c0f9 Without only the worker queue we don't need the deliverq anymore. 2017-03-16 07:30:59 +00:00
Michael a211c8cb77 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-16 05:51:22 +00:00
rabuzarus 6fdc219143 Merge pull request #3227 from annando/1703-pdo
We now support PDO
2017-03-16 00:25:16 +01:00
Michael 88a69b93d5 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 2017-03-15 13:56:17 +00:00
Michael 8decd15565 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-15 13:55:43 +00:00
Michael dc3fcf0487 Standard stuff 2017-03-15 06:00:22 +00:00
Michael 35ec1c8f26 Bugfix for pull request 3216 - feed items were mixed 2017-03-14 21:14:09 +00:00
Michael Vogel e57bd5fe55 Merge pull request #3233 from rabuzarus/20170314_-_pagination
limit pagination page buttons to  max 10
2017-03-14 20:05:29 +01:00
rabuzarus 0143369e54 limit pagination page buttons to max 10 2017-03-14 18:31:03 +01:00
Michael Vogel a7e8e86800 Merge pull request #3221 from strk/remember-openid
Fix "remember me" cookie for OpenID logins
2017-03-14 16:30:15 +01:00
Michael 0d32f0be46 One forgotten standard 2017-03-14 15:18:56 +00:00
Michael f73389dd12 Standard stuff 2017-03-14 15:17:21 +00:00
fabrixxm fa3490ba5b Merge pull request #3224 from annando/1702-no-old_pager
The old pager is now removed
2017-03-14 10:29:03 +01:00
Michael 43ceb72196 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-14 07:26:15 +00:00
Michael Vogel 199bba20d9 Merge pull request #3200 from Hypolite/issue/#3195
Improve pagination on frio
2017-03-14 06:05:42 +01:00
Michael 748caa0807 Removed debug output 2017-03-14 04:58:05 +00:00
Michael a2b7b2a968 Daily updating the server status 2017-03-13 22:16:09 +00:00
Sandro Santilli 0b46a5f935 Standards: add braces
(thanks @Hypolite)
2017-03-13 23:09:09 +01:00
Sandro Santilli 8517ba1fab Remove extra space after open parentheses 2017-03-13 23:08:03 +01:00
Michael Vogel 98945eb6fa Merge pull request #3213 from Hypolite/issue/#2792-2
Like behavior fix/improvements
2017-03-13 18:35:32 +01:00
Michael ae64f6f7e2 z_fetch_url now always returns an array 2017-03-13 14:37:51 +00:00
Sandro Santilli cbaf196f50 Only remove the "remember me" cookie at submitting the auth form
Fixes loss of remember (Friendica) cookie on switching Managed accounts
2017-03-13 11:59:05 +01:00
Michael fbb84ee219 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-13 10:18:29 +00:00
Michael 44888590e5 One error, one documentation, one brace 2017-03-13 06:32:33 +00:00
Michael acadb8ecdb Remove redundancies. 2017-03-13 06:09:00 +00:00
Michael eb6a6228f7 more spaces 2017-03-13 05:57:37 +00:00
Michael 80e58964ce Standard stuff 2017-03-13 00:09:32 +00:00
Michael 97d3176754 Querying via nodeinfo 2017-03-13 00:03:27 +00:00
Michael 49b22de705 Changes from previous pull request applied again 2017-03-12 21:57:09 +00:00
Michael e10339a47f Merge remote-tracking branch 'upstream/develop' into 1703-pdo 2017-03-12 21:05:10 +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
Michael 1624150db4 Merge remote-tracking branch 'upstream/develop' into 1702-null-date
Conflicts:
	include/onepoll.php
2017-03-12 20:54:28 +00:00
Michael 259598e569 Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share 2017-03-12 20:52:48 +00:00
Michael 044e9a6603 Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
Conflicts:
	mod/profile.php
2017-03-12 20:52:14 +00:00
Michael 18d23ca443 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-12 20:49:48 +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