tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-06 03:19:32 +02:00
Code Issues Projects Releases Wiki Activity
9,102 Commits 29 Branches 517 Tags 147 MiB
218037b8cf
Commit Graph

855 Commits

Author SHA1 Message Date
Ingo Schommer
6dc108ac3e Merge pull request #570 from adrexia/7528-insert-link 
BUGFIX: Insert link styling inconsistent with Insert media (fixes #7528)
 2012-06-25 06:24:30 -07:00
Naomi Guyer
5c6ec68389 BUGFIX: Min-width on html dialog box (fixes #7541) 2012-06-25 17:35:05 +12:00
Naomi Guyer
e51bf760e9 BUGFIX: Insert link styling broken, and inconsistent with Insert media (fixes #7528) 2012-06-25 15:31:39 +12:00
Sam Minnee
7685a0b59d Merge branch '3.0' 2012-06-25 10:01:34 +12:00
Ingo Schommer
ba9c3c7b8e BUGFIX Type checking in CMS URL params (fixes #7187) 
Nasty issue where nested requests to sub-controllers within LeftAndMain->EditForm() would fail because of
LeftAndMain->currentPageID() being taken from the URL, even though it was a field action name.
Example: POST /admin/pages/edit/EditForm/field/MyGridField/item/1/ItemEditForm/field/MyUploadField/upload
The current ID would be detected as "field" in this case.
Bug was previously fixed for AssetAdmin.
 2012-06-22 17:47:45 +02:00
Ingo Schommer
682a6a0d1b BUGFIX "Insert media" loading indicator (fixes #7542) 
No "working" indicator in insert media from web button.
Returning the $.ajax object to allow for deferred callbacks
on events other than 'success'
 2012-06-22 10:25:15 +02:00
Naomi Guyer
5713a37a32 BUGFIX: Alignment of http label in insert media 2012-06-22 18:11:00 +12:00
Naomi Guyer
f01c1640c7 BUGFIX: Alignment of http label in insert media 2012-06-22 18:04:13 +12:00
Sam Minnee
4aa4cd2c28 Merge branch '3.0' 
Conflicts:
	admin/scss/ie7.scss
 2012-06-22 17:20:07 +12:00
Naomi Guyer
cffb95280f BUGFIX: Tab colour htmleditor in IE7 2012-06-22 17:10:52 +12:00
Naomi Guyer
f3933aa3fb BUGFIX: Make entire tab clickable in htmleditor (fixes #7407) 2012-06-22 17:10:52 +12:00
Naomi Guyer
89bd7ebfba BUGFIX: Tab colour htmleditor in IE7 2012-06-22 16:55:40 +12:00
Naomi Guyer
c2e8c2450d BUGFIX: Make entire tab clickable in htmleditor (fixes #7407) 2012-06-22 16:23:01 +12:00
Sam Minnée
bafda93957 Merge pull request #563 from silverstripe-rebelalliance/trac/7427-add-responses 
BUGFIX: Add batch handler status messages (fixes #7427)
 2012-06-21 19:29:41 -07:00
Hamish Friedlander
03469230ff BUGFIX: Add batch handler status messages (fixes #7427) 
7427 was mostly fixed by Ingos previous patch. But two batch actions, delete from draft site and delete from published site werent returning
status messages. Abstracted out the status preperation code that the batch actions that were returning status messages were using, and
used that to add status messages to the problem two
 2012-06-22 13:59:08 +12:00
Hamish Friedlander
daa226a9af BUGFIX: Fix trac ticket #7476 
We missed making an event delegatable in https://github.com/silverstripe/sapphire/pull/542
the result was 7476 wasnt actually fixed
 2012-06-22 10:46:03 +12:00
Hamish Friedlander
65030906ad BUGFIX: Add validation to fix open.silverstripe.org ticket #7494 
When adding media via the HtmlEditorField dialog, the value of the URL field wasnt being validated. Youd get different errors depending on if the field was empty
or if it had text, but it didnt look like an absolute URL to HtmlEditorField#viewfile.

This adds some javascript validation to make the text field look like a URL field
 2012-06-21 14:19:41 +12:00
Naomi Guyer
d3845380d7 BUGFIX: Padding in navigation elements in IE7 
Fixes the gap between navigation elements in IE7
 2012-06-21 11:48:39 +12:00
Naomi Guyer
3eff92ad40 ChangedBUG FIX: IE filter buttons (fixes #7501) 
* Changed spacing of IE filter buttons

Conflicts:

	admin/css/ie7.css
	admin/css/ie8.css
	admin/scss/ie7.scss
 2012-06-20 14:21:12 +02:00
Ingo Schommer
89ce1ec991 Merge branch '7501-grid-field-filters' of https://github.com/adrexia/sapphire into adrexia-7501-grid-field-filters 
Conflicts:
	admin/css/ie7.css
	admin/css/ie8.css
	admin/scss/ie7.scss
 2012-06-20 14:13:39 +02:00
Naomi Guyer
42d40a7c1a BUGFIX: Turn off filters on IE Nav icons (fixes #7471) 
Set filter to none so that the icons appear correctly in IE7and 8

Conflicts:

	admin/scss/_ieShared.scss
 2012-06-20 14:11:08 +02:00
Ingo Schommer
1016c36d33 Merge branch '7471-ie-filter-nav' of https://github.com/adrexia/sapphire into adrexia-7471-ie-filter-nav 
Conflicts:
	admin/scss/_ieShared.scss
 2012-06-20 14:10:08 +02:00
Naomi Guyer
50ed4f515d BUGFIX: Show text for collapsed side panel in IE8 and 9 (fixes #7469) 
Altered IE CSS for CMS-panel to allow the text to display from top to
bottom.
 2012-06-20 14:09:05 +02:00
Naomi Guyer
c9cde893b1 BUGFIX: Show text for collapsed side panel in IE8 and 9 (fixes #7469) 
Altered IE CSS for CMS-panel to allow the text to display from top to
bottom.
 2012-06-20 14:06:21 +02:00
Sean Harvey
c6039ae8d1 BUGFIX When updating the tree from EditForm, ensure we only change the 
text of the tree node for the first .text element, instead of the nested
ones.
 2012-06-20 22:00:19 +12:00
Sean Harvey
86753baaa1 BUGFIX When updating the tree from EditForm, ensure we only change the 
text of the tree node for the first .text element, instead of the nested
ones.
 2012-06-20 21:58:23 +12:00
Naomi Guyer
9f41ffd6e1 ChangedBUG FIX: IE filter buttons (fixes #7501) 
* Changed spacing of IE filter buttons
 2012-06-19 17:52:09 +12:00
Naomi Guyer
c55627ee7c BUGFIX: Turn off filters on IE Nav icons (fixes #7471) 
Set filter to none so that the icons appear correctly in IE7and 8
 2012-06-18 13:22:01 +12:00
Ingo Schommer
dd99fbc69e BUGFIX Apply batch action node deselection (fixes #7476) 
The form ID list was only updated on node checking, but not unchecking.
 2012-06-18 00:31:27 +02:00
Hamish Friedlander
c12db51c22 BUGFIX: Fix trac/7485 2012-06-18 10:23:04 +12:00
Ingo Schommer
16527f7fef MINOR Removed old CSS files 2012-06-15 16:24:01 +02:00
Sam Minnée
e3e15e4007 Merge pull request #537 from silverstripe-rebelalliance/trac/7462 
BUGFIX: trac/7462 Amended the css to fix this by adding text-transform: ...
 2012-06-14 20:45:07 -07:00
Kirk Mayo
f546e0db64 BUGFIX: trac/7462 Amended the css to fix this by adding text-transform: capitialize and display: block to the relevant css 2012-06-15 15:38:29 +12:00
Sean Harvey
c801671a90 BUGFIX #7394: Allow unselect dropdowns in chosen if there's an empty option 2012-06-15 14:32:21 +12:00
Sam Minnée
7ce7ac406e Merge pull request #528 from mango9/master 
Ticket #5578
 2012-06-14 16:43:20 -07:00
Ingo Schommer
deff232567 MINOR Using onadd in preview JS 2012-06-15 01:19:31 +02:00
Hamish Friedlander
acee026875 BUGFIX: Buttons in the cms that didnt have .ss-ui-button werent becoming buttons because we changed buttons to trigger on onadd, but the ss-ui-button class was being added dynamically 2012-06-15 01:19:31 +02:00
Ingo Schommer
2fa835a027 MINOR Moving edit form focus logic from onadd() to onmatch() to give the form time to become visible (see #7258) 2012-06-15 01:19:20 +02:00
Ingo Schommer
ecb48bb57c BUGFIX Force full window reload on IE7/IE8 every 20 pushState requests (see #7258) 2012-06-15 01:19:20 +02:00
Ingo Schommer
5260738148 MINOR Avoid reinitialising tabs (see #7258) 2012-06-15 01:19:19 +02:00
Ingo Schommer
980686ab75 MINOR Limiting console.log() output to explicit enabling through window.debug to avoid failing IE 2012-06-15 01:19:19 +02:00
Hamish Friedlander
21e7ec61f4 ENHANCEMENT: In dev mode, include some basic leak detection functions in the admin panel 2012-06-15 01:19:19 +02:00
Hamish Friedlander
b86a787521 BUGFIX: Use new jQuery.Entwine event capturing, onadd and onremove features to plug some memory leaks 2012-06-15 01:19:15 +02:00
Ingo Schommer
04e5ff09ca MINOR Hiding CMS-specific badges in TreeDropdownField (fixes #7456) 2012-06-14 20:43:29 +02:00
Ingo Schommer
c81d0e1222 MINOR Only set X-Pjax header in redirections if it doesn't already exist in the response 2012-06-14 20:20:29 +02:00
Paul Meyrick
882b4267cb BUGFIX: Ticket #5578 SiteTree->CanCreateTopLevel() doesn't change dragged tree nodes or ParentID changes 2012-06-14 17:17:27 +12:00
Ingo Schommer
e23a7585a7 MINOR Using new jQuery.changetracker.destroy method in LeftAndMain.EditForm.js 2012-06-13 23:16:13 +02:00
Ingo Schommer
0b6d45356e MINOR Added destroy() method to jQuery.changetracker plugin 2012-06-13 23:16:09 +02:00
Ingo Schommer
4c0a0f95b0 BUGFIX Inlining TinyMCE HTML popup (fixes #7451) 
Doesn't include base TinyMCE logic when used externally,
most likely a TinyMCE bug since the source_editor.html file is unmodified.
 2012-06-13 14:39:50 +02:00
Ingo Schommer
9cdc787935 Merge branch 'stylingfixes' of https://github.com/ajshort/sapphire into ajshort-stylingfixes 2012-06-13 13:23:24 +02:00