Commit Graph

18959 Commits

Author SHA1 Message Date
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
Daniel Hensby
b77274c1a3
FIX Add unique prefix to cache stores to prevent cache leak 2017-07-18 23:43:08 +01:00
Daniel Hensby
d7095c2213
Merge branch '3' into 4 2017-07-18 14:19:16 +01:00
Daniel Hensby
43e0befcc1 Merge pull request #7185 from robbieaverill/patch-8
FIX Exclude thirdparty dir from code coverage
2017-07-18 12:02:21 +01:00
Daniel Hensby
297755d323
Merge branch '3.6' into 3 2017-07-18 12:00:33 +01:00
Daniel Hensby
7e732da709
Merge branch '3.5' into 3.6 2017-07-18 12:00:04 +01:00
Daniel Hensby
fa8f0cc955 Merge pull request #7141 from bummzack/fix-7132-utf8
Fix OS X issue with some string methods.
2017-07-18 11:59:16 +01:00
Daniel Hensby
d59e2dbe5b Merge pull request #7183 from robbieaverill/pulls/4.0/fix-log-in-as-someone-else
FIX Log in as someone else returns user back to login screen
2017-07-18 11:54:33 +01:00
Robbie Averill
ac388a5591 FIX Exclude thirdparty dir from code coverage 2017-07-18 22:21:45 +12:00
Sacha Judd
f367a0aa62 NEW add web accessible colours to web view dev/build 2017-07-18 22:00:35 +12:00
Robbie Averill
ba9ad55274 FIX Base URL defaults to a slash in currentURL if not defined already 2017-07-18 21:56:21 +12:00
Robbie Averill
8b12e97d7a FIX Enable code coverage builds with phpdbg and 7.1.7
PHP 7.1.7 is currently not segfaulting when generating coverage reports with phpdbg
2017-07-18 21:56:21 +12:00
Robbie Averill
a5ca4ecb59 FIX Log in as someone else returns user back to login screen 2017-07-18 17:15:58 +12:00
Damian Mooyman
ed0ed89865 Merge pull request #7055 from robbieaverill/pulls/4.0/polymorphic-has-one-indexes
NEW Ensure polymorphic has_one fields are indexed
2017-07-18 16:39:45 +12:00
Robbie Averill
fb18e441a7 DBIndexable::getIndexSpecs is responsible for returning a DBFields full indexable spec 2017-07-18 15:03:56 +12:00
Chris Joe
1c6505f2e4 Merge pull request #6936 from open-sausages/pulls/4.0/link-inline-toolbar
Remove "Remove link" button from the editor's main toolbar
2017-07-18 13:50:06 +12:00
Saophalkun Ponlu
c2841b6d64 Enhancement Remove "Remove link" button from the editor's main toolbar
Fix behat for selecting link should focus on field
2017-07-18 13:11:27 +12:00
Damian Mooyman
de7b746094 Merge pull request #7180 from robbieaverill/pulls/4.0/remove-config-update-use
Use merge and set instead of update for config calls
2017-07-18 09:16:20 +12:00
Daniel Hensby
be7b2d4970 Merge pull request #7179 from robbieaverill/pulls/4.0/is-cli-for-phpdbg
FIX Ensure phpdbg calls are registered by SilverStripe core as a CLI call
2017-07-17 14:26:39 +01:00
Daniel Hensby
4f095ea61d Merge pull request #7175 from robbieaverill/pulls/4.0/version-provider
FIX Version provider uses non LSB config getters, move LeftAndMain config to admin module
2017-07-17 14:01:22 +01:00
Robbie Averill
da4e46e4de FIX Use merge and set instead of update for config calls 2017-07-17 17:59:40 +12:00
Robbie Averill
ea4181166f FIX Ensure phpdbg calls are registered by SilverStripe core as a CLI call 2017-07-17 16:56:01 +12:00