Paul Clarke
|
142fcb2a27
|
Checkbox layout, including settings tab bugs. Fixes #5355
|
2016-05-09 15:09:23 +12:00 |
|
Paul Clarke
|
c5d0d0bb99
|
Build
|
2016-05-09 12:53:02 +12:00 |
|
Paul Clarke
|
f1ea820ab1
|
Steps styles fix
|
2016-05-09 12:52:02 +12:00 |
|
Paul Clarke
|
83d70c4414
|
Fixes font used for add page steps and alignment
|
2016-05-09 12:51:35 +12:00 |
|
Paul Clarke
|
261ca9378e
|
Fixes campaign thumbnail left alignment issue
|
2016-05-09 12:51:35 +12:00 |
|
Paul Clarke
|
2681b81d29
|
Swapped a few btn classes for updated ones
|
2016-05-09 12:36:14 +12:00 |
|
Daniel Hensby
|
459fb4ec80
|
Merge pull request #5465 from frankmullenger/4917-renaming
MINOR: Renaming classes with 'Html' camel cased.
|
2016-05-07 10:30:57 +01:00 |
|
Ingo Schommer
|
0b295137c2
|
Fix unguarded JS check in LeftAndMain.Preview.js
|
2016-05-06 14:42:20 +12:00 |
|
Frank Mullenger
|
b4cd617ee3
|
FIX: Renaming to HTMLEditorConfig.
FIX: Renaming to HTMLEditorField*.
FIX: Renaming to HTMLEditorSanitiser*.
|
2016-05-06 14:16:34 +12:00 |
|
Ingo Schommer
|
c251fab9af
|
Fixed more SCSSLint errors, disabled some files
The mixins and compasscompat will probably be replaced in time,
and install.scss is quite low priority to fix (same treatment as legacy/* styles)
|
2016-05-06 08:02:38 +12:00 |
|
Daniel Hensby
|
840cd4f877
|
Update translations
|
2016-05-05 12:46:38 +01:00 |
|
Daniel Hensby
|
d1751e3310
|
Merge remote-tracking branch '3.2.4' into 3.3.2
|
2016-05-05 12:33:21 +01:00 |
|
Daniel Hensby
|
cf29b2c146
|
Merge remote-tracking branch '3.1.19' into 3.2.4
|
2016-05-05 11:17:45 +01:00 |
|
Paul Clarke
|
e81e99fb0d
|
improved variable comments
|
2016-05-05 18:52:42 +12:00 |
|
Paul Clarke
|
b87d0a3e3c
|
removed path to framework in framework variables, added to assetAdmin
|
2016-05-05 18:26:27 +12:00 |
|
Paul Clarke
|
22f26d10a8
|
moved assetadmin variables into framework
|
2016-05-05 17:19:05 +12:00 |
|
Daniel Hensby
|
e8cfe1cc72
|
Merge remote-tracking branch 'security/patch/3.1/ss-2016-004' into 3.1.19
|
2016-05-05 01:01:37 +01:00 |
|
Daniel Hensby
|
47c3165aa3
|
Merge remote-tracking branch 'security/patch/3.1/ss-2015-029' into 3.1.19
|
2016-05-05 01:01:15 +01:00 |
|
Daniel Hensby
|
457931d664
|
Merge branch '3.3' into 3
|
2016-05-04 23:32:10 +01:00 |
|
Damian Mooyman
|
8b1146be9a
|
API Implement campaign item edit button
|
2016-05-05 10:24:08 +12: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 |
|
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 |
|
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 |
|
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
|
6948267c41
|
API LeftAndMain::menu_title can be overridden (#5423)
|
2016-05-02 20:57:43 +12:00 |
|
Damian Mooyman
|
a38eb8b784
|
Fix incorrect logic check
|
2016-05-02 18:15:39 +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 |
|
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
|
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 |
|
Paul Clarke
|
acb1b46a46
|
Add back button for smaller screens
|
2016-04-27 14:09:57 +12:00 |
|
Paul
|
fc8d94d789
|
Fix for toolbar-south width (#5391)
|
2016-04-26 17:41:07 +12:00 |
|
Ingo Schommer
|
5d26035a51
|
Update build artifacts
|
2016-04-26 15:34:11 +12:00 |
|
Paul Clarke
|
bbf74bdca9
|
Minor adjustments to align header, removed cancel icon and give space to main actions
|
2016-04-26 15:32:10 +12:00 |
|