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
Damian Mooyman
81087ce15c
BUG restore CMS build as required in framework tests
2016-11-01 17:31:35 +13:00
Damian Mooyman
c056362b54
Merge pull request #6266 from sminnee/src-folder
...
Move code files into the src/ folder. Fixes #6098
2016-11-01 16:59:37 +13:00
Sam Minnee
213cf8841b
NEW: Test webpack build as part of NPM test run.
...
FIX: Ensure that “npm run build” failures report an error code.
2016-11-01 16:35:40 +13:00
Damian Mooyman
5650254b53
NEW: Fixes to allow code files in src/ folder.
...
Separated from the file renames for clarity.
2016-11-01 16:35:32 +13:00
Sam Minnee
e9d2f2f733
NEW: Use composer autoloader to set the right include path.
2016-11-01 16:35:02 +13:00
Sam Minnee
7a10c194bd
NEW: Move code files into src/ folder.
...
This updates framework to be more in keeping with PHP conventions.
2016-11-01 13:37:24 +13:00
Paul
c98a08f3f5
Merge pull request #6234 from open-sausages/pulls/4.0/fix-mediaform-errors
...
BUG Fix clicking "No items found" from causing ajax error
2016-11-01 13:22:00 +13:00
Damian Mooyman
2a9138aa14
Merge pull request #6264 from dhensby/pulls/3.4/validation-docblock-fix
...
DOCS Docblock fixes for ValidationResult
2016-11-01 10:38:33 +13:00
Daniel Hensby
0b850e0819
DOCS Docblock fixes for ValidationResult
2016-10-31 13:33:59 +00:00
Loz Calver
b6bbed8de0
Merge pull request #6249 from dhensby/pulls/3.4/fix-error-message
...
FIX filterAny error message now refers to correct method name
2016-10-31 09:02:49 +00:00
Nicola Fontana
fe816076fc
BUG Make simplexml_load_file work on shared php-fpm
...
PHP #62577 [1] together with PHP #64938 [2] make simplexml_load_file()
fails when the "disable load external entities" flag is set.
As a workaround, manually enable the entity loader in the bootstrap
code. We are loading internal XML files after all, so no security
implications should arise.
[1] https://bugs.php.net/bug.php?id=62577
[2] https://bugs.php.net/bug.php?id=64938
Fix #6174 .
2016-10-31 06:21:04 +01:00
Damian Mooyman
1622ed8f69
Merge pull request #6242 from open-sausages/pulls/4.0/fix-overlay
...
BUG Fix missing loading overlay
2016-10-31 15:25:11 +13:00
Damian Mooyman
040ae2e6a3
BUG Fix clicking "No items found" from causing ajax error
2016-10-31 15:21:41 +13:00
Damian Mooyman
513c7aebc7
Fix HtmlEditorField.js indentation
2016-10-31 15:18:50 +13:00
Damian Mooyman
37cb351a66
Merge pull request #6222 from open-sausages/features/4.0/responsive-improvements
...
ENHANCEMENT: Improved behaviour for flexbox on smaller screens
2016-10-31 14:17:12 +13:00