Sean Harvey
450bc258d8
MINOR Fixing broken SQLQueryTest cases
2012-05-03 13:09:50 +12:00
Sean Harvey
37369abf1d
BUGFIX Fixing SortColumn alias to be recognised by MSSQL/PGSQL
2012-05-03 12:02:21 +12:00
Sean Harvey
521d436b45
MINOR Fixing broken test in pgsql
2012-05-03 11:22:54 +12:00
Sean Harvey
151abde17d
Merge pull request #388 from chillu/trac/7170-i18n-sprintf-injections
...
#7170 i18n sprintf injections
2012-05-02 16:18:30 -07:00
Ingo Schommer
e929753992
MINOR Using correct $locale format in installer (regression from last commit)
2012-05-03 00:00:51 +02:00
Ingo Schommer
0068b6d5b6
BUGFIX Showing only actually available languages for selection during install ( fixes #7260 )
2012-05-02 23:35:20 +02:00
Sam Minnée
a004acfb59
Merge pull request #381 from AngryPHPNerd/patch-2
...
MINOR: Colliding field check runs twice
2012-05-02 14:14:40 -07:00
Ingo Schommer
c7323545b6
BUGFIX Return consistent data from ModelAdmin->getManagedModels(), fixing custom 'title' settings in $managed_models ( fixes #7243 )
2012-05-02 22:11:26 +02:00
Ingo Schommer
e29bb3c390
ENHANCEMENT Allow opt-out of autofocus in CMS editor form, to avoid browser "auto scrolling" to bring the focused element into view ( fixes #7242 )
2012-05-02 18:27:45 +02:00
Ingo Schommer
8c1053968c
MINOR Fixed unnecessary background in CMS tabs, causes wrong display in FF, and already implemented on parent "cms-content-header" ( #7240 )
2012-05-02 18:13:34 +02:00
Ingo Schommer
dc659543a1
MINOR Correct breadcrumbs in ModelAdmin when managing multiple models ( #7240 )
2012-05-02 18:13:34 +02:00
Ingo Schommer
38ff6d4398
Merge pull request #390 from silverstripe-big-o/Trac-7222-change-gallery-icon
...
ENHANCEMENT:changed gallery icon to an edit icon for assetAdmin + regene...
2012-05-02 06:24:55 -07:00
Ingo Schommer
6c859a7622
Merge branch 'master' of github.com:silverstripe/sapphire
2012-05-02 14:17:47 +02:00
Ingo Schommer
7fdfd4d52e
BUGFIX Changing CheckboxField_holder_small template order back to 2.4 ordering: Show checkbox before label
2012-05-02 14:04:44 +02:00
Ingo Schommer
30153d4538
Merge pull request #394 from silverstripe-big-o/sapphire
...
---
Set the input to the left and label on the right in CheckboxFieldHolder_Small.ss for consistancy with checkbox set field.
Conflicts:
admin/scss/_style.scss
2012-05-02 14:03:59 +02:00
Jeremy Bridson
db9806a895
BUGFIX:Trac#7196 - Fixed styling issues with CMS page settings.
2012-05-02 16:58:08 +12:00
Sean Harvey
6483cdd204
Merge pull request #382 from chillu/trac/7217-group-default-on-member
...
Group default on member (#7217 )
2012-05-01 21:43:05 -07:00
Sean Harvey
c8d2a6f27b
Merge pull request #393 from ajoneil/blowfish-encryption
...
MINOR: Fix style according to style guidelines, and add a comment about ...
2012-05-01 20:01:45 -07:00
Andrew O'Neil
a2e9c001d7
MINOR: Fix style according to style guidelines, and add a comment about use of "$2y" instead of "$2a"
2012-05-02 14:59:39 +12:00
Sam Minnée
10789b67df
Merge pull request #391 from ajoneil/blowfish-encryption
...
ENHANCEMENT: Implement blowfish encryption and use it by default. (#7111...
2012-05-01 19:30:54 -07:00
Andrew O'Neil
fa60f9e8b2
ENHANCEMENT: Implement blowfish encryption and use it by default. ( #7111 )
2012-05-02 13:51:29 +12:00
Jeremy Bridson
bc36406826
ENHANCEMENT:changed gallery icon to an edit icon for assetAdmin + regenerated UnitTesting.css
2012-05-02 11:47:54 +12:00
Ingo Schommer
ca789ef5ff
BUGFIX Disable form submits through "enter" key in CMS, as they might trigger unwanted actions by the browser choosing the default button
2012-05-01 23:40:21 +02:00
Ingo Schommer
431b9589b6
BUGFIX Fixed arguments in global _t() function, added check for $returnValue fallback that its not the injection array as second parameter
2012-05-01 22:17:01 +02:00
Ingo Schommer
0597e914ff
MINOR Don't fail text collection for modules without any matching PHP files (only _config.php)
2012-05-01 22:17:01 +02:00
Ingo Schommer
7b18d9d0da
MINOR Switching _t() calls from sprintf() to using injection parameters ( #7170 )
2012-05-01 22:17:00 +02:00
Ingo Schommer
e949b6f2b0
ENHANCEMENT Backwards compatible $priority parameter for i18n::_t(): Allow numeric arrays as parameters, as well as %s style replacements with a named parameter map (easier transition to new system with existing translation strings)
2012-05-01 22:17:00 +02:00
Ingo Schommer
2288d80c30
Merge pull request #387 from sminnee/sapphire
...
---
The primary goal of this branch was to fix the sort bugs in AssetAdmin, however, it started a bit of a yak shave in that the API around SQLQuery was poor. The biggest change that this pull request makes is it changes the format of SQLQuery::$select to contain aliases as array keys (and consistently puts the "implicit alias" in there to assist with various query generation logic), but it also makes a bunch of changes to avoid direct access of that property.
2012-05-01 17:57:03 +02:00
Ingo Schommer
4c2352f908
MINOR Don't trigger on click on construction of view-model toggles, as it bubbles up to the panel, where it causes a toggle action which overrides any previous user choices stored in cookies ( fixes #7210 )
2012-05-01 14:10:09 +02:00
Ingo Schommer
feab46e075
MINOR Marking ModelAdmin tools filters panel as expanded by default (related to #7210 )
2012-05-01 14:08:55 +02:00
Ingo Schommer
b428fa1548
MINOR Reverting panel collapse changes for filters (see pull requests #383 and #385 )
2012-05-01 13:01:00 +02:00
Sam Minnee
2207e3d978
API CHANGE: Add SQLQuery::prepareSelect(), to further remove the need for direct property access.
...
API CHANGE: Change the format of SQLQuery::$select to use aliases as keys.
2012-05-01 18:15:11 +12:00
Sam Minnee
a8e8a6060a
BUGFIX: Fixed errors caused by complex raw SQL sort() calls. ( #7236 )
2012-05-01 18:15:08 +12:00
Sam Minnee
5abf8cf0f3
BUGFIX: Don't select *any* column() in DataQuery::initialiseQuery(); leave that until finaliseQuery(). It shouldn't be necessary and just risks field collisions.
2012-05-01 17:57:44 +12:00
Sam Minnee
8661164c19
API CHANGE: Add SQLQuery::clearSelect(), SQLQuery::selectField() and SQLQuery::itemisedSelect() to make it easier for other subsystems to use SQLQuery without resorting to direct property access.
...
API CHANGE: Remove DataQuery::select() in place of DataQuery::selectField().
BUGFIX: Remove direct property access to SQLQuery::$select
2012-05-01 17:57:39 +12:00
Sean Harvey
390d3d3fc4
MINOR Fixed broken notice
2012-05-01 17:37:18 +12:00
Sean Harvey
3cd4b33121
Merge pull request #385 from adrexia/7210-close-filter-panel-default
...
BUGFIX: Fix logic error
2012-04-30 20:26:41 -07:00
Naomi Guyer
16fae77241
BUGFIX: Fix logic error
2012-05-01 15:23:11 +12:00
Sean Harvey
1663e96ddb
BUGFIX Fixing stray . in the "Page type: x" tooltip hovering over a page
2012-05-01 15:16:22 +12:00
Sean Harvey
0882741f54
API CHANGE Renamed setModel for DataModel instances to setDataModel for
...
semantics, and also to allow a field name called "Model"
2012-05-01 14:45:44 +12:00
Sean Harvey
befc80676d
Merge pull request #383 from adrexia/7210-close-filter-panel-default
...
ENHANCEMENT: Close filter panel(Track#7210)
2012-04-30 18:44:08 -07:00
Sean Harvey
0e9bdc17c9
Merge pull request #384 from mateusz/uploadfield-derivedclasses
...
BUGFIX: include derived classes for attaching in the UploadField.
2012-04-30 18:43:37 -07:00
Mateusz Uzdowski
ee360c1877
BUGFIX: include derived classes for attaching in the UploadField.
2012-05-01 13:37:15 +12:00
Sean Harvey
c84254c5b1
API CHANGE Rename SQLQuery prepareSelect to prepareWhere
2012-05-01 12:04:11 +12:00
Naomi Guyer
af5bd4d750
ENHANCEMENT: Close filter panel(Track#7210)
...
Make the filter panel closed every time unless explicitly opened. This
commit is dependent on a commit to the CMS that adds a class to the
template.
2012-05-01 11:12:47 +12:00
Ingo Schommer
2784891bd4
MINOR Fixed anchor markdown in upgrading guide, better formatting for config upgrade instructions
2012-04-30 18:00:27 +02:00
Ingo Schommer
c2339d2181
API CHANGE Removed FormResponse handling for erroneous ajax requests in Form->validate(), use javascript validation instead, or reload the whole form with new HTML including the error messages
2012-04-30 17:15:30 +02:00
Ingo Schommer
85a331cc11
BUGFIX Choose first "action" button on submission of CMS forms via enter key, to avoid a form field button being autoselected ( fixes #7151 )
2012-04-30 17:13:39 +02:00
Ingo Schommer
517a0c9e48
MINOR Moving FakeController class (required for bootstrap.php) into its own file, so that autoloading doesn't execute bootstrap (which is the case when invoking TestRunner->module())
2012-04-30 15:04:59 +02:00
Ingo Schommer
f873707e9d
ENHANCEMENT Prepopulating group on new members ( fixes #7217 )
2012-04-30 14:35:25 +02:00