Commit Graph

9028 Commits

Author SHA1 Message Date
Sam Minnée
bba7a7ad8c Merge pull request #556 from silverstripe-rebelalliance/trac/7494
Trac/7494
2012-06-21 14:52:52 -07: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
Ingo Schommer
3a7128d00c MINOR Fixed phpdocs 2012-06-20 23:59:16 +02:00
Will Rossiter
d82b67cf97 ENHANCEMENT: remove dependencies between framework tests and cms module. 2012-06-20 16:28:06 +02:00
Will Rossiter
8b43780e23 MINOR: remove dependency on RootURLController and show a default Controller template as a failback. 2012-06-20 16:28:02 +02:00
Will Rossiter
eb2a0427cc MINOR: exclude functional tests when running just framework module tests 2012-06-20 16:27:57 +02: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
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
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
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
Sam Minnée
8ca961c2b1 Merge pull request #553 from silverstripe-rebelalliance/trac/7081
BUGFIX: Fix trac ticket 7081
2012-06-19 20:44:35 -07:00
Hamish Friedlander
ef11a0dc78 BUGFIX: Fix trac ticket 7081
IE contentEditable carets and selection boxes show on top of any elements, interfering with HtmlEditorFields dialogs.
This fixes that by storing the selection prior to opening the dialog, then unselecting everything. On dialog close the
selection is restored
2012-06-20 15:27:56 +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
Ingo Schommer
69ae8266ef Merge branch 'trac/7485' of https://github.com/silverstripe-rebelalliance/sapphire into silverstripe-rebelalliance-trac/7485 2012-06-18 00:27:23 +02:00
Hamish Friedlander
c12db51c22 BUGFIX: Fix trac/7485 2012-06-18 10:23:04 +12:00
Ingo Schommer
5f9b54c64a MINOR Added 3.0.0-rc1 changelog 2012-06-18 00:21:46 +02:00
Ingo Schommer
417c03716c BUGFIX Avoid Session::set() clearing on existing val (fixes #7487) 2012-06-17 23:46:52 +02:00
Ingo Schommer
a96659ba8b Merge pull request #532 from halkyon/filesystem_sync_fix
BUGFIX "Sync files" button doesn't work when syncing the root of the assets
2012-06-15 10:27:55 -07:00
Ingo Schommer
5fa1633fe5 MINOR Saving UploadField detail form correctly when nested in GridField 2012-06-15 17:50:18 +02:00
Ingo Schommer
eff93bdd5b ENHANCEMENT Disable UploadField when handling unsaved relations (fixes #7187) 2012-06-15 17:44:34 +02:00
Ingo Schommer
16527f7fef MINOR Removed old CSS files 2012-06-15 16:24:01 +02:00
Ingo Schommer
02332da7fb MINOR GridField compat with ViewableData records (fixes #7479)
Only use relField() when it exists (usually on DataObject),
otherwise fall back to method or value returns
(same as original GridFieldDataColumns behaviour).
2012-06-15 13:33:34 +02:00
Ingo Schommer
88582e7483 Revert "BUGFIX Aborting marking in Hierarchy->markPartialTree() before loading nodes, if the expected node count would exceed the totals (regardless of the in-memory marking state)"
This reverts commit f1bf0d0fc4. Fixes #7481
2012-06-15 11:53:33 +02:00
Sean Harvey
8b834877f9 BUGFIX DataList used in SearchContext::getQuery() should be returned so limit() and sort() are applied correctly 2012-06-15 16:20:45 +12:00
Sean Harvey
b04c199064 MINOR Fixing additional cases where DataList needs to be returned correctly when filtering 2012-06-15 16:09:40 +12:00
Sam Minnée
d014b4d106 Merge pull request #539 from simonwelsh/transliterator_rename
API CHANGE Renames Transliterator to SS_Transliterator
2012-06-14 20:59:56 -07:00
Simon Welsh
9bd7765272 API CHANGE Renames Transliterator to SS_Transliterator
The intl extension in PHP 5.4 provides a Transliterator class, which
conflicts with the SilverStripe one. This leads to some really weird
ReflectionExceptions about Transliterator's constructor being
private.
2012-06-15 15:54:47 +12:00
Sam Minnée
9de2b0b1b6 Merge pull request #538 from halkyon/query_changes
Fixing DataList to be used correctly in a few core classes
2012-06-14 20:51:39 -07:00
Sean Harvey
538bcdc74d BUGFIX Ensure that the DataList is being used correctly when applying filters in HtmlEditorField and Hierarchy 2012-06-15 15:49:22 +12:00
Sean Harvey
a9c7c69289 MINOR Ensure DataQuery used in apply() is returned on Filter classes (to be consistent with GreaterThanFilter etc which will return it) 2012-06-15 15:48:47 +12: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
Sam Minnée
a8e0fd07f2 Merge pull request #536 from sminnee/trac-7097
Fix infinite loop in dev/build?flush=all
2012-06-14 20:25:52 -07:00
Sam Minnee
3f0136749b API CHANGE: Add Security::ignore_disallowed_actions() to allow site features to be disabled when permissions have failed, rather than redirecting to the log-in form. (Trac #7097) 2012-06-15 15:17:48 +12:00
Sam Minnée
0004b1a4c4 Merge pull request #535 from halkyon/chosen_allow_deselect
BUGFIX #7394: Allow unselect dropdowns in chosen if there's an empty option
2012-06-14 19:38:31 -07: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 Minnee
09e821efc3 MINOR: Don't leave cost=31 blowfish setting dormant in code, causing timeouts. 2012-06-15 13:47:38 +12:00
Sam Minnee
a1e7c1f9bf BUGFIX: Updated MySQLDatabase::indexList() to return index columns escaped by double quotes 2012-06-15 13:25:50 +12:00
Sam Minnee
80941ef658 MINOR: Fixed unit test to respect idempotent semantics of DataList filter() and sort(). 2012-06-15 13:25:23 +12:00
Sam Minnée
a93dd9459e Merge pull request #496 from sminnee/dataquery-aggregate
Dataquery aggregate
2012-06-14 17:20:35 -07:00
Sam Minnée
aebfea7f68 Merge pull request #505 from schmengler/index-fix
BUGFIX: Added double quotes to column names in automatically generated i...
2012-06-14 17:19:48 -07:00
Sean Harvey
8b2cb9a7d9 BUGFIX Declare PasswordEncryptor_Blowfish::get_cost() as static 2012-06-15 12:13:33 +12:00
Sam Minnée
5062bb8ff5 Merge pull request #533 from halkyon/supress_mkdir_temp
BUGFIX Supress mkdir() when attempting to create a temp folder, instead
2012-06-14 16:53:54 -07:00
Sam Minnée
51af3f6557 Merge pull request #527 from camspiers/9139f737b8c12587e637452a2a388a6c84a90201
Added ability to set the cost of the blowfish crypt algorithm.
2012-06-14 16:52:28 -07:00
Sean Harvey
105986392b BUGFIX Supress mkdir() when attempting to create a temp folder, instead
of the variable. This gives a nicer error in the installer.
2012-06-15 11:48:42 +12:00
Sam Minnée
7ce7ac406e Merge pull request #528 from mango9/master
Ticket #5578
2012-06-14 16:43:20 -07:00
Sam Minnée
dda9683758 Merge pull request #530 from nyeholt/injector_updates
A resubmission of a previous pull request. Contains a couple of bugfixes (including ticket #7448) and minor usage enhancements
2012-06-14 16:42:30 -07:00
Sam Minnée
8ced5f5437 Merge pull request #531 from silverstripe-rebelalliance/pull/7258
#7258: CMS Memory Leaks
2012-06-14 16:39:31 -07:00
Sean Harvey
72fd0128c4 BUGFIX "Sync files" button doesn't work when syncing the root of the assets folder 2012-06-15 11:28:29 +12:00
carlos barberis
856991d644 BUGFIX: Ticket #6069 Checking of URLSegment can end in an infinite loop (when saving Page in CMS) 2012-06-15 11:27:58 +12:00