Christopher Joe
42d36da3fb
Switch redux-logger to redux devtools for easier debugging
2016-08-12 16:11:33 +12:00
Damian Mooyman
56f5a9e06b
Remove obsolete template Editor_toolbar.ss
2016-08-12 11:38:55 +12:00
Damian Mooyman
64ec1f0b03
Remove obsolete template ModelSidebar.ss
2016-08-12 11:08:03 +12:00
Daniel Hensby
988af4582d
Merge pull request #5862 from silverstripe-terraformers/fixes/batch-actions-checkboxes
...
Fix batch action permissions not applied to new nodes loaded
2016-08-11 14:26:27 +01:00
Damian Mooyman
6005a1c2b2
API Upgrade for silverstripe CMS namespace changes
2016-08-11 11:51:02 +12:00
Damian Mooyman
afdae4937e
API Add CMSMenu::remove_menu_class to remove items by class instead of code
2016-08-11 11:47:56 +12:00
Christopher Joe
7448fb7bae
Fix batch action permissions not applied to new nodes loaded
2016-08-11 11:41:07 +12:00
Damian Mooyman
7de5b998e1
Merge 3.4 into 3
2016-08-05 19:12:25 +12:00
Damian Mooyman
ca754eb887
Merge 3.3 into 3.4
...
# Conflicts:
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/it.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/it.js
# lang/cs.yml
# lang/eo.yml
# lang/fa_IR.yml
# lang/fi.yml
# lang/it.yml
# lang/sk.yml
2016-08-05 16:48:26 +12:00
Damian Mooyman
0d5ae23f2b
Merge 3.2 into 3.3
2016-08-05 14:36:35 +12:00
Damian Mooyman
cb39f2ef27
Merge 3.1 into 3.2
...
# Conflicts:
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# javascript/lang/fa_IR.js
# javascript/lang/src/fa_IR.js
2016-08-05 11:41:04 +12:00
Damian Mooyman
9805544cee
Update translations
2016-08-05 11:06:51 +12:00
Paul Clarke
b9445511b7
Bootstrap GridField
2016-08-03 18:35:18 +12:00
Daniel Hensby
af3412a4c2
Merge pull request #5340 from dnadesign/fixToGridFieldLoadingWrongCurrentPage
...
fix to grid field loading wrong current page id when using multiple tabs
2016-08-02 12:44:11 +01:00
Christopher Joe
d93d9bc3c4
Disable datepicker for disabled or readonly fields, they were still editable through the picker
2016-08-01 11:47:48 +12:00
Daniel Hensby
d42826e2ba
Merge pull request #5851 from open-sausages/pulls/4.0/fix-hash-navigation
...
BUG Fix hash link navigation in CMS
2016-07-29 11:26:07 +01:00
Damian Mooyman
06ae50e4f5
BUG Fix hash link navigation in CMS
2016-07-29 15:58:23 +12:00
Oly Su
89508a8f19
Tidy up history panel
2016-07-29 15:54:00 +12:00
Paul
e2826927a7
Adjust width of select dropdown ( #5850 )
2016-07-29 10:48:12 +12:00
Damian Mooyman
d15b19d208
Fix merge regressions in add-link fixes
2016-07-28 17:03:46 +12:00
Damian Mooyman
a868ecdbfa
BUG Correct include paths for legacy JS files
2016-07-28 16:34:28 +12:00
Damian Mooyman
6e74b57c36
BUG Fix issue with gulpfile.js not compiling client/src/legacy dir
...
BUG Make SelectionGroup.ss and SelectionGroup.js work together
BUG Fix for IE visual indentation of composite field
2016-07-28 16:32:40 +12:00
Oly Su
2805baecd3
Added missing bootstrap form messages
...
Align top of selection-group and label
Fix styles for overly nested composite fields
Step label added and new templates for forms
2016-07-28 16:32:40 +12:00
Damian Mooyman
c556b01071
API Update core templates for CompositeField / SelectionGroup.ss
2016-07-28 16:32:40 +12:00
Hamish Friedlander
1f8c2f781b
Fix "Insert Link" dialog in HTMLEditorField. CSS still needs work.
2016-07-28 16:01:50 +12:00
Daniel Hensby
7391ba6229
Merge branch '3.4' into 3
2016-07-25 11:46:06 +01:00
Damian Mooyman
9c7c7f6aa9
BUG Fix regression in missing require_js from #4259
2016-07-25 17:50:56 +12:00
Damian Mooyman
a809e80d01
API Convert CMS forms to bootstrap
...
NEW Add cms-forms microtheme to cater to bootstrap's needs.
Note that the old SS3 assets section is buggy as a result of this change.
2016-07-25 17:24:26 +12:00
Damian Mooyman
7c24703804
BUG Fix regressions in custom admin url from #3274
2016-07-22 10:56:35 +12:00
Damian Mooyman
20daf1f8e1
API Abstract ThemeManifest into ThemeList
...
BUG Fix Requirements not resolving $default theme
2016-07-21 12:11:25 +12:00
Daniel Hensby
c7767b0e5b
Merge pull request #5812 from silverstripe-terraformers/fixes/cms-action-spinner
...
Moved spinner to right so it does not overlap text
2016-07-19 15:34:44 +01:00
Daniel Hensby
ac17e12464
Merge pull request #3274 from colymba/custom-admin-url
2016-07-19 14:42:25 +01:00
Oly Su
059d03bb37
Moved spinner to right so it does not overlap text
2016-07-19 13:57:08 +12:00
Daniel Hensby
a8c0c0fc6a
Merge pull request #3614 from chillu/pulls/switch-states
2016-07-17 12:39:20 +01:00
Loz Calver
0a7e4cf7c3
Merge branch '3'
2016-07-15 16:01:48 +01:00
Loz Calver
391161208e
Merge branch '3.4' into 3
2016-07-15 14:34:50 +01:00
Loz Calver
44d7919496
Merge branch '3.3' into 3.4
2016-07-15 14:34:18 +01:00
Loz Calver
de61551885
Merge branch '3.2' into 3.3
2016-07-15 14:33:38 +01:00
Loz Calver
6ee3e458b6
Merge branch '3.1' into 3.2
2016-07-15 14:32:35 +01:00
Sam Minnée
5c98d331a3
Merge pull request #5804 from open-sausages/feature/themestack
...
API Theme stacking
2016-07-15 17:12:54 +12:00
Hamish Friedlander
b8b4e98ac2
API Theme stacking
2016-07-15 16:29:25 +12:00
Damian Mooyman
5cb4ab4a82
API Add PopoverField for extra-actions popup in react
2016-07-15 15:46:11 +12:00
Damian Mooyman
d08ab6ac81
API Allow X-Frame-Options to be configured
...
Fixes #2970
2016-07-15 14:08:14 +12:00
Giancarlo Di Massa
8f2953f1a0
Quick fix for HTTP/2.0 on OSX/Safari v9.1.1
2016-07-14 16:35:51 +02:00
Damian Mooyman
6e68f38efb
API Update react sections to use react-router instead of page.js ( #5796 )
...
Fixes #5711
2016-07-14 17:51:01 +12:00
Damian Mooyman
26d46517ac
API Remove custom DBHTMLText::exists() custom behaviour
...
Fix merge regressions
2016-07-13 18:45:57 +12:00
Damian Mooyman
68a9b45a9a
Build dist client files
2016-07-13 14:43:07 +12:00
Damian Mooyman
7d82304bb0
BUG Fix route invoking multiple handleStateChanges on single navigation actions
...
BUG Fix reference to non-existant window.history.state.url property
2016-07-13 14:42:57 +12:00
Damian Mooyman
d54f4dc9c6
Convert tabs to spaces in legacy script files
2016-07-13 14:33:19 +12:00
Damian Mooyman
859acf571e
API mute frontend debugging by default ( #5777 )
2016-07-07 10:22:24 +01:00
Damian Mooyman
af22a83166
API Apply Framework\Security namespace
2016-07-07 11:32:28 +12:00
Christopher Joe
b8d634166f
remove adding "original classes"
2016-07-06 21:44:11 +12:00
Damian Mooyman
0b7dab3f66
BUG Fix missing icons
...
Fixes #5657
2016-07-04 18:09:22 +12:00
Damian Mooyman
637167f2f9
BUG Fix missing icons
...
Fixes #5657
2016-07-04 18:07:11 +12:00
Daniel Hensby
390b1fc6c4
Merge branch '3.4' into 3
2016-06-29 11:43:02 +01:00
Daniel Hensby
2ab0dcf618
Merge branch '3.3' into 3.4
2016-06-29 11:42:05 +01:00
Hamish Friedlander
80d4af6b6e
API Apply Framework\ORM Namespace to model
2016-06-29 10:02:32 +12:00
Robbie Averill
1991e7d63e
Use plural name for ModelAdmin tab name ( #5736 )
...
* Fixes #3362
2016-06-27 08:56:35 +12:00
Damian Mooyman
80e5b9149e
API Move dependency on model class from form schema API
...
API Refactor hard-coded dataobject class references from CampaignAdmin
Fixes #5730
2016-06-23 11:04:42 +12:00
David Craig
83308689d5
API Initialise React controllers via routes ( #5436 )
2016-06-16 15:04:14 +12:00
Damian Mooyman
7a462cecef
Merge pull request #5684 from patricknelson/issue-5683-iframe-backport-pr-fix-5163
...
FIX for #5683 : Address security warning in CMS on 3.3 and above.
2016-06-15 14:47:03 +12:00
Hamish Friedlander
51d53f4b50
Merge pull request #5646 from open-sausages/pulls/4.0/config-table-name
...
API Allow table_name to be declared / introduce DataObjectSchema
2016-06-14 15:06:38 +12:00
Daniel Hensby
9e3f76832b
Merge branch '3'
2016-06-13 13:41:20 +01:00
Daniel Hensby
0d36899afa
Merge branch '3.4' into 3
2016-06-13 12:30:33 +01:00
Daniel Hensby
4e392a4d43
Merge branch '3.3' into 3.4
2016-06-13 12:30:16 +01:00
Daniel Hensby
695c18ac6d
Merge branch '3.2' into 3.3
2016-06-13 12:29:45 +01:00
Patrick Nelson
f0d4951815
FIX for #5683 : Address security warning in CMS when attempting to access <iframe> contents (Back-porting fix from PR #5163 )
2016-06-12 17:26:36 -07:00
Damian Mooyman
5e8ae41d47
API Refactor dataobject schema management into separate service
...
API Allow table_name to be configured via Config
2016-06-08 13:22:56 +12:00
Paul Clarke
b3a96e7e3d
minor linting fix
2016-06-07 12:45:38 +12:00
Paul Clarke
5e634c2a16
Update Form component to just Form
...
Convert form and Textfield styles to use Bootstrap
Split out btn styles a bit more clearly defined (BEM)
Toolbar modifier to improve spacing for smaller screens
Use bootstrap spacer styles .m-t-1 (margin-top-1 x spacer) instead of custom spacer
Added a few typography helpers
Tab styles continued although they are hidden (used on AssetAdmin editor panel)
2016-06-03 15:52:31 +12:00
Ingo Schommer
3c03dcff91
Variable for light component background
...
Required for a highlighted file in admin/assets
2016-06-03 15:00:04 +12:00
Ingo Schommer
7c62a6d58d
Bootstrap classes for text field
...
Required to support new "compressed" form style in admin/assets
which puts form field labels on their own line (and requires the bootstrap layout styling for this)
2016-06-03 14:59:40 +12:00
Damian Mooyman
ff3b970b71
Update translations
2016-06-02 17:07:41 +12:00
UndefinedOffset
341f49c630
BUGFIX: Fixed lookup of next closest visible field for focus restoring ( fixes #5618 )
2016-05-31 11:09:40 -03:00
Chris Joe
b4c5c71a0b
ActionTabSet, Change position absolute to bottom instead of top ( #5602 )
...
* change position absolute to bottom instead of top
* Fixed bottom position to 100% to uncover the tabset title
2016-05-31 09:48:59 +01:00
Paul
f4037fe319
Swap out .Actions class for bootstrap .btn-toolbar ( #5581 )
...
* Swap out .Actions class for bootstrap .btn-toolbar
* Converted all south toolbars to use new toolbar component styles, content and preview styles for scrollbars adjusted where required
2016-05-27 13:39:10 +12:00
Loz Calver
11aad47eeb
Fix invalid syntax in TinyMCE config ( #5593 )
2016-05-27 13:35:46 +12:00
Christopher Joe
19a1ebe789
add namespace for appBoot, and fix syntax error in GridField
2016-05-25 12:11:46 +12:00
Daniel Hensby
e5f1ca3bbe
Cleaning up Controller::handleRequest
...
1. Separated responsibility of handleAction so that it no longer bootstraps the controller and cleans up after the request is handled.
2. NEW beforeHandleRequest to take responsibility of bootstrapping the controller
3. NEW afterHandleRequest to take responsibility of cleanup for the controller
4. NEW calling init on controllers deprecated in favour of callInit() which takes responsibility of enforcing that "base init" is called and the before and after hooks
5. NEW Added prepareResponse to Controller for dealing with responses from controllers
6. NEW setResponse added to controller for setting response objects on the controller
2016-05-23 00:21:04 +01:00
Daniel Hensby
cdb0b07345
Merge branch '3'
2016-05-20 14:20:33 +01:00
Damian Mooyman
d125d4e304
Update translations
2016-05-19 14:48:39 +12:00
scott1702
f373632d98
Remove old logout icon on retina screens
...
Remove background rules for old preview icons
2016-05-18 16:28:05 +01:00
Damian Mooyman
66ef857cdf
Manual merge of #5412 into master
2016-05-18 17:42:13 +12:00
Damian Mooyman
303f695751
Merge 3.3 into 3
...
# Conflicts:
# admin/javascript/LeftAndMain.EditForm.js
2016-05-18 17:29:30 +12:00
Damian Mooyman
829f59e443
BUG Fix link dialog box layout in CMS
2016-05-17 12:04:03 +12:00
Scott Hutchinson
9ba362065e
Fix loading icon bug on IE
2016-05-14 14:09:50 +12:00
Patrick Nelson
693408330b
FIX for #5410 to help focus errors occurring on tabs within GridField controlled DataObjects (et al).
...
Tidy up Entwine logic for selecting tabs containing errors
2016-05-13 16:12:32 -07:00
Damian Mooyman
19daf8f974
Update translations
2016-05-12 15:37:09 +12:00
Hamish Friedlander
a61d0a2f0b
FIX Persistant Loading... indicator when no campaigns yet in admin
2016-05-12 13:32:38 +12:00
Ingo Schommer
0838770798
Consistent React event method naming
...
Use "on<event>" for props, same as React's own event naming: https://facebook.github.io/react/docs/forms.html#interactive-props
Use "handle<event>" to delineate internal handlers
2016-05-11 18:08:23 +12:00
Paul Clarke
c1204bc614
build js/css
2016-05-11 16:33:11 +12:00
Paul Clarke
746c4f7548
Vertically centre title only in breadcrumb
...
Fixes #5508
2016-05-11 16:32:49 +12:00
Paul Clarke
25fead8afc
Reorder Campaigns in lefthand menu
2016-05-11 16:31:02 +12:00
Ingo Schommer
a736d9e08b
Merge pull request #5510 from open-sausages/pulls/4.0/5495-security-header-fix
...
Markup and styles for back button outside of new toolbar
2016-05-11 16:07:17 +12:00
Damian Mooyman
f13e44a265
Merge 3 into master
...
# Conflicts:
# admin/javascript/LeftAndMain.Tree.js
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/en.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/en.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# css/GridField.css
# forms/gridfield/GridFieldExportButton.php
# javascript/GridField.js
# javascript/lang/ar.js
# javascript/lang/cs.js
# javascript/lang/de.js
# javascript/lang/en.js
# javascript/lang/en_GB.js
# javascript/lang/eo.js
# javascript/lang/es.js
# javascript/lang/fi.js
# javascript/lang/fr.js
# javascript/lang/id.js
# javascript/lang/id_ID.js
# javascript/lang/it.js
# javascript/lang/ja.js
# javascript/lang/lt.js
# javascript/lang/mi.js
# javascript/lang/nb.js
# javascript/lang/nl.js
# javascript/lang/pl.js
# javascript/lang/ru.js
# javascript/lang/sk.js
# javascript/lang/sl.js
# javascript/lang/sr.js
# javascript/lang/sr@latin.js
# javascript/lang/sr_RS.js
# javascript/lang/sr_RS@latin.js
# javascript/lang/src/ar.js
# javascript/lang/src/cs.js
# javascript/lang/src/de.js
# javascript/lang/src/en.js
# javascript/lang/src/eo.js
# javascript/lang/src/es.js
# javascript/lang/src/fi.js
# javascript/lang/src/fr.js
# javascript/lang/src/id.js
# javascript/lang/src/id_ID.js
# javascript/lang/src/it.js
# javascript/lang/src/ja.js
# javascript/lang/src/lt.js
# javascript/lang/src/mi.js
# javascript/lang/src/nb.js
# javascript/lang/src/nl.js
# javascript/lang/src/pl.js
# javascript/lang/src/ru.js
# javascript/lang/src/sk.js
# javascript/lang/src/sl.js
# javascript/lang/src/sr.js
# javascript/lang/src/sr@latin.js
# javascript/lang/src/sr_RS.js
# javascript/lang/src/sr_RS@latin.js
# javascript/lang/src/sv.js
# javascript/lang/src/zh.js
# javascript/lang/sv.js
# javascript/lang/zh.js
# scss/GridField.scss
# tests/model/ManyManyListTest.php
# tests/model/SQLQueryTest.php
2016-05-11 15:19:35 +12:00
Paul Clarke
7093224db3
Markup and styles for back button outside of new toolbar
...
Adjust height of north bar to match rest of CMS plus minor positioning
fixes.
2016-05-11 14:39:47 +12:00
Damian Mooyman
4f06a43986
Merge 3.3 into 3
...
# Conflicts:
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/en.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# javascript/lang/fr.js
# javascript/lang/src/ar.js
# javascript/lang/src/cs.js
# javascript/lang/src/de.js
# javascript/lang/src/en.js
# javascript/lang/src/eo.js
# javascript/lang/src/es.js
# javascript/lang/src/fi.js
# javascript/lang/src/fr.js
# javascript/lang/src/id.js
# javascript/lang/src/id_ID.js
# javascript/lang/src/it.js
# javascript/lang/src/ja.js
# javascript/lang/src/lt.js
# javascript/lang/src/mi.js
# javascript/lang/src/nb.js
# javascript/lang/src/nl.js
# javascript/lang/src/pl.js
# javascript/lang/src/ru.js
# javascript/lang/src/sk.js
# javascript/lang/src/sl.js
# javascript/lang/src/sr.js
# javascript/lang/src/sr@latin.js
# javascript/lang/src/sr_RS.js
# javascript/lang/src/sr_RS@latin.js
# javascript/lang/src/sv.js
# javascript/lang/src/zh.js
# lang/it.yml
2016-05-11 14:06:23 +12:00
Damian Mooyman
f4c2a89d5a
Update translations
2016-05-11 11:05:57 +12:00
Damian Mooyman
c27cb2dae7
Update translations
2016-05-11 11:05:37 +12:00
Damian Mooyman
60644a5be8
Update translations
2016-05-11 10:58:25 +12:00
Paul Clarke
1f4bdb2d8f
Remove the small space above menu to align with content area
2016-05-10 22:22:49 +12:00
Paul Clarke
79d1a0542d
Spacing above forms and of labels and middle column within forms
2016-05-10 22:20:00 +12:00
Paul Clarke
f64de9b667
Move accordion item up slightly
2016-05-10 22:20:00 +12:00
Paul Clarke
25f118657e
Slight adjustment to make sure icons don't effect text
2016-05-10 22:20:00 +12:00
Paul Clarke
f0d6f6b04e
Remove verdana (ui-widget) overrides
2016-05-10 22:19:31 +12:00
Paul Clarke
e0a7c4fb47
Move the back arrow back slightly for visual alignment
2016-05-10 22:19:31 +12:00
Damian Mooyman
7f03b88e5e
API Add empty campaign layout
2016-05-10 17:34:32 +12:00
Paul Clarke
0321d0868e
Added btn--icon-xl for use within assetAdmin
2016-05-10 16:34:13 +12:00
Paul Clarke
100deada75
Updated markup on Campaign edit and add screen to use newer patterns.
...
Moved role=group up a level as it broke layout.
2016-05-10 16:33:21 +12:00
Paul Clarke
75faa0de9f
Reduce spacing between buttons, fix for large icons
2016-05-10 16:27:26 +12:00
Paul Clarke
d8a13233e6
Removed menu line-height overrides
...
Now that bootstrap is in line-height isn’t needed here
2016-05-10 16:27:26 +12:00
Paul Clarke
e16d3ec963
Added space to top of assetAdmin sort
2016-05-10 16:27:26 +12:00
Paul Clarke
26b84ab488
Update spacing to be consistent throughout
...
Uses bootstrap $gutters rather than $spacer even though they are based
of the same value.
Improves alignment of a few things but mostly unnoticeable.
2016-05-10 16:27:26 +12:00
Damian Mooyman
9588f0c999
Remove redux from breadcrumbs and fix breadcrumbs lazy loading
2016-05-10 15:34:54 +12:00
Ingo Schommer
c9e7d4fb81
Unnest breadcrumbs
2016-05-10 13:34:45 +12:00
Damian Mooyman
3edbfd944e
API Implement breadcrumbs via controllable state
2016-05-10 13:34:34 +12:00
Ingo Schommer
d9f0914e4f
Use props.extraClass on TextField holder
...
This should be separated out to a common FormField class,
but for now we're only using TextField. Can be solved
properly at the same time as switching form fields to
react-bootstrap.
Required for readonly field value alignment in the "campaigns" edit form.
2016-05-10 10:45:12 +12:00
Daniel Hensby
1fcf3a1315
Merge pull request #5485 from open-sausages/pulls/4.0/grid-field-tmp-loading-indicator
...
Simple GridField ReactJS loading indication
2016-05-09 16:21:44 +01:00
Ingo Schommer
2610010d52
Load form data back into obj after save() ( fixes #5484 )
2016-05-09 22:55:43 +12:00
Ingo Schommer
eab90bc82e
Simple GridField ReactJS loading indication
...
Better than no feedback at all while campaigns are loading.
Not using spinner.gif because a loading animation is already presented when the section is loaded (via PJAX).
Not translating the "Loading..." text because its temporary.
2016-05-09 22:35:51 +12:00
Ingo Schommer
984d7c1cf6
Don't use Object.freeze on functions ( fixes #5473 )
...
We're not using it for any other props passed to ReactJS components,
so there's no reason to do it here. Props are immutable by convention.
While it would be nice to enforce this, its too common to pass through
function objects which aren't supported by IE's Object.freeze().
IE isn't following the spec on how to handle Object.freeze(function() {}).
See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/freeze#Notes
> In ES6, a non-object argument will be treated as if it was a frozen ordinary object, simply return it.
MS docs on https://msdn.microsoft.com/en-us/subscriptions/downloads/ff806186(v=vs.94).aspx
> If the object argument is not an object, a TypeError exception is thrown.
2016-05-09 21:19:43 +12:00
Damian Mooyman
8b94dd83df
API Add CSRF to Campaign delete
2016-05-09 17:33:10 +12:00
Damian Mooyman
79a76c52c5
Merge pull request #5476 from open-sausages/pulls/4.0/5355-checkboxes-bootstrap-conflict
...
Checkbox layout, including settings tab bugs. Fixes #5355
2016-05-09 16:31:15 +12:00
Hamish Friedlander
b2786c228b
FIX add_i18n_javascript calls not being updated after JS move
...
This fixes alert / confirm boxes that were popping up without text (for
example silverstripe-cms/issues/1476), although ideally we wouldn't
show empty dialog boxes on this sort of error - we'd have some default,
or a way to detect the issue.
2016-05-09 15:41:24 +12:00
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