Simon Welsh
6db96eac8f
Correct errors from differening behaviour between 3.0 and 3.1
2014-03-30 19:29:18 +13:00
Simon Welsh
f9c44e4ceb
Merge branch '3.0' into 3.1
...
Conflicts:
model/Versioned.php
view/SSTemplateParser.php
view/SSViewer.php
2014-03-30 18:15:12 +13:00
Damian Mooyman
4415a75d93
BUG Fix issue with versioned dataobjects being cached between stages
2014-03-27 13:17:29 +13:00
Ingo Schommer
023641e263
Merge pull request #2776 from ryanwachtl/fix-get-candidate-template
...
FIX Overriding of theme templates in project folder
2014-03-25 23:08:36 +13:00
Devlin
0096ab0d3d
Upload: refactor file versioning
2014-03-24 11:45:37 +01:00
Sean Harvey
f11adcfe2e
Fixing FormField not setting readonly attribute on setReadonly(true)
2014-03-24 08:59:35 +13:00
James Goodman
cd4ebb25ca
Fix HTMLText AbsoluteLinks not parsing placeholder
...
Add an AbsoluteLinks method to HTMLText that parses placeholders instead of returning the raw value.
2014-03-18 07:53:42 +13:00
Russell Michell
26f8341438
NEW Added FormatFromSettings(). Formats dates as per user preferences.
...
- Required for silverstripe-cms/issue/965.
- Separate implementations for Date and SS_Datetime.
2014-03-17 10:15:59 +13:00
Simon Welsh
90ba514cda
Merge pull request #2917 from tractorcow/pulls/fix-lazyload-queryparams
...
BUG Fix DataObject / Versioned publishing issues
2014-03-15 21:45:42 +13:00
Simon Welsh
ccaca9a6aa
Merge pull request #2916 from tractorcow/pulls/fix-classname-generation
...
BUG Prevent unnecessary reconstruction of ClassName field
2014-03-15 21:44:29 +13:00
Simon Welsh
66b60cb486
Merge pull request #2754 from madmatt/pulls/behat-profile
...
Allow GridFields without titles to be found.
2014-03-15 21:13:06 +13:00
Simon Welsh
279b927df1
Merge pull request #2903 from tractorcow/pulls/fix-fileupload-fileexists
...
BUG Fix issues with uploading to /assets
2014-03-15 21:02:36 +13:00
Simon Welsh
5beaebc43a
Merge pull request #2718 from silverstripe-rebelalliance/2503
...
BUG: Fixes performReadonlyTransformation for OptionSetField
Closes #2503
2014-03-15 20:45:04 +13:00
Simon Erkelens
6676787176
ENHANCEMENT: Allow nested grouping of GroupedList
2014-03-15 19:20:28 +13:00
Simon Welsh
0e0597f8cd
Merge branch '3.0' into 3.1
...
Conflicts:
control/Director.php
dev/Backtrace.php
docs/en/installation/nginx.md
model/HTMLValue.php
tests/model/SQLQueryTest.php
2014-03-10 22:56:27 +13:00
Damian Mooyman
cad863204c
Merge pull request #2871 from feejin/urlsegment-trailing-space
...
BUG Trim URLSegment before applying replacements in filter
2014-03-06 08:16:31 +13:00
Damian Mooyman
c61c9e7ac2
Merge pull request #2922 from JayDevlin/2904-upload-loadintofile
...
BUG Upload: loadIntoFile() duplicates files if replaceFile=true
2014-03-05 16:43:45 +13:00
Damian Mooyman
0cbad41d3b
Rewrote usages of error suppression operator
2014-03-05 15:48:55 +13:00
Damian Mooyman
6d5d3d8cb7
Rewrote usages of error suppression operator
2014-03-05 14:22:19 +13:00
Devlin
3c1e82b42c
Upload: retrieve existing File if an object without an ID is given and replaceFile=true
2014-03-04 18:02:33 +01:00
Damian Mooyman
23f5f08eda
BUG Fix DataObject::loadLazyFields discarding original query parameters
...
BUG Fix Versioned::writeToStage failing to write object with unchanged fields
2014-03-04 16:12:07 +13:00
Damian Mooyman
1cc366fe23
Merge pull request #2850 from kinglozzer/2827-member-extend
...
FIX: Rewrite Member getCMSFields to ensure updateCMSFields is only run once (fixes #2827 )
2014-03-04 13:42:17 +13:00
Damian Mooyman
53b5adbcd9
BUG Prevent unnecessary reconstruction of ClassName field after default records are generated
2014-03-04 12:03:45 +13:00
Simon Welsh
ccb791995e
Merge pull request #2894 from wilr/3.1-manymanyyaml
...
Add support for many_many_extraField in YAML
2014-03-04 11:35:58 +13:00
Colin Richardson
7b13041449
Remove trailing dashes from URLSegment
2014-03-03 22:22:03 +00:00
Ingo Schommer
c047a7b990
Reset FailedLoginCount on successful password reset
2014-03-03 17:47:16 +13:00
Colin Richardson
1795b21df0
Remove redundant underscore and update the comment
2014-03-02 15:03:02 +00:00
Damian Mooyman
c1e0f98f87
BUG Fix case where setFolder('/') would break UploadField::fileexists
...
BUG Prevent Upload from writing to the site root folder
2014-02-27 14:23:32 +13:00
Will Rossiter
8b92300622
Add support for many_many_extraField in YAML
...
Format is
RelationName:
- =>Obj.name:
ExtraFieldName: "Foo"
2014-02-24 22:03:53 +13:00
Damian Mooyman
ebeb663ddf
BUG Fixed critical issue with Folder::find_or_make failing to handle invalid filename characters
...
BUG Fix UploadField duplicate checking with invalid folderName
2014-02-21 09:11:34 +13:00
Ingo Schommer
705c75baa5
Merge pull request #2861 from srizzling/expand-filter-update
...
Expand CMS Panel Update + New Test File
2014-02-18 23:38:31 +13:00
Hamish Friedlander
d6630d240a
NEW Allow specifying element whitelist in HTMLText fields
2014-02-18 14:02:04 +13:00
Sriram Venkatesh
80997171cc
Updated Expand CMS Panel to find first visible panel and added new test file
2014-02-18 11:17:31 +13:00
Sean Harvey
30e3904e4c
Merge pull request #2845 from kinglozzer/1429-summary-searchable-fields
...
FIX: searchable_fields inheritance from summary_fields includes methods called on fields (fixes #1429 )
2014-02-17 15:14:54 +13:00
Loz Calver
d91c7d14b8
FIX: Rewrite Member getCMSFields to ensure updateCMSFields is only run once ( fixes #2827 )
...
Fix usage of inside closure
Can't use self:: in closure either
Basic unit tests to check extensions are applied correctly
2014-02-16 21:21:15 +00:00
Loz Calver
a91a4bbdc2
FIX: Searchable fields with dot notation can be inherited from summary_fields ( fixes #1429 )
2014-02-14 21:52:47 +00:00
Sam Minnee
a1c3cf1cf4
Removed use of assertCount() from this test as it causes infinite loops on Travis.
2014-02-14 16:39:36 +13:00
Sam Minnee
4f7c6ebcff
FIX: Fixed behat text selection rule, which broke some tests.
...
The behat rule for text selection wasn't working due to the JavaScript not executing properly. I have
also updated the code to traverse all childNodes, which is important if you have text like this:
<p>text1 <b>text2</b> text3</p>
And you are trying to select 'text3'
2014-02-13 17:36:46 +13:00
Ingo Schommer
5e38ef9e55
Merge pull request #2835 from kinglozzer/1891-csrf-friendly-error
...
NEW: Forms with invalid/expired SecurityIDs are repopulated (fixes #1891 )
2014-02-12 09:44:03 +13:00
Sean Harvey
c322cb2d65
Fixing SQLQueryTest failures on PHPUnit 3.7.30
2014-02-10 13:32:39 +13:00
Loz Calver
058219c0ee
NEW: Forms with invalid/expired SecurityIDs are repopulated ( fixes #1891 )
2014-02-09 10:19:24 +00:00
madmatt
267786a7d1
Add behat test for security permission checkboxes.
2014-02-07 15:41:33 +13:00
Mateusz Uzdowski
e91f10b0ab
Add Behat step to click on a row in the first GridField table.
2014-02-07 15:40:06 +13:00
Ingo Schommer
bb9f84afd5
Merge pull request #2806 from tractorcow/pulls/bug-member-locale
...
BUG Default Member.Locale now chooses a better default value when i18n.locale is not a valid translation
2014-02-03 17:03:48 -08:00
Ingo Schommer
457ec9446b
Merge pull request #2700 from ajshort/injector-factory
...
Injector Factory
2014-02-03 16:50:15 -08:00
Andrew Short
2f817ba177
NEW: Allow specifying a factory to use for creating services.
...
A service factory can be used for creating instances where a non-trivial
construction process is required. This is done by adding a `factory`
key to the service definition.
2014-02-03 11:30:22 +11:00
Ingo Schommer
91b363b141
Merge pull request #2756 from madmatt/pulls/behat-form-context
...
Update theHtmlFieldShouldContain step to include negation.
2014-01-30 18:09:55 -08:00
Kirk Mayo
44a8537f68
BUG: #2503 Fixes performReadonlyTransformation for OptionSetField
...
NEW: Adding unit test for performReadonlyTransformation #nd fixing OptionSetField #2503
BUG: Fixing undefined variables and function parameters for PerformReadonlyTransformation unit tests
NEW: Adding unit test to OptionsetField for read only fields
2014-01-30 16:09:55 +13:00
Damian Mooyman
293c672fa7
BUG Default Member.Locale now chooses a better default value when i18n.locale is not a valid translation
...
This will resolve issues in cases where the site locale may be assigned a value that does not have an explicit translation. E.g. if the locale is en_NZ (and it's appropriate for this to be the assigned locale), Afrikaans will no longer be the default selected locale when creating members. Now en_US is chosen as a better fallback default.
This is a minor ease of use fix that means fewer CMS users can be accidentally created in Afrikaans within NZ based sites.
Test cases included.
2014-01-30 15:55:14 +13:00
Simon Welsh
cf01ca818a
Revert "MINOR: Added behat test to cover changes made in e69e65c."
...
This reverts commit e0b4e6125c
.
2014-01-22 15:20:48 +13:00
Mateusz U
ce3a944903
Merge pull request #2780 from madmatt/pulls/securityadmin-js2
...
BUGFIX: Fix JS for PermissionCheckboxsetField in SecurityAdmin
2014-01-20 19:00:00 -08:00
madmatt
e0b4e6125c
MINOR: Added behat test to cover changes made in e69e65c
.
2014-01-15 16:20:19 +13:00
Ryan Wachtl
5f87d344f1
FIX Overriding of theme templates in project folder
...
Fixes issue of templates not being found when a Page's main/Layout templates are split between the project and theme folders. Adds more expansive testing for template loading.
2014-01-14 15:05:24 -06:00
Will Rossiter
a50996a010
NEW: Add support for push operator on ArrayList ( Fixes #1539 )
2014-01-12 18:55:40 +13:00
Will Rossiter
e7266535c5
FIX: Allow empty checkboxes through setValue(null) ( #1392 )
2014-01-12 17:28:09 +13:00
Will Rossiter
4ea62b44f9
FIX: Ensure GridFieldDetailForm has the current record validator.
...
Currently the validator is only set through
ModelAdmin and not through GridField
directly. This will set the validator based on the
record unless a custom validator has been
provided.
http://www.silverstripe.org/data-model-questions/show/34650?start=8#post331958
2014-01-12 16:08:31 +13:00
Will Rossiter
f433b5000f
FIX: Resolve issue when selected value is zero. ( #2530 )
...
$this->value is stored as string internally. In
the special case that the option value is 0, the
type comparison fails to resolve 0 == '0',
see http://www.php.net/manual/en/types.comparisons.php .
2014-01-11 13:25:40 +13:00
Jeremy Shipman
62694b0a8b
NEW: Made ValidationResult functions chain-able.
...
Added unit tests for CombiningResults
2014-01-09 16:32:27 +13:00
Jeremy Shipman
8d8f3abace
FIX: ConfirmedPasswordField setName failed to set names of child fields.
...
FIX: ConfirmedPasswordField relied on POST variables. These should instead come from setValue().
Added all important tests for validating the field: valid if passwords match, invalid if passwords differ.
2014-01-07 17:17:55 +13:00
Matt Peel
0eaae90bdb
Update theHtmlFieldShouldContain step to include negation.
...
This allows steps to be declared as either “should contain” or “should not
contain”.
2014-01-06 17:22:40 +13:00
madmatt
2b00036d9d
Allow GridFields without titles to be found.
2014-01-06 10:20:44 +13:00
Stephen Shkardoon
40163edba7
Make CacheTest sleep properly
...
This way it will always sleep for the right amount of time (or longer)
2013-12-21 15:05:51 +13:00
Will Rossiter
3d2875a111
Merge pull request #2741 from simonwelsh/hhvm-test
...
Changes to error message detection to handle the differences in HHVM
2013-12-20 16:55:14 -08:00
Simon Welsh
8de403abd4
Changes to error message detection to handle the differences in HHVM
2013-12-21 13:17:47 +13:00
madmatt
7d271d5346
Fix profile.feature behat test
2013-12-20 12:32:44 +13:00
Ingo Schommer
d032fadfb5
Fixed spelling of class in test
2013-12-19 20:47:16 +01:00
Ingo Schommer
78a530524b
Merge pull request #2684 from Firesphere/feature/force_write_js_to_bottom
...
NEW Forcefully write javascripts to the end of the HTML if wished
2013-12-19 09:21:06 -08:00
Daniel Pickering
94c19e349a
FIX: Year.php getDefaultOptions now fixed, sets key as year. Also added YearTest unit test.
2013-12-16 03:29:29 +00:00
Firesphere
af7afbe918
IMPROVEMENT/FEATURE Forcefully write javascripts to the end of the HTML if wanted.
...
It's defaulted to false. But when set to true, the JS is written to the end of the HTML, even though there are earlier scripts.
This results in faster page-loading if the JS isn't needed earlier-on.
2013-12-14 14:04:03 +01:00
Ingo Schommer
ab91a5a80b
Merge pull request #2622 from froog/patch-1
...
Created LessThanOrEqualFilter and GreaterThanEqualFilter
2013-12-13 03:34:45 -08:00
Ingo Schommer
c811556ea5
Removed debug code
2013-12-13 10:04:26 +01:00
Firesphere
41371fea72
NEW Force the javascripts to be put before the closing body tag
2013-12-07 15:47:31 +01:00
Ingo Schommer
a7ad85c2a8
Better "editable page" Behat assertion
2013-12-02 19:07:14 +01:00
micmania1
b89ab1eb16
Added SSViewer::get_templates_by_class() to make the functionality in LeftAndMain::getTemplatesWithSuffix() more open.
2013-12-01 07:42:37 +00:00
Ingo Schommer
df2d59df1c
Use more solid getValue() in Behat assertions
...
getAttribute('value') behaves inconsistently with Selenium drivers
(fails on Travis and TeamCity, but works locally). Selenium2Driver
in Mink provides a JS wrapper for getting the value, which is more reliable.
This fixes "insert a link" failures, see https://travis-ci.org/silverstripe/silverstripe-cms/jobs/14281251
2013-11-30 13:27:20 +01:00
Ingo Schommer
73eae2990f
Merge pull request #2683 from tractorcow/pulls/2682-fix-gridfieldsortableheader
...
BUG Fixes #2682 - Regression in #2595
2013-11-29 09:17:39 -08:00
Sean Harvey
3a8833ec28
Fixing broken manage-users behat test.
...
"ADMIN group" is created by default, but assertions are checking
for "Admin Group".
2013-11-29 14:51:46 +13:00
Sean Harvey
cfc009964c
Fixing undefined step caused by change in behat-extensio module.
2013-11-29 14:17:04 +13:00
Sean Harvey
761cc63e19
Adding test for CheckboxSetField saving into a text DB field.
2013-11-29 11:38:07 +13:00
Damian Mooyman
7636699c9f
BUG Fixes #2682 - Regression in #2595 causing gridfield headers to break on summary_fields containing field methods
2013-11-27 18:43:27 +13:00
froog
755857b22a
NEW: Created LessThanOrEqualFilter and GreaterThanEqualFilter
2013-11-25 03:59:51 +00:00
Ingo Schommer
784c766ee6
Revert "Don't rely on Behat/Selenium returning 'value' for textarea"
...
This reverts commit 8245125349
.
2013-11-22 20:38:56 +01:00
Ingo Schommer
7e291133a0
Merge pull request #2663 from ajshort/has-many-prepopulate
...
NEW: Pre-populate and disable foreign key field on has many lists.
2013-11-22 11:18:11 -08:00
Ingo Schommer
053258b984
Merge pull request #2595 from kinglozzer/gridfield-sort-relation
...
NEW: GridField can sort on relation columns
2013-11-22 11:14:12 -08:00
Ingo Schommer
8245125349
Don't rely on Behat/Selenium returning 'value' for textarea
...
Technically a textarea DOM node doesn't have a 'value' attribute,
but rather a HTML content. This used to work, but likely broke either
by updated browser handling or updated selenium logic.
Fixes "Scenario: I can edit title and content and see the changes on draft"
2013-11-22 20:05:17 +01:00
Ingo Schommer
70207b0c98
Merge pull request #2626 from Zauberfisch/filterByCallback
...
filterByCallback added to SS_Filterable interface and implemented in ArrayList
2013-11-21 05:34:36 -08:00
Zauberfisch
d9b74874fc
added filterByCallback() to interface SS_Filterable and all implementing classes
2013-11-21 13:03:18 +00:00
Will Rossiter
0e89c4b6cd
API: Implement SS_Map::push() to append values.
...
FIX: SS_Map::count() not taking into account additional firstItems
2013-11-18 20:38:57 +13:00
Ingo Schommer
bd5fdf1f19
Fixing coding conventions in Behat files
2013-11-15 12:03:43 +01:00
Loz Calver
a1a402224f
NEW: GridField can sort on relation columns
...
Slightly improved logic
Add support for relations more than one 'level' apart
Add unit tests
Fixing PostgreSQL support
Throw exception if attempting to sort on a has_many/many_many relation
2013-11-13 10:33:00 +00:00
Andrew Short
fc773c5c22
NEW: Pre-populate and disable foreign key field on has many lists.
...
This is a common use case, and by default a form field is added which
has no effect. While this coupling is undesirable, it makes the default
behaviour much more sensible.
See #2662 , #2651 , #2637 for more information.
2013-11-13 16:21:18 +11:00
Cam Spiers
14486902fb
Allow users to extend the SSTemplateParser by defining open & closed blocks
...
Currently the only way the extend SSTemplateParser is to define a class
extension of it and then tell the injector component to use your new
custom class. This new change allows a user to define new "open blocks"
and "closed blocks" for SSTemplateParser to use without needing to
recompile the real SSTemplateParser class.
The following example shows how the functionality can be used
to add a new <% minify %>…<% end_minify %> syntax to the template parser
In a config.yml file, define the new minify closed block to call the
static function "Minifier::minify"
```
Injector:
SSTemplateParser:
properties:
closedBlocks:
minify: "Minifier::minify"
```
Define a new class with the minify static method that returns the new
template code when regenerating templates:
```
class Minifier {
public static function minify(&$res) {
return <<<PHP
{$res['Template']['php']}
\$val = zz\Html\HTMLMinify::minify(\$val, array('optimizationLevel' => zz\Html\HTMLMinify::OPTIMIZATION_ADVANCED));
PHP;
}
}
```
2013-11-04 14:24:58 +13:00
Sean Harvey
70c23f37de
Merge pull request #2608 from andrewvt/3.1
...
added removeFromGroupByCode() function to Member.php
2013-11-03 12:27:10 -08:00
andrewvt
389bdb4ddf
Added a unit test for removeFromGroupByCode()
...
Added a unit test for removeFromGroupByCode()
2013-10-31 22:05:13 -04:00
Damian Mooyman
c74f7e7640
BUG Fixes issue where items could be deleted from a has_many relation by an entirely unrelated HasManyList calling delete on that item.
2013-11-01 11:39:13 +13:00
Will Rossiter
a0b7bfc7a5
Merge pull request #2604 from chillu/pulls/versioned-single-stage
...
Fixed support for single stage in Versioned
2013-10-29 01:40:40 -07:00
Ingo Schommer
dfabd54bdb
Fixed support for single stage in Versioned
...
This used to work in 2.4, so is considered a regression.
To test, simply add a Versioned("Stage") extension to
some record in 2.4 vs. 3.1.
2013-10-24 17:09:17 +02:00
Ingo Schommer
7cf8e65309
Merge pull request #2598 from halkyon/test_execution_error
...
i18nSSLegacyAdapterTest setting wrong arguments for manifest.
2013-10-24 04:24:19 -07:00
Sean Harvey
e3542fead3
i18nSSLegacyAdapterTest setting wrong arguments for manifest.
...
Currently if you run i18nSSLegacyAdapterTest twice in a row you
get errors about classes not existing, because the class manifest
doesn't get set correctly during the test setUp() method.
2013-10-24 17:22:16 +13:00
Ingo Schommer
d7e10e620a
Merge pull request #2537 from wilr/membervalidator
...
FIX: Use Injector API for managing Member_Validator instance.
2013-10-23 03:01:15 -07:00
Ingo Schommer
39efaca54f
Disable "lost password" feature, breaks on "php -S"
...
PHP's built-in webserver doesn't reliably expose SCRIPT_NAME,
see https://github.com/silverstripe/silverstripe-framework/issues/2580 .
This breaks URL routing on /Security/passwordsent/admin%40test.com
2013-10-22 15:26:20 +02:00
Ingo Schommer
f2d362b629
Merge pull request #2576 from halkyon/fulltextsearch_test
...
FulltextSearchableTest doesn't clean up after itself.
2013-10-22 01:56:29 -07:00
Sean Harvey
acaf0e40cc
FulltextSearchableTest doesn't clean up after itself.
...
The extension doesn't get unloaded correctly at the end of the test,
resulting in tests afterwards sometimes failing because the table
type is reset back to InnoDB.
See silverstripe/silverstripe-cms ed8ee4e9b for a similar fix done
in the cms module.
2013-10-22 17:52:51 +13:00
mandrew
56d7c1fde2
Behat tests for lost password
2013-10-22 00:06:36 +02:00
Ingo Schommer
5c1a9d9da5
Using Behat EmailContext by default
2013-10-21 00:50:29 +02:00
Che Van Lawrence
2be25e70ba
Merge pull request #2545 from hafriedlander/fix/protocol_and_oembed
...
FIX oembed to avoid mixed media issues
2013-10-17 19:09:35 -07:00
Hamish Friedlander
8801a50704
FIX oembed to avoid mixed media issues
2013-10-17 17:06:40 +13:00
Damian Mooyman
24950692cd
BUG Fixes serious issue with FieldList::addFieldsToTab failing to accept multiple field groups.
...
Additional groups beyond the first are ignored.
Test cases included.
2013-10-17 15:38:22 +13:00
Will Rossiter
813d34b15e
FIX: Use Injector API for managing Member_Validator instance.
...
Updates the CMS profile page and SecurityAdmin to give developers a few ways to customise the required fields.
Added extension hook updateValidator for getValidator for things like modules to inject required fields to go along with Injector for replacing the entire class for project specific use.
2013-10-16 11:29:43 +13:00
Marcus Nyeholt
7bcb180f27
BUG Director::test now calls RequestProcessor
...
This fixes https://github.com/silverstripe/silverstripe-framework/issues/2517
and provides some testing around the use of RequestProcessor in general.
2013-10-15 07:53:34 +11:00
Devlin
1e5679f20f
BUGFIX i18n module load order in i18n::include_by_locale()
...
The "project" module (normally mysite) is considered with the highest priority. Yet, the project's i18n is loaded first and cannot overwrite existing translations. I've added a array_reverse(), so the iteration keeps the translation of the module with the highest priority.
Old $sortedModules: mysite, (other_modules,) cms, admin, framework.
New $sortedModules: framework, admin, cms, (other_modules,) mysite.
2013-10-11 15:20:51 +02:00
Loz Calver
51be1e858a
Unit tests for Email
...
It's not much, but it's a start
2013-10-09 11:51:29 +01:00
Andrew Short
a339687493
API: Pass extra context information to shortcode handlers.
...
This allows shortcodes to perform more complex actions on the element
which contains them. For example, the element reference can be used
to add extra classes or attributes to links which provide additional
metadata.
2013-10-09 15:05:17 +11:00
Ingo Schommer
e489384eea
Moved manage-files.feature to cms module
2013-10-08 11:21:36 +02:00
Ingo Schommer
8d5209aef6
Migrated page-specific behat features to cms module
2013-10-08 00:24:05 +02:00
Ingo Schommer
6a665b4ca2
Behat jQuery reference
2013-10-07 23:44:13 +02:00
Ingo Schommer
795d3e4b3b
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
dev/install/install.php5
docs/en/index.md
tests/core/CoreTest.php
2013-10-07 16:18:20 +02:00
Ingo Schommer
7f0e589bf5
Behat test for language switching
2013-10-07 00:04:50 +02:00
Damian Mooyman
f67b549b77
BUG Fixed cross-platform issues with test cases and file utilities
2013-10-04 13:54:33 +13:00
Sean Harvey
38e4070ff7
Merge pull request #2477 from tractorcow/pulls/3.1-sqlquery-sort-order
...
BUG Sort column order maintained correctly when using expressions
2013-10-03 14:27:38 -07:00
Damian Mooyman
4b850fb41c
BUG Fixed cross-platform issues with test cases and file utilities
2013-10-03 14:49:18 +13:00
Damian Mooyman
afaf7f6b4e
BUG Sort column order maintained correctly when using expressions in SQLQuery and DataQuery
2013-10-03 14:20:31 +13:00
Ingo Schommer
a534b7c784
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-10-02 12:21:35 +02:00
Ingo Schommer
06b5f142b6
Increased CacheTest time delay, avoid flickering tests
...
Setting a cache lifetime of half a second seems to be
unreliable on Travis when just waiting a second,
so let's wait a bit longer.
2013-10-02 12:13:22 +02:00
Andrew Short
c26c9e641a
Fix test relying on specific member title format.
...
If a custom member title format was used, the test would fail as it
only expected the default member title format.
2013-10-02 15:16:33 +10:00
Ingo Schommer
21c226a5d2
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-09-30 23:44:12 +02:00
Ingo Schommer
a68e0ba365
Check for jQuery in Behat tests
...
Identified as one potential cause for flickering tests
on our own Selenium box.
2013-09-30 23:36:46 +02:00
Daniel Hensby
6c943007a1
removeRequiredField() limits field ( fixes #2165 )
...
Added tests to RequiredFields and fixed bugs that were found
Now you:
1. Can't add the same field name many times
2. Can use append RequiredFields correctly without fear of duplicates
I've also added a Deprecation warning to $useLabels as it's not used
*anywhere* in framework
2013-09-27 19:58:59 +02:00
Ingo Schommer
48021e9fd3
Merge pull request #2166 from dhensby/patch-2
...
FormFields now allow setting of extra CSSClasses en masse
2013-09-24 11:50:01 -07:00
Ingo Schommer
5b3f8bc04d
Merge pull request #2435 from hafriedlander/fix/join_links_query_params
...
FIX Use last of duplicate query params in join_links
2013-09-20 02:27:49 -07:00
Hamish Friedlander
b1f03db4ff
FIX Improve recent RestfulService fix for proxies
2013-09-20 16:26:39 +12:00
Mateusz Uzdowski
7ddd5b57c3
BUG Do not rely on broken curl header size calculation.
...
Header parsing now takes into account situations like a proxy or
redirections. Works around the curl issue.
Also fixes the issue when a redirected request would cause a double
amount of headers coming out of the parser - it would merrily process
anything that's in key:value format even if it was two distinct headers.
2013-09-20 15:02:40 +12:00
Hamish Friedlander
a8c1dd7f53
FIX Use last of duplicate query params in join_links
...
When using Controller::join_links to join two links with identical query
params, both query params would be used in the result, ending up with
links that look like `../edit/show/14?locale=en_NZ&locale=mi_NZ`
This patch eliminates duplicate query params, so only the last one
for any key is present in the output.
2013-09-20 11:33:03 +12:00
Ingo Schommer
ba5984e2bf
Only compare array notations in SQLQuery->getOrderedJoins()
...
If more than two $from were added through SQLQuery->addFrom(),
the getOrderedJoins() comparison kicks in. It assumes all $from
parts are in array notation, which isn't always the case.
For legacy reasons, and because we don't have full API support,
you can still add literal joins through addFrom('INNER JOIN ...').
On PHP 5.3, the ordering comparison still works because it
allows array access in strings, with string rather than numeric indexes.
Thankfully that's no longer supported in PHP 5.4.
2013-09-17 22:08:48 +02:00
Ingo Schommer
a87000170a
Behat: "apply formatting" steps
2013-09-15 01:50:10 +02:00
Ingo Schommer
849f2c1cb1
Behat: "insert external link" feature
2013-09-14 19:50:22 +02:00
Ingo Schommer
d68a016026
Behat: Friendler field reference
2013-09-14 19:50:21 +02:00
Ingo Schommer
2fbe0c39f2
Behat: Correctly quote selector in dropdown step
2013-09-14 19:50:21 +02:00
Ingo Schommer
c9047a386f
Behat: "insert link" feature
2013-09-14 19:50:21 +02:00
Ingo Schommer
7a4a1bbadb
Behat: More "insert image" steps
...
Still needs definitions
2013-09-14 19:50:21 +02:00
Ingo Schommer
e202d4b3b0
Behat: Avoid false positives in dropdown traversal
...
Was identifying fields like <input value="Select a page">
when querying for a drop down labelled "Page"
2013-09-14 19:50:21 +02:00
Ingo Schommer
8de227554e
Behat: More verbose error message in HTML field assertion
2013-09-14 19:50:21 +02:00
Ingo Schommer
fde6b65769
Behat: Allow quoted HTML in assertion
2013-09-14 19:50:21 +02:00
Ingo Schommer
35a32d608d
More specific behat tree assertion
2013-09-14 19:50:21 +02:00
Ingo Schommer
5a0b4b0f03
Shorter behat feature name
...
Looks better in relishapp ;)
2013-09-13 18:52:02 +02:00
Ingo Schommer
819eebb5dc
Behat: Profile feature (steps only)
2013-09-13 18:44:17 +02:00
Ingo Schommer
aa80c4eed2
Behat feature indentation (no content changes)
2013-09-13 18:42:27 +02:00
lukepercy
e6f7f637f3
Added feature file for behat test
...
- Added content formatting behat feature file Updated Given statement for Insert link behat feature file
- Added Behat test feature file for alignment buttons Updated formatting buttons feature file to include strikethrough formatting
2013-09-13 17:00:43 +02:00
Sean Harvey
17fb7752db
Skipping SQLQueryTest::testZeroLimitWithOffset() for MSSQLDatabase.
...
This test doesn't work on MSSQLDatabase.
2013-09-13 15:50:36 +12:00
Sean Harvey
bf1110d911
Adding a test for SQLQuery::setLimit() parsing OFFSET string clause.
2013-09-13 15:44:46 +12:00