Commit Graph

15057 Commits

Author SHA1 Message Date
David Alexander
e88032a7aa DOCS : spelling 2015-10-23 13:49:03 +13:00
Damian Mooyman
6ff29065b3 Merge pull request #4688 from camfindlay/patch-31
DOCS Module standard 1.0
2015-10-21 09:01:35 +13:00
Damian Mooyman
cd12ce584a Merge pull request #4690 from camfindlay/patch-32
FIX only use sethasemptydefault if exists.
2015-10-20 16:04:46 +13:00
Cam Findlay
c3641587a5 FIX only use sethasemptydefault if exists.
Backport of #4672 with a slight rewrite incase of subclasses of the field.
2015-10-20 12:39:04 +13:00
Cam Findlay
a555817d6f DOCS Module standard 1.0
Adding the module standard to 3.2+ docs.
2015-10-19 11:44:31 +13:00
Damian Mooyman
f5f2861dc5 Merge pull request #4684 from dhensby/pulls/multiline-enum
Allow multi-line enum declarations
2015-10-16 09:45:34 +13:00
Daniel Hensby
1974e79d71 Allow multi-line enum declarations 2015-10-15 16:23:19 +01:00
Damian Mooyman
193fc9e469 Merge pull request #4675 from kinglozzer/pulls/checktable
Only notify users about PDO native mode once
2015-10-15 11:18:05 +13:00
Loz Calver
862429e5d7 Only notify users about PDO native mode once 2015-10-14 09:53:51 +01:00
Ingo Schommer
421d1b53b0 Merge pull request #4674 from ss23/parentidfix
Fix page reordering bug with ParentID
2015-10-13 11:35:52 +13:00
Stephen Shkardoon
6030854725 Fix page reordering bug with ParentID
If you are viewing PageA in the CMS, but move PageB into PageC,
the edit form will recieve an edit form ParentID of PageC.
This is incorrect, as only PageB had it's ParentID change.
2015-10-12 20:10:48 +13:00
Daniel Hensby
592140364c Merge pull request #4673 from patricknelson/issue-4392-cache-headers-3.2
FIX #4392: Ensure headers are checked first before being clobbered by globally maintained state.
2015-10-12 00:11:19 +01:00
Damian Mooyman
cc4d92e91a Merge remote-tracking branch 'origin/3.2.0' into 3.2 2015-10-12 09:18:01 +13:00
Damian Mooyman
0092792568 Added 3.2.0 changelog 2015-10-12 08:44:34 +13:00
Patrick Nelson
f192a6ecaf FIX #4392: Ensure headers are checked first before being clobbered by globally maintained state. Also ensuring tests utilize separate responses for isolation. 2015-10-09 13:50:33 -04:00
Damian Mooyman
91a7e145d4 Merge pull request #4672 from JorisDebonnet/patch-1
Bugfix for DropdownField->castedCopy
2015-10-09 12:25:43 +13:00
JorisDebonnet
f6a1e5ec30 Bugfix for DropdownField->castedCopy
The Newsletter module crashed on it when viewing a sent Newsletter.
2015-10-08 19:02:47 +02:00
Nick Spiel
d9b3982323 Adding SVG to allowed file types
Adding svg to allowed extensions array, this should be merged in conjunction with a change I am making to the htaccess file in the silverstripe-installer repo (also on 3 branch). I will link to this when I have completed the PR
2015-10-08 17:32:35 +11:00
Damian Mooyman
a1e4db6a6d Merge pull request #4664 from patricknelson/issue-4663-tabset-returns
FIX for #4663 ensuring TabSet return values are retained from parent.
2015-10-08 13:13:20 +13:00
Patrick Nelson
a71d99cf84 FIX for #4663 ensuring return values from TabSet are retained from parent. Removing useless override. Cleaning up documentation in TabSet and return types. 2015-10-07 17:03:51 -04:00
Daniel Hensby
e28156c138 Merge pull request #4666 from tractorcow/pulls/3.2/changelogs
DOCS Update changelogs to include PDO upgrade instructions
2015-10-07 10:35:08 +01:00
Daniel Hensby
95ae107c4c Merge pull request #4486 from uniun/patch-2
BUGFIX. FulltextFilter requires table identifiers in match query
2015-10-07 10:28:15 +01:00
Elvinas L.
630062c0e0 Removed whitespaces 2015-10-07 09:33:02 +03:00
Damian Mooyman
a679680c0d Update changelogs to include PDO upgrade instructions 2015-10-07 16:11:42 +13:00
Manuel Teuber
666ce26929 FIX: Permission::checkMember() use of undefined variable $codes 2015-10-07 16:02:36 +13:00
Damian Mooyman
89571d92d7 Merge pull request #4640 from memdev/fix-permission-undefined-var
BUG: Permission::checkMember() use of undefined variable $codes
2015-10-07 16:01:58 +13:00
Damian Mooyman
04e167ad4c Merge pull request #4665 from hafriedlander/minor/update_core_contributors
Update core contributors docs to include Jono Menz
2015-10-07 14:41:08 +13:00
Hamish Friedlander
b03ae843ca Update core contributors docs to include Jono Menz 2015-10-07 14:35:29 +13:00
Damian Mooyman
ac24c6aa99 Merge pull request #4662 from patricknelson/issue-3181-button-type
FIX (partial) for #3181 where non-submit buttons are being activated on "enter" key press.
2015-10-07 12:12:46 +13:00
Damian Mooyman
557c4211fa Update changelog 2015-10-07 09:51:24 +13:00
Patrick Nelson
12c423909f FIX (partial) for #3181 where non-submit buttons are being activated on "enter" key press (relates to CMS issue at https://github.com/silverstripe/silverstripe-cms/issues/1288). 2015-10-06 15:03:49 -04:00
Elvinas L.
19c754bf9a Fixed tests 2015-10-06 18:59:39 +03:00
Elvinas L.
ee6b250a46 Ajustments
Altered code to according to the feedback and added phpdoc.
2015-10-06 18:58:22 +03:00
Damian Mooyman
4af684f2f3 Added 3.2.0-rc2 changelog 2015-10-06 18:49:35 +13:00
Damian Mooyman
0cd3569fb9 Update translations 2015-10-06 18:33:16 +13:00
Ingo Schommer
0c06964cf7 Merge pull request #4655 from tractorcow/pulls/3.2/better-imagick
BUG Imagick tests compare image dimensions rather than image hashes
2015-10-06 17:13:05 +13:00
Damian Mooyman
df805af67b BUG Imagick tests compare image dimensions rather than image hashes 2015-10-06 16:35:44 +13:00
Ingo Schommer
547a7f60f3 Merge pull request #4654 from tractorcow/pulls/3.2/fix-tree-dupe-id
BUG Fix duplicate HolderID on TreeDropdownField
2015-10-06 15:30:02 +13:00
Ingo Schommer
7ec24a1303 Merge pull request #4653 from tractorcow/pulls/3.2/imagick
BUG fix imagick interface and add to travis
2015-10-06 15:25:45 +13:00
Damian Mooyman
ad42f802c4 BUG Fix duplicate HolderID on TreeDropdownField 2015-10-06 12:54:35 +13:00
Damian Mooyman
6c117cd629 BUG fix imagick interface and add to travis 2015-10-06 12:40:24 +13:00
Damian Mooyman
9953c5f9c0 Merge pull request #4644 from kinglozzer/pulls/gfsortableheader-hasdbfield
FIX: GridFieldSortableHeader incorrectly reporting fields as sortable
2015-10-06 11:55:28 +13:00
Damian Mooyman
278caa86f4 Merge pull request #4636 from spekulatius/converting-spaces-to-tabs
converting spaces as intentation to tabs
2015-10-06 11:51:45 +13:00
Damian Mooyman
b8335793d6 Merge pull request #4620 from kinglozzer/pulls/manymanyextrafields-compat
FIX: GridFieldDetailForm failing to save many_many relations
2015-10-06 11:49:56 +13:00
Damian Mooyman
3b192ea67c Merge pull request #4649 from cjsewell/3.1
FIX: Typo in curr methods PHPDoc
2015-10-05 16:14:47 +13:00
Corey Sewell
4a70ffea06 FIX: Typo in cur methods PHPDoc 2015-10-05 15:58:46 +13:00
Daniel Hensby
fa878b1e1f Merge pull request #4642 from hailwood/patch-1
DOCS Remove extra set of li's
2015-10-03 10:28:50 +01:00
Will Morgan
92970f8a8c Merge pull request #4641 from LiamW/patch-2
fixed minor GridField initialization syntax.
2015-10-01 09:37:57 +01:00
Loz Calver
ab5aaf5afc Merge pull request #4630 from marcokernler/paginated-list-total-items
Total Items of a Paginated List
2015-10-01 09:19:26 +01:00
Loz Calver
cb55a0a621 FIX: GridFieldSortableHeader incorrectly reporting fields as sortable 2015-09-30 16:25:17 +01:00