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
9,181 Commits 31 Branches 527 Tags 162 MiB
2deb5d692c
Commit Graph

9181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
2deb5d692c Merge pull request #605 from willrossi/trac6648 
FIX: insert javascript requirements before the first inline script.
 2012-07-05 09:28:39 -07:00
Ingo Schommer
4b9ccabcf6 Merge pull request #603 from willrossi/trac7296 
FIX: ensure permissions_for_member() accounts for denied permissions
 2012-07-05 09:26:04 -07:00
Ingo Schommer
64357a4522 Merge branch '3.0' 
Conflicts:
	admin/css/screen.css
	admin/scss/_forms.scss
	docs/en/changelogs/3.0.0.md
 2012-07-05 18:01:09 +02:00
Ingo Schommer
9ce0c9a483 Relative include path for RailsYAML PHPUnit tests 
Avoids problems when PHPUnit includes this test through autodiscovery. This is the case when running PHPUnit
with a specific path argument, which overrules phpunit.xml.dist
(e.g. "phpunit sapphire/").
 2012-07-05 12:14:56 +02:00
ARNHOE
b6c59f2c95 Restricting input.time width 2012-07-04 18:57:07 +02:00
Ingo Schommer
de73db9ef7 Restructured 3.0 changelog 
Moved some more important stuff up the page,
rewritten upgrading overview to be more task focused,
reduced excessive use of paragraphs to make the text more scannable.
 2012-07-04 18:42:38 +02:00
jakr
2b5214b55a Summarized 3.0 changes in changelog 2012-07-04 18:18:27 +02:00
jakr
20696958df FIX: Ticket #7592 GridFieldDataColumns: Wrong documentation for getFieldCasting Moved documentation to the appropriate function, added note about the two parameter callback function. 2012-07-04 18:08:24 +02:00
Ingo Schommer
85480142c1 CLI bootstrap: Merge existing $_GET and $_REQUEST data 
Necessary to have the <get name="db" /> directive
working in phpunit.xml definitions, which in turns allows
us to use GET parameters to switch the database connection
for running automated tests.
 2012-07-04 15:20:08 +02:00
Will Rossiter
db4cb8de7e Merge pull request #614 from ajshort/gridfieldsetconfig 
NEW Add set config method to GridField.
 2012-07-03 23:11:01 -07:00
Will Rossiter
4a39ebe156 Merge pull request #615 from ajshort/multilineapplicationname 
Allow multi-line application names.
 2012-07-03 23:08:41 -07:00
