Commit Graph

18779 Commits

Author SHA1 Message Date
Daniel Hensby
884f53e0f2
Merge branch '3' into 4 2017-07-25 16:17:44 +01:00
Daniel Hensby
4ca96eae48
Merge branch '3.6' into 3 2017-07-25 16:03:35 +01:00
Daniel Hensby
fc35eff13f
Merge branch '3.5' into 3.6 2017-07-25 16:02:56 +01:00
Daniel Hensby
ba8c149b78
Stay on travis precise dist for now 2017-07-25 16:02:02 +01:00
Damian Mooyman
a8187a3203 Merge pull request #7196 from open-sausages/pulls/4.0/search-default-listview
Add step definition for cms list
2017-07-25 12:08:06 +12:00
Damian Mooyman
f6a5133c2f
Consolidate behat context code 2017-07-25 11:46:40 +12:00
Damian Mooyman
2c500c79c3 Merge pull request #7201 from kinglozzer/build-perf
Ensure ClassManifest isn't flushed twice on build
2017-07-25 09:51:00 +12:00
Daniel Hensby
6aeab571db Merge pull request #7195 from open-sausages/pulls/4.0/missing-unnested-from
BUG Fix unassigned nestedFrom
2017-07-24 17:07:07 +01:00
Loz Calver
ad2e1cf552 Ensure ClassManifest isn't flushed twice on build 2017-07-24 09:36:03 +01:00
Damian Mooyman
4a4d4d079f Merge pull request #7203 from dhensby/pulls/4/rename-test-helper
Rename badly named test helper
2017-07-24 10:27:56 +12:00
Damian Mooyman
40d7fae629 Merge pull request #7200 from dhensby/pulls/4/yml-syntax
FIX Deprecated yml syntax
2017-07-24 10:23:12 +12:00
Damian Mooyman
43f5a1fd7e Merge pull request #7197 from robbieaverill/pulls/4.0/add-updaterules-extension
NEW Add updateRules extension point to Director::handleRequest
2017-07-24 10:18:48 +12:00
Robbie Averill
392cda15f6 NEW Add updateRules extension point to Director::handleRequest 2017-07-23 22:10:46 +12:00
Daniel Hensby
4a1fb37d0f
Rename badly named test helper 2017-07-21 15:59:14 +01:00
Daniel Hensby
5bf9ccc235
FIX Deprecated yml syntax 2017-07-21 15:41:44 +01:00
Daniel Hensby
43620129c0 Merge pull request #7198 from open-sausages/pulls/4.0/fix-config-rules
BUG fix config rules to match updated `Except`
2017-07-21 15:23:33 +01:00
Damian Mooyman
d5ab45990d Lock travis to precise 2017-07-21 22:21:14 +12:00
Damian Mooyman
2385b73855
BUG fix config rules to match updated Except 2017-07-21 15:02:27 +12:00
Chris Joe
6a3c51e072 Merge pull request #7036 from fullscreeninteractive/wilr-patch-1
Fix ImportButton not opening the modal
2017-07-21 14:10:31 +12:00
Saophalkun Ponlu
98e77ec1c4 Add step definition for cms list 2017-07-21 12:20:54 +12:00
Damian Mooyman
4af84a2f61 Merge pull request #7192 from dhensby/pulls/4/bootstrap-simplified
Remove EnvironmentType Env var setting for test bootstrap
2017-07-21 11:21:55 +12:00
Chris Joe
3e8b636dc9 Merge pull request #6942 from open-sausages/pulls/3.4/fix-gridfield-state
BUG Ensure GridState_Component is added to GridField config
2017-07-21 10:54:07 +12:00
Klemen Dolinsek
3dd3036792 BUG Ensure GridState_Component is added to GridField config even if we set config with GridField::setConfig
Fixes #6886
2017-07-21 10:32:13 +12:00
Damian Mooyman
6fd6a38949
BUG Fix unassigned nestedFrom
Fixes #7194
2017-07-21 08:58:19 +12:00
Loz Calver
0c6790b7a6 Merge pull request #7193 from dhensby/pulls/4/global-codesniffer
TEST Make travis install codesniffer with composer global
2017-07-20 15:57:21 +01:00
Daniel Hensby
cd28dbef06
TEST Make travis install codesniffer with composer global 2017-07-20 15:12:14 +01:00
Daniel Hensby
7a43bf182e
Remove EnvironmentType Env var setting for test bootstrap 2017-07-20 15:06:07 +01:00
Daniel Hensby
426f3a60c9 Merge pull request #7191 from matmunn/patch-1
Update 01_Linux_Unix.md
2017-07-20 09:48:44 +01:00
Mat Munn
7abc57d4c6 Update 01_Linux_Unix.md
Fixed a typo
2017-07-20 14:30:54 +10:00
Damian Mooyman
e77c7fe04c Merge pull request #7188 from dhensby/pulls/4/fix-full-text-search-table-option
FIX FulltextSearchable  DB engine not set correctly
2017-07-20 12:27:30 +12:00
Damian Mooyman
bce4f67bf4 Merge pull request #7189 from dhensby/pulls/4/redundant-cache-config
Remove redundant cache config
2017-07-20 12:26:47 +12:00
Daniel Hensby
2bd24e0f98 Merge pull request #7169 from open-sausages/pulls/4.0/upgrade-docs-need-an-upgrade
Upgrade the upgrading docs
2017-07-19 18:31:21 +01:00
Daniel Hensby
016e0e657a
Merge branch '3.6' into 3 2017-07-19 15:45:56 +01:00
Daniel Hensby
90be7e806d
Merge branch '3.5' into 3.6 2017-07-19 15:40:01 +01:00
Loz Calver
0c6851e597 Merge pull request #7190 from silverstripe/revert-7035-3.5
Revert "TreeDropDown performance boost."
2017-07-19 15:37:28 +01:00
Daniel Hensby
79c74006fd Merge pull request #7146 from robbieaverill/pulls/4.0/middleware-docs
DOCS Fix typos and formatting in middleware documentation
2017-07-19 15:20:45 +01:00
Daniel Hensby
c3269e2d15 Merge pull request #7147 from robbieaverill/pulls/4.0/minor-docs-fixes
DOCS Update requirements and error handling, fix typos and markdown rendering bugs
2017-07-19 15:20:23 +01:00
Loz Calver
c41c0a957b Merge pull request #7163 from sachajudd/pulls/4.0/debugview-info-color
NEW add web accessible colours to web view dev/build
2017-07-19 15:01:36 +01:00
Daniel Hensby
9b3cfdca87
DOCS typo 2017-07-19 14:25:46 +01:00
Daniel Hensby
7b6aad8a65 Revert "TreeDropDown performance boost." 2017-07-19 12:44:43 +01:00
Daniel Hensby
4b66420f54
Remove redundant cache config 2017-07-19 12:37:30 +01:00
Daniel Hensby
8aeec92087
FIX FulltextSearchable DB engine not set correctly 2017-07-19 12:28:15 +01:00
Aaron Carlino
73652df3c5
Revisions per Robbie, Ingo 2017-07-19 12:17:58 +01:00
Damian Mooyman
844462108e
Fix diff reference 2017-07-19 12:17:51 +01:00
Damian Mooyman
75a6a188e4
Create guide for namespacing user-code
Rewrite of outdated api references
Improve documentation for logging
2017-07-19 12:17:44 +01:00
Aaron Carlino
4f3d090020
revisions per damian, robbie 2017-07-19 12:17:34 +01:00
Aaron Carlino
dcb2424b05
Docs for ownership API 2017-07-19 12:17:27 +01:00
Aaron Carlino
2b9369895d
First pass at upgrade docs 2017-07-19 12:17:22 +01:00
Daniel Hensby
292aaf6530
FIX Cache IDs grouped by site first 2017-07-19 11:29:01 +01:00
Damian Mooyman
d053c9aaac Merge pull request #7186 from dhensby/pulls/3.5/cache-prefix
FIX Add unique prefix to cache stores to prevent cache leak
2017-07-19 11:54:49 +12:00