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
77dbceee35
BUGFIX i18n::include_by_locale() doesn't include a fallback language, _t() instead will include the language if it's not available.
...
This fixes en_GB translations not being picked up. i18n::get_translators() will always have a fallback of "en" language without the
region, and "en_US" as the locale.
2012-05-23 11:48:37 +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
Ingo Schommer
69fbdad722
MINOR Removed non-functional "close popup" link from profile editing in CMS ( fixes #7343 )
2012-05-20 14:03:50 +02:00
Ingo Schommer
607a9e2f45
MINOR Reverted removal of horizontal panel scrollbars from dc5e36ec, as it makes important content like nested tree nodes inaccessible. UI elements inside the panel should adjust to the available width if visually required instead ( fixes #7347 )
2012-05-20 14:00:14 +02:00
Ingo Schommer
bb72037de1
MINOR Don't double-trigger 'stop' event in UploadField.js (regression from d642eee2, fixes #7355 )
2012-05-20 13:36:11 +02:00
Ingo Schommer
0cbb1b11e3
MINOR Fixed async entwine redraw calls in HtmlEditorField.js (regression from fdebedd1)
2012-05-20 13:35:12 +02:00
Ingo Schommer
7ab47b6493
MINOR Moved redundant toggleLooks() logic in HtmlEditorField.js to existing redraw() logic
2012-05-20 13:34:18 +02:00
Ingo Schommer
02505247d5
MINOR Indentation
2012-05-20 12:22:55 +02:00
Ingo Schommer
6f55b67f0e
MINOR Removing duplicate "edit & organize" label from HTMLEditorField upload dialog, as its handled differently from the standard AssetAdmin: Fields go directly into edit mode, no need to duplicate this in a persistent upload status ( fixes #7355 )
2012-05-20 11:31:29 +02:00
Ingo Schommer
fedb337aa5
BUGFIX Less strict checks for relative URL normalization in SS_HTTPRequest (regression from recent security fixes to Director::is_absolute_url()) ( fixes #7359 )
2012-05-20 11:16:34 +02:00
Ingo Schommer
18fa9cd03d
MINOR Fixed _t() message in AssetAdmin ( fixes #7363 )
2012-05-20 10:49:12 +02:00
Sean Harvey
1bf6495ae0
MINOR Partially reverted 4d4f9e08d9 as we don't need to check
...
forTemplate() exists
2012-05-19 18:17:25 +12:00
Sean Harvey
b68e426844
MINOR Removing dodgy conditional tests in SSViewerTest
2012-05-19 18:09:57 +12:00
Sean Harvey
4d4f9e08d9
MINOR Code formatting in SSViewer
2012-05-19 18:09:39 +12:00
Sean Harvey
e5e8f489a2
Merge branch (pull request #247 ) 'template-global-fixes' of https://github.com/sminnee/sapphire into sminnee-template-global-fixes
2012-05-19 15:39:59 +12:00
Hamish Friedlander
94f50f554e
API CHANGE: Changes to make Director rules set through the new config system. Includes the addition of a new AdminRootController to take over handling of routing /admin/* routes to the correct LeftAndMain panel.
2012-05-19 14:37:32 +12:00
Hamish Friedlander
8e9ae37719
MINOR: Rename & tweak some existing config files to better reflect meaning of various names
2012-05-19 14:37:32 +12:00
Hamish Friedlander
18ddae3375
BUGFIX: Make config yaml fragments merge following the same rules as other config sources
2012-05-19 14:37:32 +12:00
Sean Harvey
aaf91154a2
BUGFIX If there is *any* error connecting to MySQL, expose this to the installer.
2012-05-19 11:29:25 +12:00
Sean Harvey
d58e37417f
Merge pull request #445 from yukiawano/extendedDateBugFix
...
BUGFIX Changed Date.php to use DateTime->Format instead of strtotime(fixes #7311 )
2012-05-18 15:40:27 -07:00
Ingo Schommer
7c589f07dc
MINOR Don't invoke layout() in onmatch() for cms-preview, as it causes a gap above the menu/logo div for some reason. It's also unnecessary processing, since the preview is always hidden by default, and layout() will be triggered through redraw() when required (e.g. preview panel expansion)
2012-05-18 20:07:06 +02:00
