Damian Mooyman
8a8d82cc57
Merge branch '3.3.1' into 3.3
...
# Conflicts:
# lang/cs.yml
2016-02-27 21:19:29 +13:00
Damian Mooyman
14aa497b80
Merge branch '3.2.3' into 3.2
2016-02-27 21:11:57 +13:00
Damian Mooyman
807377ad2d
Added 3.3.1-rc2 changelog
2016-02-27 21:02:09 +13:00
Damian Mooyman
3d2c87029c
Added 3.3.1-rc2 changelog
2016-02-27 21:01:57 +13:00
Damian Mooyman
80a6242912
Update translations
2016-02-27 21:01:57 +13:00
Daniel Hensby
b7b1aba3fb
FIX undeclared constant issue
2016-02-27 21:01:57 +13:00
Damian Mooyman
3c053bb85d
Added 3.2.3-rc2 changelog
2016-02-27 21:00:59 +13:00
Damian Mooyman
3f5c635353
Added 3.2.3-rc2 changelog
2016-02-27 21:00:46 +13:00
Damian Mooyman
6bbd50c917
Update translations
2016-02-27 21:00:46 +13:00
Daniel Hensby
c2a0e8945f
FIX undeclared constant issue
2016-02-27 21:00:45 +13:00
Damian Mooyman
cd05068814
Merge branch '3.1.18' into 3.1
2016-02-27 20:59:51 +13:00
Damian Mooyman
b77acaeeb7
Added 3.1.18-rc2 changelog
2016-02-27 20:53:23 +13:00
Damian Mooyman
9d9a6fc0e8
Added 3.1.18-rc2 changelog
2016-02-27 20:53:15 +13:00
Damian Mooyman
387264fbbb
Update translations
2016-02-27 20:53:15 +13:00
Daniel Hensby
bd48d89642
FIX undeclared constant issue
2016-02-27 20:53:15 +13:00
Damian Mooyman
4d6e8a4dbd
Merge pull request #5102 from dhensby/pulls/fix-proxy-host-header
...
BUG Fixing undeclared constant issue
2016-02-27 20:19:11 +13:00
Daniel Hensby
3d2fcf9087
Fixing undeclared constant issue
2016-02-26 14:45:07 +00:00
Damian Mooyman
d27be2b325
Merge branch '3.3' into 3
...
# Conflicts:
# javascript/GridField.js
2016-02-26 17:45:06 +13:00
Damian Mooyman
a2c7524b85
Merge branch '3.1.18' into 3.1
2016-02-26 17:39:06 +13:00
Damian Mooyman
73780ce94e
Merge branch '3.2.3' into 3.2
2016-02-26 17:36:45 +13:00
Damian Mooyman
ae29576763
Merge branch '3.3.1' into 3.3
2016-02-26 17:35:42 +13:00
Damian Mooyman
a80c6e1e8c
Added 3.3.1-rc1 changelog
2016-02-26 17:30:07 +13:00
Damian Mooyman
8c12b6f992
Added 3.2.3-rc1 changelog
2016-02-26 17:25:00 +13:00
Damian Mooyman
9e0037d43e
Added 3.1.18-rc1 changelog
2016-02-26 17:13:49 +13:00
Damian Mooyman
0840f5d021
BUG Fix regressions in missing CSRF on print button
2016-02-26 17:05:56 +13:00
Damian Mooyman
2c1b934ba2
BUG Fix regression in gridfield get actions
2016-02-26 17:05:48 +13:00
Damian Mooyman
320c833fa1
BUG Fix regressions in missing CSRF on print button
2016-02-26 17:03:35 +13:00
Damian Mooyman
b0ad86bf8f
BUG Fix regression in gridfield get actions
2016-02-26 17:03:27 +13:00
Damian Mooyman
cc95703b18
BUG Fix regressions in missing CSRF on print button
2016-02-26 16:59:40 +13:00
Damian Mooyman
3dc0d0ee89
BUG Fix regression in gridfield get actions
2016-02-26 16:59:25 +13:00
Ingo Schommer
59026a7838
Merge pull request #5101 from open-sausages/pulls/3.3/fix-printbutton
...
BUG Fix regressions in missing CSRF on print button
2016-02-26 16:38:01 +13:00
Damian Mooyman
99ca2aa23d
BUG Fix regressions in missing CSRF on print button
2016-02-26 15:49:28 +13:00
Damian Mooyman
adf356a6a5
Merge pull request #5100 from open-sausages/pulls/fix-uploadfield-undeclared-var
...
Fix undeclared variable in UploadField.js
2016-02-26 15:08:36 +13:00
David Craig
40723aaa58
Fix undeclared variable in UploadField.js
2016-02-26 14:43:14 +13:00
Damian Mooyman
e1865151c5
Merge pull request #5098 from bummzack/5086-fix-member-validator
...
Fix for issue #5086
2016-02-26 14:39:53 +13:00
Daniel Hensby
11ad3e17c1
Merge pull request #5099 from tractorcow/pulls/3.3/gridfield-csrf-regression
...
BUG Fix regression in gridfield get actions
2016-02-26 00:48:14 +00:00
Ingo Schommer
e88c3c8098
Merge pull request #5094 from tractorcow/pulls/4.0/invokewithextensions
...
API Extensible::invokeWithExtension has same method signature as Extensible::extend
2016-02-26 13:09:40 +13:00
Damian Mooyman
f7caccaa7a
BUG Fix regression in gridfield get actions
2016-02-26 12:35:00 +13:00
Ingo Schommer
f088b07b1c
Merge pull request #5081 from tractorcow/pulls/4.0/fix-deprecated-api
...
BUG Fix deprecated API usage in DataFormatter API and DataObjectTest
2016-02-26 11:49:56 +13:00
Damian Mooyman
c4f850003b
Merge pull request #5089 from jakedaleweb/3
...
added if statement to catch NULL validators
2016-02-26 09:29:53 +13:00
Roman Schmid
f691a5da32
Improve Member_Validator to:
...
- properly check for existing members.
- allow extensions.
- remove old code and replace with new syntax and add config API.
Fix issue in Group code where Member_Validator was instantiated via "new" which didn't allow injector overrides.
Added unit-tests.
Establish a link between the member and the validator for said member.
2016-02-25 16:10:52 +01:00
Damian Mooyman
c275c21057
API Extensible::invokeWithExtension has same method signature as Extensible::extend
2016-02-25 17:32:41 +13:00
Damian Mooyman
0ee1564896
BUG Fix deprecated API usage in DataFormatter API and DataObjectTest
...
PHPDoc Cleanup
API DataFormatter::convertStringToArray is now abstract
2016-02-25 17:10:09 +13:00
Damian Mooyman
85c2bd7c95
Resolve regressions in merge affecting CMS
2016-02-25 16:58:49 +13:00
Damian Mooyman
4f1f2497be
Resolve merge regressions
2016-02-25 16:25:58 +13:00
Damian Mooyman
3b0a9f4ba2
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# admin/javascript/LeftAndMain.Menu.js
# control/HTTPRequest.php
# css/GridField.css
# css/GridField.css.map
# docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/01_File_Management.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# filesystem/Upload.php
# javascript/HtmlEditorField.js
# model/Image.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/Enum.php
# model/versioning/Versioned.php
# scss/GridField.scss
2016-02-25 14:51:59 +13:00
Daniel Hensby
2fdc96a0de
Update PHPUnit from 3.7 to 4.8
2016-02-24 21:42:20 +13:00
Damian Mooyman
9fed5561f4
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# core/Constants.php
# dev/DevelopmentAdmin.php
2016-02-24 17:39:04 +13:00
Damian Mooyman
5f2d3f31d7
Merge remote-tracking branch 'origin/3.2' into 3.3
...
# Conflicts:
# dev/DevelopmentAdmin.php
# docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
# lang/cs.yml
# lang/lt.yml
2016-02-24 17:29:06 +13:00
Damian Mooyman
efa13eb10a
Merge remote-tracking branch 'origin/3.3.0' into 3.3
2016-02-24 17:27:19 +13:00
