Stig Lindqvist
2eafd63297
Merge pull request #2077 from halkyon/changepassword_validation_redirection_issue
...
BUG If BackURL set, validation errors send the user to wrong place.
2013-06-07 22:44:13 -07:00
Will Rossiter
6d792adab2
Update documentation static declarations to private
...
Also spelling, grammar and line length clean up.
2013-06-08 15:16:59 +12:00
Sean Harvey
83bff54ec2
BUG If BackURL set, validation errors send the user to wrong place.
...
If there's validation errors in the ChangePasswordForm, the user
is taken to the BackURL because redirectBack() will go there if
it's set.
Instead of this, just redirect back to the "changepassword" action
on the Security controller.
2013-06-08 11:34:58 +12:00
Will Rossiter
31cfcdb08e
Merge pull request #2076 from halkyon/passwordvalidator_translate
...
Allow PasswordValidator to be translated
2013-06-07 16:19:40 -07:00
Sean Harvey
7862ececbd
Allow PasswordValidator to be translated
2013-06-08 10:48:27 +12:00
Ingo Schommer
4ebd5ab740
Merge pull request #2057 from jthomerson/enhancement_3.1_do_not_run_abstract_test_cases
...
ENHANCEMENT: Do not attempt to run abstract test classes
2013-06-07 07:54:05 -07:00
Will Morgan
1c0ae76f8e
Adding passwordless message instead of throwing an exception
2013-06-07 16:52:44 +02:00
Andrew Short
92135acc14
Merge pull request #2063 from g4b0/mysqldatabase-extensible
...
Enhancement: replaced private with protected
2013-06-07 07:51:49 -07:00
Ingo Schommer
117b6887c7
Merge pull request #2070 from stevie-mayhew/patch-2
...
MINOR: equality check consistency
2013-06-07 07:14:29 -07:00
Ingo Schommer
7b7d99d3b1
Merge pull request #2071 from tractorcow/3.1-uploadfield-tweaks
...
API Removed user_error UploadField::setConfig
2013-06-07 07:13:41 -07:00
Mike Parkhill
574c11a834
Behat: "Insert image from web" feature
...
Partially fixes https://github.com/silverstripe/silverstripe-cms/issues/628
Modified a bit by Ingo :)
2013-06-07 16:10:21 +02:00
Ingo Schommer
fd6060e7be
Behat: More robust "field should contain" logic
2013-06-07 16:02:29 +02:00
Ingo Schommer
924664527b
Less assumptions in "HTML field contains" step
...
Not using the loose idea of a "field name" in the NamedSelector
sense of the word as "field with id exists".
2013-06-07 15:46:05 +02:00
Ingo Schommer
7dfe5ccbd2
Limit "should see a button" to actually visible elements
2013-06-07 15:45:15 +02:00
Stig Lindqvist
17bca1db86
Behat: Adding context for 'Given I should not see a "xxx" button'
2013-06-07 12:06:01 +02:00
Ingo Schommer
ff5624c57e
BUG Fixed dropdown step definition for "preview" dropdowns
...
Broke after I optimized it to work with a TreeDropdownField
which assumes <li><a> structures that thie "preview" dropdowns
don't have. I also failed at the recursion assignment, causing
infinite loops...
2013-06-07 11:45:09 +02:00
Damian Mooyman
96023079d5
API Removed user_error when setting missing option on UploadField via setConfig. Added documentation to this function as a replacement for the check.
2013-06-07 14:32:30 +12:00
Stevie Mayhew
76f6e0f71e
MINOR: equality check consistency
...
Updated all equality checks to use double equals (==) for consistency.
2013-06-07 12:37:52 +12:00
Sean Harvey
59fb88bec7
Merge pull request #2068 from sminnee/cookie-fix
...
Ensure Cookie::get() will immediately return results.
2013-06-06 16:39:52 -07:00
Sam Minnee
a6bd8f8f43
Ensure Cookie::get() will immediately return results.
...
Without this change, a call to Cookie::get() immediately after Cookie::set()
won't return the value provided. This creates some unintuitive edge-cases,
although to date it looks like they have been worked around.
The patch doesn't have a test because our testing framework doesn't deal
with cookies well.
2013-06-07 11:27:15 +12:00
Sean Harvey
c14b7997d6
Merge pull request #2067 from chillu/pulls/sqlquery-zero-limit
...
BUG Accept $limit=0 in SQLQuery->setLimit()
2013-06-06 13:52:37 -07:00
Ingo Schommer
23e51b871b
BUG Accept $limit=0 in SQLQuery->setLimit()
...
SQLQuery->setLimit(0, 99) should result in "SELECT ... LIMIT 0 OFFSET 1".
In fact it does "SELECT ..." without a LIMIT clause at all,
which is unexpected. This is regardless of the $offset value.
2013-06-06 15:27:14 +02:00
Ingo Schommer
4603378e00
Behat: Fixed step notation
2013-06-06 15:26:50 +02:00
g4b0
6618507823
Enhancement: replaced privete with protected in order to have MySQLDatabase class extensible
2013-06-06 09:06:55 +02:00
Ingo Schommer
7791f20f49
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
2013-06-05 15:17:06 +02:00
Ingo Schommer
1d01347fd3
Behat: Use explicit fixtures
2013-06-05 14:32:42 +02:00
Ingo Schommer
f8b1c08c67
Behat: Copy fixture identifier to "Name" or "Title" by default
...
This makes fixture setup less verbose, particularly for behat
tests (e.g. with "Given a page 'About Us'")
2013-06-05 14:32:42 +02:00
Ingo Schommer
bb92e494d7
Behat fixture refactoring (shared factory instance)
2013-06-05 14:32:42 +02:00
Ingo Schommer
a9ed6b34cb
Behat: Support for TreeDropdownField
2013-06-05 14:32:42 +02:00
Ingo Schommer
a39adb46db
Behat: New fixture notation in "manage files" tests
2013-06-05 14:32:41 +02:00
Will Rossiter
358988e9c6
Merge pull request #2059 from adrexia/batch-actions
...
Batch actions styling
2013-06-03 19:14:13 -07:00
Will Rossiter
cc7a6eeaed
Merge pull request #2060 from adrexia/preview
...
Preview Background styling
2013-06-03 19:00:02 -07:00
Will Rossiter
4286e4e6ec
Merge pull request #2058 from adrexia/filter-panel
...
Filter notice styling and panel adjustments
2013-06-03 18:59:10 -07:00
Naomi Guyer
aaa8bf0029
Preview Background styling
...
* Added background color to preview for sites that don't have a
background color (based on @clarkepaul's commit:
https://github.com/silverstripe-droptables/sapphire/commit/7750c8f75fc4a
764b384c6e19dbe543c4811cdcb)
2013-06-04 12:57:09 +12:00
Naomi Guyer
91605ca8ad
Batch actions styling
...
* Removed cog icon (usually associated with settings), and tidied up
padding (based on @clarkepaul's commit:
https://github.com/silverstripe-droptables/sapphire/commit/b09cd5f7f8e73
4df1f7ca0d387a5b97a03a3b604)
2013-06-04 12:48:51 +12:00
Naomi Guyer
01e7bfb350
Filter notice styling and panel adjustments
...
* Based on @clarkepaul's commit here:
https://github.com/silverstripe-droptables/sapphire/commit/e5de6c06489f3
449ee8131bf4ee2a4e1b2380bee
* Kept margin adjustments, but avoided implementing tab changes, as
tabs have chnaged a lot since original commit
2013-06-04 12:11:05 +12:00
Jeremy Thomerson
12cade8126
ENHANCEMENT: Do not attempt to run abstract test classes
...
There is no reason to try to run test cases of a class that is abstract. By
skipping them we allow developers to create abstract test case classes that
have test functions in them. This is especially helpful when someone is
testing multiple implementations of the same service interface. Most of their
tests can be in the abstract class, and then they can create concrete test
classes for each of their implementations and inherit all of the testing that
is built into the abstract class.
2013-06-03 20:25:08 +00:00
Ingo Schommer
e137d9e2f0
Merge pull request #2039 from g4b0/sitetree-edit-disabled
...
BUG: fixed "regression" adding a new class to SiteTree elem (edit-disabled)
2013-06-03 04:46:48 -07:00
Ingo Schommer
d5510f54b3
Merge pull request #2041 from Mark-M/patch-1
...
FIX Deprecation $manifest not in global scope
2013-06-03 00:30:26 -07:00
Ingo Schommer
fa66593960
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-06-03 00:19:43 +02:00
Ingo Schommer
95a206290f
Updated translations
2013-06-03 00:07:59 +02:00
Ingo Schommer
f5f2864024
Merge pull request #2046 from wilr/leftandmain_requirements
...
FIX LeftAndMain::extra_requirements to accept non associative arrays.
2013-06-02 14:35:40 -07:00
Ingo Schommer
857af16b5b
Fixed injector usage in i18nTextCollector
...
Using singleton, which causes master strings to be cached
between modules with merge=true. Regression from a3c406e4d2
2013-06-02 23:30:33 +02:00
Ingo Schommer
a3c406e4d2
NEW Merge i18nTextCollector with existing ( fixes #1838 )
...
This is a necessity for any further 3.1 pushes of master files to getlocalization.
Because we'd otherwise remove existing master strings for CTF etc,
which means we can no longer backport new translations to 3.0
(and there's no way for users to contribute translations to 3.0 via getlocalization).
It's still a very monolithic class, but at least I've refactored it to return
all collected strings without writing it to files (for easier testing).
2013-06-02 20:17:28 +02:00
Will Rossiter
e1b1fce31f
Doc cleanup (spelling, line length, grammar)
2013-06-02 13:38:10 +12:00
Will Rossiter
db85f3ca16
FIX extra_requirements to accept non associative arrays.
...
Added unit tests for extra_requirements_js and extra_requirements_css.
Fixed YAML documentation to indicate list syntax.
2013-06-02 13:37:34 +12:00
Sean Harvey
1cebfc5d51
Revert "FIX make augmentSQL API consistent for strict PHP"
...
This reverts commit ab40dcc0ca
2013-06-01 11:51:01 +12:00
Sean Harvey
f5b6c55245
Updating FileTest to use the correct shortcode format with commas
2013-06-01 11:25:10 +12:00
Ingo Schommer
8da41f4250
Merge pull request #2042 from jthomerson/fix_augment_sql_api
...
FIX make augmentSQL API consistent for strict PHP
2013-05-31 14:22:46 -07:00
Jeremy Thomerson
ab40dcc0ca
FIX make augmentSQL API consistent for strict PHP
...
This references silverstripe/silverstripe-translatable#113
For that issue, we needed to have the DataQuery as the second parameter to
DataQuery's augmentSQL call. Fortunately, DataQuery was already passing this
argument. However, where the function was defined in DataExtension, the
argument was not present. Thus, subclasses of DataExtension could not add the
parameter to their function signature if they were running in PHP strict mode
because PHP will complain that the signatures don't match.
2013-05-31 19:24:12 +00:00
