Ingo Schommer
58445245d9
Conditionally reset MemberLoginForm.force_message
...
Avoid starting a session just because the login form is rendered,
which adds overhead to requests and makes them harder to cache.
2014-06-03 23:21:57 +12:00
Ingo Schommer
0101423969
Merge pull request #3048 from JayDevlin/2920-uploadfield-master
...
API UploadField: move replaceFile to the front end config
2014-05-26 22:20:35 +12:00
Damian Mooyman
a5a390680f
Merge pull request #3150 from IgorNadj/patch-3
...
BUG fix listview not working with IE9
2014-05-22 13:11:03 +12:00
Igor
32136305be
BUG fix listview not working with IE9
...
To reproduce:
1. Using IE9, go to demo.silverstripe.com
2. login
3. go to Pages
4. switch to listview
5. expand pages to get to one with pagination (e.g. Pages > Features > Listview)
6. go to next page
Expected: you go to the next page
Actual: it jumps you back to the home page
Fix: this fix passes parameters stored in the hash part of the url, which IE9 and below rely on for PJAX.
2014-05-22 12:39:32 +12:00
Hamish Friedlander
a263bed937
Merge pull request #3091 from willmorgan/pulls/testrunner-suites
...
TestRunner: allow test suite running
2014-05-22 10:32:21 +12:00
Devlin
5f7ebd3c23
API UploadField: move replaceFile to the front end config
2014-05-21 12:03:26 +02:00
Damian Mooyman
ec578e5c8a
Merge remote-tracking branch 'origin/3.1'
2014-05-12 11:32:22 +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
f84e439959
Merge pull request #3121 from willmorgan/pulls/testrunner-db-cookie-fix
...
FIX remove redundant DB name switch in TestRunner
2014-05-12 08:23:15 +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
8335de49b3
FIX remove redundant DB name switch in TestRunner
...
From what I can see, this doesn't actually do anything, except cause an error with cookie setting after HTTP body is sent when tests fail.
2014-05-09 10:15:53 +01:00
Will Morgan
d01cbbbdc7
TestRunner: allow test suite running
2014-05-09 10:03:59 +01: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
76932f7a00
Merge pull request #3114 from dhensby/restful-service-links
...
MINOR use `Controller::join_links()` in `RestfulService`
2014-05-09 08:23:24 +12:00
Daniel Hensby
7617f08ad3
Use Controller::join_links()
in RestfulService
...
At the moment, `RestfulService` duplicates functionality of
`Controller::join_links` (badly) and it means that one MUST use a base
URL with a trailing slash for the URL to be constructed properly
Plus tests for `RestfulService::getAbsoluteRequestURL()`
API Deprecating `RestfulService::constructURL()`
This function isn't used in core so we should remove it
2014-05-08 08:59:57 +01:00
Damian Mooyman
0305eb97e7
Merge pull request #3111 from silverstripe-iterators/pulls/gridfield-getrecord
...
GridFieldDetailForm_ItemRequest->getRecord()
2014-05-08 09:13:36 +12:00
Ingo Schommer
802b46bd0a
GridFieldDetailForm_ItemRequest->getRecord()
2014-05-07 23:49:04 +12:00
Ingo Schommer
ca1f9a58f4
Merge pull request #3110 from dhensby/pulls/restful-docs
...
fixing docs spacing
2014-05-07 23:13:43 +12:00
Daniel Hensby
b873e32d9e
fixing docs spacing
2014-05-07 12:06:44 +01:00
Andrew Short
48240d8fd0
Merge pull request #3109 from dhensby/pulls/restful-docs
...
Restful service docs
2014-05-07 19:26:26 +10:00
Daniel Hensby
bef913aeb9
Updating RestfulService
docs to explain how to set cURL options
...
see #3108
2014-05-07 10:12:08 +01:00
Will Rossiter
d01083cfce
Merge pull request #3108 from dhensby/master
...
Revert "FIX: allow CURLOPT_CONNECTTIMEOUT to be configured."
2014-05-07 08:47:02 +01: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
Daniel Hensby
87bb99667e
Revert "FIX: allow CURLOPT_CONNECTTIMEOUT to be configured."
...
This reverts commit 0d493d4eff
.
2014-05-06 22:13:56 +01:00
Ingo Schommer
6d3f7887a6
Merge pull request #3018 from willmorgan/patch-3
...
FIX change action variable source to getViewer
2014-05-07 08:38:33 +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
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
93cd339ff0
Merge pull request #3060 from tractorcow/pulls/tinymce-blockquote
...
API tinymce editor no longer transforms paragraphs with margin-left into blockquotes
2014-05-06 11:40:44 +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
e9c3ff933f
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
composer.json
2014-05-06 10:22:09 +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
Ingo Schommer
aac93669dd
Merge pull request #3095 from willmorgan/pulls/templatemanifest-cache-fix
...
FIX TemplateManifest prevent cache collision
2014-05-06 08:20:05 +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
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