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
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
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
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
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
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
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
Loz Calver
a3fd150bd0
Upgrade template translation syntax
2015-07-22 14:17:03 +01:00
Daniel Hensby
cd560eee12
Merge pull request #4397 from flashbackzoo/pulls/batch-actions-tree-status-fix
...
Update tree status after bulk action is applied
2015-07-22 13:53:41 +01:00
Dan Hensby
64ceba133c
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
admin/css/screen.css
2015-07-20 14:08:36 +00:00
Daniel Hensby
ca8d0f2818
Merge branch '3.1' into 3.2
...
Conflicts:
dev/Debug.php
docs/en/05_Contributing/01_Code.md
forms/FormField.php
i18n/i18nTextCollector.php
model/DataQuery.php
2015-07-20 10:48:01 +01:00
Jonathon Menz
272f6d7700
Improved site tree tooltips
...
Now shows full title and friendly singular name for page type
2015-07-16 08:49:43 -07:00
David Craig
3c20b58067
Update tree status after bulk action is applied
2015-07-16 10:50:09 +12:00
Tom Densham
b17b186e93
Convert FQCNs to html safe strings
...
Convert namespaced class names to html safe strings in `LeftAndMain.php` `CMSMenu.php` and `LeftAndMain.Main.js` by replacing backslashes (\) with dashes (\) and removing special characters with `Convert::raw2htmlname()`
2015-07-15 15:33:00 +01:00
scott1702
c51c52f61f
Update button and tab styles
2015-07-15 10:35:21 +12:00
Damian Mooyman
560f9a6e39
API respect custom attributes on OptionsetField and CheckboxSetField
2015-07-10 14:49:05 +12:00
David Craig
e4447698b5
Update compass config
...
- Add sourcemaps for debugging
- More consistant builds across environments
2015-07-09 10:11:00 +12:00
Jonathon Menz
2a9e7087eb
Improved label clipping in site tree
...
Deeply nested site tree nodes show a few more characters and any clipped text in labels is marked as such (fixes https://github.com/silverstripe/silverstripe-cms/issues/1235 )
2015-07-07 09:00:40 -07:00
Jonathon Menz
e5ac209e3e
Expanded bulk action checkbox hit zone
...
Increased checkbox click area so it's harder to accidentally click underlying link. Also lightened selected checkbox background colour for consistency (fixes #4342 , fixes https://github.com/silverstripe/silverstripe-cms/issues/400 , closes #4352 )
2015-07-03 16:16:48 -07:00
David Craig
ae3fc84181
Add three column layout to Page content view
...
- Content filters included in SiteTree view
- View (tree/list) buttons included in SiteTree view
- Update view button styles for new layout
- Updated breadcrumbs for new layout
2015-07-02 10:22:24 +12:00
Jonathon Menz
74e6a67cfa
Different status dots for draft and modified
...
Added a colour difference for status dots so status of draft vs modified can be distinguished at a glance
2015-06-26 11:00:48 -07:00
Loz Calver
3ebb73a675
Fix background size for spinner @2x
2015-06-24 12:04:21 +01:00
scott1702
3bdae22f63
Fix padding bug pushing out the 'post options' panel
2015-06-24 11:53:38 +12:00
Damian Mooyman
0ce92b0728
Merge remote-tracking branch 'origin/3.2' into 3
2015-06-23 17:35:29 +12:00
David Craig
f6745a3feb
Fix new page SiteTree nesting
2015-06-23 16:53:38 +12:00
David Craig
ca039e15ef
BUG Fix regressions in changes to batch action feature
2015-06-23 16:28:25 +12:00
David Craig
a6013ed1d0
Move filters from panel to header
...
- The filter panel has been removed in favour of a search menu in the header.
- The multi-select component has been updated:
- Now called 'Bulk actions'
- Styling updated
- Added placeholder text / removed redundant option
- Now also appears in SiteTree view
2015-06-23 13:08:23 +12:00
Damian Mooyman
bc8bc7d0c5
Update translations
2015-06-19 18:18:00 +12:00
Hamish Friedlander
4e8aa72702
Merge pull request #4310 from tractorcow/pulls/3.2/deprecations
...
Set deprecation level for all changes in 3.x to 4.0
2015-06-19 15:58:27 +12:00
Damian Mooyman
d9c7d4538b
Update user help link for 3.2
2015-06-19 15:56:12 +12:00
Damian Mooyman
e14f743bf0
Set deprecation level for all changes in 3.x to 4.0
2015-06-19 13:07:41 +12:00
Damian Mooyman
1d122803cc
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
dev/SapphireTest.php
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
forms/DatetimeField.php
forms/NullableField.php
forms/NumericField.php
forms/gridfield/GridField.php
tests/control/DirectorTest.php
tests/model/DataObjectSchemaGenerationTest.php
tests/model/MySQLDatabaseTest.php
2015-06-19 10:48:07 +12:00
scott1702
6cc1c4580c
Update styles for multi-selection button
2015-06-17 22:22:59 +12:00
Damian Mooyman
d0bd5bc225
Merge pull request #4292 from scott1702/drag-drop
...
Shorten space between page icons and child page dropdown arrow
2015-06-17 12:33:45 +12:00
Damian Mooyman
0abacaead6
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
admin/code/LeftAndMain.php
forms/EmailField.php
forms/Form.php
forms/HeaderField.php
forms/LiteralField.php
forms/PasswordField.php
forms/TextareaField.php
forms/TreeDropdownField.php
model/DataObject.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
scott1702
d36d0f348f
Shorten space between page icons and child page dropdown arrow
2015-06-17 10:23:07 +12:00
Matthew Hailwood
d673fdf497
Float labels with ss-ui-button class in accordion
...
Currently things like the upload field etc break when you use them inside a ToggleCompositeField:
![Broken](http://i.imgur.com/abUopVf.png )
This fixes it by adding the float back
![Fixed](http://i.imgur.com/7P0muen.png )
2015-06-12 14:13:47 +12:00
Daniel Hensby
ad04eeb5c4
Merge pull request #4259 from tractorcow/pulls/3/multi-htmleditor-config
...
API Support for multiple HTMLEditorConfig per page
2015-06-12 00:53:44 +01:00
Damian Mooyman
c877882f7e
Merge pull request #4170 from kinglozzer/pulls/4137-leftandmain-tree
...
Store current page before marking tree nodes (fixes #4137 , fixes silverstripe/silverstripe-cms#1135 )
2015-06-10 09:18:05 +12:00
scott1702
f0bc073848
Tidy up loading gif
2015-06-09 13:41:21 +12:00
Damian Mooyman
54f4ef0e9f
Merge pull request #4249 from scott1702/tinymce-linkform-uploadfield
...
Update #2908 for 3.2
2015-06-09 12:38:46 +12:00
Damian Mooyman
a8ace75341
API Support for multiple HTMLEditorConfig per page
2015-06-09 12:17:55 +12:00
Damian Mooyman
a72bd16f42
API Deprecate delete in favour of archive
...
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug in reporting publishing of error pages
Restoring a page also restores parents
2015-06-03 14:24:27 +12:00
scott1702
a9d22f1fbf
NEW: Files can be uploaded directly in the 'Insert Link' form
2015-06-03 11:20:29 +12:00
Damian Mooyman
8331171f2c
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
.scrutinizer.yml
admin/javascript/LeftAndMain.Panel.js
core/startup/ParameterConfirmationToken.php
dev/Debug.php
dev/FixtureBlueprint.php
docs/en/00_Getting_Started/05_Coding_Conventions.md
docs/en/00_Getting_Started/index.md
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
filesystem/File.php
filesystem/Folder.php
forms/FieldList.php
forms/LabelField.php
forms/MoneyField.php
forms/TextField.php
forms/TreeDropdownField.php
forms/Validator.php
forms/gridfield/GridField.php
forms/gridfield/GridFieldExportButton.php
lang/de.yml
lang/fi.yml
model/DataObject.php
model/SQLQuery.php
parsers/ShortcodeParser.php
security/ChangePasswordForm.php
security/Security.php
tests/control/DirectorTest.php
tests/core/startup/ParameterConfirmationTokenTest.php
tests/dev/FixtureBlueprintTest.php
tests/forms/FieldListTest.php
tests/forms/MoneyFieldTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
2015-06-02 19:13:38 +12:00
Jonathon Menz
869e69a9b2
BUG: Clicking icon in site tree link fails
...
Code removed here intentonally prevented node selection when dragging but at the cost of clicks on site tree icons selecting the node but not loading the link. Since it's possible to drag a site tree item from the title, not just the icon, think it's better to remove this for now (choosing the lesser of two evils). A full fix to prevent node selection should follow, perhaps during an upgrade to jstree.
2015-05-27 09:22:42 -07:00
Damian Mooyman
161cd5c14d
Merge pull request #4203 from scott1702/sharedraftcontent-module-fix
...
Fix broken inline buttons
2015-05-26 13:24:59 +12:00
scott1702
f9bd068ffe
Fix broken share draft button
2015-05-26 10:19:47 +12:00
David Craig
8b29732291
Fix left nav styling.
...
- Incorrent collapsed state on reload, when 'flush' param is not present.
- The content area had a horizontal scroll in split-mode.
2015-05-25 16:55:25 +12:00
David Craig
3bac6fadfe
Add 'sticky' behaviour to left menu
2015-05-25 12:09:14 +12:00
scott1702
2f2ba8600b
Run compass compile
2015-05-25 10:44:31 +12:00
scott1702
fe15016e2b
Updated SiteTree status overlay colours
2015-05-21 11:34:33 +12:00
scott1702
2670828cdc
Change drag/drop icons and only appear on hover
2015-05-20 11:00:16 +12:00
Damian Mooyman
69a244e03f
Update translations
2015-05-14 13:45:03 +12:00
David Craig
232ed3cb4f
Fix panel collapse
2015-05-13 10:15:50 +12:00
Loz Calver
8b4a9a3988
Store current page before marking tree nodes ( fixes #4137 , fixes silverstripe/silverstripe-cms#1135 )
2015-05-07 16:01:24 +01:00
Loz Calver
f38836df37
Recompile SCSS
2015-05-07 12:38:18 +01:00
Sean Harvey
2a04713323
Merge pull request #4153 from tractorcow/pulls/3/filter-page-highlight
...
API Enable tree filter highlighting
2015-05-07 10:14:33 +12:00
scott1702
8107e86d01
Change cursor for drag + drop icon on hover/active
2015-05-05 16:43:47 +12:00
Damian Mooyman
8863797b76
API Enable tree filter highlighting
...
Decoupling of CMS / Framework
2015-05-04 17:06:16 +12:00
Stevie Mayhew
0d94cf15a5
UPDATE: change all instances of $this->request to use appropriate getter/setter
2015-04-30 11:04:08 +12:00
David Craig
fa6f446867
Add styling to handle toggleable descriptions for files
2015-04-28 10:49:17 +12:00
Loz Calver
120b983ad6
FIX: X-Reload & X-ControllerURL didn't support absolute URLs ( fixes #4119 )
2015-04-27 15:38:54 +01:00
David Craig
3122226273
Add toggleable description to CMS fields
2015-04-24 11:40:29 +12:00
Florian Thoma
3e69ae84c3
fix width of remote url field label to allow right-click-paste
2015-04-21 12:30:10 +10:00
Daniel Hensby
cb7aed46cd
Adding loading spinner to ui-autocomplete fields when making ajax reqests
2015-04-17 11:38:04 +01:00
scott1702
25c9e9141e
Fix z-index bug with sidebar
2015-04-16 15:31:48 +12:00
Damian Mooyman
43f49e8434
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
admin/code/ModelAdmin.php
control/Director.php
model/SQLQuery.php
security/Member.php
tests/control/HTTPTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
tests/view/SSViewerTest.php
2015-03-31 19:54:15 +13:00
ielmin
b617ef1abd
Hardcoded http:// cause browser warnings
2015-03-26 13:20:21 +11:00
Naomi Guyer
636cddb4bc
BUG: export and print buttons outside button row
...
Export and print buttons are appearing outside the button row in model admin, meaning that if the add button is removed (say, by removing the create permission), the buttons are flush with the gridfield.
2015-03-26 14:08:46 +13:00
Loz Calver
2d1fa46be8
Merge pull request #4011 from dhensby/pulls/model-admin-import-naming
...
Using sigular name for model import form rather than class name
2015-03-19 21:09:19 +00:00
Daniel Hensby
13cec2ee81
Using sigular name for model import form rather than class name
2015-03-13 13:36:52 +00:00
Damian Mooyman
319b96b48b
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/05_Contributing/01_Code.md
forms/TreeDropdownField.php
model/DataObject.php
security/Member.php
tests/model/DataObjectTest.php
2015-03-11 11:40:06 +13:00
Damian Mooyman
636784845e
Update admin js translations
2015-03-10 09:13:35 +13:00
Damian Mooyman
a7bd6de2ec
Update translations
2015-03-09 17:11:10 +13:00
Daniel Hensby
d2a3da2203
Making docs gender agnostic
2015-03-07 12:32:04 +00:00
Jonathon Menz
8ee9130bcf
NEW: CMS site tree status icons
...
Added coloured status 'dots' to overlay page icons and improved visibility of status labels
2015-03-04 08:43:00 -08:00
Jonathon Menz
5216b67290
Compile latest scss
2015-03-04 08:43:00 -08:00
Ingo Schommer
7c4c30270a
Merge pull request #3901 from flashbackzoo/pulls/ui-dialog-styling
...
Improve styling on modal dialogs
2015-02-21 16:27:32 +13:00
Damian Mooyman
dff65867cc
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
control/HTTP.php
control/HTTPResponse.php
docs/en/05_Contributing/01_Code.md
forms/CompositeField.php
forms/FormAction.php
forms/FormField.php
forms/InlineFormAction.php
forms/NumericField.php
forms/TreeDropdownField.php
forms/TreeMultiselectField.php
templates/forms/TreeDropdownField.ss
tests/core/CoreTest.php
tests/forms/NumericFieldTest.php
tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +13:00
Daniel Hensby
1d4150bee4
Merge pull request #3787 from uniun/patch-4
...
FIX. Use i18n_plural_name() instead of plural_name()
2015-02-17 10:54:45 +00:00
David Craig
33930597c0
Improve styling on modal dialogs
2015-02-16 08:58:23 +13:00
Aden Fraser
d555b5b26e
Fixed JS error in lib.js ( fixes #3481 )
2015-02-11 16:59:53 +00:00
Ingo Schommer
d5bb290b8e
Don't update CMS preview on a CMS redirect
...
The CMS preview causes unnecessary browser processing by loading a URL
which should be considered "in transit" when a CMS redirect is set through
the X-ControllerURL HTTP header. The CMS history processing will
load this new URL, and cause a new preview URL to be loaded.
Fixes https://github.com/silverstripe/silverstripe-translatable/issues/158
2015-02-08 19:58:55 +13:00
Oliver Shaw
7484b4f5d9
Trim ModelAdmin SearchForm values
2015-02-08 19:25:51 +13:00
Elvinas L
730c4d3733
Dropdowns admin styling
2015-02-08 18:59:38 +13:00
John Milmine
95d0ed486c
fixing tab force active
...
Wasn't getting li, plus was find tabs in child tabsets
2015-01-29 13:18:39 +13:00
Loz Calver
9944e82e51
Merge pull request #3712 from nickspiel/3
...
Update 'spinner' to a SilverStripe branded version
2015-01-27 09:33:12 +00:00
Damian Mooyman
88fdc75456
Merge remote-tracking branch 'composer/3.1' into 3
...
Conflicts:
.editorconfig
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/00_Getting_Started/index.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/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/02_Developer_Guides/10_Email/index.md
docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
filesystem/File.php
filesystem/GD.php
model/DataDifferencer.php
model/Versioned.php
security/BasicAuth.php
security/Member.php
tests/filesystem/FileTest.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/VersionedTest.php
tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
Damian Mooyman
aa445b8e5a
Merge pull request #3564 from kinglozzer/pulls/3563-encode-backurl
...
FIX: Ensure query string in X-Backurl is encoded (fixes #3563 )
2015-01-15 10:23:19 +13:00
Nick Spiel
227ea82953
Update 'spinner' to an SilverStripe branded version
...
PSD: http://nickspiel.me/uploads/silverstripe-assets/spinner.psd
2015-01-14 20:29:07 +11:00
Loz Calver
dae4de1169
Merge pull request #3780 from phptek/centre-pane-expand
...
FIX: Expands the CMS' centre-pane when collapsed and it's clicked.
2015-01-14 09:13:43 +00:00
Russell Michell
ef237f69cc
FIX: Expands the CMS' centre-pane when collapsed and it's clicked.
2015-01-14 08:40:05 +13:00
Elvinas L.
ab24ed3bea
FIX. Use i18n_plural_name() instead of plural_name()
2015-01-13 15:31:17 +02:00
Damian Mooyman
c2af23033f
Update translations
2015-01-12 17:54:49 +13:00
Stevie Mayhew
11e48245c9
Remove "Filter" title if no search form is present
...
Same as with the import form - you can overload the public function `SearchForm` in your model admin subclass to not return a form and the title currently remains there which makes no sense.
2015-01-07 16:22:12 +13:00
Will Rossiter
218ef0b599
Merge commit 'ec0c259' into 3
...
* commit 'ec0c259':
BUG: Reinstate tab and form focus states (fixes CMS #732 and #817 )
2015-01-07 14:26:19 +13:00
Damian Mooyman
19549d620f
Moved deprecation of SQLQuery to 4.0
2014-12-04 09:30:50 +13:00
Jonathon Menz
e4db619f8d
MINOR: Fix broken 'Insert From CMS' layout
...
Some updates to UploadField styles broke the layout of this form a bit
2014-11-19 10:52:08 +10:30
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
Loz Calver
e4ddb4b975
FIX: Ensure query string in X-Backurl is encoded ( fixes #3563 )
2014-11-16 20:35:41 +00:00
Jeremy Roundill
729e8ea3e1
Parsing fix for searching on DateFields
2014-11-11 19:44:06 +13:00
Naomi Guyer
ec0c259c17
BUG: Reinstate tab and form focus states (fixes CMS #732 and #817 )
...
* Added methods to track and restore field focus
* Added a trigger event when tabstate reset
Update LeftAndMain.EditForm.js
2014-10-26 14:21:47 +13:00
Damian Mooyman
3f1102306d
Merge pull request #3575 from kinglozzer/pulls/fix-reopen-tab-response
...
FIX: Prevent JSON response showing when re-opening closed tab (fixes silverstripe/silverstripe-cms#1121 )
2014-10-24 17:04:41 +13:00
Loz Calver
d6e1c5131c
FIX: Prevent JSON response showing when re-opening closed tab ( fixes silverstripe/silverstripe-cms#1121 )
2014-10-23 22:24:36 +01:00
lukepercy
7e4e9dc40c
fixed RemoteURL css for issue 1086
2014-10-22 14:57:59 +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
Damian Mooyman
eb069e605d
Remove all redundant whitespace
2014-08-19 09:17:15 +12:00
Sean Harvey
404478b07f
Removing @deprecated 3.1 functionality and classes.
...
Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
2014-08-18 16:00:13 +12:00
Damian Mooyman
79c7276611
BUG Reapply fix for cms crashing due to History.js blindly appending slashes to end of url
2014-08-15 15:17:39 +12:00
Mateusz Uzdowski
8bf3853887
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/misc/contributing/issues.md
docs/en/reference/uploadfield.md
forms/HtmlEditorField.php
i18n/i18n.php
javascript/HtmlEditorField.js
model/DB.php
model/Image.php
model/SQLQuery.php
2014-08-14 09:08:26 +12:00
Damian Mooyman
69de7e3fce
BUG Fix incorrect parsing of HTML content
2014-08-11 11:47:14 +12:00
Damian Mooyman
fbc7e7c264
BUG Fix issue with generating tree data for missing pages
2014-08-08 15:29:28 +12:00
Damian Mooyman
e3d4e79bba
Update translations
2014-08-05 15:02:18 +12:00
Stig Lindqvist
333a2aa8f9
BUG: CMS tree filters doesn't count the correct number of children for deleted pages
...
This is a bug that combines Hierarchy, Versioned and LeftAndMain admins and CMSSiteTreeFilters.
This bug can be reproduced by having a large site tree with enough deleted pages in it so it doesn't
pre load all the children pages when initially opening an admin. Filter by either 'All pages including deleted'
or 'Deleted pages'. For CMS users it will look like deleted pages are gone.
The solution involves a couple of smaller fixes in both CMS and framework modules.
1) Ensure that 'numHistoricalChildren' are used instead of 'numChildren' when dealing with deleted pages
2) LeftAndMain::currentPage() deletes all the 'marking' cache previously built up by Hierarchy::markPartialTree()
3) Use Versioned::get_included_deleted() instead of raw DB queries against the DataObject tables when calculating parents in CMSSiteTreeFilter
2014-07-25 16:19:30 +12:00
Mateusz U
613722053c
Merge pull request #3299 from stojg/pull/if-user-logged-out-causes-500-error
...
BUG If user is logged out getHtmlEditorConfigForCMS() gets called on non object
2014-07-17 15:15:30 +12:00
Stig Lindqvist
ac64d258b7
BUG If user is logged out getHtmlEditorConfigForCMS() gets called on non object
...
This can happen if the auto-logout feature logs a user out and the user then tries to open another admin or
do an pjax call.
2014-07-17 14:45:22 +12:00
Mateusz Uzdowski
b34aaca2e8
BUG Fix several issues around onmatch/onunmatch entwines.
...
1. Add missing _super calls.
2. Make UI widget destroys more consistent to avoid exceptions.
Selectable would throw an exception in the GridField.js if destroy
called from onunmatch - at that stage jQuery UI would have had called
the destroy already. Add a guard, and change to onremove, which triggers
before the element is removed from DOM.
3. DOM traversal fails after the element is removed from DOM.
Onunmatch triggers after the removal of the element from the DOM, which
makes DOM traversal fail. Use onremove instead, which triggers while the
element is still in DOM.
2014-07-17 14:14:52 +12:00
Simon Welsh
c14d58f585
Merge branch '3.1'
...
Conflicts:
.travis.yml
model/ManyManyList.php
model/fieldtypes/DBField.php
2014-07-16 21:24:02 +10:00
Damian Mooyman
d8e9af8af8
API New Database abstraction layer. Ticket #7429
...
Database abstraction broken up into controller, connector, query builder, and schema manager, each independently configurable via YAML / Injector
Creation of new DBQueryGenerator for database specific generation of SQL
Support for parameterised queries, move of code base to use these over escaped conditions
Refactor of SQLQuery into separate query classes for each of INSERT UPDATE DELETE and SELECT
Support for PDO
Installation process upgraded to use new ORM
SS_DatabaseException created to handle database errors, maintaining details of raw sql and parameter details for user code designed interested in that data.
Renamed DB static methods to conform correctly to naming conventions (e.g. DB::getConn -> DB::get_conn)
3.2 upgrade docs
Performance Optimisation and simplification of code to use more concise API
API Ability for database adapters to register extensions to ConfigureFromEnv.php
2014-07-09 18:04:05 +12:00
Sean Harvey
50214abf7f
Merge pull request #2998 from torleif/patch-4
...
Fix: WYSIWYG now returns valid HTML in tables
2014-07-08 19:56:16 +12:00
Damian Mooyman
e9c3ff933f
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
composer.json
2014-05-06 10:22:09 +12:00
Damian Mooyman
aef4b80fda
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
.travis.yml
forms/ConfirmedPasswordField.php
2014-05-06 10:06:58 +12:00
Stephen Shkardoon
677f0edcfc
MINOR LeftAndMain::getRecord check $ClassName before use
...
While the check for `$classname` was done in the first conditional, it was left out of the other two, leading to potential issues when an invalid ID was given, instead of the expected `false`.
2014-05-05 19:26:05 +12:00
Damian Mooyman
0b4f62dfd8
BUG Fix jstree when duplicating subtrees
2014-04-29 16:00:07 +12:00
Damian Mooyman
4c69d42bd2
Merge remote-tracking branch 'origin/3.1'
2014-04-02 17:23:39 +13:00
Damian Mooyman
a2cadf9d5a
Merge pull request #2974 from sunnysideup/patch-30
...
typo fix
2014-04-02 16:17:15 +13:00
torleif
169273b38d
Fix: WYSIWYG now returns valid HTML in tables
...
The WYSIWYG by default creates invalid HTML5. Creating a table and running it through W3C validator returns the following error: The border attribute on the table element is obsolete. Use CSS instead.
2014-04-01 10:16:07 +13:00
Damian Mooyman
da1231a6e5
Updated translation masters
2014-03-31 14:13:15 +13:00
Simon Welsh
1d5706f15c
Correct line length and indentation
2014-03-30 21:11:56 +13:00
Simon Welsh
2566795b59
Merge branch '3.1'
...
Conflicts:
view/SSViewer.php
2014-03-30 19:39:18 +13:00
Simon Welsh
ac1546eb97
Correct line length and indentation
2014-03-30 19:37:54 +13:00
Simon Welsh
fe8dc50ffc
Merge branch '3.1'
...
Conflicts:
tests/view/SSViewerTest.php
2014-03-30 18:17:24 +13:00
Nicolaas
005e8065b9
typo fix
...
upated should be spelled updated
2014-03-21 14:30:17 +13:00
Simon Welsh
cbbce430e1
Merge pull request #2297 from colymba/htmleditorconfig-mode-fix
...
HtmlEditorConfig default TinyMCE mode is now none
2014-03-17 08:22:14 +13:00
colymba
9b5e5e812e
HtmlEditorConfig default TinyMCE mode is now none
2014-03-16 13:48:01 +02:00
Ingo Schommer
d8361f9d3f
Merge remote-tracking branch 'origin/3.1'
2014-02-18 22:06:59 +13:00
Ingo Schommer
a101d4edb3
Updated translations
2014-02-18 11:49:55 +13:00
Ingo Schommer
0d7e9a9692
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
_config/routes.yml
docs/en/topics/datamodel.md
forms/DropdownField.php
2014-02-04 08:19:04 +13:00
Will Rossiter
6d9d53059c
Tidy up active tab styles to match background, border alignment on page tabs.
...
Before: https://www.evernote.com/shard/s6/sh/82f0a398-c80a-4cb7-81d7-a10b6e2c85ff/b1dfa1ae8ffcbd633b548fa3b2ea8951
After: https://www.evernote.com/shard/s6/sh/66cbe9d3-df0a-42c8-a6e8-a82c68161efe/27df7167802de9c3a267d40324972aa3
Tested throughout the CMS in IE8, Firefox and Chrome.
2014-01-29 15:47:15 +13:00
Mateusz U
027022ef67
Merge pull request #2785 from halkyon/cmsmenu_test_fix
...
Fixing failing tests because ?locale= is appended to the end of the URL.
2014-01-16 17:50:40 -08:00
Sean Harvey
9d11f6f2f5
Fixing failing tests because ?locale= is appended to the end of the URL.
...
Switching from assertEquals to assertContains to be more flexible when
extensions like Translatable add query vars at the end of the links.
2014-01-17 13:48:46 +13:00
madmatt
77c35e7bde
BUGFIX: Remove possibility of E_NOTICE in updatetreenodes().
2014-01-13 17:47:33 +13:00
Matt Peel
aec29bf8c8
Properly fix SecurityAdmin Groups javascript checkbox toggling.
2014-01-09 08:47:41 +13:00
Simon Welsh
39d42e4ea3
Merge branch '3.1'
2014-01-09 08:22:47 +13:00
Matt Peel
ee1cfa2393
BUGFIX: Fix SecurityAdmin checkboxes not being properly unchecked
2014-01-08 14:55:23 +13:00
Will Rossiter
88c59ef0a7
Fix icon being stretched in ModelAdmins
2013-12-23 20:21:05 +13:00
Will Rossiter
3f6db0ddae
Fix section icon in cms header
2013-12-21 17:23:07 +13:00
Will Rossiter
3e2cf27b38
Add ability for a panel link to link externally.
2013-12-21 16:59:09 +13:00
Will Rossiter
770e23f8e1
Merge pull request #2270 from ARNHOE/3.1-updatedfieldgroup
...
BUG Updated fieldgroup class and example code
2013-12-20 19:14:21 -08:00
Will Rossiter
57e65075e9
Dialog icon size
...
The dialog close icon was one 1px higher then the dialog close hover icon causing a little bit of movement when hovering.
2013-12-21 16:11:06 +13:00
Will Rossiter
1f125730e4
Merge pull request #2281 from mandrew/fixed_collapsed
...
Fixing expanding/collapse CMS menu targeting wrong element
2013-12-20 18:51:55 -08:00
Will Rossiter
9ee4de76c4
Merge pull request #1048 from silverstripe-rebelalliance/3.1_7876
...
MINOR:added padding to ui-dialog-title so that it doesn't sit flush with...
2013-12-20 16:09:23 -08:00
micmania1
229bea399b
added logout url to Security and deprecated Security::set_login_url in favour of config
2013-12-20 21:55:54 +00:00
Ingo Schommer
f29d51f433
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/reference/dataobject.md
lang/es.yml
2013-12-19 20:23:09 +01:00
Ingo Schommer
ca0c56e203
Updated translation masters
...
Fixed two inconsistenties with missing namespaces in templates.
2013-12-19 19:51:25 +01:00
Ingo Schommer
ddcdb2c0f0
Updated translations
2013-12-19 18:04:37 +01:00
Ingo Schommer
8d796cbea0
Merge pull request #2679 from micmania1/2658-get-templates-with-suffix
...
API: moved getTemplatesWithSuffix functionality out into a SSViewer
2013-12-12 13:39:13 -08:00
Ingo Schommer
41031900f9
Merge query strings in $.path rather than duplicating
...
Fixes common duplications like ?locale=en_US&locale=en_US,
triggered e.g. by gridfield's showDetailView().
See https://github.com/silverstripe/silverstripe-translatable/issues/154
2013-12-07 11:14:46 +01:00
Ingo Schommer
6176d65bd2
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/gridfield/GridFieldSortableHeader.php
model/DataList.php
model/fieldtypes/Enum.php
2013-12-02 20:49:34 +01:00
micmania1
b89ab1eb16
Added SSViewer::get_templates_by_class() to make the functionality in LeftAndMain::getTemplatesWithSuffix() more open.
2013-12-01 07:42:37 +00:00
Ingo Schommer
556090ccfa
Generic “cancel” button behaviour with History.back()
...
Used in “add page” dialog. See https://github.com/silverstripe/silverstripe-cms/pull/793 for context
2013-11-22 12:47:35 +01:00
Loz Calver
c8caeb8154
Add X-Backurl header to CMS ajax requests
2013-11-15 09:20:53 +00:00
Andrew Short
bedf292612
Merge branch '3.1'
...
Conflicts:
docs/en/reference/execution-pipeline.md
lang/nl.yml
2013-11-11 18:18:25 +11:00
Ingo Schommer
8286ba346e
admin/myprofile layout after validation ( fixes #2644 )
...
Broke because the <form> tag was returned, while
the client logic was expecting the whole <div> including the <form>.
Fixed to display the button bar at the bottom,
and tested with validation errors as well as switching from/to
the panel via ajax.
2013-11-07 16:19:40 +01:00
Ingo Schommer
adccda35aa
Merge pull request #2609 from chillu/pulls/js-i18n-3.1
...
API JS i18n files with short locale names, generated by build task
2013-11-01 04:15:17 -07:00
Ingo Schommer
c547e426dd
Merge pull request #2599 from tractorcow/pulls/3.1-uploadfield-formchanged
...
BUG / API - Change tracking for UploadField
2013-10-31 15:28:34 -07:00
Loz Calver
5a74a2e4e1
Set default encoding for compass
...
See https://github.com/haml/haml/issues/269 . Seems that OS X Mavericks causes this to occur, even when system default is set to utf-8.
Force encoding in admin scss as well
2013-10-30 16:11:11 +00:00
Damian Mooyman
4102cc64a0
BUG Issues with CMSForm not consistently respecting new form naming scheme.
...
Fixes for failing CMSFormTest cases
2013-10-30 17:08:31 +13:00
Ingo Schommer
2c145cd454
API JS i18n files with short locale names, generated by build task
...
The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.
See b59f3858af
for generator logic.
Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
2013-10-25 12:05:46 +02:00
Ingo Schommer
2266d77237
Revert "Style destructive actions destructively"
...
This reverts commit 3851ef9f2c
.
Breaks button alignment in CMS.
2013-10-24 11:37:40 +02:00
Damian Mooyman
415f8a04b2
API Change tracker allows explicit dirty messages
...
BUG Fixed issue with UploadField not detecting changes
2013-10-24 17:53:40 +13:00
colymba
dda1441cce
API TinyMCE contextmenu is disabled by default
...
Allows for built-in browser spell-check to be used
2013-10-23 19:15:16 +03:00
Ingo Schommer
4d1dd1e6c0
Merge pull request #2589 from kinglozzer/2188-treedropdownfield-overflow
...
FIX: Allow TreeDropdownField to open upwards (fixes #2188 )
2013-10-23 06:11:41 -07:00
Ingo Schommer
b56ca812dc
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
tests/security/MemberTest.php
2013-10-23 14:53:29 +02:00
Loz Calver
e46bcf792c
FIX: Allow TreeDropdownField to open upwards ( fixes #2188 )
2013-10-23 13:32:01 +01:00
Ingo Schommer
d7e10e620a
Merge pull request #2537 from wilr/membervalidator
...
FIX: Use Injector API for managing Member_Validator instance.
2013-10-23 03:01:15 -07:00
Ingo Schommer
ea5b3e4269
Merge pull request #2520 from wilr/destructivestyles
...
Style destructive actions destructively
2013-10-22 17:07:38 -07:00
Ingo Schommer
25b6175e67
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
forms/FormField.php
2013-10-20 13:52:56 +02:00
Ingo Schommer
0d993c1aac
Merge pull request #2535 from Martimiz/3.1
...
Strip duplicate querystrings from the url before adding document.location.search
2013-10-16 12:41:52 -07:00
Loz Calver
3bbfca820b
Allow non-action buttons to pass through validation ( fixes #2527 )
...
The specific example for this issue is InlineFormField - results in actionName() on non-object error. See #2527 for context.
Include parentheses for coding conventions
2013-10-16 10:39:31 +01:00
Will Rossiter
813d34b15e
FIX: Use Injector API for managing Member_Validator instance.
...
Updates the CMS profile page and SecurityAdmin to give developers a few ways to customise the required fields.
Added extension hook updateValidator for getValidator for things like modules to inject required fields to go along with Injector for replacing the entire class for project specific use.
2013-10-16 11:29:43 +13:00
Will Rossiter
8febaeafb9
Update docblocks
2013-10-15 11:29:58 +13:00
Martimiz
364ce08f52
Strip duplicate querystrings from the url before adding document.location.search
...
When a querystring is passed with the url (for example Translatable locale) it is duplicated each time the content panel is reloaded, by adding document.location.search and so it should be stripped from the url first.
2013-10-14 15:33:40 +02:00
Andrew Short
024d46ceb5
Merge pull request #2525 from chillu/pulls/tree-node-parent-refresh
...
Load tree parent nodes if non-existant
2013-10-11 07:37:31 -07:00
Andrew Short
3f7b3fddc9
BUG: Fix tab state not being restored due to incorrect selector.
...
Closes #2321 .
2013-10-12 01:09:58 +11:00
Ingo Schommer
6c96c490c6
Load tree parent nodes if non-existant
...
This edge case can occur when a large tree is cached in HTML already,
without any nodes expanded via ajax. If a new node is added with
a parent that's not existant, it was simply placed on the root node.
This is a display bug, a full CMS refresh fixes it.
Fixes a related bug where tree causes (view) duplicates,
where the same node is rendered twice. This was due to the whole
subtree being refreshed (including the new node) through jstree's
built-in "open"/"select" events, while at the same time
creating a new node through updateNodesFromServer() callbacks.
Also added a global tree loading indication to make it clear
that the tree is still processing.
See https://github.com/silverstripe/silverstripe-cms/issues/872
2013-10-11 11:51:11 +02:00
Will Rossiter
3851ef9f2c
Style destructive actions destructively
2013-10-11 20:00:11 +13:00
RuthAdele
9850d2c5f2
Remove large left margin on field description within cms-content-tools
2013-10-10 12:51:28 +02:00
Ingo Schommer
8727d1b1eb
Merge remote-tracking branch 'origin/3.1'
2013-10-10 12:11:50 +02:00
Will Rossiter
9bb97140ad
Merge pull request #2510 from kinglozzer/cmsmenuitem-tests
...
Unit test coverage for CMSMenuItem
2013-10-09 23:19:14 -07:00
Andrew Short
a63b9c9d5d
FIX: Fix not switching to the correct tab on validation error.
2013-10-09 23:28:09 +11:00
Andrew Short
ed9f8dcf1f
BUG: Fix CMS forms with validation errors responding incorrectly.
...
A new form instance was being constructed for the response, which mean
that a lot of the validation information was lost. This fix means that:
* Enterered data is correctly persisted.
* A validation error notification is displayed.
2013-10-09 23:27:56 +11:00
Loz Calver
c34167b0ec
Unit test coverage for CMSMenuItem
2013-10-09 10:43:53 +01:00
Ingo Schommer
93558a6d62
Globalization in TreeDropdownField JS
2013-10-08 12:12:25 +02:00
Ingo Schommer
d485faf0c9
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
forms/Form.php
2013-10-08 11:17:06 +02:00
Ingo Schommer
aa6ca49651
Merge pull request #2493 from kinglozzer/2449-form-validation-exemptions
...
NEW: Allow setting of specific form actions that do not require validation on CMSForm
2013-10-08 01:51:11 -07:00
Ingo Schommer
6e8ec778c3
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
admin/templates/Includes/LeftAndMain_Menu.ss
lang/en.yml
2013-10-07 16:19:40 +02:00
Ingo Schommer
795d3e4b3b
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
dev/install/install.php5
docs/en/index.md
tests/core/CoreTest.php
2013-10-07 16:18:20 +02:00
Ingo Schommer
0e5524af44
Merge remote-tracking branch 'origin/tmp-3.1.0' into 3.1
...
Conflicts:
docs/en/changelogs/3.1.1.md
tests/behat/features/profile.feature
2013-10-07 15:19:07 +02:00
Ingo Schommer
dc7e2df20a
Corrected translation references in templates
...
Were using old entity naming scheme (*.ss) instead
of underscored version which doesn't create a new YML
namespace. This means all existing translations should indeed be used.
Was already fixed in master, but not in 3.1
2013-10-06 23:25:47 +02:00
Ingo Schommer
60fc7e5346
Merge remote-tracking branch 'origin/3.1'
2013-10-06 19:07:39 +02:00
Loz Calver
3172c7732e
Allow setting of specific form actions that do not require validation
...
Move validation exemptions into CMSForm
Also fix buttonClicked() to skip CompositeField
Whitespace
Adding unit tests
2013-10-04 10:30:20 +01:00
Sean Harvey
5e5a2f8845
Merge pull request #2288 from chillu/pulls/browser-spellcheck
...
API Disable discontinued Google Spellcheck in TinyMCE (#2213 )
2013-10-03 14:42:45 -07:00
Ingo Schommer
6ce97b959e
Merge pull request #2037 from kinglozzer/feature-disable-treemultiselect-nodes
...
FEATURE: Disable specific tree nodes in TreeDropdownField
2013-10-02 05:09:36 -07:00