Sam Minnée
618d24670c
Merge pull request #555 from chillu/commit-guidelines
...
MINOR Updated commit docs
2012-06-20 12:44:16 -07:00
Ingo Schommer
464504a9bf
MINOR Updated commit docs
2012-06-20 17:25:53 +02:00
unclecheese
e2c1deb4f7
MINOR Chainable Form->loadDataFrom()
2012-06-20 17:01: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
Will Rossiter
a4bce3fc44
ENHANCEMENT: remove dependencies between framework tests and cms module.
2012-06-20 16:17:29 +02:00
Will Rossiter
e57dd604aa
MINOR: remove dependency on RootURLController and show a default Controller template as a failback.
2012-06-20 16:17:26 +02:00
Will Rossiter
525707f3a7
MINOR: exclude functional tests when running just framework module tests
2012-06-20 16:16:55 +02:00
Ingo Schommer
51a1026cd8
MINOR Fixed case sensitive require_once() (broken by 3a01c2ab2
)
2012-06-20 14:41:40 +02:00
Ingo Schommer
3ac9381399
Merge pull request #552 from pitchandtone/patch-1
...
changed sake tasks example to realistic command and added get parameter ...
2012-06-20 05:39:02 -07: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
Ingo Schommer
3a01c2ab2e
MINOR Updated sfYaml parser dependency to 2.0.14, use it in ConfigManifest and i18nTextCollector
...
Changed class loading to new file structure, moved dependency to framework/thirdparty,
rather than relying on "second level" dependencies through Zend_Translate_RailsYAML.
To be replaced by a composer dependency (+ proper autoloading) once in place.
2012-06-20 14:06:21 +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
0ef825301d
MINOR Upgrade TinyMCE dependency from 3.5.1.1 to 3.5.3
2012-06-20 22:34:39 +12:00
Sean Harvey
af1d826e7c
Merge branch '3.0'
2012-06-20 22:13:15 +12: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
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
John Milmine
1d8c96d924
changed sake tasks example to realistic command and added get parameter example to dev/build
2012-06-20 15:00:31 +12:00
Naomi Guyer
7db0e32f9c
MINOR: Remove unnecessarily repeated mixins
2012-06-20 10:42:20 +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
Sam Minnee
da7935e01c
MINOR: Fixed filename glitch in changelog
2012-06-18 18:26:01 +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
Sean Harvey
529d23625e
Merge pull request #534 from halkyon/doc_update
...
MINOR Removing "functionality below isn't implemented" message in datamo...
2012-06-17 15:56:03 -07: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