Damian Mooyman
09210efbc0
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
control/Session.php
docs/en/05_Contributing/01_Code.md
docs/en/05_Contributing/02_Release_Process.md
forms/FormField.php
model/DataQuery.php
model/Image.php
model/queries/SQLConditionalExpression.php
view/SSViewer.php
view/ViewableData.php
2015-07-31 15:49:35 +12:00
Damian Mooyman
7ee444e08a
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
filesystem/File.php
model/DataObject.php
model/DataQuery.php
search/filters/FulltextFilter.php
search/filters/SearchFilter.php
tests/core/ClassInfoTest.php
tests/filesystem/FileTest.php
tests/model/DataListTest.php
2015-07-31 11:38:18 +12:00
Stevie Mayhew
0d94cf15a5
UPDATE: change all instances of $this->request to use appropriate getter/setter
2015-04-30 11:04:08 +12:00
Ingo Schommer
5d1c355cad
Form action validation excempts
...
Thanks to @kinglozzer for doing the majority of work on this. See #2493 .
2014-11-26 22:49:37 +13:00
Damian Mooyman
eb069e605d
Remove all redundant whitespace
2014-08-19 09:17:15 +12:00
Mateusz Uzdowski
8bf3853887
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/misc/contributing/issues.md
docs/en/reference/uploadfield.md
forms/HtmlEditorField.php
i18n/i18n.php
javascript/HtmlEditorField.js
model/DB.php
model/Image.php
model/SQLQuery.php
2014-08-14 09:08:26 +12:00
Damian Mooyman
fbc7e7c264
BUG Fix issue with generating tree data for missing pages
2014-08-08 15:29:28 +12:00
Damian Mooyman
d8e9af8af8
API New Database abstraction layer. Ticket #7429
...
Database abstraction broken up into controller, connector, query builder, and schema manager, each independently configurable via YAML / Injector
Creation of new DBQueryGenerator for database specific generation of SQL
Support for parameterised queries, move of code base to use these over escaped conditions
Refactor of SQLQuery into separate query classes for each of INSERT UPDATE DELETE and SELECT
Support for PDO
Installation process upgraded to use new ORM
SS_DatabaseException created to handle database errors, maintaining details of raw sql and parameter details for user code designed interested in that data.
Renamed DB static methods to conform correctly to naming conventions (e.g. DB::getConn -> DB::get_conn)
3.2 upgrade docs
Performance Optimisation and simplification of code to use more concise API
API Ability for database adapters to register extensions to ConfigureFromEnv.php
2014-07-09 18:04:05 +12:00
Ingo Schommer
0d7e9a9692
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
_config/routes.yml
docs/en/topics/datamodel.md
forms/DropdownField.php
2014-02-04 08:19:04 +13:00
Sean Harvey
9d11f6f2f5
Fixing failing tests because ?locale= is appended to the end of the URL.
...
Switching from assertEquals to assertContains to be more flexible when
extensions like Translatable add query vars at the end of the links.
2014-01-17 13:48:46 +13:00
Damian Mooyman
4102cc64a0
BUG Issues with CMSForm not consistently respecting new form naming scheme.
...
Fixes for failing CMSFormTest cases
2013-10-30 17:08:31 +13:00
Loz Calver
c34167b0ec
Unit test coverage for CMSMenuItem
2013-10-09 10:43:53 +01:00
Loz Calver
3172c7732e
Allow setting of specific form actions that do not require validation
...
Move validation exemptions into CMSForm
Also fix buttonClicked() to skip CompositeField
Whitespace
Adding unit tests
2013-10-04 10:30:20 +01:00
Will Rossiter
2d0a354405
API: Add attributes argument for CMSMenuItem.
...
Currently help menu item is the only external link in the CMS and the ability for it to work is hardcoded in the template. This request makes the target attribute definable by CMSMenu::add_link().
Adds documentation for how to add a basic external link to the CMS.
2013-10-02 19:06:54 +13:00
Simon Welsh
151baeede1
Correct line length and indentation
2013-08-21 18:54:05 +12:00
Will Rossiter
db85f3ca16
FIX extra_requirements to accept non associative arrays.
...
Added unit tests for extra_requirements_js and extra_requirements_css.
Fixed YAML documentation to indicate list syntax.
2013-06-02 13:37:34 +12:00
Ingo Schommer
3334eafcb1
API Marked statics private, use Config API instead ( #8317 )
...
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:20:53 +01:00
Sam Minnee
1f7fc1f76a
FIX Remove instances of lines longer than 120c
...
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit. This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
2012-09-30 17:18:13 +13:00
Ingo Schommer
e2f073f38a
Method visibility according to coding conventions
2012-09-20 10:46:59 +02:00
Sean Harvey
e3dee85635
MINOR Fix broken test
2012-05-28 12:03:13 +12:00
Ingo Schommer
fb7cd328cf
MINOR Fixed field naming in SecurityAdminTest (recently changed alongside new GridFieldAddButton commit)
2012-05-25 00:02:23 +02:00
Sean Harvey
b1e17578c7
API CHANGE Removed assertType() and assertEmpty() workarounds. Use assertInstanceOf()
...
instead of assertType(), assertEmpty() is available in PHPUnit 3.5+.
PHPUnit 3.4 is no longer supported, so please upgrade your version to
work.
MINOR Removed FullTestSuite which was a workaround for PHPUnit but not
used.
2012-05-09 23:05:39 +12:00
Ingo Schommer
f6c8468d56
MINOR Disabled MainMenu caching in LeftAndMain
2012-05-03 14:19:07 +02:00
Simon Welsh
3a6341a251
API-CHANGE sapphire folder can now be renamed.
2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814
MINOR Add newline to end of files without one
2012-04-15 10:50:19 +12:00
Sean Harvey
fca60b786c
ENHANCEMENT Addition of ModelAdmin::getExportFields() which allows ModelAdmin classes to customise which fields should be exported. Defaults to the summary fields from the model class definition.
2012-03-25 20:01:43 +13:00
Stig Lindqvist
8b82dae06c
API CHANGE: Renaming of gridfield components #6921
2012-03-09 12:54:02 +13:00
Ingo Schommer
3223404a3f
MINOR Disabled two SecurityAdmin tests related to CSV export, which is not fully implemented in the new interface yet. Fixed the group URL in another test.
2012-03-06 01:23:35 +01:00
Ingo Schommer
0117b32fee
API CHANGE Removed MemberTableField, use GridField with GridFieldConfig_RelationEditor instead
2012-03-05 17:41:51 +01:00
Fred Condo
d370423825
Clean up trailing ?> per coding standard
...
All sapphire but the lang directory
2012-02-12 12:40:16 -08:00
Ingo Schommer
d261f4406a
API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path
2012-02-01 18:42:21 +01:00
Ingo Schommer
0dab75c3a0
MINOR Making SecurityAdminTest more resilient against markup order changes
2012-01-02 16:48:36 +01:00
Simon Welsh
89ec7e622e
When relying on the order of returned objects, sort explicitly as it is nondeterminate for non-MySQL.
2011-10-29 15:24:06 +13:00
Will Rossiter
1732a17114
Merged new-orm into datagrid
2011-09-26 16:47:54 +13:00
Ingo Schommer
ce8e72cf0e
MINOR Removing executable flag from all files (thanks miiihi)
2011-09-18 22:04:02 +02:00
Ingo Schommer
bc9fb126c0
MINOR Fixed LeftAndMainTest assertions around DBField instead of string values (broken in 1827c18f
)
2011-08-12 14:14:06 +02:00
Sam Minnee
878b348a0f
Merge branch 'master' into new-orm
...
Conflicts:
docs/en/reference/built-in-page-controls.md
model/SQLQuery.php
2011-05-26 17:08:10 +12:00
Will Rossiter
6956275d2e
MINOR: css styles and formatting for left hand side menu bar. Altered the stylesheet structure to allow future admin scss theme files to be included easier
2011-05-20 11:29:40 +12:00
ajshort
1f6f7f0862
API CHANGE: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList().
...
MINOR: Replaced usage of FieldSet with FieldList.
MINOR: Renamed FieldSetTest to FieldListTest.
2011-05-11 17:51:54 +10:00
Ingo Schommer
b1f27b40ce
MINOR Updated image references in sapphire/ folder to local files, rather than requiring cms/ folder (copied a bunch of images files over for this)
2011-03-29 21:34:26 +13:00
Ingo Schommer
95dcc74c10
MINOR Removed reliance of sapphire/admin unit tests on SiteTree and CMSMain
2011-03-29 18:20:10 +13:00
Ingo Schommer
a1fb071b2b
MINOR Moved LeftAndMain, SecurityAdmin, ModelAdmin and related functionality from 'cms' module to sapphire/admin
2011-03-29 18:07:59 +13:00