Chris Joe
90ce2abecb
Merge pull request #7422 from open-sausages/pulls/4.0/flags-in-gridfield
...
Add gridfield versioned columns
2017-10-06 14:39:02 +13:00
Christopher Joe
578f3f208c
Fix behat test
2017-10-06 13:40:11 +13:00
Saophalkun Ponlu
1a324d9d77
Wrap content gridfield cell in another non-td element for styling
2017-10-06 11:47:38 +13:00
Daniel Hensby
16cac4e3bd
Merge branch '3' into 4
2017-10-05 16:40:31 +01:00
Daniel Hensby
96a314f076
Merge pull request #7401 from creative-commoners/pulls/4.0/i18n-collector-fix
...
FIX Class name in _t() call in installer and run text collector
2017-10-05 10:56:12 +01:00
Christopher Joe
e07658ef50
Fix linting issues and fix doc
2017-10-05 15:28:58 +13:00
Damian Mooyman
89f86033bf
Merge pull request #7428 from creative-commoners/pulls/4.0/refactor-lost-password
...
MINOR Separate some areas of logic in LostPasswordHandler to make them more overridable
2017-10-05 15:27:50 +13:00
Saophalkun Ponlu
6424f4dea0
Changes based on peer review feedbacks
2017-10-05 15:04:46 +13:00
Robbie Averill
6044579a3f
MINOR Separate some areas of logic in LostPasswordHandler to make them more overridable
2017-10-05 14:17:38 +13:00
Damian Mooyman
168db412de
Merge pull request #7424 from creative-commoners/pulls/4.0/extensible-change-password
...
NEW Make Member::changePassword extensible
2017-10-05 13:18:53 +13:00
Chris Joe
8b03283143
Merge pull request #7407 from open-sausages/pulls/4.0/delta-config-rewrite
...
BUG Config updates are now applied after middleware not before
2017-10-05 13:06:44 +13:00
Damian Mooyman
4dbd727206
BUG Config updates are now applied after middleware not before
2017-10-05 12:30:21 +13:00
Robbie Averill
6b52412693
NEW Make Member::changePassword extensible
2017-10-05 11:18:34 +13:00
Damian Mooyman
daad9761cc
Merge pull request #7429 from open-sausages/pulls/4/fix-sake-path
...
Fix sake path, improve .htaccess upgrading instructions
2017-10-05 08:59:47 +13:00
Ingo Schommer
7d63acb221
Better .htaccess upgrading instructions
2017-10-04 09:51:29 +01:00
Ingo Schommer
924e2a714f
Fix sake path relative to vendor
2017-10-04 09:32:05 +01:00
Ingo Schommer
68d99c579f
Merge pull request #7427 from open-sausages/pulls/4/vendorise-me-baby
...
BUG Fix resource mapping for TinyMCE
2017-10-04 21:31:28 +13:00
Ingo Schommer
f6ce07dc88
Fix behat bootstrap path
2017-10-04 08:12:37 +01:00
Damian Mooyman
1b6d0144c5
BUG Fix resource mapping for TinyMCE
...
API add ModuleResource::getRelativeResource()
2017-10-04 17:44:04 +13:00
Saophalkun Ponlu
ae930833ad
Add gridfield versioned columns
2017-10-04 17:33:15 +13:00
Matthew Hailwood
b044fefc91
Difference between a single array call vs multiple calls to exclude
...
This table should best summarise the difference - 1 = row is visible, 0 = row is excluded
| Name | SELECT * FROM Player WHERE (FirstName != 'A' OR LastName != 'B') | SELECT * FROM Player WHERE FirstName != 'A' AND LastName != 'B' |
| A B | 0 | 0 |
| A C | 1 | 0 |
2017-10-03 16:28:08 +13:00
Damian Mooyman
4cbaf7cccb
Merge pull request #7418 from open-sausages/pulls/4/vendorise-me-baby
...
Expose as vendor module
2017-10-03 16:08:19 +13:00
Damian Mooyman
16f4345124
Remove unnecessary FRAMEWORK_DIR constants
2017-10-03 14:52:23 +13:00
Damian Mooyman
f4a77649a4
Fix requirements tests
2017-10-03 14:21:24 +13:00
Damian Mooyman
5ffe64f024
Fix tinymce plugins
2017-10-03 14:08:24 +13:00
Damian Mooyman
cdefd19091
Ensure HTMLEditor can load vendor css
2017-10-03 13:08:22 +13:00
Damian Mooyman
f64c95b33c
Add new ModuleResourceLoader helper
2017-10-03 12:20:49 +13:00
Ingo Schommer
e1b98d154e
Fix tinymce operation for resource paths
...
It was referencing secondary TinyMCE assets in the vendor/* folder
from its generated files (e.g. skin.min.css).
2017-10-03 09:03:37 +13:00
Ingo Schommer
8e49b563a9
Fix installer paths for vendorised module
2017-10-03 09:03:37 +13:00
Ingo Schommer
ffcfd4b7e8
Remove .htaccess (no longer in webroot)
...
See https://github.com/silverstripe/silverstripe-framework/issues/7405
2017-10-03 09:03:37 +13:00
Ingo Schommer
85a951584e
Update main.php path to support framework in vendor
2017-10-03 09:03:37 +13:00
Ingo Schommer
31b213be7b
Allow autoloading from vendor path
2017-10-03 09:03:36 +13:00
Ingo Schommer
e884dc3b53
Expose as vendor module
2017-10-03 09:03:33 +13:00
Daniel Hensby
b783df04fd
Merge pull request #7417 from open-sausages/pulls/4.0/test-dev
...
Fix test environment type
2017-10-02 17:34:37 +01:00
Damian Mooyman
85255891be
Fix test environment type
2017-10-02 17:13:00 +13:00
Damian Mooyman
b4910e133c
Merge pull request #7412 from open-sausages/pulls/4.0/fun-times-in-thumbnails
...
Enhancement add notice for MigrateFileTask if FileMigrationHelper doesn't exist
2017-10-02 16:59:40 +13:00
Damian Mooyman
17718e3854
Merge pull request #7415 from open-sausages/pulls/4.0/no-cache-in-my-home
...
Fix typos in FilesystemCacheFactory
2017-10-02 16:53:52 +13:00
Damian Mooyman
c8925c93a0
Update documentation for file migration
2017-10-02 15:30:37 +13:00
Chris Joe
b219e40ff7
Merge pull request #7414 from open-sausages/pulls/4.0/basic-auth-var
...
BUG Restore SS_USE_BASIC_AUTH env var
2017-10-02 15:11:19 +13:00
Christopher Joe
26f7f0482c
Fix typos in FilesystemCacheFactory
2017-10-02 15:10:44 +13:00
Christopher Joe
36397c787c
Enhancement add notice for MigrateFileTask if FileMigrationHelper doesn't exist
...
Enhancement add call to image thumbnail helper to generate thumbnails
2017-10-02 14:54:31 +13:00
Chris Joe
fe98555d0a
Merge pull request #7413 from open-sausages/pulls/4.0/member-i18n-speed
...
ENHANCEMENT Use less expensive i18n defaults in Member::populateDefaulateDefaults()
2017-10-02 13:03:44 +13:00
Chris Joe
ccc24764c4
Merge pull request #7411 from open-sausages/pulls/4.0/superfluous-date-props
...
Remove superfluous datefield props
2017-10-02 10:24:30 +13:00
Ingo Schommer
349e1e739c
Merge pull request #7395 from open-sausages/pulls/4.0/vendor-modules
...
WIP Vendor modules proof of concept
2017-09-29 19:48:20 +13:00
Damian Mooyman
e2750c03fc
BUG Restore SS_USE_BASIC_AUTH env var
...
Fixes #7268
2017-09-29 16:56:56 +13:00
Damian Mooyman
f4b1417612
ENHANCEMENT Use less expensive i18n defaults in Member::populateDefaults()
...
Fixes #7381
2017-09-29 16:40:17 +13:00
Damian Mooyman
fa57deeba4
ENHANCEMENT Allow vendor modules with url rewriting
...
API Introduce ModuleResource feature
2017-09-29 10:28:38 +13:00
Damian Mooyman
3011650b5a
Remove superfluous datefield props
...
Fixes #7397
2017-09-29 10:25:22 +13:00
Damian Mooyman
91943c03e5
Merge pull request #7392 from open-sausages/pulls/4.0/there-is-no-leftandmain-config
...
Enhancement Add setter and getter for certain classes
2017-09-29 09:25:36 +13:00
Daniel Hensby
b49d1d7fbd
Merge branch '3.6' into 3
2017-09-28 17:17:19 +01:00
