tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
15,084 Commits 31 Branches 527 Tags 162 MiB
3c053bb85d
Commit Graph

15084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
cb55a0a621 FIX: GridFieldSortableHeader incorrectly reporting fields as sortable 2015-09-30 16:25:17 +01:00
Matthew Hailwood
5e68512e1c Remove extra set of li's 2015-09-30 14:19:20 +13:00
Liam Whittle
71a2ef1350 fixed minor GridField initialization syntax. 2015-09-29 18:51:08 -04:00
Will Morgan
85654a495f Merge pull request #4635 from spekulatius/adding-space-before-casting 
adding a space before casting into a different type
 2015-09-28 11:17:08 +01:00
Will Morgan
ecf06f9130 Merge pull request #4634 from spekulatius/remove-trailing-spaces 
remove trailing spaces in the codebase
 2015-09-28 11:16:42 +01:00
Peter Thaleikis
5fda95d951 converting spaces as intentation to tabs 2015-09-28 22:21:30 +13:00
Peter Thaleikis
21216b47ab remove trailing spaces in the codebase 2015-09-28 22:21:08 +13:00
Peter Thaleikis
e6084b7ad2 adding a space before casting into a different type 2015-09-28 22:21:02 +13:00
Daniel Hensby
e2fbbda2fd Merge pull request #4625 from kinglozzer/pulls/editform-field-focus 
FIX: Issues with field focus in edit forms (fixes #4621)
 2015-09-24 17:52:25 +01:00
Loz Calver
8f0f6475da FIX: Issues with field focus in edit forms (fixes #4621) 2015-09-23 15:19:24 +01:00
Loz Calver
0d89a13c2d FIX: GridFieldDetailForm failing to save many_many relations 2015-09-22 14:46:57 +01:00
Damian Mooyman
a13d7e2b53 Merge pull request #4616 from spekulatius/patch-1 
Update 01_Extensions.md
 2015-09-21 10:40:13 +12:00
Peter Thaleikis
7ca97cd86d Update 01_Extensions.md 
adding missing space
 2015-09-20 15:15:54 +12:00
Damian Mooyman
c2a407a01b Add note to changelog 2015-09-18 14:51:04 +12:00
Damian Mooyman
b12bdb754b Added 3.1.15 changelog 2015-09-18 14:21:20 +12:00
Damian Mooyman
7f71a2ccfe Update translations 2015-09-18 14:21:20 +12:00
johndalangin
23d0f51592 Added cookie_secure configuration directive 
Seeing that cookie_secure is not yet added to the documentation, I took the liberty to add it myself.

Thanks and hope this helps!
 2015-09-17 15:53:58 +08:00
Damian Mooyman
e64d73c1f7 BUG Fix ClassInfo::table_for_object_field 2015-09-17 18:31:46 +12:00
Will Morgan
6261b7eb53 Merge pull request #4595 from kinglozzer/pulls/uploadfield-file-link-fix 
FIX: Editing existing file links in HtmlEditorField was broken
 2015-09-16 10:33:40 +01:00
Damian Mooyman
c4710b2272 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	admin/code/GroupImportForm.php
	admin/code/MemberImportForm.php
	tests/model/DataListTest.php
 2015-09-15 13:18:47 +12:00
Damian Mooyman
8ddb4c7ffe Merge remote-tracking branch 'origin/3.1.14' into 3.1 2015-09-15 11:07:14 +12:00
Damian Mooyman
00caeb700d Added 3.1.14 changelog 
Update translations
 2015-09-15 10:58:15 +12:00
Damian Mooyman
b7f3095098 Merge pull request #4602 from SpiritLevel/patch-2 
FIX: #103 in silverstripe-installer
 2015-09-14 15:06:36 +12:00
David Alexander
81ca74bc30 FIX: #103 
See also #58
 2015-09-14 13:41:32 +12:00
Damian Mooyman
6699f65b3f Merge pull request #4594 from kinglozzer/uploadfield-attach-nonexistent 
FIX: UploadField error when attempting to attach non-existent file IDs
 2015-09-11 16:33:42 +12:00
Loz Calver
6056e9cb1b FIX: Editing existing file links in HtmlEditorField was broken 2015-09-10 09:57:50 +01:00
Ingo Schommer
f935f2f25e Merge pull request #3 from silverstripe-security/fixes/ss-2015-020 
[ss-2015-020]: Prevent possible Privilege escalation
 2015-09-10 16:51:13 +12:00
Damian Mooyman
7367cf54c4 [ss-2015-020]: Prevent possible Privilege escalation 2015-09-10 13:01:24 +12:00
Damian Mooyman
45b22c788e BUG Fix missing framework/admin/tests 2015-09-10 11:06:15 +12:00
Loz Calver
06cc18526a FIX: UploadField error when attempting to attach non-existent file IDs 2015-09-09 09:24:56 +01:00
Damian Mooyman
6ad277c412 Fix merge regressions 2015-09-09 16:12:12 +12:00
Damian Mooyman
309ac0d196 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	.travis.yml
	admin/code/CMSProfileController.php
	admin/tests/LeftAndMainTest.php
	control/HTTP.php
	security/Permission.php
	tests/forms/FormTest.php
	tests/model/ArrayListTest.php
	tests/security/PermissionTest.php
 2015-09-09 14:35:29 +12:00
Ingo Schommer
4c73721bab Merge pull request #1 from silverstripe-security/fixes/ss-2015-016 
[ss-2015-016]: Fix XSS in install.php
 2015-09-09 09:48:56 +12:00
Daniel Hensby
00385792c5 Merge pull request #4588 from tractorcow/fix/3.1/admin-tests 
BUG Fix missing framework/admin/tests
 2015-09-08 09:57:53 +01:00
Christopher Pitt
751d77386c Merge pull request #2 from silverstripe-security/fixes/ss-2015-015 
[ss-2015-015]: Fix insecure returnURL in DatabaseAdmin
 2015-09-08 10:53:59 +12:00
Damian Mooyman
d8fd64c3e2 [ss-2015-016]: Fix XSS in install.php 2015-09-08 10:08:28 +12:00
Damian Mooyman
7192932022 [ss-2015-015]: Fix insecure returnURL in DatabaseAdmin 2015-09-08 09:48:09 +12:00