Ben Speakman
27bca14f86
Test for getExtension()
2017-05-08 17:22:50 +12:00
Damian Mooyman
d2c6c539d2
Merge pull request #6872 from sminnee/fixture-by-table
...
NEW: Allow SapphireTest::objFromFixture() to accept either table or class
2017-05-05 15:14:01 +12:00
Sam Minnee
a05958b3ea
FIX: i18n test fixtures stricter for Symfony3
2017-05-05 14:32:07 +12:00
Damian Mooyman
942c0257b7
API Upgrade to behat 3
2017-05-05 14:32:07 +12:00
Sam Minnee
1691e90fbd
NEW: Allow SapphireTest::objFromFixture() to accept either table or class
...
Right now SapphireTest::objFromFixture() requires a class as the first
argument. This is fine when your fixture file uses classes as the keys,
but if populating a fixture via tables, objFromFixture() won’t work.
This patch lets you specify either the table name or the class name as
the key.
The benefit here is that you can build fixtures as raw inserts, which is
substantially quicker, and is likely to be a useful tool in building
more efficient test suites.
2017-05-05 10:53:49 +12:00
Damian Mooyman
1f8de20ce7
Fix FormSchemaTest.php linting issues
2017-05-04 13:56:54 +12:00
Damian Mooyman
8b9f41d4f4
BUG Fix ApcuCache and MemCache namespace
2017-05-04 12:17:33 +12:00
Damian Mooyman
0c52ea067c
BUG Fix incorrect text collection of __CLASS__ following an Name::class constant ( #6868 )
2017-05-04 10:19:05 +12:00
Damian Mooyman
12fc690d80
Merge pull request #6850 from robbieaverill/bugfix/i18n-lang-region-same
...
FIX IntlLocales::validate when lang and region are the same e.g. de_DE
2017-05-01 08:41:44 +12:00
Robbie Averill
3a372a1f41
FIX IntlLocales::validate when lang and region are the same e.g. de_DE
2017-04-28 17:19:27 +12:00
Damian Mooyman
699d5d6a42
Fix i18nTextCollector handling of special string characters
2017-04-28 14:59:42 +12:00
Damian Mooyman
2ae8fde2d3
Fix tests
2017-04-28 14:59:42 +12:00
Uncle Cheese
d51c4891e2
New namespaced i18n keys
2017-04-28 14:59:42 +12:00
Uncle Cheese
494cbd1875
Ran upgrader for lang files
2017-04-28 14:59:42 +12:00
Ingo Schommer
daed727acc
Fixed form schema validation
2017-04-28 08:30:59 +12:00
Ingo Schommer
a2ee6a76a0
Fixed formschematest
2017-04-27 21:44:28 +12:00
Ingo Schommer
60706c8efd
Store $value in ISO and server timezone consistently, fix min/max timezone handling
2017-04-27 14:59:11 +12:00
Ingo Schommer
de8abe1167
API rename
2017-04-27 11:53:43 +12:00
Ingo Schommer
9b41350f64
More min/max setter tests
2017-04-27 11:53:34 +12:00
Ingo Schommer
958736502a
Removed “T” str_replace, more comments
2017-04-27 10:32:22 +12:00
Ingo Schommer
a73abbfcb8
unit test cleanup
2017-04-27 09:18:38 +12:00
Ingo Schommer
1ec2abe75f
Fixed timezone and normalised ISO handling
...
A few observations:
- ISO says “T” is optional (https://en.wikipedia.org/wiki/ISO_8601#cite_note-21 ),
- WHATWG says in the HTML5 spec that it’s optional (https://html.spec.whatwg.org/multipage/infrastructure.html#local-dates-and-times )
- W3C says it’s reqiured in 1997 (https://www.w3.org/TR/NOTE-datetime ), but then later says it’s optional in its HTML5 spec (https://www.w3.org/TR/html5/infrastructure.html#floating-dates-and-times ).
- Chrome doesn’t parse values with whitespace separators (requires "T")
- DataObject DBDatetime values and database columns use whitespace separators (and will have many devs relying on this format)
- MySQL only supports whitespace separators (https://dev.mysql.com/doc/refman/5.7/en/datetime.html )
- SQLite can parse both ways (https://sqlite.org/lang_datefunc.html )
So the goal here is to retain ORM/database compatibility with 3.x (whitespace separator),
while exposing "T" separators to the browser in HTML5 mode.
Regarding timezones, this fixes a regression where setValue() would not actually
apply the timezone (last $value assignment is ineffective now that sub fields are removed).
2017-04-26 22:55:29 +12:00
Ingo Schommer
a279d00e81
Min/max validations
2017-04-26 22:45:12 +12:00
Ingo Schommer
e97783b057
Better second handling
2017-04-26 22:45:08 +12:00
Saophalkun Ponlu
dba1f61f13
Fix tests related to date time
2017-04-26 22:45:07 +12:00
Christopher Joe
1f74221c2d
Fix unit tests
2017-04-26 16:03:52 +12:00
Simon Erkelens
ff3ad6eb6b
Use Config for authenticator settings
2017-04-22 14:48:56 +12:00
Damian Mooyman
2548bfba1e
API Replace SS_HOST with SS_BASE_URL
...
API Remove Director::$test_servers / $dev_servers
API Remove MODULES_PATH / MODULES_DIR constants
ENHANCEMENT Injector backtick syntax now supports environment variables as well as constants
Fixes #6588
2017-04-20 22:28:57 +12:00
Damian Mooyman
136b67f597
API Major refactor of Hierarchy into MarkedSet
2017-04-13 16:27:13 +12:00
Damian Mooyman
7bc447eea8
Merge pull request #6795 from robbieaverill/bugfix/phpunit-config-bug-with-constants
...
FIX Ensure that mysite test boostrap configuration is loaded after core and before the database connection
2017-04-12 12:57:22 +12:00
Damian Mooyman
f2768c85b1
API Enable namespaced-localisation keys in templates
...
BUG Fix whitespaces in SSTemplateParser.peg
2017-04-11 18:07:53 +12:00
Robbie Averill
1ca51eb57a
FIX Ensure that mysite test boostrap configuration is loaded after core and before the database connection
2017-04-11 14:32:53 +12:00
Daniel Hensby
1f0e1913cd
Merge branch '3.5' into 3
2017-04-08 20:25:27 +01:00
Robbie Averill
55eb7ebdcc
FIX Do not insert requirements more than once in includeInHTML
...
This change consolidates the string replacements used to insert requirements into the page content to help ensure
that they are not compounding and overwriting eachother.
The added test case includes where a user may have a Javascript snippet that contains a closing head tag, and the
test ensures that it does not get injected with requirements as well as the actual head tag in the DOM.
2017-04-07 17:04:17 +12:00
Sam Minnee
22ad39e5ae
FIX: Fix SSViewerTest in PHP7
...
PHP7 is a bit more picky about passing values by reference.
2017-04-05 11:05:29 +10:00
Loz Calver
454646c4df
Fix invalid closure param in ShortcodeParserTest
2017-04-05 11:05:28 +10:00
Loz Calver
40bf945322
NEW: PHP 7 compatibility
...
This patch introduces PHP 7 compatability without breaking semver by adding DBInt
and DBFloat classes, with Int/Float classes that are only loaded into PHP 5 environments
2017-04-05 11:00:04 +10:00
Damian Mooyman
e61257c27b
API Update embed/embed to 3.0
...
API Better shortcode generation for embed shortcodes
2017-04-04 10:20:08 +12:00
Damian Mooyman
9be22701fd
API exists() no longer true for nullifyIfEmpty if empty string
...
Optimise DBString::exists() to skip shortcodes
2017-04-04 10:20:08 +12:00
Daniel Hensby
51f98c973f
Merge branch '3.5' into 3
2017-04-03 22:57:58 +01:00
Ingo Schommer
e3fbd1dcac
Fixed coding conventions
2017-04-03 20:54:25 +12:00
Ingo Schommer
e9693467bf
Fixed tests
2017-04-03 20:04:37 +12:00
Ingo Schommer
a70de91b33
Fix DatetimeFieldTest
2017-04-03 19:35:40 +12:00
Ingo Schommer
3b94d14e42
MERGE
2017-04-03 12:11:21 +12:00
Ingo Schommer
326aa37ea4
API HTML5 date/time fields, remove member prefs ( fixes #6626 )
2017-03-31 15:21:47 +13:00
Daniel Hensby
ac075eaf0b
Remove TestListener and rely on PHPUnits APIs
2017-03-30 11:46:58 +13:00
Ingo Schommer
ac9d645e4e
Root-level module support in Module->getResourcePath()
...
See https://github.com/silverstripe/silverstripe-framework/pull/6733
2017-03-29 10:19:31 +13:00
Ingo Schommer
556c9a537e
Module->getResourcePath()
...
Based on Sam's feedback in https://github.com/silverstripe/silverstripe-framework/pull/6733
2017-03-28 17:22:30 +13:00
Damian Mooyman
874c6ccdd4
API Add experimental getResource() to Module
2017-03-28 14:13:47 +13:00
Loz Calver
b3d37880e9
FIX: many_many_extraFields breaks _SortColumn0 ordering ( fixes #6730 )
2017-03-27 09:16:13 +01:00
Damian Mooyman
ac3a9c9e6e
API Split out SilverStripe\ORM\Versioned into new module
2017-03-27 11:03:39 +13:00
Daniel Hensby
0410b4c35e
Respect PHPUnit method visibility
2017-03-24 16:23:03 +13:00
Daniel Hensby
6b4a72dee8
Fixing deprecated PHPUnit APIs
2017-03-24 16:23:01 +13:00
Damian Mooyman
1186f07830
API Use mysql-safe table namespace separator
2017-03-24 14:17:30 +13:00
Sam Minnée
d91c6659be
Merge pull request #6723 from open-sausages/pulls/4.0/assets-module
...
API Split SilverStripe\Assets into separate module
2017-03-23 09:21:27 +13:00
Damian Mooyman
dae6d5902f
API Split SilverStripe\Assets into separate module
2017-03-21 11:12:51 +13:00
Damian Mooyman
e4c68bc2bf
Fix and test pluralisation usages
2017-03-21 10:49:30 +13:00
Damian Mooyman
54ba08a306
API Replace ManifestCache with ManifestCacheFactory
...
API Remove lots of deprecated module code from ClassManifest
2017-03-21 09:43:48 +13:00
Sam Minnee
5ea238c58b
MINOR: Add a Versioned test for #6680
...
It turns out that cascaded query params as described in #6680 were
already implemented; this test confirms that.
2017-03-14 09:39:26 +13:00
Damian Mooyman
0c41a97a8b
API Refactor Form request handling into FormRequestHandler
...
API Add HasRequestHandler interface
API Refactor Link() and url handling behaviour from Controller into RequestHandler
API RequestHandler classes now must define url_segment to have a default Link()
API Clean up redirectBack()
2017-03-10 15:04:33 +13:00
Christopher Joe
50deb17763
API remove UploadField, AssetField and associated files
...
Fixes #6481
2017-03-09 10:16:46 +13:00
Daniel Hensby
cdb4a86e1c
PHPParser optimisations and update
2017-03-06 10:35:25 +00:00
Damian Mooyman
f1b99b6fa7
API Enable theming of GroupedDropdownField
...
Based on partial back-port of 4.0 code
2017-03-06 11:44:42 +13:00
Daniel Hensby
f225b83e2b
Merge branch '3'
2017-03-03 15:55:22 +00:00
Daniel Hensby
e932b22388
Merge branch '3.5' into 3
2017-03-03 14:54:43 +00:00
Daniel Hensby
8aaa3e3a86
Merge branch '3.4' into 3.5
2017-03-03 14:54:29 +00:00
Daniel Hensby
7f194a917d
Merge pull request #6351 from steve-silverstripe/patch-2
2017-03-03 14:05:53 +00:00
Daniel Hensby
62e301bdba
Merge pull request #6529 from timezoneone/3.5
...
Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns
2017-03-03 12:45:05 +00:00
Shawn
72b6fb49b6
Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns
2017-03-03 14:11:53 +13:00
Damian Mooyman
6ed98a3a94
BUG Prevent obsolete class cache breaking autoload
...
Remove hard-coded class paths
2017-03-01 10:06:15 +13:00
Damian Mooyman
ff47bc03d7
BUG Remove reference to $_SERVER within FakeController
2017-02-27 16:54:01 +13:00
Damian Mooyman
695194546d
BUG Ensure test fixture uses test module manifest
2017-02-27 16:54:01 +13:00
Damian Mooyman
c452d5f6cd
API Rename CoreConfigCreator to CoreConfigFactory
...
Fix rebase regressions
2017-02-27 16:54:01 +13:00
Damian Mooyman
8444a21cbf
API Upgrade tests to use new Config API
2017-02-27 16:54:01 +13:00
Ingo Schommer
d220ca3f67
API Use symfony/cache ( fixes #6252 )
2017-02-26 13:07:59 +13:00
Daniel Hensby
1c55948fc1
Ensure test objects implement TestOnly
2017-02-21 20:30:15 +00:00
Daniel Hensby
7156da6279
Merge branch '3'
2017-02-20 22:19:33 +00:00
Daniel Hensby
0ddf3b4186
Merge branch '3.5' into 3
2017-02-20 21:33:31 +00:00
Daniel Hensby
5a6f784e42
Merge branch '3.4' into 3.5
2017-02-20 21:31:09 +00:00
Ingo Schommer
80723c077b
Reinstated separated DateField functionality
2017-02-16 09:06:14 +13:00
Damian Mooyman
014f0d23ed
API Create SeparatedDateField
...
API Restrict allowed values parsed via DBDate::setValue
API Remove NumericField_Readonly
API Remove DBTime::Nice12 / Nice24
2017-02-15 11:07:58 +13:00
Daniel Hensby
7122e1fde7
FIX Comments ignored by classmanifest ( #6619 )
2017-02-15 10:46:04 +13:00
Damian Mooyman
029a8b9586
API Substitute Zend_Currency with NumberFormatter based solution
...
API Substitute Zend_Locale with Locale / NumberFormatter
API Substitute Zend_Date with IntlDateFormatter
API Added DBTIme::Nice12, FormatFromSettings
API Added Short() method to DBDate / DBTime / DBDatetime
API Add Date::getTimestamp()
API Added setSubmittedValue api for FormField
API Add second arg to base FormField::setValue()
API Major refactor of i18n into component data parts
API Implement Resettable interface to reset objects between tests
ENHANCEMENT Changed DBField::create_field return type to `static` to support better type hinting
ENHANCEMENT i18nTextCollector supports __CLASS__
2017-02-09 15:28:59 +13:00
Daniel Hensby
71383b827d
Merge branch '3'
2017-02-08 12:34:45 +00:00
Daniel Hensby
4d3cd9d9a2
Merge branch '3.5' into 3
2017-02-08 10:40:40 +00:00
Andrew Aitken-Fincham
b8a0944bda
FIX/load fields if lazy ones exists
2017-02-08 08:52:48 +00:00
Damian Mooyman
c25c443d95
BUG Fix minor mysql 5.7 warning in SQLQueryTest ( #6608 )
...
Fixes #5451
2017-02-08 15:44:55 +13:00
Aaron Carlino
0982f77ec7
Feature/aggregate data filters ( #6553 )
2017-02-03 09:03:19 +13:00
Daniel Hensby
8c8231c03e
NEW Director::host() to determine host name of site
2017-01-31 21:36:04 +00:00
Daniel Hensby
873fd8c5bc
NEW replace _ss_environment.php with .env and environment vars
2017-01-31 20:40:17 +00:00
Daniel Hensby
a5da085cc7
Merge branch '3'
2017-01-31 17:03:53 +00:00
Daniel Hensby
669f6a3d41
Merge branch '3.5' into 3
2017-01-31 13:33:26 +00:00
Daniel Hensby
56b887f578
Merge branch '3.4' into 3.5
2017-01-31 13:33:00 +00:00
Damian Mooyman
7b26b4a1f3
BUG Ensure that tests run with flush=1 clean Flushables
...
BUG Restore opt-in flushing (regression from #4404 )
2017-01-31 18:59:19 +13:00
Damian Mooyman
609b0a612c
Merge pull request #6512 from silverstripe/pulls/3.4/ensure-string-return
...
Test fixes - reorder assertions and ensure string returned
2017-01-31 17:25:34 +13:00
Damian Mooyman
de02a3f733
Restored context parameter to i18n, and added to a “comment” key
...
Rolled pluralisation functionality into the i18n::_t() method
Warnings on missing default can now be turned off
2017-01-25 18:12:40 +13:00
Damian Mooyman
8a07c56bdf
API Replace i18n message localisation with symfony/translation
...
API Implement enhanced pluralisation
Remove Zend_Translate and all Zend dependencies from i18n
Deprecated $context from i18n::_t()
Warn on missing default string for i18n::_t()
2017-01-25 17:08:12 +13:00
Robbie Averill
3583f1f79e
API Convert::raw2json can be passed an optional bitmask of JSON constants as options
2017-01-24 13:27:16 +13:00
Daniel Hensby
8b4cce435e
Merge branch '3'
2017-01-17 14:17:45 +00:00
Damian Mooyman
d192a4f86f
BUG Fix root folder getFilename() returning incorrect path ( #6510 )
2017-01-17 17:49:42 +13:00
Daniel Hensby
2ce80e448d
Merge branch '3.5' into 3
2017-01-16 21:00:14 +00:00
Stephan Bauer
17d123a3be
BUG Ensure correct regeneration of ConfigManifest if only one of the cache files is missing
2017-01-16 21:24:34 +01:00
Daniel Hensby
de7372ad3b
Test fixes - reorder assertions and ensure string returned
2017-01-16 14:46:22 +00:00
Damian Mooyman
7d67c5b9bd
API Allow users to act-as another
2017-01-16 09:04:20 +13:00
Stephan Bauer
1f1fffe734
BUG Ensure correct regeneration of ConfigManifest if only one of the cache files is missing ( fixes #6467 )
2017-01-14 23:13:47 +01:00
Daniel Hensby
f2470cc98d
Merge pull request #6459 from robbieaverill/feature/nofollow-robots-in-security
...
Add X-Robots-Tag noindex,nofollow header from Security controller to prevent indexing
2017-01-13 12:38:04 +00:00
Daniel Hensby
c4972da37e
Merge pull request #6496 from robbieaverill/feature/remove-gridfield-components
...
API Enhancement: Allow "removeComponentsByType" to remove multiple component"s"
2017-01-13 11:29:04 +00:00
Robbie Averill
ce38f1f1fd
API Enhancement: Allow "removeComponentsByType" to remove multiple component"s"
2017-01-13 23:30:30 +13:00
Daniel Hensby
3ea5015f8b
NEW Move to SwiftMailer powered Emails ( #6466 )
...
* API Replace existing Email and Mailer classes with SwiftMailer powered email system
* DOCS New Email docs
* Initial feedback from Damian
* Making Mailer an interface
* Templates relocated
* Round of feedback
* More robust approach to plain parts
* Revert changes to TestMailer
2017-01-13 14:48:46 +13:00
Ingo Schommer
3b06e30558
Don’t add extension dot in FileNameFilter
...
File names are generally valid without an extension (although they might be disallowed by upload constraints),
so the filter should deal gracefully with them (“myfile” should return “myfile”, not “myfile.”)
2017-01-13 11:11:40 +13:00
Ingo Schommer
b1d5e97a3d
Enforce unique Folder names, use AssetNameGenerator
2017-01-13 11:11:37 +13:00
Daniel Hensby
747c0770e7
Merge pull request #6446 from robbieaverill/feature/controllers-without-underscores
...
API Allow controller discovery without underscores (PSR-2 compliance)
2017-01-11 15:27:56 +00:00
Damian Mooyman
6b5efb91fd
Merge pull request #6434 from open-sausages/features/4.0/ui-button-refresh
...
Refresh CMS UI buttons to new flat style and bootstrap classes
2017-01-11 14:22:25 +13:00
Robbie Averill
6fb49224b9
FIX SSViewer should resolve templates with or without underscores
...
* Capture fully qualified class name, without "Controller"
2017-01-11 09:59:28 +13:00
Robbie Averill
2f6f5b5eff
Do not send the header if it is not defined
2017-01-11 08:26:04 +13:00
Daniel Hensby
f3b6bb1470
Merge branch '3'
2017-01-10 14:31:07 +00:00
Daniel Hensby
733511565e
Merge branch '3.5' into 3
2017-01-10 12:52:06 +00:00
Damian Mooyman
9e563ebd3a
API Moved iShouldSeeAButton to behat-extension
2017-01-10 14:39:24 +13:00
Robbie Averill
cb2dcc75f1
Add X-Robots-Tag noindex,nofollow header from Security controller to prevent indexing
2017-01-09 16:13:39 +13:00
Paul Clarke
178bd480eb
API Changes required for asset search behaviour
2017-01-09 14:55:20 +13:00
Damian Mooyman
3e32b18c6b
Merge pull request #6263 from dhensby/pulls/3/allow-unltd-grid-row-count
...
NEW Allow setting of unlimited row counts on GridFieldPaginator
2017-01-05 09:12:02 +13:00
Daniel Hensby
faccdef532
Merge pull request #6444 from robbieaverill/feature/add-group-tests
...
TEST Add Group tests for collating family IDs and getting all children
2016-12-29 23:41:31 +00:00
Robbie Averill
b4e183aba5
TEST Add Group tests for collating family IDs and getting all children
2016-12-30 11:27:52 +13:00
Daniel Hensby
776d2fbc66
NEW Allow setting of unlimited row counts on GridFieldPaginator
2016-12-29 14:10:13 +00:00
Robbie Averill
e8b959864e
TEST Add historical password count test
2016-12-30 00:43:14 +13:00
Robbie Averill
37a009289c
Consolidate temporary file creation and deletion logic.
2016-12-29 22:32:04 +13:00
Robbie Averill
7448622a1a
FIX Replace ini casting to int with explicit split and cast for PHP 7.1. Add tests.
2016-12-29 21:55:52 +13:00
Daniel Hensby
664c0eafbe
Merge branch '3'
2016-12-28 14:30:54 +00:00
Daniel Hensby
c8a40605ec
Merge pull request #6413 from volkerloew/1400-text-contextsummary
...
search term highlighting without altering case (fixes #1400 )
2016-12-28 13:36:08 +00:00
Volker Löw
5e581eace7
search term highlighting without altering case ( fixes #1400 )
2016-12-28 13:03:35 +00:00
Damian Mooyman
b1b3a6ee13
Merge 3.4 into 3.5
2016-12-22 13:18:37 +13:00
Damian Mooyman
94c3bc9fa1
Merge 3.4.3 into 3.4
2016-12-22 13:16:12 +13:00
Damian Mooyman
f314b86ad8
BUG Temp disable shortcode SPLIT behaviour due to crash ( #6436 )
...
Fixes #5987
2016-12-22 10:08:46 +13:00
Damian Mooyman
ffdb99e78d
BUG Temp disable shortcode SPLIT behaviour due to crash ( #6436 )
...
Fixes #5987
2016-12-21 18:55:00 +13:00
Damian Mooyman
9be5142fc1
API ChangeSet::publish() / canPublish() no longer treats hasChanges() = false as a permission error
...
BUG fix issues with doArchive() in live mode
2016-12-21 14:28:20 +13:00
Daniel Hensby
273a06d47d
TEST Duplicated DataObjects dont keep Created date value
2016-12-19 14:23:39 +00:00
Daniel Hensby
78ed003977
Merge branch '3.4' into 3.5
2016-12-19 10:48:10 +00:00
Damian Mooyman
c2a1e86f5d
Apply PSR2 / Namespace to remaining admin / tests
2016-12-19 16:08:19 +13:00
Damian Mooyman
c007e85d1b
BUG Suppress HtmlEditorField casting
...
Fixes #6396
2016-12-19 16:03:48 +13:00
Daniel Hensby
efd8114fd5
Merge branch '3.4' into 3.5
2016-12-16 15:52:53 +00:00
Daniel Hensby
f8132b39af
Assertions should be $this->assert($expected, $actual)
2016-12-13 11:32:52 +00:00
Damian Mooyman
6e589aac75
API Updates to Form, ValidationResponse, ValidationException
...
API Implement form schema "errors" handling
2016-12-09 14:24:11 +13:00
Sam Minnee
6650561dac
Don't use session and FormSchema to manage server-side React validation responses
2016-12-09 10:27:23 +13:00
Damian Mooyman
6b06fd9f2d
API Add buttonTooltop to PopoverField and fix critical positioning issue
2016-12-07 13:06:35 +13:00
Damian Mooyman
6107f45d1e
Temp patch to 5987 to prevent cms crashing
2016-11-30 11:20:22 +13:00
Daniel Hensby
2e538ca9ab
Merge tag '3.4.2' into 3.4
...
Release 3.4.2
2016-11-29 17:17:00 +00:00
Daniel Hensby
c6d43b477e
Merge branch '3'
2016-11-29 13:27:49 +00:00
Daniel Hensby
fb39022ef3
Merge branch '3.4' into 3.5
2016-11-29 11:40:37 +00:00
Daniel Hensby
3a009a5849
Merge branch '3.3' into 3.4
2016-11-29 11:39:58 +00:00
Damian Mooyman
9ec1d35f2b
BUG Fix behat tests unable to capture HTML editor fields
2016-11-29 14:49:39 +13:00
