tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
17,641 Commits 31 Branches 527 Tags 162 MiB
7c76d2cb09
Commit Graph

17641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paul Clarke
9b7e242f56 Updated list-group variables 2016-12-06 14:05:28 +13:00
Will Rossiter
8d373046db Add OtherItemID as a schema param 
History Form needs both an ItemID and a VersionID. Follows the same naming as $ID/$OtherID available in other controllers.
 2016-12-06 14:05:28 +13:00
Damian Mooyman
2181e3b86b
BUG Fix localisation issues 2016-12-06 11:20:10 +13:00
Damian Mooyman
b4ba606ff2 ENHANCEMENT: HTMLEditorField default alignment setting 2016-12-06 09:55:48 +13:00
Jonathon Menz
24dc3428d9 NEW HTMLEditorField default alignment setting 
A config setting to control the default alignment of embedded media and images
 2016-12-05 11:54:36 -08:00
Daniel Hensby
d9537eb76b Merge pull request #6349 from open-sausages/pulls/4.0/fix-cms-crash 
Temp patch to 5987 to prevent cms crashing
 2016-11-30 10:02:13 +00:00
Damian Mooyman
6107f45d1e
Temp patch to 5987 to prevent cms crashing 2016-11-30 11:20:22 +13:00
Daniel Hensby
7c23443fb6
Merge branch '3' 2016-11-29 17:20:19 +00:00
Daniel Hensby
dbe063911c
Merge branch '3.5' into 3 2016-11-29 17:18:55 +00:00
Daniel Hensby
0821310207
Merge branch '3.4' into 3.5 2016-11-29 17:18:36 +00:00
Daniel Hensby
afb7652459
Merge branch '3.3' into 3.4 2016-11-29 17:17:08 +00:00
Daniel Hensby
2e538ca9ab
Merge tag '3.4.2' into 3.4 
Release 3.4.2
 2016-11-29 17:17:00 +00:00
Daniel Hensby
c875d7a3ea
Merge branch '3.2' into 3.3 2016-11-29 17:14:43 +00:00