1
0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00

12808 Commits

Author SHA1 Message Date
Damian Mooyman
830c10704c Fix changelog 3.1.5 2014-05-13 15:06:43 +12:00
Damian Mooyman
c492c5efda Merge remote-tracking branch 'origin/3.0' into 3.1.5
Conflicts:
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	tests/filesystem/FolderTest.php
2014-05-13 14:32:27 +12:00
Damian Mooyman
d9c037bb69 Merge remote-tracking branch 'origin/3.0.11' into 3.0 2014-05-13 14:02:28 +12:00
Damian Mooyman
ce516ca1cd Release docs 3.0.11 2014-05-13 13:02:21 +12:00
Will Morgan
1d4082b6f0 MINOR Use composer @stable for PHPUnit
Using stable will allow some packages to be downloaded as zips instead of clones all the time.
2014-05-13 11:25:56 +12:00
Damian Mooyman
96b086a843 Update translation masters
Revert some changes from prior commit
2014-05-13 10:54:33 +12:00
Will Morgan
8ab3881bfa MINOR Use composer @stable for PHPUnit
Using stable will allow some packages to be downloaded as zips instead of clones all the time.
2014-05-09 16:42:43 +12:00
Damian Mooyman
98e5c1556f Release docs update 3.0.11-rc1 2014-05-07 15:54:55 +12:00
Damian Mooyman
0099a18182 Merge pull request from tractorcow/pulls/3.0-fix-foldername
FIX Folder Title not being exactly the same as Name field
2014-05-07 15:34:59 +12:00
Damian Mooyman
0ae96ab030 Changelog tags 2014-05-07 14:11:10 +12:00
Damian Mooyman
953e4b4c49 Added change log for 3.0.11-rc1 2014-05-07 14:03:13 +12:00
Damian Mooyman
617827d3ed Updated documentation index 3.1.5-rc1 2014-05-07 11:06:34 +12:00
Damian Mooyman
58d2535082 Added 3.1.5-rc1 change log 2014-05-07 10:54:33 +12:00
Ingo Schommer
ea1a0d16fc Merge pull request from tractorcow/pulls/3.0/path-checking
Path resolution cleanup
2014-05-07 08:39:17 +12:00
Damian Mooyman
5a69cf67ff Update translation masters 2014-05-06 17:38:58 +12:00
Hamish Friedlander
50e1ed2f72 Merge pull request from tractorcow/pulls/3.1-fileexists-checking
BUG Better checking of existing files
2014-05-06 15:32:06 +12:00
Hamish Friedlander
149b4e4356 Merge pull request from tractorcow/pulls/3.1-dataquery-tables
BUG Fix data query not always joining necessary tables
2014-05-06 15:26:26 +12:00
Damian Mooyman
9bfeffd06a Path resolution cleanup
Backport of  to 3.0
2014-05-06 15:20:57 +12:00
Hamish Friedlander
54cbb53267 Merge pull request from tractorcow/pulls/3.1-requestfilter-versioned-fixes
BUG Fix Versioned stage not persisting in Session
2014-05-06 15:16:45 +12:00
Damian Mooyman
ae573f829f BUG Fix Versioned stage not persisting in Session. Fixes
BUG Disabled disruptive test case in DirectorTest
API RequestProcessor and VersionedRequestFilter now both correctly implement RequestFilter
Better PHPDoc on RequestFilter and implementations
2014-05-06 14:11:44 +12:00
Damian Mooyman
df28ccb59f BUG Better checking of existing files
[ref: CWPBUG-158]
2014-05-06 14:06:16 +12:00
Damian Mooyman
a3c8a594ca BUG Fix data query not always joining necessary tables
Fixes 
2014-05-06 12:22:46 +12:00
Hamish Friedlander
bbaf23331d Merge pull request from tractorcow/pulls/3.1-path-checking
Path resolution cleanup
2014-05-06 11:38:47 +12:00
Hamish Friedlander
bbd7bba11f Merge pull request from tractorcow/pulls/injector-stack-tests
API Injector supports nesting
2014-05-06 11:35:32 +12:00
Damian Mooyman
aef4b80fda Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	.travis.yml
	forms/ConfirmedPasswordField.php
