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
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
