tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
8,481 Commits 31 Branches 527 Tags 162 MiB
7fdfd4d52e
Commit Graph

8481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Fred Condo
b8228271e6 BUGFIX: Start a PHP session in installer. 
This fixes blank username and password on home/successfullyinstalled
 2012-04-27 16:51:47 -07:00
Ingo Schommer
c7ca63e0d1 MINOR Updated translation-process docs, migrated FAQs from translate.silverstripe.org 2012-04-27 17:56:29 +02:00
Ingo Schommer
7e222393ea MINOR Updated docs with getlocalization.com instructions 2012-04-27 17:33:14 +02:00
Julian Seidenberg
523c19e88a BUGFIX: fixing core error that occurs when there are two or more proxy servers in front of the SilverStripe application server 2012-04-27 11:03:05 +02:00
Ingo Schommer
4d64946a48 Merge pull request #368 from adrexia/apply-chosen-updates-coffeescript 
MINOR: Fix chosen Coffeescript files
 2012-04-27 01:21:22 -07:00
Ingo Schommer
8489ff37db Merge pull request #359 from silverstripe-big-o/sapphire 
---

When open an image form loaded from TinyMCE Content, change the looks of the popup, such as popup heading (change from "Insert Image" to "Update Image"), action button label (change from "Insert" to "Update"), hiding the cancelling button on the top right corner which still needs to show when in inserting mode

Conflicts:
	lang/en.yml
 2012-04-27 10:15:16 +02:00
Ingo Schommer
f48346d458 MINOR Regenerating lang master files with fixed entity collection logic (fixes "CMSPagesController" menu title in interface) 2012-04-27 10:12:09 +02:00
Ingo Schommer
f47cf33d71 MINOR Fixed i18nTextCollector module disambiguation, was looking at wrong array key (shifted one due to removed priority setting) 2012-04-27 10:11:38 +02:00
Ingo Schommer
98c2517b80 MINOR Fixed i18n:;get_owner_module(), broken by changed manifest returns (paths with leading slash) 2012-04-27 10:11:06 +02:00
Ingo Schommer
e7a4eec0da Merge pull request #377 from adrexia/sapphire 
---

Added padding back into the settings panel.
 2012-04-27 09:42:10 +02:00
Sean Harvey
80575a0e5e MINOR Re-adding getFilter as a deprecated method instead of removing it 2012-04-27 16:56:07 +12:00
Naomi Guyer
f5c26e7282 BUGFIX: Add padding to settings panel 2012-04-27 16:45:07 +12:00