tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
9,317 Commits 31 Branches 527 Tags 162 MiB
52deb8f276
Commit Graph

9317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sam Minnée
5e47159a52 Merge pull request #562 from silverstripe-rebelalliance/bugfix/themedcss 
Make themedCSS use {theme}_{module}/css/{name}.css files if they exist
 2012-06-21 18:41:07 -07:00
Hamish Friedlander
0bea6974b6 BUGFIX: Make themedCSS use {theme}_{module}/css/{name}.css files if they exist 
2.4 used to use a manifest to find css. One side-effect of that is that even without explicit support,
css files in module-specific themes (/themes/{theme}_{module}/) would get picked up. This broke in 3.

This fix does still require the module name to be explicitly passed as a parameter to themedCSS, but if
you do, and a css file of that name exists in the module-specific themes css directory, that will
be included in preference to the theme or module provided css
 2012-06-22 13:34:03 +12:00
Sam Minnée
20da6efb68 Merge pull request #560 from silverstripe-rebelalliance/trac/7476 
Trac/7476
 2012-06-21 16:57:00 -07:00
Sam Minnee
0352a9191e MINOR: Fixed filename glitch in changelog 2012-06-22 11:46:35 +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
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
01062c70a1 ENHANCEMENT: Add back CountryDropdownField 
We removed this because it depended on GeoIP, which was weird, and had its own dependancies.
But Zend_Locale is included in core, and can give us all the data we need for CountryDropdownField
 2012-06-22 09:51:33 +12:00
Andrew Short
77d712202c ENHANCEMENT: Add method to disable automatic limiting on PaginagedLists. 
In some circumstances a custom generated list will already only contain
the items for the current page. The automatic limiting will then limit
the already limited list, breaking pagination. This allows you to disable
automatic limiting so all items are shown regardless of the current page.
 2012-06-21 21:21:34 +02:00
Ingo Schommer
5eab25cdbc Merge pull request #551 from adrexia/scss-tidy 
MINOR: Remove unnecessarily repeated mixins
 2012-06-21 12:13:40 -07:00
Ingo Schommer
578f6a1a63 MINOR Fixed broken links in docs 2012-06-21 21:11:48 +02:00
Ingo Schommer
45a14951a3 Revert "MINOR Updated sfYaml parser dependency to 2.0.14, use it in ConfigManifest and i18nTextCollector" 
This reverts commit 3a01c2ab2e.

Conflicts:

	core/manifest/ConfigManifest.php
	i18n/i18nTextCollector.php
 2012-06-21 21:11:48 +02:00
Ingo Schommer
ec6330c7f3 Merge pull request #547 from adrexia/IE7-Nav-fixes 
BUGFIX: Padding in navigation elements in IE7
 2012-06-21 11:54:08 -07:00
Hamish Friedlander
58fb8d6cbc Merge pull request #557 from adrexia/7497-file-upload-fixes 
BUGFIX: Media in IE9 (fixes #4 of #7497)
 2012-06-20 21:52:40 -07:00
Naomi Guyer
1197a2fa14 BUGFIX: Media styles in IE9 (fixes #4 of #7497) 
Changed media conditional as was evaluating as false in IE9
 2012-06-21 16:50:14 +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
Ingo Schommer
6af3b076be MINOR Fixed phpdocs 2012-06-20 23:59:57 +02:00
Ingo Schommer
3a7128d00c MINOR Fixed phpdocs 2012-06-20 23:59:16 +02:00
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