Commit graph

14479 commits

Author SHA1 Message Date
Hypolite Petovan 8f7d191bfc Merge branch 'develop' into 20170316_-_fix_event_edit 2017-03-20 11:08:07 -04:00
Michael Vogel eaf308ad01 Merge pull request #3250 from tobiasd/20170320-msg
regenerated master messages.po file
2017-03-20 08:40:37 +01:00
Tobias Diekershoff 8bd8e858d0 regenerated master messages.po file 2017-03-20 08:27:10 +01:00
Tobias Diekershoff 3021254f85 Merge pull request #3247 from annando/issue-3242-b
If the maintenance reason is a url, then redirect to this address
2017-03-20 07:20:23 +01:00
Michael 62915007c6 Test code removed 2017-03-20 04:37:59 +00:00
Michael aa4f9c985f Enhanced explanation 2017-03-20 04:37:13 +00:00
Hypolite Petovan 8c8b8c32d9 Merge pull request #3249 from annando/bugfix-dbstructure
Bugfix for issue 3242 - forgotten "use"
2017-03-19 21:00:55 -04:00
Michael b42a977894 Bugfix for issue 3242 - forgotten "use" 2017-03-19 22:58:35 +00:00
Michael 24ee60492b If the maintenance reason is a url, then redirect to this address 2017-03-19 19:03:09 +00:00
Hypolite Petovan 65f809f5cb Merge pull request #3245 from annando/issue-3242
Issue 3242: Define a maintenance reason
2017-03-19 11:06:25 -04:00
Hypolite Petovan 7dfe6d1580 Merge pull request #3243 from annando/1702-null-date
Datetime compatibility to MySQL restored
2017-03-19 11:03:32 -04:00
Michael 51f93346d6 Standards, like always 2017-03-19 14:57:36 +00:00
Michael e93825b9f0 Some more standards 2017-03-19 14:43:24 +00:00
Michael 8dd732a896 Issue 3242: Define a maintenance reason 2017-03-19 13:24:07 +00:00
Michael b06d787130 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 2017-03-19 08:06:02 +00:00
Michael 132688d663 Standards, what else? 2017-03-19 08:04:04 +00:00
rabuzarus 080e2af882 Merge pull request #3244 from annando/bugfix-text
You shouldn't use a text variable like an array.
2017-03-19 00:51:57 +01:00
Michael fb5f1f61fc You shoudln't use a text variable like an array. 2017-03-18 23:32:59 +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
Tobias Diekershoff 909e1e055f Merge pull request #3228 from annando/1702-detect-server
Server type detection is improved
2017-03-18 09:10:03 +01:00
rabuzarus 497df57ef7 more standards work 2017-03-18 04:41:54 +01:00
Michael f3bcf63d46 Standards and some logging improvements 2017-03-17 19:25:01 +00:00
rabuzarus e1d22ef5d4 some code cleanup 2017-03-17 19:10:48 +01:00
rabuzarus c785eb29c6 more work on standards compliance 2017-03-17 17:57:57 +01: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
rabuzarus 1dd839c2c2 Merge pull request #3240 from annando/bugfix-dba
Bugfix: When a query fails we mustn't use the result value.
2017-03-17 13:20:56 +01:00
Michael 24a57020b9 Better version transformation for nodeinfo and statistics.json 2017-03-16 21:34:53 +00:00
rabuzarus 8ae8465d48 add dop event & fix event edit 2017-03-16 20:15:25 +01: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
rabuzarus b4bad92657 Merge pull request #3239 from Hypolite/issue/#3194-2
Fix wrong deferred function name
2017-03-15 19:53:16 +01:00
Hypolite Petovan 35ba3cce70 Fix wrong deferred function name 2017-03-15 14:42:34 -04: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
rabuzarus b8e8c96386 Merge pull request #3236 from annando/bugfix-feed
Bugfix for pull request 3216: Feed items were mixed
2017-03-15 12:18:49 +01: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 187a81f159 Merge remote-tracking branch 'upstream/develop' into develop 2017-03-14 21:13:02 +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