tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-18 17:33:52 +02:00
Code Issues Projects Releases Wiki Activity
12,627 Commits 29 Branches 519 Tags 147 MiB
bdd936d078
Commit Graph

261 Commits

Author SHA1 Message Date
Simon Welsh
0e0597f8cd Merge branch '3.0' into 3.1 
Conflicts:
	control/Director.php
	dev/Backtrace.php
	docs/en/installation/nginx.md
	model/HTMLValue.php
	tests/model/SQLQueryTest.php
 2014-03-10 22:56:27 +13:00
Ingo Schommer
b489f40866 Added 3.0.9 changelog 2014-03-03 10:19:08 +13:00
Ingo Schommer
ead3e26378 Added 3.1.3 changelog 2014-03-03 08:54:18 +13:00
Ingo Schommer
d6b75acbc4 Added 3.1.3-rc2 changelog 2014-02-24 10:08:09 +13:00
Ingo Schommer
6ba7b2e3d8 Added changelog links 2014-02-19 15:40:16 +13:00
Ingo Schommer
2bc62f2e71 Added changelog links 2014-02-19 15:39:54 +13:00
Ingo Schommer
4af711613f 3.1.3-rc1 changelog 2014-02-19 15:24:04 +13:00
Ingo Schommer
ec02df2160 Removed SS-2014-002 from changelog, not backported to 3.0 2014-02-19 15:22:12 +13:00
Ingo Schommer
a6f794c3b9 Added 3.0.9-rc1 changelog 2014-02-19 15:20:24 +13:00
Ingo Schommer
9b57609fcd Merge pull request #2853 from hafriedlander/feature/htmltext_whitelist 
NEW Allow specifying element whitelist in HTMLText fields
 2014-02-18 15:38:30 +13:00
Hamish Friedlander
d6630d240a NEW Allow specifying element whitelist in HTMLText fields 2014-02-18 14:02:04 +13:00
Ingo Schommer
53a699527e Preliminary 3.1.3 changelog 2014-02-18 11:44:08 +13:00
Ingo Schommer
054b35ded7 Added 3.1.2 changelog 2013-11-12 19:43:44 +01: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
Ingo Schommer
a2cfe6e7ea Updated 3.1.1 changelog 2013-10-07 20:50:39 +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
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
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