Commit Graph

363 Commits

Author SHA1 Message Date
Damian Mooyman
19549d620f Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13:00
Damian Mooyman
6baf63e18c Merge remote-tracking branch 'origin/3.1'
Conflicts:
	dev/install/install.php5
	docs/en/changelogs/index.md
	security/Security.php
2014-11-19 11:16:46 +13:00
Josh Kosmala
2e416b60f3 Update javascript.md fixes #3652
I needed to know how to do this to do some jQuery manipulation in the CMS.
2014-11-18 21:56:51 +00:00
Damian Mooyman
0b1f297873 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
Antony Thorpe
98937f2467 Update forms.md
Should be "set" not "get" in FormField->setSmallFieldHolderTemplate().
2014-11-11 18:04:40 +13:00
Phill Price
a184d228e3 Filter heading being processed as part of code
Whitespace issue causing the filter header to become part of the sorting example above - fixed whitespace.
2014-11-10 11:08:12 +00:00
Gabriele Brosulo
f2a059b148 Update versioning.md 2014-11-06 11:31:55 +01:00
Gabriele Brosulo
b64cfaf649 Update versioning.md
Added information about $SilverStripeNavigator
2014-11-06 10:55:32 +01:00
Sean Harvey
95963b19b8 Merge pull request #3559 from g4b0/patch-2
Update versioning.md
2014-10-16 11:54:46 +13:00
Gabriele Brosulo
1770161550 Update fixtures.md
syntax error
2014-10-15 15:31:32 +02:00
Gabriele Brosulo
8a7a25edf5 Update versioning.md
Removed parent::onAfterPublish(); because Page parents does not implement it. The old code generate this error:

