Mike Cochrane
3673a5e141
FIX Inserting a 'Download a file' without selecting an image
...
In the html editor, when inserting a 'Download a file' link without selecting a file to link to, no link should be inserted. Currently is inserting a link to an undefined file id: [file_link,id=undefined]
2016-03-11 00:35:13 +00:00
Mike Cochrane
0b81bbef22
FIX attempt to access https iframe from http interface
2016-03-09 21:36:39 +13:00
Mike Cochrane
a3ee9ece90
FIX avoid javascript error when preview is https
...
When the admin interface is http but the preview is https, javascript isn't able to read the contentDocument of the secure preview iframe. This currently results in a javascript error. Patch wraps try/catches around the two instances,
2016-03-09 21:19:26 +13:00
Damian Mooyman
6d88caa9b3
Merge pull request #5132 from open-sausages/features/form-schema
...
API Form schema
2016-03-07 14:08:36 +13:00
Ingo Schommer
3b11d73c46
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# forms/gridfield/GridFieldDetailForm.php
# javascript/GridField.js
2016-03-07 09:26:35 +13:00
Ingo Schommer
f36b110db3
Merge remote-tracking branch 'origin/3.3'
2016-03-04 17:06:04 +13:00
Ingo Schommer
466ed29f0e
Merge remote-tracking branch 'origin/3.3' into 3
2016-03-04 14:55:08 +13:00
Ingo Schommer
3c53da0890
Merge remote-tracking branch 'origin/3.2' into 3.3
2016-03-04 14:05:06 +13:00
Ingo Schommer
7bb6295c79
Fix TreeDropdownField auto-close regression
...
Causes build failures due to Behat not being able to select
a link from a dropdown in "Insert Media".
Follow on effect from triggering a window.resize event
when the window wasn't actually resized (in order to force a layout redraw).
See https://github.com/silverstripe/silverstripe-framework/pull/5087 for context
2016-03-03 17:54:07 +13:00
Ingo Schommer
61a8529d76
More reuseable FormSchema logic, return on save
2016-03-03 13:36:51 +13:00
Ingo Schommer
746322a9f1
Replace CMSForm use with new setValidationResponseCallback() API
...
Preparing for form schema API, see https://github.com/silverstripe/silverstripe-framework/issues/4938
2016-03-03 08:20:55 +13:00
David Craig
404ac4ae43
Initial schemaState implementation
2016-03-03 08:20:54 +13:00
David Craig
afccef718c
Initial Form Field Schema implementation
...
- Adds FormSchema class
- Adds FormSchema dependency to LeftAndMain via Injector
- Adds schema allowed_action method to LeftAndMain for generating Form schemas
- Adds FormFieldSchemaTrait to for schema getters and setters on FormFields
2016-03-03 08:20:54 +13:00
Nicola Fontana
29b35c7ccf
Do not hang on nested parameters in search context
...
Backport of 0b5a57389b
for 3.2 that does not add a new API, as
required by #5056 to be semver compatible.
2016-02-28 21:40:34 +01:00
David Craig
40723aaa58
Fix undeclared variable in UploadField.js
2016-02-26 14:43:14 +13:00
Damian Mooyman
c4f850003b
Merge pull request #5089 from jakedaleweb/3
...
added if statement to catch NULL validators
2016-02-26 09:29:53 +13:00
Damian Mooyman
3b0a9f4ba2
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# admin/javascript/LeftAndMain.Menu.js
# control/HTTPRequest.php
# css/GridField.css
# css/GridField.css.map
# docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.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/01_File_Management.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# filesystem/Upload.php
# javascript/HtmlEditorField.js
# model/Image.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/Enum.php
# model/versioning/Versioned.php
# scss/GridField.scss
2016-02-25 14:51:59 +13:00
Damian Mooyman
9fed5561f4
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# core/Constants.php
# dev/DevelopmentAdmin.php
2016-02-24 17:39:04 +13:00
Damian Mooyman
5f2d3f31d7
Merge remote-tracking branch 'origin/3.2' into 3.3
...
# Conflicts:
# dev/DevelopmentAdmin.php
# docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
# lang/cs.yml
# lang/lt.yml
2016-02-24 17:29:06 +13:00
Jake Ovenden
48ecb8d8f4
added if statement to catch NULL validators
2016-02-24 15:13:00 +13:00
scott1702
a67b8144b0
Fix incorrect height on main nav after toggle
2016-02-24 10:23:16 +13:00
David Craig
5a42a4181a
Added Bootstrap Alpha.2
...
- Managed by npm
- Created an `npm run css` task to compile
- Updated shrinkwrap
- Updated changelog
2016-02-23 11:11:24 +13:00
Damian Mooyman
f20ad434ce
API Update TinyMCE to 4.x
...
API Allow HtmlEditorField to be individually configured
BUG Fix incorrect change detection
BUG Fix missing i18n files
2016-02-23 10:10:02 +13:00
Damian Mooyman
3738436d0e
Update translations
2016-02-19 10:54:36 +13:00
scott1702
38b1c0a162
Replace Compass with gulp-sass
2016-02-16 18:35:57 +13:00
Damian Mooyman
b82d585b57
Merge pull request #5019 from open-sausages/require-react
...
Include React and related libraries in framework
2016-02-15 16:25:39 +13:00
scott1702
2bf802a8cd
Include React and related libraries in framework
2016-02-15 16:05:55 +13:00
Damian Mooyman
230d017677
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# admin/css/ie7.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/font/icon-reference.html
# admin/font/silverstripe.eot
# admin/font/silverstripe.svg
# admin/font/silverstripe.ttf
# admin/font/silverstripe.woff
# admin/scss/_forms.scss
# admin/scss/_style.scss
2016-02-12 15:41:45 +13:00
Damian Mooyman
d5b4c90cb4
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# admin/css/screen.css
# admin/css/screen.css.map
# admin/scss/_fonts.scss
# admin/scss/_retina.scss
2016-02-09 18:25:47 +13:00
Damian Mooyman
35b5c03fbc
Merge branch 3.3.0 into 3.3
2016-02-09 18:22:58 +13:00
Damian Mooyman
adc7a59108
Update translations
2016-02-09 17:45:21 +13:00
Daniel Hensby
cb39c41872
Merge pull request #5015 from webbuilders-group/3.3-datetime-search-fix
...
BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel
2016-02-05 15:31:37 +00:00
UndefinedOffset
0c252af334
BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel
2016-02-05 10:53:35 -04:00
Loz Calver
70f8343475
Re-instate back button for item edit forms
2016-02-05 09:39:57 +00:00
Damian Mooyman
d754884214
Update translations
2016-02-04 11:03:41 +13:00
scott1702
f39989a396
Add new font icons to set
...
Add .no-text class for icons which have no text
2016-02-04 10:34:30 +13:00
Daniel Hensby
316d5ef967
Set the stage reading mode in LeftAndMain
2016-02-03 21:27:13 +00:00
scott1702
15fba5a4cb
Remove old logout icon on retina screens
...
Remove background rules for old preview icons
2016-02-03 16:36:21 +13:00
Daniel Hensby
24aaee984e
Set the stage reading mode in LeftAndMain
2016-02-02 13:35:39 +00:00
Daniel Hensby
c5fc9dd650
FIX CMS actions alignment
2016-01-26 14:38:48 +00:00
Damian Mooyman
d4521cbc92
Update gitattributes and Rebuild bundles
2016-01-26 13:14:48 +13:00
Damian Mooyman
6cebffd89b
BUG Fix SSViewerTest not restoring old requirements
...
BUG Fix incorrect js path in UploadField.php
Restore changes missing from merge
2016-01-26 11:39:53 +13:00
David Craig
2fc9d69197
Remove files after rebase
2016-01-26 11:39:53 +13:00
David Craig
2140025c20
Implement RFC-7 JavaScript module loader
...
- Adds ES6 support via Babel
- Transforms existing JavaScript to UMD modules
- Adds module bundling via Browserify
- Existing JavaScript converted to UMD modules
- lib.js and leftandmain.js are bundled using browserify
- JavaScript minifying of bundles handed by gulp
2016-01-26 11:39:20 +13:00
Damian Mooyman
69c9ad1428
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/scss/_style.scss
# css/AssetUploadField.css
# css/GridField.css.map
# docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
# lang/fi.yml
2016-01-25 16:15:41 +13:00
Damian Mooyman
e091bb8474
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# admin/scss/_forms.scss
# admin/scss/_style.scss
# tests/model/VersionedTest.yml
2016-01-25 15:57:37 +13:00
Damian Mooyman
75493e79ff
Update translations
2016-01-25 15:06:55 +13:00
scott1702
1a1c7b2f55
Update background colors
2016-01-22 17:50:01 +13:00
divzpatel123@gmail.com
7ead6f0ca9
Minor: changed px value on tabs (border-bottom)
2016-01-22 17:22:31 +13:00
Meeeeeeow
d8ee25c39c
Minor: Remove Boxshadows
2016-01-22 17:18:02 +13:00
divzpatel123@gmail.com
fbc68f433f
Minor: update background colors
2016-01-22 16:32:52 +13:00
scott1702
e4222d8186
Add default action from batch actions
2016-01-22 16:02:27 +13:00
Igor
3924db26d8
Add special flag to CMS preview requests
2016-01-22 13:02:59 +13:00
Daniel Hensby
1bf0605f5e
Merge pull request #4568 from tractorcow/pulls/4.0/dropdown-cleanup
...
API Cleanup and refactor of select fields and Standardise Relation interface
2016-01-21 12:39:27 +00:00
Loz Calver
219f76f87c
Merge pull request #4951 from divya-patel/logout-menu-update
...
Minor:updated the menu on the top left; changed styles
2016-01-21 09:54:54 +00:00
Damian Mooyman
bdb1a95758
API Cleanup and refactor of select fields
...
API Standardise Relation interface
2016-01-21 15:40:19 +13:00
Damian Mooyman
bc2a4dd652
Merge pull request #4953 from lry6003/search-icon
...
Search Icon Hover/Active/Focus changes
2016-01-21 14:57:13 +13:00
Damian Mooyman
d8ea6ceccc
Update translations
2016-01-21 14:22:35 +13:00
divzpatel123@gmail.com
4dee924432
Minor:updated the menu on the top left; changed styles
2016-01-20 15:44:40 +13:00
Luke Ryley
38e2cb5b6d
Search Icon Hover/Active/Focus changes
...
Changed the color of the search icon when it is in Hover/Active/Focus state and removed backgroup color changes in these states
2016-01-20 14:35:54 +13:00
Damian Mooyman
eeb110a04f
Merge pull request #4939 from lry6003/unbold-labels
...
Minor: Unbolded labels in CMS
2016-01-20 13:31:13 +13:00
Damian Mooyman
e6b877df27
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# control/Director.php
# control/HTTP.php
# core/startup/ParameterConfirmationToken.php
# docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
# docs/en/00_Getting_Started/04_Directory_Structure.md
# docs/en/00_Getting_Started/05_Coding_Conventions.md
# docs/en/01_Tutorials/01_Building_A_Basic_Site.md
# docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
# docs/en/01_Tutorials/03_Forms.md
# docs/en/01_Tutorials/04_Site_Search.md
# docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
# docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
# docs/en/02_Developer_Guides/13_i18n/index.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
# docs/en/03_Upgrading/index.md
# docs/en/changelogs/index.md
# docs/en/howto/customize-cms-menu.md
# docs/en/howto/navigation-menu.md
# docs/en/index.md
# docs/en/installation/index.md
# docs/en/installation/windows-manual-iis-6.md
# docs/en/misc/contributing/code.md
# docs/en/misc/contributing/issues.md
# docs/en/misc/module-release-process.md
# docs/en/reference/dataobject.md
# docs/en/reference/execution-pipeline.md
# docs/en/reference/grid-field.md
# docs/en/reference/modeladmin.md
# docs/en/reference/rssfeed.md
# docs/en/reference/templates.md
# docs/en/topics/commandline.md
# docs/en/topics/debugging.md
# docs/en/topics/email.md
# docs/en/topics/forms.md
# docs/en/topics/index.md
# docs/en/topics/module-development.md
# docs/en/topics/modules.md
# docs/en/topics/page-type-templates.md
# docs/en/topics/page-types.md
# docs/en/topics/search.md
# docs/en/topics/testing/index.md
# docs/en/topics/testing/testing-guide-troubleshooting.md
# docs/en/topics/theme-development.md
# docs/en/tutorials/1-building-a-basic-site.md
# docs/en/tutorials/2-extending-a-basic-site.md
# docs/en/tutorials/3-forms.md
# docs/en/tutorials/4-site-search.md
# docs/en/tutorials/5-dataobject-relationship-management.md
# docs/en/tutorials/building-a-basic-site.md
# docs/en/tutorials/dataobject-relationship-management.md
# docs/en/tutorials/extending-a-basic-site.md
# docs/en/tutorials/forms.md
# docs/en/tutorials/index.md
# docs/en/tutorials/site-search.md
# main.php
# model/SQLQuery.php
# security/ChangePasswordForm.php
# security/MemberLoginForm.php
# tests/control/ControllerTest.php
# tests/core/startup/ParameterConfirmationTokenTest.php
# tests/model/SQLQueryTest.php
# tests/security/SecurityTest.php
# tests/view/SSViewerTest.php
# view/SSTemplateParser.php
# view/SSTemplateParser.php.inc
# view/SSViewer.php
2016-01-20 13:16:27 +13:00
Damian Mooyman
8c1cafd1a0
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# admin/scss/_forms.scss
# admin/scss/_style.scss
# admin/scss/_tree.scss
# javascript/TreeDropdownField.js
2016-01-19 17:08:26 +13:00
Meeeeeeow
4301ae20bf
Changed the link colours
2016-01-19 15:46:29 +13:00
Luke Ryley
2701248387
Minor: Unbolded labels in CMS
...
- updated _forms.scss removed font-weight
- also removed drop-shadow include
Luke Ryley - open source academy
2016-01-19 12:04:55 +13:00
David Craig
254b942737
Adds npm for managing client-side dependencies
...
- Includes a package.json file with build and CI scripts
- Includes shrinkwrap file for locking dependency version
- Includes Gulp for running build tasks
- Includes a 'build' task for copying library files from node_modules to thirdparty
- Includes a 'sanity' task for makes sure library files in thirdparty match what's in node_modules
- Includes updates to .travis.yml (new JS_SANITY_CHECK flag) to run the sanity task
2016-01-13 09:23:47 +13:00
scott1702
4a0e157479
Remove focus outline when clicking tabs
2016-01-08 15:11:17 +13:00
Sam Minnee
3ee8f505b7
MINORE: Remove training whitespace.
...
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.
Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.
The command used was this:
for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +13:00
scott1702
b64d73dcbf
color updates to meet contrast requirements
2016-01-05 11:20:30 +13:00
Damian Mooyman
952896e638
Update translations
2015-12-23 13:22:38 +13:00
Damian Mooyman
9fcca5c7e2
Merge pull request #4842 from open-sausages/icon-tabs
...
Update icon-button-group css
2015-12-22 16:20:38 +13:00
Damian Mooyman
4e3d6f9118
Fix merge regressions from 3.2 -> 3
2015-12-22 14:35:05 +13:00
Damian Mooyman
48a30909f3
Merge remote-tracking branch 'origin/3.2' into 3
...
# Conflicts:
# admin/javascript/LeftAndMain.BatchActions.js
# css/UploadField.css
# forms/HtmlEditorField.php
2015-12-22 14:07:52 +13:00
scott1702
78190f213d
Update icon-button-group css
2015-12-11 18:20:33 +13:00
Damian Mooyman
b338efe5a7
Update translations
2015-11-11 16:07:20 +13:00
scott1702
4f8b061b59
Remove drag handle from non-draggable js-trees
2015-11-05 13:09:47 +13:00
Damian Mooyman
44728d1c76
Merge pull request #4740 from chillu/pulls/3.2/batch-action-url-fix
...
Batch actions break with Translatable installed
2015-11-04 09:31:21 +13:00
Ingo Schommer
acdcf8ca02
Batch actions break with Translatable installed
...
Due to ?locale GET parameter being appended to the action URL,
and naive string concatenation of additional GET parameters.
2015-11-04 08:35:25 +13:00
Damian Mooyman
1e1a7a345c
Merge remote-tracking branch 'origin/3'
...
Conflicts:
control/Director.php
filesystem/File.php
filesystem/GD.php
filesystem/ImagickBackend.php
forms/HtmlEditorField.php
javascript/UploadField_uploadtemplate.js
model/Image.php
model/Image_Backend.php
model/fieldtypes/Enum.php
templates/AssetUploadField.ss
tests/model/ImageTest.php
tests/search/FulltextFilterTest.php
2015-11-03 14:23:16 +13:00
Damian Mooyman
c4dc10b255
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
forms/DropdownField.php
tests/model/ImageTest.php
2015-11-03 13:06:39 +13:00
Damian Mooyman
e07f80014c
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
lang/cs.yml
lang/sk.yml
2015-11-03 11:10:46 +13:00
Ed Linklater
42d2e0ebbf
Don't try to unbind events from inside top-level iframes
2015-11-01 06:14:30 +13:00
scott1702
9f9d0089df
Send user to new area when inserting url
2015-10-29 11:37:59 +13:00
scott1702
1f64631bfc
Update asset admin toolbar
2015-10-23 17:39:42 +13:00
Stephen Shkardoon
6030854725
Fix page reordering bug with ParentID
...
If you are viewing PageA in the CMS, but move PageB into PageC,
the edit form will recieve an edit form ParentID of PageC.
This is incorrect, as only PageB had it's ParentID change.
2015-10-12 20:10:48 +13:00
scott1702
4f72b5cfb6
Add thumbnails font-icon
2015-10-08 10:22:14 +13:00
Damian Mooyman
0cd3569fb9
Update translations
2015-10-06 18:33:16 +13:00
scott1702
23baa288ba
Sticky footer on insert media/link elements
2015-10-01 15:35:56 +13:00
scott1702
3f85c57013
Move 'upload new file' section to main files area
...
Optimise and fix drag drop on upload fields
Combine 3 tabs from the 'insert media' dialog box into 1
2015-09-28 12:02:33 +13:00
Loz Calver
8f0f6475da
FIX: Issues with field focus in edit forms ( fixes #4621 )
2015-09-23 15:19:24 +01:00
Nicola Fontana
c39cf2d55f
Do not hang on nested parameters in search context
2015-09-23 09:12:02 +02:00
Damian Mooyman
34b71cf6c8
Merge remote-tracking branch 'origin/3'
2015-09-15 13:42:17 +12:00
Damian Mooyman
00caeb700d
Added 3.1.14 changelog
...
Update translations
2015-09-15 10:58:15 +12:00
scott1702
48c48d703d
Disable split view mode when not enough room
2015-09-15 10:28:37 +12:00
Damian Mooyman
45b22c788e
BUG Fix missing framework/admin/tests
2015-09-10 11:06:15 +12:00
Damian Mooyman
812b5ecb62
Fix merge regressions
2015-09-09 16:18:39 +12:00
Damian Mooyman
13e1f52b37
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-09 16:14:28 +12:00
Damian Mooyman
6ad277c412
Fix merge regressions
2015-09-09 16:12:12 +12:00
Damian Mooyman
b552a7370f
Merge remote-tracking branch 'origin/3'
...
Conflicts:
tests/model/ImageTest.php
2015-09-09 15:44:47 +12:00
Damian Mooyman
f10785350e
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
2015-09-09 14:50:47 +12:00
Damian Mooyman
309ac0d196
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
.travis.yml
admin/code/CMSProfileController.php
admin/tests/LeftAndMainTest.php
control/HTTP.php
security/Permission.php
tests/forms/FormTest.php
tests/model/ArrayListTest.php
tests/security/PermissionTest.php
2015-09-09 14:35:29 +12:00
Damian Mooyman
96d20bc180
BUG Fix missing framework/admin/tests
2015-09-07 18:04:56 +12:00
scott1702
9cbb235daa
update cms notifications
...
New style - text now wraps instead of overflowing
Now stay on screen longer
Hovering causes notification to stay on screen
2015-09-02 15:47:48 +12:00
Damian Mooyman
92f9af1984
Update translations
2015-09-02 11:15:53 +12:00
scott1702
5f56f204f1
Update view mode section w/ font icons
2015-09-01 10:54:52 +12:00
Daniel Hensby
ea757e72a6
Merge pull request #4560 from willmorgan/bugfixes/localstorage-win81-ie11
...
Fix localStorage for Windows 8.1 IE11 desktop mode
2015-08-29 21:15:19 +01:00
James Bolitho
0cb98bcce2
Fix localStorage for Windows 8.1 IE11 desktop mode
...
In IE11 windows 8 call to window.localStorage was throwing out an access denied error. Using try and catch manages the issue and allows the script to execute in IE 11 in desktop mode.
I think it is a problem with IE11 rather than the way Silverstripe is implementing the preview via an iframe from what I have been reading. http://blogs.msdn.com/b/ieinternals/archive/2009/09/16/bugs-in-ie8-support-for-html5-postmessage-sessionstorage-and-localstorage.aspx . It seems that the way IE11 deals with localStorage is broken in certain cases but I am not 100% certain of the cause yet as I have not been able to find a definitive answer. I only noticed it was a problem when a new client said they couldn't view the admin screen properly in IE11. I took a look in IE11 and I was experiencing the same problem which makes the admin interface layout screw up and the preview doesn't work due the error mentioned in the first post.
Instead of the original code I submitted I have amended it and added an additional function to test more robustly to see if localStorage is available and can be accessed properly. It is a copy of the code on a blog post Mathias Bynens has written about detecting if localStorage is available and can be used: https://mathiasbynens.be/notes/localstorage-pattern
I have added a console.warn as you suggested if localStorage is not available so that at least you get a warning if localStorage tests fail.
I have tested this on Windows 8.1: Firefox, Chrome & Mac: Firefox, Safari, Chrome and it seems to work as expected. On IE11 it displays the admin area correctly now but obviously doesn't save the preview settings between page loads if localStorage is not available.
2015-08-29 15:54:14 +01:00
Sam Minnée
f4b7cd3f68
Merge pull request #4500 from stevie-mayhew/pulls/get-response
...
FEATURE: implement getter and setter usage for response
2015-08-29 15:35:55 +12:00
Stevie Mayhew
1b57e0ca5b
FEATURE: implement getter and setter usage for response
2015-08-29 10:24:06 +12:00
scott1702
17ab371ffa
Update font icon library
2015-08-28 15:15:06 +12:00
scott1702
6180788f9d
Fix alignment of logout area
2015-08-28 12:20:00 +12:00
Daniel Hensby
08dd8fda62
Merge pull request #4086 from xini/fix-remote-url-field
...
fix width of remote url field label to allow right-click-paste
2015-08-27 20:50:35 +01:00
Daniel Hensby
2d4b743090
FIX Members can access their own profiles in CMS
2015-08-26 15:47:51 +01:00
Damian Mooyman
445f1d4ccb
Merge pull request #4529 from scott1702/filtered-tree
...
update the filtered tree styling
2015-08-25 14:50:39 +12:00
scott1702
7bbe258b44
update the filtered tree styling
2015-08-25 13:01:17 +12:00
Damian Mooyman
f7c19830d6
BUG Fix JS error on clicking collapsed panel
2015-08-24 17:36:29 +12:00
Sam Minnée
5c5dd7efce
Merge pull request #4531 from tractorcow/pulls/3.2/block-archived-dragdrop
...
BUG disable archived pages from being droppable
2015-08-24 17:04:41 +12:00
Sam Minnée
942ef04664
Merge pull request #4532 from tractorcow/pulls/3.2/packages
...
Add missing packages
2015-08-24 17:04:39 +12:00
Damian Mooyman
f220adc3e0
Update translations
2015-08-24 16:52:39 +12:00
Damian Mooyman
4a011303b9
Add missing packages
2015-08-24 16:15:38 +12:00
Damian Mooyman
80ce5498d8
BUG disable archived pages from being droppable
...
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1257
2015-08-24 15:59:59 +12:00
Damian Mooyman
58409f64c0
Merge remote-tracking branch 'origin/3'
2015-08-24 11:59:21 +12:00
Damian Mooyman
1bb6b85280
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
admin/javascript/LeftAndMain.BatchActions.js
2015-08-24 11:55:54 +12:00
Damian Mooyman
b14794b780
BUG Fix bulk actions making sitetree unclickable
2015-08-21 16:24:13 +12:00
Damian Mooyman
0f81d5ece5
BUG Fix bulk actions making sitetree unclickable
2015-08-21 16:22:08 +12:00
scott1702
7182c50721
Fix overlaying border on header tabs
2015-08-21 09:52:10 +12:00
Daniel Hensby
84b70422b6
Merge branch '3'
...
Conflicts:
.travis.yml
2015-08-18 16:41:21 +01:00
Daniel Hensby
0b177ad20f
Merge branch '3.2' into 3
2015-08-18 16:40:20 +01:00
Daniel Hensby
af5ef13e6c
Merge branch '3.1' into 3.2
2015-08-18 16:39:35 +01:00
Loz Calver
8b638f56fb
FIX: Using undefined var in ModelAdmin
2015-08-18 15:37:15 +01:00
Daniel Hensby
0b36082564
Merge branch '3'
...
Conflicts:
.travis.yml
composer.json
docs/en/changelogs/4.0.0.md
forms/gridfield/GridFieldExportButton.php
2015-08-17 13:12:41 +01:00
Dan Hensby
c5c8a6a720
Merge remote-tracking branch '3.2' into 3
...
Conflicts:
admin/templates/Includes/ModelAdmin_ImportSpec.ss
css/GridField.css
2015-08-17 11:59:24 +00:00
Daniel Hensby
a8ab5a468d
Merge branch '3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
composer.json
2015-08-17 11:43:28 +01:00
Sam Minnée
5911d50bca
Merge pull request #4477 from nickbooties/nickbooties-patch-1
...
Fixes #4424
2015-08-11 17:34:35 +12:00
Nick
c4c4d79c26
Fix for Issue #4424
...
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces.
Uses className for element ID on ImportSpec template.
2015-08-11 14:56:13 +10:00
Stevie Mayhew
ea7b0714c2
MINOR: be more specific with background class for menu
2015-08-07 13:22:57 +12:00
Daniel Hensby
009458e342
Fixing rubbish login message when trying to access the CMS
2015-08-04 12:23:22 +01:00
Nick
1438a53900
Issue #4424
...
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces #4424
2015-08-04 15:57:38 +10:00
Nick
9ad64716cc
Issue #4424
...
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces #4424
2015-08-04 15:55:07 +10:00
Damian Mooyman
102892e247
Update translations
2015-08-04 13:02:20 +12:00
Damian Mooyman
f2c39aac20
API batch restore action
2015-08-03 18:26:44 +12:00
scott1702
dfaaa3353e
Update batch archive warning to incl children pages
2015-08-03 16:17:31 +12:00
Damian Mooyman
66ca5405d0
BUG Fix change detection on browser back button
2015-08-03 08:31:51 +12:00
Damian Mooyman
09210efbc0
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
control/Session.php
docs/en/05_Contributing/01_Code.md
docs/en/05_Contributing/02_Release_Process.md
forms/FormField.php
model/DataQuery.php
model/Image.php
model/queries/SQLConditionalExpression.php
view/SSViewer.php
view/ViewableData.php
2015-07-31 15:49:35 +12:00
Damian Mooyman
fa76f98d0c
Merge pull request #4441 from jonom/choose-file-thumbnails-3.2
...
FIX Missing thumbnails and inconsistencies
2015-07-31 14:37:10 +12:00
Damian Mooyman
e0a560051e
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
css/AssetUploadField.css
2015-07-31 14:33:16 +12:00
Damian Mooyman
7ee444e08a
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
filesystem/File.php
model/DataObject.php
model/DataQuery.php
search/filters/FulltextFilter.php
search/filters/SearchFilter.php
tests/core/ClassInfoTest.php
tests/filesystem/FileTest.php
tests/model/DataListTest.php
2015-07-31 11:38:18 +12:00
Jonathon Menz
aa286ef7d7
FIX Missing thumbnails and inconsistencies
...
Made thumbnails and columns in File list Grid Fields more consistent (fixes #4409 )
2015-07-30 16:15:51 -07:00
Daniel Hensby
1e20b7d698
Merge pull request #4390 from tractorcow/pulls/3.2/predictable-ids
...
API respect custom attributes on OptionsetField and CheckboxSetField
2015-07-30 11:15:15 +01:00
Damian Mooyman
ae783e9598
Merge pull request #4042 from selay/3.1
...
Hardcoded http:// cause browser warnings in admin panel
2015-07-28 09:14:34 +12:00