Commit Graph

17716 Commits

Author SHA1 Message Date
Martijn
1ec56a1202
Prevent undefined index notices 2016-11-07 15:09:35 +00:00
Daniel Hensby
cbd3aa0949 Merge pull request #6299 from silverstripe/revert-6237-modeladmin-showImportForm
Revert "Added $showSearchForm to ModelAdmin"
2016-11-07 13:42:55 +00:00
Daniel Hensby
27206c9240 Revert "Added $showSearchForm to ModelAdmin" 2016-11-07 13:42:47 +00:00
Daniel Hensby
250a4672fb Merge pull request #6237 from Zauberfisch/modeladmin-showImportForm
Added $showSearchForm to ModelAdmin
2016-11-07 13:42:34 +00:00
Daniel Hensby
38ccce656b Merge pull request #6201 from open-sausages/pulls/4.0/update-devtools
Update devtools code to reflect the new API
2016-11-07 13:13:26 +00:00
Daniel Hensby
3f1be23c57 Merge pull request #6294 from open-sausages/pulls/4.0/safari-layout-bugs
Safari layout bugs for page actions toolbar and menu toggle area
2016-11-07 13:11:54 +00:00
Daniel Hensby
d5402d9dce Merge pull request #6186 from ntd/pr5
BUG Use simplexml_load_string instead of simplexml_load_file
2016-11-07 12:16:32 +00:00
Paul Clarke
aafa448bdd Capitalise title 2016-11-07 14:08:42 +13:00
Paul Clarke
d109992a37 Safari fix for menu toggle position and bottom of menu 2016-11-07 13:57:46 +13:00
Christopher Joe
8c15e53feb Update devtools code to reflect the new API 2016-11-07 09:08:01 +13:00
Damian Mooyman
df1354238a Merge pull request #6276 from dhensby/pulls/3.4/versioned-phpdoc
DOCS Fix up some PHPDoc on Versioned
2016-11-07 08:56:46 +13:00
Daniel Hensby
d66c031244 Merge pull request #6292 from webbuilders-group/base-path-fix
BUGFIX: Fixed crash when BASE_PATH is set by assuming the location of Constants.php
2016-11-04 21:45:50 +00:00
UndefinedOffset
f18ef75c3d BUGFIX: Fixed crash when BASE_PATH is set by assuming the location of Constants.php 2016-11-04 13:43:42 -03:00
Daniel Hensby
683bde6d82
Merge pull request #3535 from manja/3.1 2016-11-03 14:40:39 +00:00
Daniel Hensby
0a835c6fe7
Merge branch '3.4' into 3 2016-11-03 13:27:31 +00:00
Daniel Hensby
5f99c4aa5f
Merge branch '3.3' into 3.4 2016-11-03 13:27:11 +00:00
Daniel Hensby
fad53ae33e
Merge branch '3.2' into 3.3 2016-11-03 13:26:30 +00:00
Daniel Hensby
6eebf07a8e
Merge branch '3.1' into 3.2 2016-11-03 13:20:11 +00:00
Daniel Hensby
c914dde7d1
Update travis build to use target branch as core release 2016-11-03 13:17:41 +00:00
Damian Mooyman
857caa8fff Merge pull request #6274 from SpiritLevel/PDO-as-default-in-webinstaller
Setting default db adapter in installation  as PDO MySQL
2016-11-03 17:42:20 +13:00
Damian Mooyman
91f51a6783 Merge branch '3.4' into pulls/3.4/versioned-phpdoc 2016-11-03 17:41:02 +13:00
Damian Mooyman
182c9fb70f Merge pull request #6282 from sminnee/fix-32
FIX: Ensure that builds use the 3.2 dependencies.
2016-11-03 17:40:30 +13:00
Sam Minnee
edfe514540 FIX: Ensure that builds use the 3.4 dependencies.
This fix does it in a way that doesn’t need manual maintenance
per-branch
2016-11-03 16:38:38 +13:00
Damian Mooyman
a633b01c7c Merge pull request #6283 from sminnee/fix-34-builds
FIX: Ensure that builds use the 3.4 dependencies.
2016-11-03 16:28:44 +13:00
Damian Mooyman
af27a0f888 Added 4.0.0-alpha3 changelog 2016-11-03 15:27:10 +13:00
Sam Minnee
135a64761f FIX: Ensure that builds use the 3.4 dependencies.
This fix does it in a way that doesn’t need manual maintenance
per-branch
2016-11-03 14:56:51 +13:00
Damian Mooyman
ae037b68c6 Update translations 2016-11-03 14:53:52 +13:00
Damian Mooyman
cc451d9ca4 BUG Fix crash when re-ordering pages (#6281)
Fixes #6273
2016-11-03 14:51:17 +13:00
Damian Mooyman
eefecc21fc BUG Fix incorrect include paths in tests and railsyml (#6279) 2016-11-03 14:41:19 +13:00
Damian Mooyman
ce10530f53 Merge pull request #6251 from open-sausages/pulls/4.0/schema-validation-rules
Implement client-side form validation feedback in React forms
2016-11-03 12:27:54 +13:00
Damian Mooyman
4ee78fc29d BUG Restore travis artifacts (#6277)
Fixes #6046
2016-11-03 12:17:15 +13:00
Damian Mooyman
3449d5df0f
BUG Fix broken promise handling 2016-11-03 11:45:54 +13:00
Christopher Joe
d65270c4c7 Removed temporary validation for AddToCampaign 2016-11-03 10:43:42 +13:00
Christopher Joe
8a7ea044ac Added validator class to decouple validation library from FormBuilder
Added required rule priority logic and fix styling of error messages
2016-11-03 10:39:53 +13:00
Christopher Joe
0901de2995 BUG Fix php schema generation 2016-11-03 10:26:39 +13:00
Damian Mooyman
67f00302f9 Add logic to React FormBuilder to utilise validation schema generated 2016-11-03 10:24:36 +13:00
Damian Mooyman
1142757c21 API Add 'validation' to form schema 2016-11-03 10:07:24 +13:00
Daniel Hensby
567b125fbc
DOCS Fix up some PHPDoc on Versioned 2016-11-02 14:08:35 +00:00
David Alexander
506213899b Setting default db adapter in installation as PDO MySQL with MySQLi as fail safe.
Added back missed assignment of $_REQUEST['db']['type']
2016-11-02 19:51:13 +13:00
Damian Mooyman
3bad5fcd9b Merge pull request #6269 from dhensby/pulls/3/inherited-default-records
FIX default_records are no longer inherited to child classes
2016-11-02 13:29:39 +13:00
Damian Mooyman
019e99dd4d BUG Fix regressions from src folder creation (#6272) 2016-11-02 13:18:56 +13:00
Sam Minnée
82c3bc7c98 Merge pull request #6257 from open-sausages/simpler-test-run
BUG restore CMS build as required in framework tests
2016-11-02 11:28:39 +13:00
Damian Mooyman
d7cb38434e
Create separate cms-config.yml for cms behat tests within framework 2016-11-02 10:54:09 +13:00
Daniel Hensby
c61d61d003
FIX default_records are no longer inherited to child classes 2016-11-01 20:58:03 +00:00
Damian Mooyman
6da36a9ed1
Fix some issues with tests 2016-11-02 09:11:35 +13:00
Matt Peel
45048ae3b3 Update 14_PHP_Coding_Conventions.md (#6094)
Include a note preferring type-safe identical comparisons (===) over equality (==) where possible.
2016-11-01 18:12:11 +13:00
Antony Thorpe
148126fb79 Updated 01_Error_Handling.md (#6128)
Corrected indentation in yaml
2016-11-01 18:11:10 +13:00
Jono Menz
fdfd0c4fc3 DOCS Remove duped content (#6214)
D.R.Y.
2016-11-01 17:56:32 +13:00
Damian Mooyman
c0c219e178
Fix invalid files_path 2016-11-01 17:55:43 +13:00
Damian Mooyman
38fdafb474 Fix tinymce breaking in non-typical install location 2016-11-01 17:40:59 +13:00