Ingo Schommer
fa445ad13f
Merge pull request #452 from adrexia/sapphire
...
---
* Added a separate component to grid field to hold buttons.
* Updated templates for changes
* Updated comments
Conflicts:
css/AssetUploadField.css
css/GridField.css
2012-05-24 23:06:46 +02:00
Sam Minnée
1772355ef3
Merge pull request #484 from simonwelsh/multipe-shortcodes
...
BUGFIX: Handle consecutive shortcodes.
2012-05-23 22:56:40 -07:00
Sam Minnée
25ddf2f879
Merge pull request #489 from mateusz/cms-oembed
...
Cms oembed from Simon Walsh
2012-05-23 22:22:53 -07:00
Mateusz Uzdowski
5b845248ed
ENHANCEMENT: add test to Oembed
2012-05-24 17:00:22 +12:00
Mateusz Uzdowski
32817b4133
BUGFIX: replace foreach loop with a core function call
2012-05-24 17:00:22 +12:00
Mateusz Uzdowski
1c8d39be4c
BUGFIX: add comments, make the code more readable
2012-05-24 17:00:22 +12:00
Mateusz Uzdowski
63ed0cba32
BUGFIX: return a meaningful translatable string when resource is invalid
2012-05-24 17:00:21 +12:00
Simon Welsh
bb29ff3611
FEATURE: Allow adding media to the CMS using oEmbed
2012-05-24 17:00:21 +12:00
Sean Harvey
b325fea709
MINOR Fixing "No current controller available" error when TestSession::__destruct() is called
2012-05-24 16:41:29 +12:00
Sean Harvey
9074f524cc
BUGFIX Fixing regression in Boolean::scaffoldSearchField()
2012-05-24 14:13:55 +12:00
Sam Minnée
c5616f8724
Merge pull request #487 from nyeholt/injector_bugfixes
...
Change singleton and strong_create to use dependency injector, with additional fixes to existing classes to behave correctly
2012-05-23 18:46:48 -07:00
Sean Harvey
45465dca91
Merge pull request #483 from halkyon/cms_ping_keepalive
...
Re-instate CMS ping to ensure sessions are kept alive
2012-05-23 15:55:22 -07:00
Sean Harvey
1ed5e3c9be
Merge pull request #485 from halkyon/deprecate_director_statics_for_controller
...
Deprecate director controller static functions
2012-05-23 15:54:57 -07:00
Sean Harvey
a84ef8d8f3
MINOR Don't use template method Actions internally in Form
2012-05-24 10:49:47 +12:00
Sean Harvey
c7e0cee637
API CHANGE Add Form->getController() and use this instead of Controller::curr() in FileIFrameField
...
API CHANGE Add Form->getName() and deprecate Form->Name(), use getName() instead.
2012-05-24 10:46:57 +12:00
Sean Harvey
08bb9c63d0
Merge pull request #486 from halkyon/deprecate_dropdownfield_emptystring_arg
...
Deprecate DropdownField $emptyString argument properly
2012-05-23 14:59:07 -07:00
Marcus Nyeholt
82495f5a7e
BUGFIX Versioned's constructor doesn't provide suitable defaults. Previously a bug/feature in singleton, where it would pass null,true as params to strong_create, which would then get passed through as params to Versioned's constructor, meant that the code still executed fine (as was set to something that wasn't an array, so the null and true were instead taken as args). The fact that the usage of singleton(Versioned) never really used the classes code, purely for value lookup, meant that this never propagated errors. I've now switched singleton() to use the injector for retrieving values, which means these dud values are no longer passed through
...
CHANGE Given that Config::inst is an implementation of the singleton pattern itself, I've removed the extra call to singleton(). A side effect of this is that it gets around a possibly nasty circular reference with the dependency injector (which relies on the config object); in future, this dependency structure should really be structured from the DI directly.
MINOR Change singleton and strong_create to use dependency injector
BUGFIX: Provide default constructor values for classes (fixes issues when used in 'singleton' scenario during dev/build in particular)
MINOR Clear out injector state when resetting db schema during tests (a follow on from changing singleton() calls to use the injector underneath)
2012-05-23 21:10:04 +10:00
Sean Harvey
60c72c40d9
API CHANGE Use of the DropdownField $emptyString argument is now
...
properly deprecated (has been marked as deprecated since 2.3). Please
use setEmptyString() on the DropdownField instance instead.
2012-05-23 22:59:40 +12:00
Sean Harvey
77c2365b87
MINOR Replacing deprecated static function calls to Director with
...
current Controller instance replacements.
2012-05-23 21:50:02 +12:00
Sean Harvey
f7f67d90a5
API CHANGE Static functions Director::redirect(), Director::redirectBack(),
...
Director::set_status_code(), Director::get_status_code() and
Director::redirected_to() are now deprecated. Use Controller->redirect(),
Controller->redirectBack(), Controller->getResponse()->setStatusCode(),
Controller->getResponse()->getStatusCode() and
Controller->redirectedTo() respectively.
2012-05-23 21:48:06 +12:00
Simon Welsh
a172a2e731
BUGFIX: Handle consecutive shortcodes.
2012-05-23 18:18:06 +12:00
Sean Harvey
ecf847b61c
ENHANCEMENT Re-instate pinging every 5 minutes in the CMS as a measure
...
to keep sessions alive. Moved Security/ping to admin/security/ping
2012-05-23 17:15:17 +12:00
Sean Harvey
4267c0312a
Merge pull request #482 from halkyon/mateusz-entwines6
...
BUGFIX: add missing onunmatches
2012-05-22 21:25:31 -07:00
Mateusz Uzdowski
8d469b66c8
BUGFIX: add missing onunmatches
2012-05-23 16:24:15 +12:00
Sean Harvey
fa6c39bc2c
Merge pull request #480 from mateusz/minor-tabset-exception
...
BUGFIX: cater for elements without href
2012-05-22 21:10:12 -07:00
Mateusz Uzdowski
bbb08df176
BUGFIX: cater for elements without href
2012-05-23 15:53:46 +12:00
Sean Harvey
29e04a1049
Revert "BUGFIX Versioned's constructor doesn't provide suitable defaults. Previously a bug/feature in singleton, where it would pass null,true as params to strong_create, which would then get passed through as params to Versioned's constructor, meant that the code still executed fine (as was set to something that wasn't an array, so the null and true were instead taken as args). The fact that the usage of singleton(Versioned) never really used the classes code, purely for value lookup, meant that this never propagated errors. I've now switched singleton() to use the injector for retrieving values, which means these dud values are no longer passed through"
...
This reverts commit 5eaca340b4
2012-05-23 09:52:57 +12:00
Sean Harvey
627def6be3
Merge pull request #477 from nyeholt/injector_bugfixes
...
A few bug fixes and changes to make the injector play better with existing code.
2012-05-22 14:32:24 -07:00
Marcus Nyeholt
5eaca340b4
BUGFIX Versioned's constructor doesn't provide suitable defaults. Previously a bug/feature in singleton, where it would pass null,true as params to strong_create, which would then get passed through as params to Versioned's constructor, meant that the code still executed fine (as was set to something that wasn't an array, so the null and true were instead taken as args). The fact that the usage of singleton(Versioned) never really used the classes code, purely for value lookup, meant that this never propagated errors. I've now switched singleton() to use the injector for retrieving values, which means these dud values are no longer passed through
...
CHANGE Given that Config::inst is an implementation of the singleton pattern itself, I've removed the extra call to singleton(). A side effect of this is that it gets around a possibly nasty circular reference with the dependency injector (which relies on the config object); in future, this dependency structure should really be structured from the DI directly.
MINOR Change singleton and strong_create to use dependency injector
2012-05-22 19:09:35 +10:00
Sean Harvey
3ed9c5f9f8
MINOR Removed getitem allowed action, this method no longer exists in LeftAndMain
2012-05-22 17:33:34 +12:00
Sean Harvey
f446547cd7
MINOR Using Config system instead of Director::addRules() in tests
2012-05-22 17:13:05 +12:00
Sean Harvey
ae1a106600
BUGFIX Ensure that CMSMain rule doesn't override the CMSPagesController
...
rule in AdminRootController::add_rule_for_controller()
2012-05-22 16:59:31 +12:00
Paul Clarke
d522b81892
ENHANCEMENT gridfield styling improvements, asset admin style improvements
2012-05-22 16:06:50 +12:00
Paul Clarke
a9cbea343e
ENHANCEMENT gridfield colours simplified to use base colours, css tidy up around actions & icons
2012-05-22 16:06:50 +12:00
Paul Clarke
2f4a033bc2
BUGFIX: CMS tabs were hidden in ie7, changed css to make them appear far right
2012-05-22 16:06:50 +12:00
Paul Clarke
84bf5e2029
ENHANCEMENT tabs text-shadow direction change, improve visibility for IE
2012-05-22 16:06:49 +12:00
Paul Clarke
5edf447d2a
ENHANCEMENT visual enhancements, cms tabs, main menu drop shadow adjusted, actions panel top gradient replaced
2012-05-22 16:06:49 +12:00
Sean Harvey
0d4f7a04dc
BUGFIX Fixing incorrect arguments to submitForm() in
...
LeftAndMain.AddForm.js
2012-05-22 15:37:31 +12:00
Sean Harvey
ce7a96b116
BUGFIX Fixed missing comma in LeftAndMain.AddForm
2012-05-22 14:57:30 +12:00
Sean Harvey
c30ae6711e
Merge pull request #476 from mateusz/entwines4
...
BUGFIX: add missing onunmatch
2012-05-21 19:54:20 -07:00
Mateusz Uzdowski
78b7836d04
BUGFIX: add missing onunmatch
2012-05-22 14:49:57 +12:00
Sean Harvey
f1873b7b43
Merge pull request #475 from mateusz/entwines4
...
BUGFIX: add missing selectors and namespace qualifiers
2012-05-21 17:08:27 -07:00
Mateusz Uzdowski
ac2567761b
BUGFIX: add missing selectors and namespace qualifiers
2012-05-22 11:29:06 +12:00
Ingo Schommer
bc4bf9d43c
MINOR Added 3.0.0-beta3 changelog
2012-05-21 23:10:30 +02:00
Ingo Schommer
063f6bcff5
MINOR Updated language master
2012-05-21 08:24:55 +02:00
Naomi Guyer
16982ba17c
ENHANCEMENT: Make GridFieldAddNewButton Content more specific
...
* Alter Grid Field "Add New" Button to take the name of the table (i.e.
"Add Member")
* Alter table names in security section to be singular so the button
text makes sense
2012-05-21 17:47:14 +12:00
Naomi Guyer
1747298786
ENHANCEMENT: Make GridFieldButtonRow more adaptable
...
* Add ability to choose where to put buttons (in buttonRow, toolbar
header, etc)
* Adjust styles to take these changes into account
2012-05-21 14:41:46 +12:00
Naomi Guyer
a7336e9dca
ENHANCEMENT: Move GridField buttons out of table (fixes 7213)
...
* Added a separate component to grid field to hold buttons.
* Updated templates for changes
* Updated comments
2012-05-21 14:19:59 +12:00
Sam Minnée
f348141cfd
Merge pull request #466 from silverstripe-scienceninjas/feature/config-enhancements
...
Feature/config enhancements
2012-05-20 19:03:43 -07:00
Ingo Schommer
dd924f1246
BUGFIX Removed duplicate 'change' event trigger from TreeDropdownField.js ( fixes #7329 )
2012-05-20 23:15:28 +02:00
