Damian Mooyman
0b1f297873
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
README.md
admin/code/LeftAndMain.php
admin/css/screen.css
admin/scss/screen.scss
api/RestfulService.php
conf/ConfigureFromEnv.php
control/injector/ServiceConfigurationLocator.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
core/Object.php
css/AssetUploadField.css
css/ComplexTableField_popup.css
dev/CSSContentParser.php
dev/DevelopmentAdmin.php
docs/en/changelogs/index.md
docs/en/misc/contributing/code.md
docs/en/reference/execution-pipeline.md
filesystem/GD.php
filesystem/ImagickBackend.php
filesystem/Upload.php
forms/Form.php
forms/FormField.php
forms/HtmlEditorConfig.php
forms/gridfield/GridFieldDetailForm.php
forms/gridfield/GridFieldSortableHeader.php
lang/en.yml
model/Aggregate.php
model/DataList.php
model/DataObject.php
model/DataQuery.php
model/Image.php
model/MySQLDatabase.php
model/SQLQuery.php
model/fieldtypes/HTMLText.php
model/fieldtypes/Text.php
scss/AssetUploadField.scss
search/filters/SearchFilter.php
security/Authenticator.php
security/LoginForm.php
security/Member.php
security/MemberAuthenticator.php
security/MemberLoginForm.php
security/Security.php
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
tests/control/HTTPTest.php
tests/control/RequestHandlingTest.php
tests/filesystem/UploadTest.php
tests/forms/FormTest.php
tests/forms/NumericFieldTest.php
tests/model/DataListTest.php
tests/model/DataObjectTest.php
tests/model/TextTest.php
tests/security/MemberAuthenticatorTest.php
tests/security/SecurityDefaultAdminTest.php
tests/view/SSViewerCacheBlockTest.php
tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
Damian Mooyman
53c40a94fa
API Enable re-authentication within the CMS if a user session is lost
...
BUG Resolve issue with error redirection being ignored within CMS
BUG Fix issue with invalid securityID being re-emitted on failure
2014-10-14 15:19:48 +13:00
Loz Calver
5f653a00eb
Add "retina" styles for high-dpi screens
2014-08-27 17:06:57 +01:00
Mateusz Uzdowski
fe08236f21
API Add action tabsets as a interface idiom.
...
Introduces the concept of action tabsets - usage of TabSet and Tabs
in between the action buttons to allow richer set of capabilities that
can be offered to the user.
Goes along with c8d0cdec99c95dbed3b58ebcc098cc9d22c58206 that implements
a change to the CMS actions.
2012-12-13 17:43:24 +01:00
Mateusz Uzdowski
f4b080ee06
NEW Side by side editing functionality - first cut (os#7412)
...
Introduces a preview window that appears when the screen is wide enough,
removes old preview button, adds a draft-public switch, adds variety of
preview options which are not hooked up yet.
Goes along with cms commit fa3738a9f4c5181eabf18a77ca89792d31592250
2012-12-10 17:51:35 +01:00
Naomi Guyer
f048b7edf0
BUG FIX: Support for gradients in editor in IE9
...
Signed-off-by: Naomi Guyer <adrexia@gmail.com>
2012-03-09 15:04:26 +13:00
Ingo Schommer
ef514b924e
MINOR Fixed SecurityAdmin styling
2012-01-09 10:09:40 +01:00
Ingo Schommer
3202d12933
MINOR Moved ModelAdmin styles into separate file
2012-01-03 18:11:21 +01:00
Will Rossiter
6b88006456
BUGFIX show scroll bar on menu and side panels in adminstration section rather than hiding
2011-10-29 15:47:07 +13:00
Will Rossiter
a1b6a8aff2
ENHANCEMENT: stripped out typography styles from the cms into its own file. Included styling for ins and del
2011-09-19 17:27:26 +02:00
Ingo Schommer
ce8e72cf0e
MINOR Removing executable flag from all files (thanks miiihi)
2011-09-18 22:04:02 +02:00
Will Rossiter
404e71399b
ENHANCEMENAT: sprited up cms menu icons via compass
2011-08-05 16:46:03 +12:00
Will Rossiter
7872c1297f
MINOR: #css implemented multiple column support for optionset fields.
2011-08-01 10:54:31 +12:00
Will Rossiter
aad97ba220
MINOR: added vertical and horizontal grid helpers
2011-07-29 15:10:14 +12:00
Will Rossiter
1827c18fe1
BUGFIX: fixed CMSMain menu being displayed on CMSPageController pages. MINOR: added icons for main left hand side.
2011-07-28 16:57:41 +12:00
Ingo Schommer
177e085a79
MINOR Improved CSS for left navigation, tabs and form fields
2011-07-08 15:36:47 +02:00
Will Rossiter
6956275d2e
MINOR: css styles and formatting for left hand side menu bar. Altered the stylesheet structure to allow future admin scss theme files to be included easier
2011-05-20 11:29:40 +12:00
Ingo Schommer
f8b38e9adb
MINOR Moving _layout.scss include from screen.css into its own file, in order to selectively block layout options like body {overflow: none;} while retaining all other cms styles (useful in a dialog context)
2011-05-01 20:23:07 +12:00
Ingo Schommer
4ddd69f85f
ENHANCEMENT Using SCSS variables for colour definitions in CMS, setting to greyscale theme for now in order to communicate the early status of the UI work
2011-04-24 11:46:51 +12:00
Ingo Schommer
99a68dde75
ENHANCEMENT Started styles for new CMS
2011-04-24 11:46:48 +12:00
Ingo Schommer
b273861591
ENHANCEMENT Implemented new jLayout layout manager, more expressive class names in LeftAndMain.ss
2011-04-24 11:46:46 +12:00
Ingo Schommer
f6edcd1170
MINOR Setting base font size for CMS
2011-04-24 11:44:19 +12:00
Ingo Schommer
fd0c38c175
MINOR Added sapphire/admin/scss folder and started SCSS file architecture
2011-04-24 11:44:16 +12:00