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
12,685 Commits 31 Branches 527 Tags 162 MiB
b88a0955a5
Commit Graph

282 Commits

Author SHA1 Message Date
Ingo Schommer
6176d65bd2 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	forms/gridfield/GridFieldSortableHeader.php
	model/DataList.php
	model/fieldtypes/Enum.php
 2013-12-02 20:49:34 +01:00
Ingo Schommer
054b35ded7 Added 3.1.2 changelog 2013-11-12 19:43:44 +01:00
Andrew Short
bedf292612 Merge branch '3.1' 
Conflicts:
	docs/en/reference/execution-pipeline.md
	lang/nl.yml
 2013-11-11 18:18:25 +11:00
Ingo Schommer
008bd97828 Added 3.1.2-rc1 changelog 2013-11-08 01:11:57 +01:00
Ingo Schommer
99abe16c21 Added 3.1.2 changelog 2013-11-08 00:42:28 +01:00
Ingo Schommer
91f6039eed Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	control/Director.php
 2013-11-05 10:15:40 +01:00
Ingo Schommer
65b4407337 FIX "Draft" stage to fix dev/build, Versioned docs (fixes #2619) 2013-11-03 21:27:26 +01:00
colymba
f89f203392 Raised minimum PHP Veresion to 5.3.3 2013-10-23 11:10:42 +03:00
Ingo Schommer
b367dd6237 API Removed Member.LastVisited and Member.NumVisits 2013-10-10 12:35:07 +02:00
Ingo Schommer
d485faf0c9 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	forms/Form.php
 2013-10-08 11:17:06 +02:00
Ingo Schommer
a2cfe6e7ea Updated 3.1.1 changelog 2013-10-07 20:50:39 +02:00
Ingo Schommer
6e8ec778c3 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	lang/en.yml
 2013-10-07 16:19:40 +02:00
Ingo Schommer
795d3e4b3b Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	dev/install/install.php5
	docs/en/index.md
	tests/core/CoreTest.php
 2013-10-07 16:18:20 +02:00
Ingo Schommer
11fd15c87d Added 3.1.2 changelog 2013-10-07 15:21:56 +02:00
Ingo Schommer
0e5524af44 Merge remote-tracking branch 'origin/tmp-3.1.0' into 3.1 
Conflicts:
	docs/en/changelogs/3.1.1.md
	tests/behat/features/profile.feature
 2013-10-07 15:19:07 +02:00
Ingo Schommer
d3b5b11942 Added 3.1.1 changelog 2013-10-07 14:57:56 +02:00
Ingo Schommer
548d784397 Added 3.1.1 changelog 2013-10-07 02:02:01 +02:00
Ingo Schommer
e4adff48bc Added 3.0.8 changelog 2013-10-07 01:31:28 +02:00
Ingo Schommer
60fc7e5346 Merge remote-tracking branch 'origin/3.1' 2013-10-06 19:07:39 +02:00
Sean Harvey
5e5a2f8845 Merge pull request #2288 from chillu/pulls/browser-spellcheck 
API Disable discontinued Google Spellcheck in TinyMCE (#2213)
 2013-10-03 14:42:45 -07:00
Ingo Schommer
a534b7c784 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-02 12:21:35 +02:00
Sean Harvey
92e98f0adb Removing "Unreleased" text from changelog. 2013-10-01 13:47:06 +13:00
Ingo Schommer
9709a5cd8c Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-10-01 01:45:27 +02:00
Ingo Schommer
6de517bf72 3.0.7 changelog 2013-10-01 00:26:11 +02:00
Ingo Schommer
304e5d192e Minor changelog fixes 2013-10-01 00:22:53 +02:00
Ingo Schommer
2c8d8767b0 Merge branch '3.1.0' into 3.1 2013-09-30 23:43:21 +02:00
Ingo Schommer
298de5a67d FIX Escape breadcrumbs in SecurityAdmin (SS-2013-007) 2013-09-30 22:53:43 +02:00
Ingo Schommer
455e550d9a Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/topics/testing/create-silverstripe-test.md
	forms/Form.php
	i18n/i18n.php
	model/Image.php
 2013-09-27 19:22:14 +02:00
Ingo Schommer
e53f03cd94 Merge remote-tracking branch 'origin/3.1.0' into 3.1 
Conflicts:
	docs/en/changelogs/rc/3.1.0-rc3.md
 2013-09-27 18:52:37 +02:00
Ingo Schommer
2e3511bc5f Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	docs/en/changelogs/3.0.6.md
	forms/Form.php
	forms/FormField.php
	forms/TreeDropdownField.php
 2013-09-27 18:50:47 +02:00
Ingo Schommer
652682c048 3.0.6 changelog 2013-09-26 11:33:42 +02:00
Ingo Schommer
237ed5c516 Improved 3.1 changelog 2013-09-26 10:33:16 +02:00
Ingo Schommer
b3c91ecac9 Added 3.1.0-rc3 changelog 2013-09-26 01:42:27 +02:00
Ingo Schommer
ffb316dbc9 Added 3.0.7-rc1 changelog 2013-09-26 01:32:41 +02:00
Ingo Schommer
debd81d380 Merge pull request #2453 from chillu/pulls/escape-3.1.0 
Escaping 3.1
 2013-09-25 16:02:45 -07:00
Ingo Schommer
e1f9458db1 Added 3.0.7 changelog 2013-09-24 21:54:34 +02:00
Ingo Schommer
2b7a2a289e API Escape form validation messages (SS-2013-008) 2013-09-24 21:41:21 +02:00
Ingo Schommer
f3ef04a432 FIX Auto-escape titles in TreeDropdownField 
Related to SS-2013-009. While the default "TreeTitle" was escaped
within the SiteTree->TreeTitle() getter, other properties like SiteTree->Title
weren't escaped. The new logic uses the underlying casting helpers
on the processed objects.
 2013-09-24 21:41:21 +02:00
Ingo Schommer
78ce99be09 FIX Escape breadcrumbs in SecurityAdmin (SS-2013-007) 2013-09-24 21:41:18 +02:00
Tomáš Bílek
65d5f10e60 Update 3.1.0-rc2.md 
Corrected RC number in heading of page.
 2013-09-13 18:50:45 +02:00
Stephen Shkardoon
f765696d26 Update 3.0.6.md 
Add reference to information disclosure in Versioned.php (SS-2013-006)
 2013-09-13 10:34:51 +12:00
Ingo Schommer
03d1d58148 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/code/SecurityAdmin.php
	css/AssetUploadField.css
	docs/en/topics/configuration.md
	security/PermissionRole.php
 2013-09-12 17:33:36 +02:00
Ingo Schommer
c2b312d76f Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-09-12 17:24:42 +02:00
Ingo Schommer
7627d95555 Updated changelog 2013-09-12 17:02:13 +02:00
Ingo Schommer
a6b402f491 Added 3.0.6-rc2 changelog 2013-09-12 16:48:15 +02:00
Ingo Schommer
8b5c8eab72 Linking to older security issue in change log 
Mainly for consistency with the newer format
 2013-09-12 15:42:43 +02:00
Ingo Schommer
05757efceb FIX Privilege escalation through APPLY_ROLES assignment (SS-2013-005) 
See http://www.silverstripe.org/ss-2013-005-privilege-escalation-through-apply-roles-assignment/
 2013-09-12 15:42:43 +02:00
Ingo Schommer
6cff9671d4 FIX Privilege escalation through Group and Member CSV upload (SS-2013-004) 
See http://www.silverstripe.org/ss-2013-004-privilege-escalation-through-group-and-member-csv-upload/
 2013-09-12 15:42:43 +02:00
Ingo Schommer
720c149aee FIX Privilege escalation through Group hierarchy setting (SS-2013-003) 
See http://www.silverstripe.org/ss-2013-003-privilege-escalation-through-group-hierarchy-setting/
 2013-09-12 15:42:42 +02:00
Ingo Schommer
a492d56f7c 3.1.0-rc2 changelog 2013-09-12 15:42:36 +02:00