Robbie Averill
7448622a1a
FIX Replace ini casting to int with explicit split and cast for PHP 7.1. Add tests.
2016-12-29 21:55:52 +13:00
Daniel Hensby
664c0eafbe
Merge branch '3'
2016-12-28 14:30:54 +00:00
Daniel Hensby
c8a40605ec
Merge pull request #6413 from volkerloew/1400-text-contextsummary
...
search term highlighting without altering case (fixes #1400 )
2016-12-28 13:36:08 +00:00
Volker Löw
5e581eace7
search term highlighting without altering case ( fixes #1400 )
2016-12-28 13:03:35 +00:00
Daniel Hensby
1b1f8ed731
Merge branch '3.5' into 3
2016-12-28 11:37:10 +00:00
Daniel Hensby
054cbaa219
Merge pull request #6437 from open-sausages/pulls/4.0/update-apollo-client
...
Updated apollo-client
2016-12-28 11:32:13 +00:00
Damian Mooyman
a9b7a489d1
Merge 3.5 into 3
2016-12-22 13:19:08 +13:00
Damian Mooyman
b1b3a6ee13
Merge 3.4 into 3.5
2016-12-22 13:18:37 +13:00
Damian Mooyman
0bcd40545d
Merge 3.5.1 into 3.5
2016-12-22 13:17:18 +13:00
Damian Mooyman
94c3bc9fa1
Merge 3.4.3 into 3.4
2016-12-22 13:16:12 +13:00
Damian Mooyman
28d065c587
Added 3.4.3 changelog
2016-12-22 12:02:45 +13:00
Ingo Schommer
120bcee4f8
Updated apollo-client
2016-12-22 11:26:44 +13:00
Damian Mooyman
9de539fdab
Added 3.5.1 changelog
2016-12-22 10:43:34 +13:00
Damian Mooyman
f314b86ad8
BUG Temp disable shortcode SPLIT behaviour due to crash ( #6436 )
...
Fixes #5987
2016-12-22 10:08:46 +13:00
Will Rossiter
f4bf0cad3b
Merge pull request #6420 from open-sausages/pulls/4.0/graphql
...
Gallery View & Create Folder uses GraphQL (fixes #316 )
2016-12-22 09:24:15 +13:00
Damian Mooyman
ffdb99e78d
BUG Temp disable shortcode SPLIT behaviour due to crash ( #6436 )
...
Fixes #5987
2016-12-21 18:55:00 +13:00
Ingo Schommer
b0e0e99026
Merge pull request #6435 from silverstripe/revert-6424-patch-9
...
Revert "Optimised keyedColumn() and map() for MySQLQuery"
2016-12-21 18:23:55 +13:00
Damian Mooyman
5aa52f1343
Revert "Optimised keyedColumn() and map() for MySQLQuery"
2016-12-21 14:48:26 +13:00
Damian Mooyman
9be5142fc1
API ChangeSet::publish() / canPublish() no longer treats hasChanges() = false as a permission error
...
BUG fix issues with doArchive() in live mode
2016-12-21 14:28:20 +13:00
Damian Mooyman
fd9b872cb5
Merge pull request #6425 from andrewandante/bugfix/duplicating-copies-created-dbfield
...
remove Created field on duplicate
2016-12-21 09:43:53 +13:00
Daniel Hensby
8b8ea1aab0
Merge pull request #6426 from robbieaverill/bugfix/gridfield-filter-panel-selector
...
FIX Make GridField filter button selector more specific
2016-12-20 10:58:37 +00:00
Mike Cochrane
4c6936834e
Optimised keyedColumn() and map() for MySQLQuery ( #6424 )
...
* Optimised keyedColumn() and map() for MySQL
* WS
* Add unit tests for map() and keyedColumn()
2016-12-20 10:57:37 +00:00
Ingo Schommer
603b64c871
GraphQL
2016-12-20 17:20:06 +13:00
Damian Mooyman
1c76148b1c
Merge pull request #6428 from open-sausages/pulls/4.0/replace-file
...
File replacement action
2016-12-20 15:06:38 +13:00
Robbie Averill
8ad030baba
FIX Make GridField filter button selector more specific
2016-12-20 09:03:14 +13:00
Dan Hensby
26cd99de22
Added 3.5.1-rc2 changelog
2016-12-19 16:28:18 +00:00
Daniel Hensby
c794c29ddb
Merge branch '3.4' into 3.4.3
2016-12-19 16:17:44 +00:00
Daniel Hensby
2d8ac831ad
Merge branch '3.5' into 3.5.1
2016-12-19 16:16:26 +00:00
Daniel Hensby
8dc250455e
Merge branch '3.4' into 3.5
2016-12-19 16:15:46 +00:00
Daniel Hensby
6455430658
Merge pull request #6414 from PingMetal/patch-1
...
Fixed a pagination bug
2016-12-19 15:24:35 +00:00
PingMetal
222ee6bde2
Fixed a pagination bug
...
Depending on the current page, a page not supposed to show up in the pagination summary can be skipped without returning a null value. It makes it difficult to know it is existent, but just skipped.
2016-12-19 14:54:06 +00:00
Daniel Hensby
273a06d47d
TEST Duplicated DataObjects dont keep Created date value
2016-12-19 14:23:39 +00:00
Andrew Aitken-Fincham
eecdf56b36
remove Created field on duplicate
2016-12-19 13:50:48 +00:00
Dan Hensby
98b8fefad8
Added 3.4.3-rc1 changelog
2016-12-19 12:21:39 +00:00
Dan Hensby
bf3c129ec1
Update translations
2016-12-19 12:21:38 +00:00
Daniel Hensby
19dd8d6824
Merge branch '3.5' into 3
2016-12-19 11:18:00 +00:00
Daniel Hensby
78ed003977
Merge branch '3.4' into 3.5
2016-12-19 10:48:10 +00:00
Daniel Hensby
2918463619
Merge pull request #6410 from tractorcow/pulls/3.4/fix-htmlfield-casting
...
BUG Suppress HTMLEditorField casting
2016-12-19 06:26:51 +00:00
Damian Mooyman
c2a1e86f5d
Apply PSR2 / Namespace to remaining admin / tests
2016-12-19 16:08:19 +13:00
Damian Mooyman
fae0055544
BUG Fix missing TRAVIS_NODE_VERSION ( #6419 )
...
Fixes #6418
2016-12-19 16:07:02 +13:00
Damian Mooyman
c007e85d1b
BUG Suppress HtmlEditorField casting
...
Fixes #6396
2016-12-19 16:03:48 +13:00
Christopher Joe
d8843c6fe2
Enhancement Split out the fetch call easier mocking
...
API shirted getFileExtension to DataFormat
2016-12-19 10:11:14 +13:00
Christopher Joe
bb71a37cc8
API added enlarge icon
...
API added autofill callback in FormBuilder for fields to programmatically change another field value
2016-12-19 10:09:35 +13:00
Damian Mooyman
fd9ee8aed3
Merge pull request #6379 from open-sausages/pulls/4.0/psr-coding-conventions
...
Updated coding conventions for PSR-2
2016-12-19 09:41:02 +13:00
Damian Mooyman
534d0f16a3
Merge pull request #6314 from chillu/pulls/4.0/contributing-composer-install
...
Composer contributing docs
2016-12-19 09:40:02 +13:00
Dan Hensby
d249dc9c86
Added 3.5.1-rc1 changelog
2016-12-16 20:49:07 +00:00
Dan Hensby
e57d7a30bd
Update translations
2016-12-16 20:49:05 +00:00
Daniel Hensby
4a74db2c5f
Merge pull request #6392 from open-sausages/pulls/4.0/uploadfield-entwine
...
ENHANCEMENT Enable UploadField.js within non-react sections
2016-12-16 16:12:56 +00:00
Daniel Hensby
efd8114fd5
Merge branch '3.4' into 3.5
2016-12-16 15:52:53 +00:00
Damian Mooyman
1ea4f29dbe
Merge pull request #6404 from mediabeastnz/patch-3
...
Updated location of custom field templates
2016-12-16 15:21:26 +13:00