2014-05-06 10:06:58 +12:00
Simon Welsh
ddae5825b3 Merge pull request from ss23/patch-3
MINOR LeftAndMain::getRecord check $ClassName before use
2014-05-05 17:47:57 +10:00
Stephen Shkardoon
677f0edcfc MINOR LeftAndMain::getRecord check $ClassName before use
While the check for `$classname` was done in the first conditional, it was left out of the other two, leading to potential issues when an invalid ID was given, instead of the expected `false`.
2014-05-05 19:26:05 +12:00
Damian Mooyman
d9bc352271 Path resolution cleanup
[ref: CWPBUG-158]
2014-05-05 14:52:41 +12:00
Hamish Friedlander
ad27cd5ec9 FIX Folder Title not being exactly the same as Name field
Backport to 3.0 of PR 
2014-05-05 14:39:45 +12:00
Ingo Schommer
f2b2ee8a68 Merge pull request from tractorcow/pulls/3.1-htmltext-whitelist
BUG HTMLText whitelist considers text nodes
2014-05-05 13:23:52 +12:00
Ingo Schommer
fc8da3fb1d Merge pull request from tractorcow/pulls/3.0-phpunit
BUG Allow PHPUnit installation with composer / Fix travis
2014-05-05 13:20:17 +12:00
Damian Mooyman
1baefab391 Merge pull request from simonwelsh/nonexclusive-test
Don't add the class manifest with tests as an exclusive manifest
2014-05-05 08:43:47 +12:00
Simon Welsh
9116e40eb8 Don't add the class manifest with tests as an exclusive manifest 2014-05-04 11:46:06 +10:00
Ingo Schommer
447c1b97c2 Merge pull request from timsnadden/3.1
Fix 'Uncaught ReferenceError: jQuery is not defined'
2014-05-03 14:29:03 +12:00
Hamish Friedlander
d5b76a87d0 Merge pull request from tractorcow/pulls/3.1-phpunit
BUG Allow PHPUnit installation with composer / Fix travis
2014-05-02 18:37:59 +12:00
Damian Mooyman
b9872c0856 Allow PHPUnit installations with composer
Instruct travis to use composer version of phpunit
2014-05-02 18:23:58 +12:00
Will Morgan
bec8927a08 BUG Allow PHPUnit installation with composer / Fix travis 2014-05-02 18:22:04 +12:00
Damian Mooyman
7a772b2480 Merge pull request from hafriedlander/fix/CWPBUG-155
FIX Folder Title not being exactly the same as Name field
2014-05-02 18:17:37 +12:00
Simon Welsh
48f65669c8 Change PHP 5.6 to an allowed failure 2014-05-02 15:24:51 +10:00
Hamish Friedlander
8e841cc471 FIX folder Title not being exactly the same as Name field if setName modified the value 2014-05-02 14:41:10 +12:00
Damian Mooyman
73b2c7fe35 Merge pull request from dhensby/patch-3
Oembed warning if GD function is missing
2014-05-02 08:37:38 +12:00
Sean Harvey
e79e894970 Merge pull request from mparkhill/patch-1
FIX: parent::init is not called first
2014-05-01 15:53:57 +12:00
Michael Parkhill
bd5abb62ff FIX: parent::init is not called first
In the controller's init function, parent::init() should be called before any other method calls.
2014-05-01 15:35:45 +12:00
Ingo Schommer
512c7140cc Merge pull request from PapaBearNZ/patch-1
FIX: corrected link to CMS Alternating Button Page
2014-05-01 11:43:57 +12:00
James Pluck
4fd3015ea4 FIX: corrected link to CMS Alternating Button Page 2014-05-01 10:45:12 +12:00
Tim Snadden
afad65ee71 Fix 'Uncaught ReferenceError: jQuery is not defined' if jQuery is not included in template. 2014-04-30 09:30:22 +12:00
Ingo Schommer
ff42ad268e Merge pull request from tractorcow/pulls/fix-imagetest
BUG Fix ImageTest
2014-04-29 21:34:04 +12:00
Ingo Schommer
5524bd4ebb Merge pull request from tractorcow/pulls/3.1-remove-thirdparty-demo
Removed demo folder
2014-04-29 21:33:31 +12:00
Mateusz U
2c9f99c1f0 Merge pull request from tractorcow/pulls/3.1-fix-tree-duplication
BUG Fix jstree when duplicating subtrees
2014-04-29 16:19:00 +12:00
Damian Mooyman
0b4f62dfd8 BUG Fix jstree when duplicating subtrees 2014-04-29 16:00:07 +12:00