Robbie Averill
bbf4b67e23
Merge branch '1.3' into 1
2017-09-08 14:58:21 +12:00
Robbie Averill
827f4f2fe9
Merge branch '1.2' into 1.3
2017-09-08 14:58:01 +12:00
Robbie Averill
f0b762cd0d
Merge branch '1.1' into 1.2
2017-09-08 14:46:50 +12:00
Robbie Averill
c1bf1bcc21
Merge branch '1.0' into 1.1
2017-09-08 14:41:11 +12:00
Robbie Averill
2cbdeba69a
BUG Remove Behat tests from Travis matrix for SS3
2017-09-08 14:31:02 +12:00
Robbie Averill
58b8476ede
Merge branch '1'
2017-09-08 13:57:10 +12:00
Robbie Averill
e84c4f5d7d
Merge branch '1.3' into 1
2017-09-08 13:55:16 +12:00
Robbie Averill
4884bdde05
Merge branch '1.2' into 1.3
2017-09-08 13:54:28 +12:00
Robbie Averill
4328c20b45
Merge branch '1.1' into 1.2
2017-09-08 13:54:05 +12:00
Robbie Averill
669995d544
Use precise distro on Travis
2017-09-08 13:52:59 +12:00
Robbie Averill
20b81fc4b0
Merge branch '1.0' into 1.1
2017-09-08 13:52:05 +12:00
Damian Mooyman
9d186d6e7a
Merge pull request #307 from creative-commoners/pulls/2.0/upgrade-exclusions
...
Add upgrade exclusion rules
2017-09-08 13:09:40 +12:00
Damian Mooyman
bd26907abf
Merge pull request #306 from creative-commoners/pulls/1.0/remove-transifex
...
SS3 translations are frozen. Please contribute translation fixes via pull requests to lang files.
2017-09-08 13:09:23 +12:00
Daniel Hensby
f7bdc570d1
Merge pull request #300 from wernerkrauss/sanitise-error-filename
...
Sanitise filenames for error pages
2017-09-07 14:23:00 +01:00
Werner M. Krauß
2da5828e90
Sanitise filenames for error pages
...
fixes #299
2017-09-07 11:19:07 +02:00
Robbie Averill
de2220754c
Add upgrade exclusion rules
2017-09-07 17:01:49 +12:00
Robbie Averill
df4f68be08
SS3 translations are frozen. Please contribute translation fixes via pull requests to lang files.
2017-09-07 16:47:42 +12:00
Damian Mooyman
aab69e0baa
Merge pull request #304 from creative-commoners/pulls/2.0/namespace-templates
...
API Move templates to namespaced location, remove unused templates
2017-09-07 16:43:46 +12:00
Robbie Averill
8c4a4e743c
API Move templates to namespaced location, remove unused templates
...
templates/LeftAndMain_Menu.ss looks to be a copy of the fully namespaced version, which is no longer used - removed. GridFieldAddFromTemplateButton also looks to be unused, so was also removed.
2017-09-07 16:20:01 +12:00
Robbie Averill
e331c51abb
NEW Add segment to SubsiteCopyPageTask
2017-09-07 16:00:40 +12:00
Franco Springveldt
a7fee1729e
Merge pull request #302 from creative-commoners/pulls/2.0/fix-db-not-ready-delegation
...
FIX Ensure delegated requests are continued when DB builds fail in middleware
2017-09-07 15:58:53 +12:00
Robbie Averill
56accd0856
FIX Ensure delegated requests are continued when DB builds fail in middleware
2017-09-07 15:54:53 +12:00
Damian Mooyman
adfa7257d7
Merge pull request #294 from creative-commoners/pulls/2.0/fix-tests
...
Fix up test suite, re-enable Behat, update further SS4 API changes
2017-09-06 10:26:05 +12:00
Robbie Averill
19aeb8fd64
API Add getSubsiteIdWasChanged calculated dynamically
2017-09-05 13:48:28 +12:00
Robbie Averill
65f85faff6
FIX Catch database exceptions in middleware when DB is not ready, set session ID after delegation
2017-09-05 12:07:49 +12:00
Robbie Averill
1ac6e78bb3
FIX Remove session coupling, leave it to middleware. Use state instead.
2017-09-04 11:45:21 +12:00
Robbie Averill
793b46ede3
FIX Update i18n::validate_locale for SS4
2017-09-01 12:33:16 +12:00
Robbie Averill
314f218306
Merge branch '1'
2017-09-01 12:30:43 +12:00
Robbie Averill
ffe0d61c4f
Merge branch '1.3' into 1
2017-09-01 12:29:48 +12:00
Robbie Averill
c3471ece1c
Merge pull request #288 from gregsmirnov/pulls/1.3/fix-subsite-page-language
...
Fix page rendering with proper subsite locale
2017-09-01 12:22:34 +12:00
Robbie Averill
b9582167c7
Mark SubsitesVirtualPage tests as incomplete, need to be fixed later
2017-08-31 14:17:47 +12:00
Robbie Averill
d934fbe08c
FIX Update behat tests and add configuration
2017-08-31 10:21:46 +12:00
Robbie Averill
1a9797c185
FIX Remove last use of static session methods, update some namespaces and assertion fixes
2017-08-31 09:44:09 +12:00
Damian Mooyman
46bcffaa86
Merge pull request #293 from creative-commoners/pulls/2.0/add-subsite-state
...
NEW Add SubsiteState and initialisation middleware
2017-08-30 17:42:41 +12:00
Robbie Averill
b0087b9035
FIX Allow persisted subsite IDs to session from state, fix remaining unit tests
2017-08-30 15:29:13 +12:00
Robbie Averill
c155855100
FIX Update API changes in ErrorPage and typo in extension config class name
2017-08-30 12:14:11 +12:00
Robbie Averill
c620ff02f4
FIX LeftAndMain references to owner class, replace Member::currentUser usage
2017-08-30 12:04:43 +12:00
Robbie Averill
38031887a9
FIX Update alternateTreeTitle to updateTreeTitle
2017-08-30 11:54:42 +12:00
Robbie Averill
e129cafa94
NEW Add SubsiteState and initialisation middleware, replace Subsite::currentSubsiteID use
2017-08-30 11:47:11 +12:00
Damian Mooyman
5cf2d87e59
Merge pull request #291 from creative-commoners/pulls/2.0/update-travis-config
...
Update Travis configuration for PHP 5.6-7.1, add composer dependencies and codecov.io config
2017-08-29 18:18:04 +12:00
Robbie Averill
ce360aa383
Comment out Behat Travis runs, needs some love
2017-08-29 17:49:01 +12:00
Robbie Averill
c081de1202
FIX Replace static assertions with instance calls
2017-08-29 17:43:29 +12:00
Robbie Averill
7ffaf61aeb
FIX Update tests API implementations, add missing fixture namespaces
2017-08-29 17:43:29 +12:00
Robbie Averill
8d8ee14cc2
FIX Run SS standard PHP linter, separate SiteTree test mock classes
2017-08-29 17:43:28 +12:00
Robbie Averill
9fdc1d6607
Update Travis configuration for PHP 5.6-7.1, add composer dependencies and codecov.io config
2017-08-29 17:43:14 +12:00
Damian Mooyman
60725e7b5c
Merge pull request #289 from wernerkrauss/fix-ss-4-master
...
SilverStripe 4 Compatibility
2017-08-29 16:47:29 +12:00
Garion Herman
8be959f747
Migrate excluded report to YAML config.
2017-08-28 22:23:39 +12:00
Garion Herman
ddefef11d6
Fix Subsite picker UI, reformat CSS.
2017-08-28 22:10:40 +12:00
Garion Herman
af6f499cac
Add non-blank default to ThemeFieldEmptyString translation.
2017-08-28 22:05:01 +12:00
Garion Herman
9a289a2e17
Merge branch 'master' into fix-ss-4-master
2017-08-28 21:52:32 +12:00