Error at framework/core/Object.php line 761: Uncaught Exception: Object->__call(): the method 'onafterpublish' does not exist on 'MyPage' (http://ssdev-master.zk/admin/pages/edit/EditForm)
2014-10-15 15:25:13 +02:00
Damian Mooyman
53c40a94fa API Enable re-authentication within the CMS if a user session is lost
BUG Resolve issue with error redirection being ignored within CMS
BUG Fix issue with invalid securityID being re-emitted on failure
2014-10-14 15:19:48 +13:00
Sean Harvey
c55e4fe7e2 Merge pull request #3475 from AntonyThorpe/PHPUnitDocs
Update testing/index.md for clearer PHPUnit installation instructions
2014-09-26 11:11:19 +12:00
Damian Mooyman
e47800917a API Mailer can be configured to use different encoding mechanisms, and added support for unicode quoted-string encoding
API Mailer bounce email can now be configured
API Mailer no longer calls Convert::xml2raw on all email subjects
API Deprecate dead Mailer code and refactored duplicate or mis-documented code.
2014-09-25 16:04:56 +12:00
Christopher Darling
39e9513c32 removed reference to deprecated :Negation filter 2014-09-24 12:49:12 +01:00
AntonyThorpe
11187c56c0 Updated for PHPUnit version clarification
Updated Composer command to reference latest stable version as advised
Removed testing installation via Browser step
Added a note about the PHPUnit 3.7 requirement for running tests via the Browser
2014-09-17 16:49:52 +12:00
Damian Mooyman
062ad8e685 API Allow parameterised joins / subselects 2014-09-16 17:54:30 +12:00
AntonyThorpe
da8cebaa62 Describe adding PHPUnit as a simple one line command
- Removed the composer.json example
- Removed comment about PHPUnit versions

Signed-off-by: AntonyThorpe <antony.thorpe@budget12.com>
2014-09-12 17:02:04 +12:00
AntonyThorpe
f5ccdda22f Updated en/topics/testing/index.md for clearer PHPUnit installation instructions
Step by step Composer installation instructions, including a composer.json example.

In addition:
- Removed self-page reference to an introduction
- Removed reference to PEAR installation instructions due to end of life
- Removed reference to Ruby as doesn't add value
- Shortened testing via Web Browser section (as covered in Composer installation instructions)
2014-09-10 17:20:29 +12:00
Sean Harvey
6267d2e51e Fixing broken docs on setting allowed extensions on a FileField
Refers to an invalid variable, and is overriding the entire Upload,
which isn't necessary.
2014-09-09 11:14:38 +12:00
Damian Mooyman
aec8430395 Merge pull request #3393 from halkyon/flushable
NEW Provide a consistent way of triggering flush
2014-08-22 10:28:26 +12:00
Sean Harvey
2b316e79e5 NEW Provide a consistent way of triggering flush
Provides an interface for classes to implement their own flush()
functionality. This function gets called early in a request on
all implementations of Flushable when flush=1|all is requested in the
URL.

This fix came out of an issue where Requirements combined files were not
being cleaned up after dev/build?flush=1, due to the fact that flush
would only occur when you called it while on a page that used those
combined files, but not in any other contexts. This will now call flush
on any implementors of Flushable regardless of the context of where
flush was called.
2014-08-22 09:24:27 +12:00
Christopher Darling
d89ed7c4a7 DOCS: correct notes on TEMP_FOLDER
getTempParentFolder() in framewor/core/TempPath.php checks for silverstripe-cache directory in webroot first, failing that it falls back on the sys_get_temp_dir() folder.

also, getTempFolder() is no longer in framework/core/Core.php since #b075fa29c59f970bea31bbe8be1bd6560a8778b6, it is now located in framework/core/TempPath.php
2014-08-21 14:31:55 +01: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
Simon Welsh
9b8d07ca5b Merge pull request #3180 from colymba/i18n-js-injection-fix
API New i18n JS sprintf and inject replacement functions
2014-08-07 21:24:52 +10:00
Damian Mooyman
350ee4d421 Merge pull request #3277 from kopymark/patch-3
Fix for joins code block
2014-07-23 08:54:18 +12:00
Simon Welsh
c14d58f585 Merge branch '3.1'
Conflicts:
	.travis.yml
	model/ManyManyList.php
	model/fieldtypes/DBField.php
2014-07-16 21:24:02 +10:00
Simon Welsh
8a3eebf289 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	i18n/i18n.php
2014-07-16 21:18:07 +10:00
Adam Judd
171eb42c9e Fix for joins code block 2014-07-09 22:31:41 +09:30
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
Mateusz U
32ae468454 Merge pull request #3216 from halkyon/session_inst
Better support for overloading start and destroy methods in Session
2014-06-23 10:15:15 +12:00
daslicht
e0c4a70a8d Update javascript.md
Replaced deprecated jQuery live() with on(), updated link to documentation.
2014-06-22 10:59:59 +02:00
Sean Harvey
0ee3a683a5 Better support for overloading start and destroy methods in Session
Move functionality from static start and destroy functions into instance
methods, allowing these to be overloaded. This works the same way as
calling Session::set() which then in turn calls inst_set()

Additionally use Injector to create the default Session instance to
allow the class to be swapped out.
2014-06-20 10:35:53 +12:00
Stig Lindqvist
86e91b57bf Merge pull request #3219 from AntonyThorpe/patch-1
Update forms.md with additional example code in MyForm.ss
2014-06-19 15:43:11 +12:00
Antony Thorpe
6ac1c8256b Update forms.md with additional code in MyForm.ss
Show two ways of reaching a nested field plus that field's validation message
2014-06-17 17:18:04 +12:00
Ingo Schommer
bb03f6ba2f Merge remote-tracking branch 'origin/3.1'
Conflicts:
	forms/HtmlEditorField.php
2014-06-15 22:50:20 +12:00
colymba
8fb5e9c3a4 API New JS sprintf and inject replacement functions
Fix sprintf issues when replacement was at start of string + introduce
new inject function using injection map similar to the PHP version of
_t()
2014-06-05 22:47:49 +03:00
Stevie Mayhew
0da889bde2 Update datamodel.md
Fix broken link to SS_List->column
2014-05-29 16:25:40 +12:00
Stephen Shkardoon
6b410aa9a0 Update i18n.md
Fix a link being inside backticks, which broke the formatting.
2014-05-29 13:13:45 +12:00
JorisDebonnet
90bb1ec7f7 Update i18n.md
Corrected a mistake: to make a new locale available (in particular for use with silverstripe/translatable), i18n:common_locales needs to be updated, not i18n:common_languages.
2014-05-25 21:09:06 +02:00
Damian Mooyman
e9c3ff933f Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	composer.json
2014-05-06 10:22:09 +12:00
Damian Mooyman
2e73dcb891 API Remove swf,html,htm,xhtml,xml as default allowed upload able file types 2014-04-29 11:09:30 +12:00
Martin D.
6b3a21653b Fixed config setting link 2014-04-28 10:31:54 -04:00
Jim Tittsler
8acb28ffc5 remove leading tab
fix rendering
2014-04-23 14:50:34 +09:00
Damian Mooyman
982ad569b9 Merge remote-tracking branch 'origin/3.1' 2014-04-22 12:09:51 +12:00
Simon Welsh
fc9864eed3 Wording fix to forms.md
Closes #3032
2014-04-17 17:44:54 +12:00
Damian Mooyman
997077ae83 API Security.remember_username to disable login form autocompletion 2014-04-11 09:05:25 +12:00
Damian Mooyman
4c69d42bd2 Merge remote-tracking branch 'origin/3.1' 2014-04-02 17:23:39 +13:00
OliBridgman
49232151af Update index.md
topics/templates doesn't exist.
2014-04-02 10:19:47 +13:00
Damian Mooyman
7c60c73dbb API Polymorphic has_one behaviour 2014-03-18 09:18:04 +13:00