Andrew Short
b44ff84aac Allow multi-line application names. 2012-07-04 13:17:19 +10:00
Andrew Short
eb733dee60 NEW Add set config method to GridField. 2012-07-04 13:13:23 +10:00
Sam Minnée
9c57294aa9 Merge pull request #613 from silverstripe-rebelalliance/trac/7598 
BUG $db in extensions not inited early enough (#7598)
 2012-07-02 19:33:54 -07:00
Hamish Friedlander
890f7e3919 BUG $db in extensions not inited early enough (#7598) 
When querying DataObjects by a generic parent class (like SiteTree for instance), fields added via $db
set on child classes wouldnt appear.

This is because Object::__construct wasnt called early enough in DataObject::__construct, so
extensions werent initialised when $db was first accessed
 2012-07-02 17:25:14 +12:00
Sean Harvey
ea910a5174 Merge pull request #608 from willrossi/trac6441 
API: add api for setting a custom template on  RSS feed.
 2012-07-01 18:54:33 -07:00
Sean Harvey
bea58b1193 Merge pull request #607 from willrossi/trac6416 
FIX: check GetRandom() exists for RandomGenerator.
 2012-07-01 18:38:53 -07:00
Sean Harvey
95e4057e21 Merge pull request #606 from willrossi/trac6303 
API: add SecurityToken::reset() as a shortcut for regenerating a token.
 2012-07-01 18:37:41 -07:00
Will Rossiter
f1db65d6b6 API: add api for setting a custom template on a RSS feed. 
See initial idea at http://open.silverstripe.org/ticket/6441. Added $template property and corresponding getters / setters for customizing the template used. Added relevant unit test.
 2012-07-01 21:27:50 +12:00
Sean Harvey
a4ff1d3613 FIX: check GetRandom() exists for RandomGenerator 
See http://open.silverstripe.org/ticket/6416
 2012-07-01 21:05:10 +12:00
Will Rossiter
f9ea5430bb API: add SecurityToken::reset() as a shortcut for regenerating a secure token. 
See http://open.silverstripe.org/ticket/6303
 2012-07-01 20:53:58 +12:00
Simon Welsh
9f6eeb4d0e FIX: insert javascript requirements before the first inline script. 
From http://open.silverstripe.org/ticket/6648.
 2012-07-01 18:34:24 +12:00
Will Rossiter
9babb01a4b FIX: ensure that permissions_for_member() accounts for denied permissions. 
Taken from http://open.silverstripe.org/ticket/7296. PermissionTest extended to validate that permissions_for_member() includes permissions denied pre applying patch. PermissionTest passes post patch.
 2012-07-01 17:55:20 +12:00
Sam Minnée
23ed5335e6 Merge pull request #601 from willrossi/themedcontroller 
MINOR: update core controller template with more help information.
 2012-06-29 21:12:15 -07:00
Will Rossiter
9cfbe9b84f MINOR: update core controller template with more help information. 
Updated controller and director documentation to reflect the new YAML configuration for route path definition.
 2012-06-30 15:19:36 +12:00
Ingo Schommer
976f1f5da0 Merge pull request #593 from willrossi/trac3881 
API: add $includeGetVars flag for SS_HTTPRequest().
 2012-06-29 05:41:48 -07:00
Ingo Schommer
8014a67028 Merge pull request #592 from willrossi/trac6156 
FIX: ensure RestfulServiceTest uses email as the unique identifer field
 2012-06-29 05:39:05 -07:00
Ingo Schommer
496c240bc9 Merge pull request #591 from willrossi/sqlquerylimitfix 
FIX: ensure limits to SQLQuery are passed as positive values
 2012-06-29 05:36:24 -07:00
Ingo Schommer
9f0cfe00b6 Merge branch 'gsoc-22-yamlfixture-import-string-rc' of https://github.com/michalochman/sapphire into michalochman-gsoc-22-yamlfixture-import-string-rc 2012-06-29 14:34:17 +02:00
Ingo Schommer
fa62c1b0ba Smarter concat of query params in LeftAndMain.js 
Broke when CMS URL already had query params,
such as ?locale=en_US with the Translatable module enabled.
With this patch it doesn't double-concat ?locale....
Still doubles query params, but that's acceptable
until we find a more solid URL manipulation lib for JS.
 2012-06-29 14:23:01 +02:00
Will Rossiter
16cb504d8e API: add $includeGetVars flag for SS_HTTPRequest() to return the URL with the attached GET parameters. 2012-06-29 22:02:30 +12:00
Simon Welsh
cd0a1ff623 FIX DataQuery::applyRelation was returning the base class. 
If the applyRelation() was passed a relation that went to a class with a parent
class with a database table, applyRelation would return the name of the parent
class, rather than the class the relation was actually too.
 2012-06-29 21:54:48 +12:00
Will Rossiter
4977318f46 FIX: ensure RestfulServiceTest uses email as the unique identifer field for running tests. Fixes: #6156. 2012-06-29 20:45:57 +12:00
Sam Minnée
c07d4ec95e Merge pull request #590 from willrossi/errorheaders 
FIX: exclude error string in headers to prevent white screen display.
 2012-06-29 00:51:36 -07:00
Will Rossiter
4ee709e88d FIX: ensure limits to SQLQuery are passed as positive values 2012-06-29 19:40:28 +12:00
Will Rossiter
168663657b MINOR: add flag for combine in order to test Requirements::combine_files() while in dev 2012-06-29 18:35:55 +12:00
Will Rossiter
48408d323a FIX: exclude error string in headers to prevent white screen display. 2012-06-29 18:14:14 +12:00
Sam Minnée
8b98b44b02 Merge pull request #588 from willrossi/devadmin 
FIX: restore and update style for DevelopmentAdmin.
 2012-06-28 21:59:07 -07:00
Will Rossiter
0910a651d5 FIX: restore and update style for DevelopmentAdmin. 2012-06-29 16:52:36 +12:00
Sam Minnée
0e168c2608 Merge pull request #587 from simonwelsh/modeladmin-ns 
FIX Santise model classes in ModelAdmin
 2012-06-28 19:17:07 -07:00
Simon Welsh
8d670283c9 FIX Santise model classes in ModelAdmin 
As ModelAdmin puts classes directly into links, a namespaced class
has its \s turned into /s, breaking the links. This escapes them by
converting each \ to a -, then converting them back when loading.
 2012-06-29 13:52:33 +12:00
Sam Minnee
5271504feb Fixed changelog links 2012-06-29 11:17:12 +12:00
Sam Minnee
4424ec679a Updated change logs for 3.0.0 stable 2012-06-29 11:05:42 +12:00
Michał Ochman
c282190299 ENHANCEMENT Add YamlFixture String argument support 
Enhanced YamlFixtureTest to cover this addition.
 2012-06-29 00:33:00 +02:00
Ingo Schommer
402297ee1f Removed outdated docs for SQLQuery and data model techniques 
Some of the SQLQuery recipes are now handled better by DataList,
others should be contrasted with their respective DataList implementation,
pointing out the limitations
 2012-06-28 14:51:04 +02:00
Ingo Schommer
19e087d226 Fixed references to deprecated APIs in docs 2012-06-28 14:49:55 +02:00
Ingo Schommer
0236a3c03a NEW Docs for form validation (incl. HTML5 types) and model validatoin 2012-06-28 11:43:30 +02:00
Ingo Schommer
3ef394c448 Proof reading tutorials 1 and 2 2012-06-28 11:42:50 +02:00
Ingo Schommer
aa8dfd127c FileField->getUpload() and setUpload() 2012-06-28 11:42:27 +02:00
Ingo Schommer
ee71356fca Removed 'subversion' docs 
No longer required since we've successfully switched to git
 2012-06-28 09:00:13 +02:00