Damian Mooyman
c24a2c2177
BUG ArrayList failing to respect the SS_Sortable interface
...
ref: CWPBUG-133
2014-05-15 14:25:23 +12:00
Damian Mooyman
c3c3145d37
Merge remote-tracking branch 'origin/3.1.5' into 3.1
2014-05-13 16:51:55 +12:00
Damian Mooyman
830c10704c
Fix changelog
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
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
Sean Harvey
f5569078e5
Merge pull request #3125 from tractorcow/pulls/3.1/configtest
...
BUG Fix deprecated use of statics in test cases
2014-05-12 09:21:28 +12:00
Damian Mooyman
51c3346b46
BUG Fix deprecated use of statics in test cases
2014-05-12 08:44:11 +12:00
Ingo Schommer
21fef41c3f
Merge pull request #3124 from kinglozzer/pulls/3122-translate-cache-cleaning
...
FIX: Prevent i18n clearing all SS_Caches (fixes #3122 )
2014-05-12 08:14:58 +12:00
Loz Calver
d012b79cf0
FIX: Prevent i18n clearing all SS_Caches ( fixes #3122 )
2014-05-10 21:37:13 +01: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
Ingo Schommer
dd638014a4
Merge pull request #3104 from willmorgan/patch-5
...
MINOR Use composer @stable for PHPUnit
2014-05-09 16:34:01 +12:00
Ingo Schommer
a05d8113af
Merge pull request #3103 from simonwelsh/configstatic_nextstring
...
Adds to nextString() method to ConfigStaticManifest
2014-05-09 16:08:19 +12:00
Ingo Schommer
c647c97fe4
Merge pull request #3118 from phillprice/patch-1
...
Update pagination.md
2014-05-09 09:09:42 +12:00
Phill Price
adf478b4e9
Update pagination.md
...
Eror in Limit example
2014-05-08 21:46:30 +01:00
Damian Mooyman
98e5c1556f
Release docs update
2014-05-07 15:54:55 +12:00
Damian Mooyman
0099a18182
Merge pull request #3100 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
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 #3106 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
Simon Welsh
3602ce2db8
Adds to nextString() method to ConfigStaticManifest
...
This is used to get the classname out of the tokens, rather than assuming that
the class name is a single T_STRING.
2014-05-06 15:35:37 +10:00
Hamish Friedlander
50e1ed2f72
Merge pull request #3101 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 #3019 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 #3085 to 3.0
2014-05-06 15:20:57 +12:00
Hamish Friedlander
54cbb53267
Merge pull request #2918 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 #962
...
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 #2846
2014-05-06 12:22:46 +12:00
Hamish Friedlander
bbaf23331d
Merge pull request #3085 from tractorcow/pulls/3.1-path-checking
...
Path resolution cleanup
2014-05-06 11:38:47 +12:00
Hamish Friedlander
bbd7bba11f
Merge pull request #3058 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
Will Morgan
06aa0c9993
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-05 15:30:05 +01:00
Simon Welsh
ddae5825b3
Merge pull request #3102 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 #3086
2014-05-05 14:39:45 +12:00
Ingo Schommer
f2b2ee8a68
Merge pull request #3021 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 #3087 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 #3096 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 #3079 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 #3088 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 #3086 from hafriedlander/fix/CWPBUG-155
...
FIX Folder Title not being exactly the same as Name field
2014-05-02 18:17:37 +12:00
