Commit Graph

18055 Commits

Author SHA1 Message Date
Damian Mooyman
88b4ae65cc API Add css class to assist with bootstrapping entwine sections 2016-12-16 13:41:50 +13:00
Myles Derham
18ff6bec6d Updated location of custom field templates 2016-12-16 10:40:01 +13:00
Daniel Hensby
2ec664d4c2 Merge pull request #6400 from robbieaverill/patch-6
Update 04_Fixtures.md
2016-12-15 18:51:12 +00:00
Daniel Hensby
734fe5d8e4 Merge pull request #6399 from robbieaverill/patch-5
Update 00_Write_a_SapphireTest.md
2016-12-15 15:49:28 +00:00
Daniel Hensby
5926cd3501 Merge pull request #6398 from robbieaverill/patch-4
Update unit testing doc for 4.0
2016-12-15 15:03:22 +00:00
Daniel Hensby
ba39e552a2
Merge branch '3' 2016-12-15 12:20:29 +00:00
Daniel Hensby
4a6fe3c375
Merge branch '3.5' into 3 2016-12-15 11:59:54 +00:00
Daniel Hensby
68ce7b538b Merge pull request #6401 from andrewandante/HOTFIX/namespace-IPUtils-correctly-3.5
remove FRAMEWORK_PATH and namespace IPUtils
2016-12-15 11:51:40 +00:00
Andrew Aitken-Fincham
e0c94e0f72 remove FRAMEWORK_PATH and namespace IPUtils 2016-12-15 11:10:47 +00:00
Robbie Averill
0f058af946 Update 04_Fixtures.md
* Added reference for namespaced class names in YAML fixtures
* Updated some examples for PSR-2 compatibility
2016-12-15 16:11:42 +13:00
Robbie Averill
07e4ee4187 Update 00_Write_a_SapphireTest.md
* Add imported namespace and convert example to PSR-2
2016-12-15 15:47:56 +13:00
Robbie Averill
403f02e0cd Update unit testing doc for 4.0
* Add namespaced class imports
* Convert examples to PSR-2
2016-12-15 15:45:14 +13:00
Daniel Hensby
149d260be6 Merge pull request #6393 from webbuilders-group/imagick-crop-function
NEW: Added ImagickBackend::crop() for compatibility with GDBackend
2016-12-14 15:08:25 +00:00
Damian Mooyman
8e08eb04ce Merge branch 'master' into pulls/4.0/psr-coding-conventions 2016-12-14 19:29:35 +13:00
Damian Mooyman
d5049af35f Merge pull request #6375 from dhensby/pulls/3.4/square-bracket-submitted-data
FIX Handle fields with square brackets
2016-12-14 11:08:17 +13:00
UndefinedOffset
52cad6ce99 NEW: Added ImagickBackend::crop() for compatibility with GDBackend 2016-12-13 12:17:55 -04:00
Daniel Hensby
f8132b39af
Assertions should be $this->assert($expected, $actual) 2016-12-13 11:32:52 +00:00
Daniel Hensby
5248be9226
FIX Handle fields with square brackets 2016-12-13 11:32:50 +00:00
Damian Mooyman
55a9496ad7 Merge pull request #6378 from open-sausages/pulls/4.0/english-coding-conventions
Clarify UK-english in coding conventions
2016-12-12 10:29:46 +13:00
Damian Mooyman
4e1c511deb Merge pull request #6371 from open-sausages/pulls/4.0/gallery-list
Styling for gallery list view
2016-12-09 17:55:17 +13:00
Christopher Joe
fcf1eedee4 FIX getting fileSize shouldn't give a "NaN" 2016-12-09 16:26:55 +13:00
Paul Clarke
6ec7804932 Enhancement Add icon size for 14px icons and table padding for asset list 2016-12-09 16:25:48 +13:00
Christopher Joe
799ebe5ba8 API Expose QueryString library and lib/Format as external for formatting items 2016-12-09 16:24:40 +13:00
Sam Minnée
b2e3540385 Merge pull request #6356 from open-sausages/pulls/4.0/use-validationexceptions-in-forms
API Refactor form validation handling
2016-12-09 16:00:25 +13:00
Damian Mooyman
6e589aac75
API Updates to Form, ValidationResponse, ValidationException
API Implement form schema "errors" handling
2016-12-09 14:24:11 +13:00
Ingo Schommer
013e6bd636 Merge pull request #6377 from robbieaverill/patch-3
Remove RHS heading delimiters
2016-12-09 12:08:19 +13:00
Ingo Schommer
e1b84b3c8d Updated coding conventions for PSR-2
See https://github.com/silverstripe/silverstripe-framework/pull/6340
See https://github.com/silverstripe/silverstripe-framework/issues/6376
2016-12-09 11:59:01 +13:00
Ingo Schommer
ad99da1c2e Clarify UK-english in coding conventions 2016-12-09 11:44:19 +13:00
Robbie Averill
43ad12f134 Remove RHS heading delimiters
Our markdown parser doesn't catch them, and they end up being output literally.
2016-12-09 11:20:14 +13:00
Damian Mooyman
0d20ec1e10 Merge pull request #6374 from dhensby/pulls/3.5/no-exception-on-requirements-failure
Revert Requirements throwing exceptions from #5260
2016-12-09 10:41:13 +13:00
Sam Minnee
6650561dac Don't use session and FormSchema to manage server-side React validation responses 2016-12-09 10:27:23 +13:00
Daniel Hensby
272703b41a
Revert Requirements throwing exceptions from #5260 2016-12-08 13:25:50 +00:00
Daniel Hensby
f39c4d94f2 Merge pull request #6256 from SilbinaryWolf/optimization-configmanifest-4.x
OPTMIZATION 200% speed increase with ConfigManifest's use of Manifest…
2016-12-08 13:00:01 +00:00
Jake Bentvelzen
085c8f5a43 ENHANCEMENT 2x increase in scanning of files for ConfigManifest 2016-12-08 21:35:38 +11:00
Ingo Schommer
322d3e18fd Merge pull request #6370 from open-sausages/pulls/4.0/remove-temp-json
ENHANCEMENT Move temporary JSON block into standard component
2016-12-08 23:24:58 +13:00
Ingo Schommer
2846af891b Merge pull request #6366 from open-sausages/pulls/4.0/asset-admin-behat
API Add buttonTooltop to PopoverField and fix critical positioning issue
2016-12-08 21:23:11 +13:00
Ingo Schommer
5f5d682176 Merge pull request #6372 from robbieaverill/feature/improve-task-docblocks
Add doc blocks for the $request given to BuildTasks
2016-12-08 17:28:13 +13:00
Robbie Averill
d7db913824 Add doc blocks for the $request given to BuildTasks
Allows BuildTask developers to know what the $request is, and outline BuildTask instances.
2016-12-08 16:46:40 +13:00
Damian Mooyman
2a25a525cb
ENHANCEMENT Move temporary JSON block into standard component 2016-12-08 13:31:11 +13:00
Daniel Hensby
b56a8075a3
Merge branch '3.5' into 3 2016-12-07 13:15:10 +00:00
Daniel Hensby
16fe69fdef
Merge branch '3.4' into 3.5 2016-12-07 13:14:14 +00:00
Damian Mooyman
4e8a2f24f8 Merge pull request #6316 from wilr/history-form-changes
Add OtherItemID as a schema param
2016-12-07 14:09:21 +13:00
Damian Mooyman
6b06fd9f2d
API Add buttonTooltop to PopoverField and fix critical positioning issue 2016-12-07 13:06:35 +13:00
Damian Mooyman
7ca876a4c7 Merge pull request #6369 from dhensby/pulls/3.4/travis-simplification
Move travis env vars out of .travis.yml and into travis CI dashboard
2016-12-07 12:17:01 +13:00
Daniel Hensby
6af1e5bf0d
Move travis env vars out of .travis.yml and into travis CI dashboard 2016-12-06 22:29:13 +00:00
Loz Calver
e191bc875f Merge pull request #6367 from colintucker/6363-fix-csv-bulk-loader
FIX hard-coded boolean in CsvBulkLoader (fixes #6363)
2016-12-06 09:42:06 +00:00
Loz Calver
1919b05980 Merge pull request #6365 from tractorcow/pulls/3.4/fix-localisation-strings
BUG Fix localisation issues
2016-12-06 09:38:19 +00:00
Colin Tucker
3fca7b3c4d Fix hard-coded boolean in CsvBulkLoader 2016-12-06 16:08:00 +11:00
Christopher Joe
c405b4e41a remove required for actions 2016-12-06 14:27:27 +13:00
Paul Clarke
af853861ec Updated list-group styles to work with file history and campaigns 2016-12-06 14:10:50 +13:00