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
Naomi Guyer
dc5e36ec5c
BUGFIX: 7117 Fixes
...
Includes:
* Changes to chosen to include a custom function that will let the
drop-down rise-up if there is room and it would otherwise drop beneath
the size of the window (changes in coffeescript, jquery output, and
chosen css)
* Changes in SCSS to stop the automatic addition of scrollbars, and
to limit the extra space at the bottom of the filter div
Issues remaining:
* jLayout is calculating the height of the filter div incorrectly.
It is assuming the div is around 70px longer than it is. This height
assumption is linked somehow to chosen, as initiating the select box
results in a correct height calculation.
2012-05-01 17:14:16 +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
Ingo Schommer
72eadef113
ENHANCEMENT GridFieldDetailForm->setItemEditFormCallback()
2012-04-30 13:46:51 +02:00
Dominik Beerbohm
fdd5e71ba9
ENHANCEMENT: Remove unnecessary NULL check.
2012-04-30 13:44:31 +03:00
Ingo Schommer
fed2785173
ENHANCEMENT Per-instance customisation of GridFieldDetailForm_ItemRequest
2012-04-30 12:31:17 +02:00
Ingo Schommer
ffe698ca1e
MINOR Placeholder text for adding a group in Member->getCMSFields() ( fixes #7217 )
2012-04-30 10:29:09 +02:00
Ingo Schommer
0e8c3acc35
MINOR Using SapphireInfo non-statically in RestfulService ( fixes #7238 )
2012-04-30 10:22:00 +02:00
Ingo Schommer
136b61eaba
Merge pull request #379 from adrexia/sapphire
...
---
* Added a height to the iframe body for all browsers except IE8, to fix the issue of the iframe not being high enough.
* Changed the place where the background colour of the files iframe was set, as IE browsers wont inherit this from the parent li.
* Replaced the height declaration of the drop-down field with a max-height declaration.
* Set the height of the dropdown field, and its parent to be 150px in IE7, because IE7 has trouble recalculating the height of the parent when the dropdown is initiated. 150px allows for easy navigation of the dropdown list and doesnt break the design (the 200px used in other browsers results in a design that looks broken when the parent is also set to this height)
2012-04-30 09:33:56 +02:00
Sam Minnée
ec1b0fd590
Merge pull request #380 from robert-h-curry/7077-lazy-loading
...
ENHANCEMENT: Add lazy loading to DataQuery.
2012-04-29 22:51:04 -07:00
Robert Curry
ff6909df97
ENHANCEMENT: Add lazy loading to DataQuery.
2012-04-30 16:12:15 +12:00
Naomi Guyer
61c18c5dbc
BUGFIXES: Fixes #7003
2012-04-30 12:25:35 +12:00
Sean Harvey
3ccaa1f864
MINOR Supress any error connecting to the database so the installer
...
doesn't show it in the page header
2012-04-30 11:15:21 +12:00
Sean Harvey
5e7e823c73
Merge pull request #378 from oddnoc/install-from-source-docs
...
Fixes for docs about installing from source (option 1)
2012-04-27 21:50:25 -07:00
Sean Harvey
32d4ec837c
Merge pull request #374 from oddnoc/installer-email-password-feedback
...
BUGFIX: Start a PHP session in installer.
2012-04-27 21:49:38 -07:00
Fred Condo
d47821a73c
Change git add command to also include the changes to .gitignore
...
Shell * does not match .gitignore
2012-04-27 17:59:23 -07:00
Fred Condo
0e9dd9242a
Augment/correct phing installation instructions
2012-04-27 17:55:19 -07:00
Sean Harvey
b03cf04dbd
BUGFIX Updating MySQLDatabaseConfigurationHelper to check for MySQLi
...
instead of mysql_connect and other old function usage, as we've moved to
MySQLi in MySQLDatabase.php now
2012-04-28 12:13:58 +12:00
