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
c2a1e86f5d
Apply PSR2 / Namespace to remaining admin / tests
2016-12-19 16:08:19 +13:00
Damian Mooyman
fae0055544
BUG Fix missing TRAVIS_NODE_VERSION ( #6419 )
...
Fixes #6418
2016-12-19 16:07:02 +13:00
Damian Mooyman
c007e85d1b
BUG Suppress HtmlEditorField casting
...
Fixes #6396
2016-12-19 16:03:48 +13:00
Christopher Joe
d8843c6fe2
Enhancement Split out the fetch call easier mocking
...
API shirted getFileExtension to DataFormat
2016-12-19 10:11:14 +13:00
Christopher Joe
bb71a37cc8
API added enlarge icon
...
API added autofill callback in FormBuilder for fields to programmatically change another field value
2016-12-19 10:09:35 +13:00
Damian Mooyman
fd9ee8aed3
Merge pull request #6379 from open-sausages/pulls/4.0/psr-coding-conventions
...
Updated coding conventions for PSR-2
2016-12-19 09:41:02 +13:00
Damian Mooyman
534d0f16a3
Merge pull request #6314 from chillu/pulls/4.0/contributing-composer-install
...
Composer contributing docs
2016-12-19 09:40:02 +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
4a74db2c5f
Merge pull request #6392 from open-sausages/pulls/4.0/uploadfield-entwine
...
ENHANCEMENT Enable UploadField.js within non-react sections
2016-12-16 16:12:56 +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
Damian Mooyman
8c7921a2df
Merge pull request #6406 from robbieaverill/bugfix/default-page-doc-links
...
FIX Update links to docs.ss for default template
2016-12-16 15:20:36 +13:00
Robbie Averill
eb0a274069
FIX Update links to docs.ss for default template
2016-12-16 14:28:18 +13:00
Damian Mooyman
fb0f517769
Implement feedback
2016-12-16 13:46:36 +13:00
Damian Mooyman
6d5e5e7782
Add upgrading note for UploadField.js
2016-12-16 13:41:50 +13:00
Damian Mooyman
c4dd7af886
Whitespace cleanup for 4.0.0.md
2016-12-16 13:41:50 +13:00
Damian Mooyman
88b4ae65cc
API Add css class to assist with bootstrapping entwine sections
2016-12-16 13:41:50 +13:00
Myles Derham
18ff6bec6d
Updated location of custom field templates
2016-12-16 10:40:01 +13:00
Daniel Hensby
2ec664d4c2
Merge pull request #6400 from robbieaverill/patch-6
...
Update 04_Fixtures.md
2016-12-15 18:51:12 +00:00
Daniel Hensby
734fe5d8e4
Merge pull request #6399 from robbieaverill/patch-5
...
Update 00_Write_a_SapphireTest.md
2016-12-15 15:49:28 +00:00
Daniel Hensby
5926cd3501
Merge pull request #6398 from robbieaverill/patch-4
...
Update unit testing doc for 4.0
2016-12-15 15:03:22 +00:00
Daniel Hensby
ba39e552a2
Merge branch '3'
2016-12-15 12:20:29 +00: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
Robbie Averill
0f058af946
Update 04_Fixtures.md
...
* Added reference for namespaced class names in YAML fixtures
* Updated some examples for PSR-2 compatibility
2016-12-15 16:11:42 +13:00
Robbie Averill
07e4ee4187
Update 00_Write_a_SapphireTest.md
...
* Add imported namespace and convert example to PSR-2
2016-12-15 15:47:56 +13:00
Robbie Averill
403f02e0cd
Update unit testing doc for 4.0
...
* Add namespaced class imports
* Convert examples to PSR-2
2016-12-15 15:45:14 +13: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
8e08eb04ce
Merge branch 'master' into pulls/4.0/psr-coding-conventions
2016-12-14 19:29:35 +13: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
Damian Mooyman
55a9496ad7
Merge pull request #6378 from open-sausages/pulls/4.0/english-coding-conventions
...
Clarify UK-english in coding conventions
2016-12-12 10:29:46 +13:00
Damian Mooyman
4e1c511deb
Merge pull request #6371 from open-sausages/pulls/4.0/gallery-list
...
Styling for gallery list view
2016-12-09 17:55:17 +13:00
Christopher Joe
fcf1eedee4
FIX getting fileSize shouldn't give a "NaN"
2016-12-09 16:26:55 +13:00
Paul Clarke
6ec7804932
Enhancement Add icon size for 14px icons and table padding for asset list
2016-12-09 16:25:48 +13:00
Christopher Joe
799ebe5ba8
API Expose QueryString library and lib/Format as external for formatting items
2016-12-09 16:24:40 +13:00