Commit Graph

16581 Commits

Author SHA1 Message Date
Robbie Averill
51d4d2c11e Update some phpdocs that had typos, missing parts or incorrect formats 2018-04-11 20:12:38 +12:00
Daniel Hensby
b36ba81a40
Merge branch '3.5' into 3.6 2018-03-28 11:06:32 +01:00
Damian Mooyman
45a7b44a15
Merge pull request #7858 from dhensby/pulls/3.5/add-support-file
Add support.md file
2018-03-28 16:56:11 +13:00
Daniel Hensby
61463424ff
Support file grammer improvements 2018-03-27 11:49:04 +01:00
Daniel Hensby
e3cdefaa3c
Add support.md file 2018-03-27 11:43:13 +01:00
Robbie Averill
0d8915a898
Merge pull request #7947 from lerni/lerni-patch-1
Update link forum
2018-03-27 14:22:02 +13:00
Lukas
78896a73e2
Update link forum 2018-03-20 22:14:23 +01:00
Daniel Hensby
a7931e7a11
Merge branch '3.5' into 3.6 2018-03-14 13:49:29 +00:00
Daniel Hensby
35f28a824a
Merge pull request #7922 from mooror/3.6 2018-03-12 13:18:23 +00:00
Benjamin Blake
6fb8d27ac5 Updated the DocBlock for ManyManyList's add() method 2018-03-11 14:49:17 -06:00
Loz Calver
535d02ffeb
Merge pull request #7874 from flamerohr/pulls/3.6/to-match-thy-father
FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated
2018-02-28 10:06:36 +00:00
Christopher Joe
86addea1d2 FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated 2018-02-16 23:34:05 +13:00
Daniel Hensby
9c50b03b86
Merge branch '3.5' into 3.6 2018-02-13 14:30:29 +00:00
Daniel Hensby
1bec8a5d0c
Merge pull request #7850 from jonom/singleton-fix-3x
FIX Singleton creation
2018-02-13 08:29:47 +00:00
Jonathon Menz
c767e472dc FIX DataObject singleton creation
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878)
2018-02-12 20:30:35 -08:00
Robbie Averill
1a91806bcc
Merge pull request #7857 from dhensby/pulls/3.5/add-license
Create licence file so that GitHub (and humans) can more easily find it
2018-02-13 09:32:24 +13:00
Daniel Hensby
24ea2638fe
Create licence file so that GitHub (and humans) can more easily find it 2018-02-12 11:21:03 +00:00
Daniel Hensby
48a8a82326
Merge branch '3.5' into 3.6 2018-02-09 13:20:38 +00:00
Daniel Hensby
2a8d365aac
Merge pull request #6973 from steadlane/fix/csv-unescaped-values
Fix for badly escaped values in CSV export
2018-02-08 13:45:52 +00:00
JorisDebonnet
5df1ec7eee
Use fputcsv in GridFieldExportButton 2018-02-08 12:26:29 +00:00
Damian Mooyman
a805aabecd Added 3.6.5 changelog 2018-02-05 15:19:24 +13:00
Damian Mooyman
96ec6e9181
Merge remote-tracking branch 'origin/3.5' into 3.6 2018-02-05 15:07:21 +13:00
Damian Mooyman
abbc4b72be Added 3.5.7 changelog 2018-02-05 14:30:53 +13:00
Damian Mooyman
6fe5c37d6a
Merge pull request #7795 from kinglozzer/uploadfield-height
FIX: Fix UploadField cuts off “Save” button (closes #2862)
2018-02-05 14:24:30 +13:00
Damian Mooyman
fa44d22058
Merge pull request #6744 from d-rivera-c/dev/pharmac-fork
fixing val reference to url in https hotlink and allowes https hotlinking on TinyMCE
2018-02-05 14:22:08 +13:00
Damian Mooyman
aca1e16b8e
Merge pull request #6211 from jason-zz/patch-3
BUG Fix : relObject() should return null if one of the node is null
2018-02-05 14:18:44 +13:00
Damian Mooyman
98907b3ba4
Merge pull request #4096 from patricknelson/issue-4095-tinymce-embed
FIX for #4095, TinyMCE not able to modify props of embed media (bug 1) and invalid HTML inserted (bug 2)
2018-02-05 14:14:44 +13:00
Damian Mooyman
4da99efd5d
Merge remote-tracking branch 'origin/3.5' into 3.6 2018-01-31 16:03:42 +13:00
Daniel Hensby
cf373ad53b
Merge pull request #7804 from beerbohmdo/bugfix/composite_field_missing_table
BUG $this->tableName in CompositeDBField->addToQuery is blank.
2018-01-30 16:52:02 +00:00
Daniel Hensby
231de43e3a
Merge pull request #7784 from spaceship-operators/bugfix/gridfield-overflow
FIX: Gridfields with dropdowns having lots of overflow
2018-01-30 16:36:27 +00:00
Scott Hutchinson
7384e3fc25
FIX: Gridfields with dropdowns having lots of overflow 2018-01-30 14:45:08 +00:00
Dominik Beerbohm
416915b082 BUG tableName is blank in CompositeDBField->addToQuery
Added call to setTable() to ensure tableName is provided inside addToQuery method.
2018-01-26 14:58:46 +01:00
Loz Calver
861112bd31
Merge pull request #7803 from open-sausages/pulls/3.5/fix-ping-reqs
BUG Fix ping including requirements
2018-01-26 09:16:20 +00:00
Damian Mooyman
cf69d04866
BUG Fix ping including requirements
Fixes #7802
2018-01-26 10:26:18 +13:00
Damian Mooyman
72e2326731
Merge pull request #7798 from kinglozzer/member-groupset-delete
FIX: Fix Member_GroupSet::removeAll() (fixes #3948)
2018-01-25 09:20:30 +13:00
Loz Calver
c2cd6b3832 FIX: Fix Member_GroupSet::removeAll() (fixes #3948) 2018-01-24 17:17:20 +00:00
Loz Calver
f2b4c192ec FIX: Fix UploadField cuts off “Save” button (closes #2862) 2018-01-24 15:49:46 +00:00
Damian Mooyman
83de0a0d36
Merge pull request #7783 from emteknetnz/emteknetnz-member-id-cast
Ensure currentUserID() returns an int
2018-01-23 18:18:28 +13:00
Steve Boyd
f214cd52e0
Ensure currentUserID() returns an int
Cast $id returned from Session as an int to ensure it's never returned as a string
2018-01-23 13:37:06 +13:00
Damian Mooyman
bb37bc5491 Added 3.6.4 changelog 2018-01-16 16:40:43 +13:00
Damian Mooyman
39a8410460
Merge pull request #7754 from oetiker/patch-1
JSON.parse does not like empty strings
2018-01-15 10:56:15 +13:00
Tobias Oetiker
396005381f
JSON.parse does not like empty strings
Add some protection for the case that envent.data is empty or null
2018-01-12 16:21:33 +01:00
Daniel Hensby
4c51cf67e7
Merge pull request #7742 from nglasl/3.6
FIX, adding a missing return statement.
2018-01-09 23:43:18 +00:00
Nathan
2ef4a2d4ee
FIX, adding a missing return statement.
This causes issues such as an `_function` to incorrectly return null.
2018-01-10 09:50:18 +11:00
Daniel Hensby
a049876418
Merge branch '3.5' into 3.6 2018-01-09 13:34:56 +00:00
Damian Mooyman
677336fbef
Merge pull request #7726 from dhensby/pulls/3.5/functionaltest-html5-forms
FIX Allow HTML 5 input tags in FunctionalTest form submissions
2018-01-08 13:32:44 +13:00
Daniel Hensby
44930f211b
FIX Allow HTML 5 input tags in FunctionalTest form submissions 2017-12-22 11:15:56 +00:00
Daniel Hensby
7b0500982e
Merge branch '3.5' into 3.6 2017-12-14 15:25:36 +00:00
Daniel Hensby
81150c5922
FIX Use PHP 5.3 array syntax 2017-12-14 15:24:53 +00:00
Damian Mooyman
052f11a427
Remove merge artifact 2017-12-08 11:52:48 +13:00