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
Ingo Schommer
d23e8ec14c
BUGFIX Fixed cms menu expansion logic when shown alongside preview panel, retain cookie preference
2012-05-18 20:07:06 +02:00
Ingo Schommer
e185a9b8f8
MINOR Adding title to menu items so they can be more easily identified in collapsed mode
2012-05-18 20:07:06 +02:00
Yuki Awano
c04b01fc2a
BUGFIX Changed Date.php and DateTime.php to use DateTime->Format instead of strtotime to handle extended dates on 32bit environment( fixes #7311 )
2012-05-18 16:09:38 +09:00
Sean Harvey
7dc2d61871
MINOR Removing whitespace
2012-05-18 18:05:45 +12:00
Stig Lindqvist
b1690b2c95
Merge pull request #458 from silverstripe-scienceninjas/trac/4113
...
MINOR: Updated inline phpdoc while investigating trac/4113
2012-05-17 23:02:33 -07:00
Naomi Guyer
a412aa0ce4
BUGFIX: Filter IDs
...
Change ID of action buttons in the filter panel to be unique
2012-05-18 18:01:07 +12:00
Russell Michell
88a222fff3
MINOR: Updated inline phpdoc while investigating trac/4113
2012-05-18 18:00:03 +12:00
Sean Harvey
3f932d6bad
Merge pull request #464 from mateusz/os7299
...
BUGFIX: add capability of redirecting form actions.
2012-05-17 22:44:05 -07:00
Mateusz Uzdowski
8b4b896578
BUGFIX: add capability of redirecting form actions.
...
Form actions assume that they are reloading the form afterwards. But
this is not always the case - for example "delete" action will redirect
back to the panel, so we need to be able to set the X-Pjax headers
accordingly.
2012-05-18 17:36:06 +12:00
Sam Minnee
1e47b0fbd3
BUGFIX: Don't include ._-prefixed config files.
2012-05-18 16:15:14 +12:00
Sam Minnee
1025524d8c
API CHANGE: Added $insertBefore argument to GridFiedlConfig::addComponent()
2012-05-18 16:15:14 +12:00
Sam Minnee
c8e994d573
BUGFIX: Allow modification of a config's components after the grid field is instantiated.
2012-05-18 16:15:13 +12:00
Sam Minnee
7201f06476
API CHANGE: Added new config option Money.default_currency.
2012-05-18 16:15:13 +12:00
Sam Minnee
7036abbd75
BUGFIX: Make WithinRangeFilter work with dates and related columns.
2012-05-18 16:15:13 +12:00
Sam Minnee
6bb1218760
MINOR: Update entities via collector script.
2012-05-18 16:15:13 +12:00
Sam Minnee
70a5b49dd6
MINOR: Fixed i18n coding for LeftAndMain save and delete.
2012-05-18 16:15:13 +12:00
Sean Harvey
b65dff0fbe
BUGFIX Allowing actions related to coverage tests
2012-05-18 16:05:05 +12:00
Sean Harvey
4f42b2e773
Merge pull request #461 from mateusz/entwines3
...
BUGFIX: add missing onunmatches causing exceptions in entwine
2012-05-17 19:29:38 -07:00
Mateusz Uzdowski
97e00a35dd
BUGFIX: add missing onunmatches causing exceptions in entwine
2012-05-18 14:27:09 +12:00
Sean Harvey
d782c37044
Merge pull request #457 from mateusz/entwines2
...
Refactor JS entwines
2012-05-17 19:14:10 -07:00
Sean Harvey
e98572e3a3
Merge pull request #460 from robert-h-curry/6993-gridfield-not-clicking-on-ipad
...
BUGFIX: Force iOS Safari to send through click events on gridfield rows.
2012-05-17 19:11:33 -07:00
Robert Curry
38e4bfd150
BUGFIX: Force iOS Safari to send through click events on gridfield rows. ( fixes #6993 )
2012-05-18 14:00:23 +12:00
Marcus Nyeholt
b269badfbe
FEATURE: Added dependency injector for managing creation of new objects and their dependencies.
...
API CHANGE: Pass Object::create() calls to Injector::create().
API CHANGE: Add "RequestProcessor" injection point in Director, that Director will call preRequest() and postRequest() on.
2012-05-18 12:39:57 +12:00
Mateusz Uzdowski
6e436b54f4
BUGFIX: change namespace for the tree so all matchers are executed
...
.cms-tree.multiple matcher would not execute, because .cms-tree from
another file is overriding it (and the element is marked as resolved by
entwine). We need to move it to a separate namespace.
2012-05-18 12:27:30 +12:00
Mateusz Uzdowski
37399f88db
BUGFIX: add missing _super calls to all matchers and unmatchers
...
Otherwise some matchers might not be triggered as expected.
2012-05-18 12:27:30 +12:00
Mateusz Uzdowski
3d0876c8f5
BUGFIX: put all CMS JS code into 'ss' namespace.
...
Conflicts:
admin/javascript/LeftAndMain.js
javascript/GridField.js
2012-05-18 12:27:30 +12:00
Sam Minnée
3412a0e58d
Merge pull request #456 from normann/trac/7324
...
trac 7324: Disable GridField pagination links when only one page is visible
2012-05-17 17:18:22 -07:00
Normann Lou
5290b81c55
ENHANCEMENT: don't show the paginating elements in the paginator when only one page, and keep 'view 1 - 5 of 5' there
2012-05-18 11:31:33 +12:00
Sean Harvey
d8b5b97e28
MINOR Upgrade notes on TinyMCE upgrade and how to resolve a common issue
2012-05-18 10:56:34 +12:00
Sean Harvey
18a92f922b
Merge pull request #454 from adrexia/7215-Fix-design-toggle-searchfields-gridfield
...
BUGFIX: GridField filter
2012-05-17 15:19:46 -07:00
Sean Harvey
78423c1bd0
BUGFIX Ensure HTTP::get_mime_type() checks the full path in
...
file_exists() before using the finfo class
2012-05-18 09:22:02 +12:00
Sean Harvey
c9bcfd49ec
BUGFIX Only use finfo if the file exists, otherwise the MIME type
...
detection won't work, such as in the case of HTTPRequest::send_file()
2012-05-17 14:54:30 +12:00
Sean Harvey
e2aa635323
BUGFIX Ensure GridFieldExportButton uses "text/csv" as the MIME type
2012-05-17 14:54:29 +12:00
Naomi Guyer
f0c61c20df
BUGFIX: GridField filter
...
Make sure the new class is used consistently, and has the correct css
applied to it.
2012-05-17 11:15:53 +12:00
Ingo Schommer
eeef41e91f
SECURITY Fixed remote code execution vuln in install.php due to inserting unescaped user data into mysite/_config.php. Not critical because install.php is required to be removed on a SilverStripe installation anyway ( fixes #7205 )
2012-05-16 14:59:42 +02:00
Ingo Schommer
8f2ede8fcf
MINOR Fixed syntax errors from SQLQuery/DataQuery cleanup
2012-05-16 13:17:19 +02:00
Ingo Schommer
4da9e72eed
Merge branch 'master' of github.com:silverstripe/sapphire
2012-05-16 13:09:42 +02:00
Sean Harvey
8407c76b82
Merge pull request #451 from chillu/security-docs
...
Improved security docs around DataList, SQLQuery
2012-05-16 03:48:50 -07:00
Ingo Schommer
dfa01c8ce1
Merge pull request #446 from adrexia/sapphire
...
---
MINOR: SCSS refactoring
1. Refactored some gridfield styles to enable reuse (created a mixin file to hold mixins that generate specific css objects/elements).
2. Made some scss comments use // so they wouldnt appear in generated css
ENHANCEMENT: Gridfield usability (fixes 7215)
1. Modified gridfield to use default colours
2. Added ability to show and hide the filter
3. Design changes to icons used
4. Gridfield template fixes: Took out broken mark-up from templates (spans were being inserted inside spans), and adjusted styles. Added extra class to template
5. Added "filter by ..." placeholder text to input fields
Conflicts:
css/GridField.css
2012-05-16 12:29:13 +02:00
Ingo Schommer
3a11c690ed
MINOR Updated security documentation (phpdoc and markdown) around new DataList and SQLQuery APIs, additional automatic escaping on some stricter inputs like column names
2012-05-16 11:59:22 +02:00
Ingo Schommer
6e99e187b4
MINOR Css coding conventions for CMS
2012-05-16 11:38:20 +02:00
Ingo Schommer
51eb70781b
Merge pull request #450 from adrexia/file-upload-status
...
BUGFIX: Re-add status for successful upload
2012-05-16 00:42:00 -07:00
Ingo Schommer
c01cfddc66
Merge pull request #449 from adrexia/broken-pagination
...
BUGFIX: Fix pagination buttons
2012-05-16 00:35:28 -07:00
