Daniel Hensby
|
b11bbffb7d
|
Merge branch '3'
|
2016-05-04 23:36:10 +01:00 |
|
Daniel Hensby
|
457931d664
|
Merge branch '3.3' into 3
|
2016-05-04 23:32:10 +01:00 |
|
Daniel Hensby
|
32f0a637b4
|
Merge branch '3.2' into 3.3
|
2016-05-04 23:17:36 +01:00 |
|
Daniel Hensby
|
0884683c6b
|
Merge branch '3.1' into 3.2
|
2016-05-04 23:15:43 +01:00 |
|
Daniel Hensby
|
9fc4160425
|
Merge pull request #5348 from tractorcow/pulls/3/filterable-unsavedrelation
|
2016-05-04 10:50:46 +01:00 |
|
Loz Calver
|
4bd9a04896
|
Merge pull request #5440 from tractorcow/pulls/4.0/api-explicit-injector-inheritance
API Injector dependencies no longer inherit from parent classes
|
2016-05-04 09:31:51 +01:00 |
|
Paul
|
e04fb5b986
|
Fixes missing actions on responsive gridfield, cleanup indentation (#5446)
|
2016-05-04 20:21:11 +12:00 |
|
Paul
|
4b8e98b351
|
fix for scss linting issues in new scss (#5448)
|
2016-05-04 20:14:56 +12:00 |
|
Loz Calver
|
36e64168a5
|
Merge pull request #5444 from tractorcow/pulls/3/fix-upload-size
BUG fix Upload_Validator getAllowedMaxFilesize
|
2016-05-04 09:13:00 +01:00 |
|
Ingo Schommer
|
2ecd73d303
|
Added CodeClimate integration (#5443)
|
2016-05-04 19:48:11 +12:00 |
|
Hamish Friedlander
|
11a9be6cf3
|
Merge pull request #5449 from open-sausages/pulls/4.0/isset-regression
Excuse php7 errors due to regressions in 7.0.6
|
2016-05-04 17:08:31 +12:00 |
|
Damian Mooyman
|
4bc04e795a
|
Excuse php7 errors due to regressions in 7.0.6
|
2016-05-04 16:33:40 +12:00 |
|
Hamish Friedlander
|
ab3aebf2d4
|
Merge pull request #5437 from open-sausages/pulls/4.0/fix-gridfield-autocomplete
BUG Fix GridFieldAddExistingAutocompleter and GridFieldExportButton
|
2016-05-04 13:59:32 +12:00 |
|
Christopher Darling
|
220290d61c
|
test to prove #5222
|
2016-05-04 12:05:02 +12:00 |
|
Tim Kung
|
d1c7554c1e
|
Upload_Validator fixing getAllowedMaxFileSize to correctly return * value
|
2016-05-04 12:05:02 +12:00 |
|
Damian Mooyman
|
5925b65547
|
Merge pull request #5395 from dhensby/pulls/3.3/empty-manifest-fix
MINOR Empty YAML config causes invalid argument error
|
2016-05-04 10:48:28 +12:00 |
|
Damian Mooyman
|
0bc5fb31c1
|
Merge branch 'pull/5388' into 3
|
2016-05-04 10:33:45 +12:00 |
|
Damian Mooyman
|
8ce3d90e18
|
API Injector dependencies no longer inherit from parent classes automatically
API Allow classes to inherit service definitions explicitly
|
2016-05-03 18:39:31 +12:00 |
|
Damian Mooyman
|
f88d708ee9
|
BUG Fix GridFieldAddExistingAutocompleter and GridFieldExportButton
Based on https://github.com/silverstripe/silverstripe-framework/pull/5426
Fixes #5267
|
2016-05-03 17:45:46 +12:00 |
|
Damian Mooyman
|
ca1716b9f3
|
Merge pull request #5393 from open-sausages/pulls/4.0/BEM-enhancements
Style enhancements
|
2016-05-03 17:27:02 +12:00 |
|
Hamish Friedlander
|
db6af3300c
|
Merge pull request #5434 from open-sausages/pulls/4.0/fix-htmleditorfield-whitelist
[ss-2015-027] FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs
|
2016-05-03 16:21:20 +12:00 |
|
Ingo Schommer
|
3abd2f7119
|
Updated dist files
|
2016-05-03 16:17:36 +12:00 |
|
Paul Clarke
|
cd9a5dbbe9
|
created placeholder ListGroup.js, not currently used
|
2016-05-03 16:17:36 +12:00 |
|
Paul Clarke
|
7895e21d51
|
hide campaign links for alpha1
|
2016-05-03 16:17:36 +12:00 |
|
Paul Clarke
|
c7eca59a8a
|
Refactored class names, split out campaign specific elements, hide campaign links
|
2016-05-03 16:17:28 +12:00 |
|
Paul Clarke
|
6d1a14de9c
|
delete unused file, swap class for bootstrap list-group-item-heading class
|
2016-05-03 16:04:48 +12:00 |
|
Paul Clarke
|
4e67a913d6
|
Move label style out of component, remove legacy overrides
|
2016-05-03 16:04:48 +12:00 |
|
Paul Clarke
|
22617cd9b2
|
Improves readability slightly
|
2016-05-03 16:04:48 +12:00 |
|
Paul Clarke
|
bcbb0fcc5c
|
rename class for better reusability and refactor
|
2016-05-03 16:04:47 +12:00 |
|
Paul Clarke
|
5b2d910aeb
|
Form action styles update
Doesn’t conform to BEM.
Need to update places btn-success is being used and replace with
btn-primary, but the differences shouldn’t be too noticeable.
|
2016-05-03 16:04:47 +12:00 |
|
Paul Clarke
|
3be4e80711
|
Restructure accordion so list items are in their own component
Accordion styles to get more BEM
|
2016-05-03 16:04:42 +12:00 |
|
Paul
|
a7f5ef7b95
|
Removed More Options action and popover from template (#5435)
|
2016-05-03 15:30:41 +12:00 |
|
Damian Mooyman
|
70480f5ee4
|
[ss-2015-027] FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs
Fixes #4947
|
2016-05-03 15:29:18 +12:00 |
|
Damian Mooyman
|
6948267c41
|
API LeftAndMain::menu_title can be overridden (#5423)
|
2016-05-02 20:57:43 +12:00 |
|
Damian Mooyman
|
71a4f1e605
|
Merge branch 'pull/5384' into 3.1
|
2016-05-02 18:16:41 +12:00 |
|
Damian Mooyman
|
a38eb8b784
|
Fix incorrect logic check
|
2016-05-02 18:15:39 +12:00 |
|
Hamish Friedlander
|
feca77c902
|
Merge pull request #5408 from open-sausages/pulls/4.0/changeset-preview
API Implement basic preview behaviour
|
2016-05-02 16:29:57 +12:00 |
|
Paul Clarke
|
1506f83ef5
|
focus adjustments to items so selected item isn't blury
|
2016-05-02 15:27:12 +12:00 |
|
Damian Mooyman
|
72fcfbf4bc
|
API Campaign preview for images
|
2016-05-02 15:27:12 +12:00 |
|
Damian Mooyman
|
4be5e7c961
|
API Implement basic preview behaviour
|
2016-05-02 15:27:12 +12:00 |
|
Damian Mooyman
|
e7cd864ebc
|
Merge branch 'master'
|
2016-05-02 10:38:08 +12:00 |
|
Damian Mooyman
|
e7d5c92ec1
|
Fix merge regressions
|
2016-05-02 09:08:37 +12:00 |
|
Tim
|
a15e8eca72
|
[BUG] Updating Upload_Validator and related translatable files to change all cases of filesize spelling to file size (#5369)
|
2016-05-02 08:58:35 +12:00 |
|
Paul
|
ddda7db303
|
reduced line-height to old height and vertically centered (#5406)
|
2016-05-02 08:56:20 +12:00 |
|
Damian Mooyman
|
2a5ba397e6
|
BUG Fix SS_HTTPResponse being cast as string (#5413)
Fixes #5335
|
2016-05-02 08:54:19 +12:00 |
|
Paul
|
9238bc5778
|
Added class to actions cell to reduce space (#5404)
|
2016-05-02 08:53:53 +12:00 |
|
Damian Mooyman
|
8d2f063f0c
|
Fix eslint errors (#5411)
|
2016-05-02 08:51:31 +12:00 |
|
Paul
|
2e056dd98b
|
media query to use mixin (#5402)
|
2016-05-02 08:50:29 +12:00 |
|
Damian Mooyman
|
baa3d4e7d7
|
Fix trailing spaces on merge
|
2016-04-29 17:54:52 +12:00 |
|
Damian Mooyman
|
d52db0ba34
|
Merge 3 into master
# Conflicts:
# .travis.yml
# admin/css/ie7.css
# admin/css/ie7.css.map
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.js
# admin/scss/_style.scss
# admin/scss/_uitheme.scss
# control/HTTPRequest.php
# core/Object.php
# css/AssetUploadField.css
# css/AssetUploadField.css.map
# css/ConfirmedPasswordField.css.map
# css/Form.css.map
# css/GridField.css.map
# css/TreeDropdownField.css.map
# css/UploadField.css
# css/UploadField.css.map
# css/debug.css.map
# dev/Debug.php
# docs/en/00_Getting_Started/00_Server_Requirements.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
# filesystem/File.php
# filesystem/Folder.php
# filesystem/GD.php
# filesystem/Upload.php
# forms/ToggleField.php
# forms/Validator.php
# javascript/lang/en_GB.js
# javascript/lang/fr.js
# javascript/lang/src/en.js
# javascript/lang/src/fr.js
# model/Image.php
# model/UnsavedRelationList.php
# model/Versioned.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/DBField.php
# model/fieldtypes/Enum.php
# scss/AssetUploadField.scss
# scss/UploadField.scss
# templates/email/ChangePasswordEmail.ss
# templates/forms/DropdownField.ss
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
# tests/forms/EnumFieldTest.php
# tests/security/MemberTest.php
# tests/security/MemberTest.yml
# tests/security/SecurityTest.php
|
2016-04-29 17:50:55 +12:00 |
|