Daniel Hensby
|
efd8114fd5
|
Merge branch '3.4' into 3.5
|
2016-12-16 15:52:53 +00:00 |
|
Damian Mooyman
|
1ea4f29dbe
|
Merge pull request #6404 from mediabeastnz/patch-3
Updated location of custom field templates
|
2016-12-16 15:21:26 +13:00 |
|
Myles Derham
|
18ff6bec6d
|
Updated location of custom field templates
|
2016-12-16 10:40:01 +13:00 |
|
Daniel Hensby
|
68ce7b538b
|
Merge pull request #6401 from andrewandante/HOTFIX/namespace-IPUtils-correctly-3.5
remove FRAMEWORK_PATH and namespace IPUtils
|
2016-12-15 11:51:40 +00:00 |
|
Andrew Aitken-Fincham
|
e0c94e0f72
|
remove FRAMEWORK_PATH and namespace IPUtils
|
2016-12-15 11:10:47 +00:00 |
|
Damian Mooyman
|
d5049af35f
|
Merge pull request #6375 from dhensby/pulls/3.4/square-bracket-submitted-data
FIX Handle fields with square brackets
|
2016-12-14 11:08:17 +13:00 |
|
Daniel Hensby
|
f8132b39af
|
Assertions should be $this->assert($expected, $actual)
|
2016-12-13 11:32:52 +00:00 |
|
Daniel Hensby
|
5248be9226
|
FIX Handle fields with square brackets
|
2016-12-13 11:32:50 +00:00 |
|
Damian Mooyman
|
0d20ec1e10
|
Merge pull request #6374 from dhensby/pulls/3.5/no-exception-on-requirements-failure
Revert Requirements throwing exceptions from #5260
|
2016-12-09 10:41:13 +13:00 |
|
Daniel Hensby
|
272703b41a
|
Revert Requirements throwing exceptions from #5260
|
2016-12-08 13:25:50 +00:00 |
|
Daniel Hensby
|
16fe69fdef
|
Merge branch '3.4' into 3.5
|
2016-12-07 13:14:14 +00:00 |
|
Damian Mooyman
|
7ca876a4c7
|
Merge pull request #6369 from dhensby/pulls/3.4/travis-simplification
Move travis env vars out of .travis.yml and into travis CI dashboard
|
2016-12-07 12:17:01 +13:00 |
|
Daniel Hensby
|
6af1e5bf0d
|
Move travis env vars out of .travis.yml and into travis CI dashboard
|
2016-12-06 22:29:13 +00:00 |
|
Loz Calver
|
e191bc875f
|
Merge pull request #6367 from colintucker/6363-fix-csv-bulk-loader
FIX hard-coded boolean in CsvBulkLoader (fixes #6363)
|
2016-12-06 09:42:06 +00:00 |
|
Loz Calver
|
1919b05980
|
Merge pull request #6365 from tractorcow/pulls/3.4/fix-localisation-strings
BUG Fix localisation issues
|
2016-12-06 09:38:19 +00:00 |
|
Colin Tucker
|
3fca7b3c4d
|
Fix hard-coded boolean in CsvBulkLoader
|
2016-12-06 16:08:00 +11:00 |
|
Damian Mooyman
|
2181e3b86b
|
BUG Fix localisation issues
|
2016-12-06 11:20:10 +13:00 |
|
Daniel Hensby
|
0821310207
|
Merge branch '3.4' into 3.5
|
2016-11-29 17:18:36 +00:00 |
|
Daniel Hensby
|
afb7652459
|
Merge branch '3.3' into 3.4
|
2016-11-29 17:17:08 +00: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
|
c875d7a3ea
|
Merge branch '3.2' into 3.3
|
2016-11-29 17:14:43 +00:00 |
|
Daniel Hensby
|
cbbfc50675
|
Merge tag '3.3.4' into 3.3
Release 3.3.4
|
2016-11-29 17:14:37 +00:00 |
|
Daniel Hensby
|
8865f680e6
|
Merge tag '3.2.6' into 3.2
Release 3.2.6
|
2016-11-29 17:10:13 +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 |
|
Daniel Hensby
|
f1244db49b
|
Merge pull request #6342 from open-sausages/pulls/3.3/fix-behat-html
BUG Fix behat tests unable to capture HTML editor fields
|
2016-11-29 10:29:23 +00:00 |
|
Damian Mooyman
|
792a9ec3ed
|
Add missing changelog content
|
2016-11-29 16:21:14 +13:00 |
|
Damian Mooyman
|
9ec1d35f2b
|
BUG Fix behat tests unable to capture HTML editor fields
|
2016-11-29 14:49:39 +13:00 |
|
Daniel Hensby
|
4bb6765392
|
Merge branch '3.4' into 3.5
|
2016-11-28 13:36:06 +00:00 |
|
Daniel Hensby
|
71efd960b0
|
Merge tag '3.5.0' into 3.5
Release 3.5.0
|
2016-11-28 13:32:48 +00:00 |
|
Daniel Hensby
|
17690ff6bc
|
Merge branch '3.3' into 3.4
|
2016-11-28 13:30:29 +00:00 |
|
Daniel Hensby
|
fc83321b6e
|
Merge tag '3.4.2' into 3.4
Release 3.4.2
|
2016-11-28 13:29:33 +00:00 |
|
Daniel Hensby
|
6552dce70e
|
Merge branch '3.2' into 3.3
|
2016-11-28 13:26:31 +00:00 |
|
Daniel Hensby
|
b299a7921d
|
Merge tag '3.3.4' into 3.3
Release 3.3.4
|
2016-11-28 13:20:07 +00:00 |
|
Daniel Hensby
|
214c3d2582
|
Merge branch '3.1' into 3.2
|
2016-11-28 13:16:27 +00:00 |
|
Daniel Hensby
|
f7fd0d3f21
|
Merge tag '3.2.6' into 3.2
Release 3.2.6
|
2016-11-28 13:16:21 +00:00 |
|
Daniel Hensby
|
612a9164af
|
Merge tag '3.1.21' into 3.1
Release 3.1.21
|
2016-11-28 13:13:48 +00:00 |
|
Dan Hensby
|
179996b5f9
|
Added 3.5.0 changelog
|
2016-11-28 12:35:19 +00:00 |
|
Dan Hensby
|
7593df6db3
|
Update translations
|
2016-11-28 12:35:18 +00:00 |
|
Daniel Hensby
|
a9c85057b0
|
Merge pull request #6332 from andrewandante/BUGFIX/apply-send-all-emails-from-to-SS_LogEmailWriter
|
2016-11-25 11:21:21 +00:00 |
|
Andrew Aitken-Fincham
|
13aaa6badb
|
Apply email defaults to SS_LogEmailWriter
|
2016-11-25 09:59:41 +00:00 |
|
Damian Mooyman
|
76ce9fb94f
|
Merge pull request #6335 from webbuilders-group/shortcode-location-fix
BUGFIX: Fixed issue where a shortcode's location would not get set to split when using the class leftAlone
|
2016-11-25 10:56:25 +13:00 |
|
UndefinedOffset
|
a4760b8ee4
|
BUGFIX: Fixed issue where a shortcode's location would not get set to split when using the class leftAlone
|
2016-11-24 17:28:15 -04:00 |
|
Daniel Hensby
|
464af18346
|
Merge pull request #6291 from dhensby/pulls/3.4/fix-uploadfield-max-size
FIX UploadField incorrectly setting max upload size
|
2016-11-24 12:40:04 +00:00 |
|
Daniel Hensby
|
dd9ade4294
|
FIX UploadField incorrectly setting max upload size
|
2016-11-24 11:54:44 +00:00 |
|
Daniel Hensby
|
602062802e
|
Merge branch '3.4' into 3.5
|
2016-11-23 23:55:31 +00:00 |
|
Daniel Hensby
|
406307c77b
|
Merge branch '3.3' into 3.4
|
2016-11-23 23:29:25 +00:00 |
|
Daniel Hensby
|
b7bb7a46da
|
Merge branch '3.2' into 3.3
|
2016-11-23 22:26:15 +00:00 |
|
Daniel Hensby
|
17eb351f81
|
Merge branch '3.1' into 3.2
|
2016-11-23 21:54:22 +00:00 |
|
Damian Mooyman
|
730512f036
|
Merge pull request #6328 from dhensby/pulls/3.1/test-i18n-fix
FIX Tests shouldnt set date or time format to null
|
2016-11-24 10:01:42 +13:00 |
|