Damian Mooyman
87c7a53511
Merge remote-tracking branch 'origin/4.1' into 4
...
# Conflicts:
# .travis.yml
2018-04-13 09:56:58 +12:00
Damian Mooyman
5a8c5601a9
Merge remote-tracking branch 'origin/4.0' into 4.1
...
# Conflicts:
# .travis.yml
# composer.json
2018-04-13 09:55:23 +12:00
Damian Mooyman
c54b07a952
API Update to use new chromedriver + behat-extension + facebook/webdriver
2018-04-12 14:19:14 +12:00
Robbie Averill
af2c3886b9
Merge branch '4.1' into 4
2018-04-10 16:27:00 +12:00
Will Rossiter
09cc75a656
MINOR Add visiblity to SelectionGroup test functions
2018-04-05 10:33:27 +12:00
Will Rossiter
2512761587
Fix invalid markup in SelectionGroup selected values
2018-04-05 10:16:25 +12:00
Ingo Schommer
983a724ea5
Merge pull request #7399 from dhensby/pulls/4/reduce-dependence-on-session-for-reading-mode
...
Reduce dependence on session state for accessing draft stages
2018-03-23 16:19:26 +13:00
Damian Mooyman
df9e0e40d3
Deprecate useDraftStage
2018-03-22 17:23:50 +13:00
Damian Mooyman
257ff69e32
API Implement many_many through polymorphic (from only) ( #7928 )
...
* API Support many_many through polymorphic relations (from side only)
Fixes #7911
Fixes #3136
* Add extra docs and allow optional arguments
* ENHANCEMENT Enable quiet to be turned off
* BUG Fix issue with manymanythroughlist duplication
2018-03-22 10:26:25 +13:00
Damian Mooyman
8b9c292509
Merge remote-tracking branch 'origin/4.1' into 4
2018-03-13 14:26:39 +13:00
Damian Mooyman
625f7b4eee
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-03-13 14:26:18 +13:00
Damian Mooyman
3a1c813b28
API Add getContentCSS() / setContentCSS() to allow per-config customisation of content_css
...
Fixes #7873
2018-03-05 16:10:44 +13:00
Roman Schmid
40c2e299a0
Fix "mb_stripos(): Empty delimiter" warning when no search-keywords are given for DBText::ContextSummary.
...
Add unit-test to cover that case.
2018-03-01 11:39:30 +01:00
Daniel Hensby
9006daf20b
Cleaning up PR and adding tests
2018-02-28 13:31:56 +00:00
Aaron Carlino
0863bac29a
Update getVariables to return a copy of globals rather than including the reference in an array merge
2018-02-27 09:52:36 +13:00
Daniel Hensby
722f2d178a
Merge branch '4.1' into 4
2018-02-26 10:57:52 +00:00
Daniel Hensby
856e89998b
Merge branch '4.0' into 4.1
2018-02-26 10:56:45 +00:00
Damian Mooyman
b27102f810
BUG Fix incorrect assets created when ASSETS_PATH !== BASE_PATH . '/assets'
2018-02-26 13:12:08 +13:00
Aaron Carlino
d91648dd6e
Update getVariables to return a copy of globals rather than including the reference in an array merge
2018-02-23 16:25:41 +13:00
Daniel Hensby
ced2ba1f64
API Move CSV writing/reading to league/csv library
2018-02-22 09:22:37 +13:00
Daniel Hensby
dace2f179d
Merge branch '4.1' into 4
2018-02-21 13:58:45 +00:00
Daniel Hensby
c04ff8c55a
Merge branch '4.0' into 4.1
2018-02-21 13:40:30 +00:00
Damian Mooyman
0e26c06644
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 12:20:18 +13:00
Damian Mooyman
12e701c8ed
Merge remote-tracking branch 'origin/4.1' into 4
2018-02-15 09:28:14 +13:00
Damian Mooyman
34233c0470
Update reference to TestAssetStore
2018-02-14 16:24:12 +13:00
Damian Mooyman
0b7cf80331
BUG Fix incorrect convert slashes argument
2018-02-13 16:33:35 +13:00
Daniel Hensby
16d3498a56
Merge branch '4.1' into 4
2018-02-12 10:26:07 +00:00
Daniel Hensby
7ec5fa2c8d
Merge branch '4.0' into 4.1
2018-02-09 15:19:15 +00:00
Daniel Hensby
e298fcc345
Merge branch '3.6' into 4.0
2018-02-09 14:32:58 +00:00
Daniel Hensby
48a8a82326
Merge branch '3.5' into 3.6
2018-02-09 13:20:38 +00:00
Chris Joe
95308e1af6
Merge pull request #7849 from open-sausages/pulls/4.0/fix-debug-string-class-cli
...
BUG Fix issue with CLIDebugView failing on class name of existing class
2018-02-09 15:41:18 +13:00
Daniel Hensby
d3278d5470
FIX Add Nested DB transaction support ( #7848 )
...
* TEST Prove nested transactions break
* Add nested transaction support
2018-02-09 10:28:32 +13:00
Damian Mooyman
0a486b8f57
BUG Fix issue with CLIDebugView failing on class name of existing class
...
Fixes #7827
2018-02-09 09:52:32 +13:00
JorisDebonnet
5df1ec7eee
Use fputcsv in GridFieldExportButton
2018-02-08 12:26:29 +00:00
Robbie Averill
dd82820242
NEW Allow GridFieldConfig::addComponents to accept an array ( #7844 )
2018-02-08 11:06:27 +13:00
Andrew Aitken-Fincham
860fa2a05a
API Add excludeAny() and tests for complicated excludes/filters ( #7838 )
2018-02-08 09:20:17 +13:00
Damian Mooyman
2f1f5c0caa
Merge remote-tracking branch 'origin/4.0' into 4
2018-02-07 11:48:46 +13:00
Daniel Hensby
660dfd34a8
FIX Issue where default admin has no password encryption
2018-02-06 20:18:32 +00:00
Daniel Hensby
62057befdb
Merge branch '4.0' into 4
2018-02-06 10:08:17 +00:00
Daniel Hensby
28ca11dd7e
FIX Regex range identifier correctly escaped
2018-02-05 15:17:20 +00:00
Damian Mooyman
e359948eb3
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# src/Core/CoreKernel.php
2018-02-05 17:52:38 +13:00
Damian Mooyman
db9aa2c5c7
BUG Fix regression in has_one getters breaking DataDifferencer
2018-02-05 16:16:07 +13:00
Damian Mooyman
aa2c71424d
API Implement cascade_duplications
...
API Add DataObject::setComponent()
API Support unary components as getter and setter fields
API ManyManyList::add() now supports unsaved records
ENHANCEMENT Animal farm
2018-02-05 12:04:57 +13:00
Damian Mooyman
288aaf083c
BUG Fix issue with DebugView failing on class name of existing class
...
Fixes #7827
2018-02-05 10:45:49 +13:00
Damian Mooyman
740c3326e9
BUG Fix critical issue with incorrectly saved session data
2018-02-02 15:08:52 +13:00
Damian Mooyman
4da99efd5d
Merge remote-tracking branch 'origin/3.5' into 3.6
2018-01-31 16:03:42 +13:00
Christopher Joe
456871fd91
Enhancement Updated PasswordValidator to fallback to config options - still retains instance variables
2018-01-31 10:54:43 +13:00
Robbie Averill
3d7ecc5240
FIX Allow cleanup marker regex to handle self closing HTML5 tags
2018-01-30 11:16:21 +13:00
Damian Mooyman
76d2db12b0
Merge pull request #7794 from kinglozzer/id-like-to-place-an-ordinal
...
NEW: Add support for ordinals in DBDate::Format()
2018-01-26 09:27:46 +13:00
Loz Calver
fcf5022550
NEW: Add support for ordinals in DBDate::Format()
2018-01-25 09:41:06 +00:00
