Daniel Hensby
1b1f8ed731
Merge branch '3.5' into 3
2016-12-28 11:37:10 +00:00
Damian Mooyman
b1b3a6ee13
Merge 3.4 into 3.5
2016-12-22 13:18:37 +13:00
Damian Mooyman
0bcd40545d
Merge 3.5.1 into 3.5
2016-12-22 13:17:18 +13:00
Damian Mooyman
94c3bc9fa1
Merge 3.4.3 into 3.4
2016-12-22 13:16:12 +13:00
Damian Mooyman
28d065c587
Added 3.4.3 changelog
2016-12-22 12:02:45 +13:00
Damian Mooyman
9de539fdab
Added 3.5.1 changelog
2016-12-22 10:43:34 +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
fd9b872cb5
Merge pull request #6425 from andrewandante/bugfix/duplicating-copies-created-dbfield
...
remove Created field on duplicate
2016-12-21 09:43:53 +13:00
Dan Hensby
26cd99de22
Added 3.5.1-rc2 changelog
2016-12-19 16:28:18 +00:00
Daniel Hensby
c794c29ddb
Merge branch '3.4' into 3.4.3
2016-12-19 16:17:44 +00:00
Daniel Hensby
2d8ac831ad
Merge branch '3.5' into 3.5.1
2016-12-19 16:16:26 +00:00
Daniel Hensby
8dc250455e
Merge branch '3.4' into 3.5
2016-12-19 16:15:46 +00:00
Daniel Hensby
6455430658
Merge pull request #6414 from PingMetal/patch-1
...
Fixed a pagination bug
2016-12-19 15:24:35 +00:00
PingMetal
222ee6bde2
Fixed a pagination bug
...
Depending on the current page, a page not supposed to show up in the pagination summary can be skipped without returning a null value. It makes it difficult to know it is existent, but just skipped.
2016-12-19 14:54:06 +00:00
Daniel Hensby
273a06d47d
TEST Duplicated DataObjects dont keep Created date value
2016-12-19 14:23:39 +00:00
Andrew Aitken-Fincham
eecdf56b36
remove Created field on duplicate
2016-12-19 13:50:48 +00:00
Dan Hensby
98b8fefad8
Added 3.4.3-rc1 changelog
2016-12-19 12:21:39 +00:00
Dan Hensby
bf3c129ec1
Update translations
2016-12-19 12:21:38 +00:00
Daniel Hensby
19dd8d6824
Merge branch '3.5' into 3
2016-12-19 11:18:00 +00:00
Daniel Hensby
78ed003977
Merge branch '3.4' into 3.5
2016-12-19 10:48:10 +00:00
Daniel Hensby
2918463619
Merge pull request #6410 from tractorcow/pulls/3.4/fix-htmlfield-casting
...
BUG Suppress HTMLEditorField casting
2016-12-19 06:26:51 +00:00
Damian Mooyman
c007e85d1b
BUG Suppress HtmlEditorField casting
...
Fixes #6396
2016-12-19 16:03:48 +13:00
Dan Hensby
d249dc9c86
Added 3.5.1-rc1 changelog
2016-12-16 20:49:07 +00:00
Dan Hensby
e57d7a30bd
Update translations
2016-12-16 20:49:05 +00:00
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
4a6fe3c375
Merge branch '3.5' into 3
2016-12-15 11:59:54 +00: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
Daniel Hensby
149d260be6
Merge pull request #6393 from webbuilders-group/imagick-crop-function
...
NEW: Added ImagickBackend::crop() for compatibility with GDBackend
2016-12-14 15:08:25 +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
UndefinedOffset
52cad6ce99
NEW: Added ImagickBackend::crop() for compatibility with GDBackend
2016-12-13 12:17:55 -04: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
Ingo Schommer
013e6bd636
Merge pull request #6377 from robbieaverill/patch-3
...
Remove RHS heading delimiters
2016-12-09 12:08:19 +13:00
Robbie Averill
43ad12f134
Remove RHS heading delimiters
...
Our markdown parser doesn't catch them, and they end up being output literally.
2016-12-09 11:20:14 +13: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
Ingo Schommer
5f5d682176
Merge pull request #6372 from robbieaverill/feature/improve-task-docblocks
...
Add doc blocks for the $request given to BuildTasks
2016-12-08 17:28:13 +13:00
Robbie Averill
d7db913824
Add doc blocks for the $request given to BuildTasks
...
Allows BuildTask developers to know what the $request is, and outline BuildTask instances.
2016-12-08 16:46:40 +13:00
Daniel Hensby
b56a8075a3
Merge branch '3.5' into 3
2016-12-07 13:15:10 +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
