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
16,933 Commits 31 Branches 527 Tags 162 MiB
3
Commit Graph

16933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
0408048653
Merge pull request #71 from silverstripe-security/pulls/3.6/ss-2018-014 
[SS-2018-014] Remove dotm, potm, jar, css, js, xltm from default File.allowed_extensions
 2018-05-10 15:55:32 +12:00
Robbie Averill
19fdebfa24 [SS-2018-014] Remove dotm, potm, jar, css, js, xltm from default File.allowed_extensions 2018-05-10 15:53:11 +12:00
Robbie Averill
8b750b3d80 Merge remote-tracking branch 'origin/3.5.8' into 3.6.6 2018-05-10 15:52:23 +12:00
Robbie Averill
89dcc93a4f
Added 3.5.8 changelog 2018-05-10 12:00:45 +12:00
Robbie Averill
9d055dd946
Added 3.5.8-rc1 changelog 2018-05-10 09:38:54 +12:00
Robbie Averill
65668b8b58
Merge pull request #63 from silverstripe-security/pulls/3.6/ss-2018-001 
[ss-2018-001] Restrict non-admins from being assigned to admin groups
 2018-05-10 09:25:19 +12:00
Damian Mooyman
5771388821 [ss-2018-001] Restrict non-admins from being assigned to admin groups 2018-05-09 15:12:40 +12:00
Damian Mooyman
47a9cdfd49 ENHANCEMENT Backport of querystring work to 3.x (#8026) 
* WIP Backport of querystring work to 3.x

* Remove dataextension requirement

* Fix up bootstrapping

* more backporting

* Bug fix some tests

* Fix up some tests

* Fix support for custom stages
Don't set empty stage

* Better cache typehint

* Make sure useDraftSite(false) re-enables secure site

* Remove unnecessary guard around controller property
 2018-05-08 10:04:44 +12:00
Daniel Hensby
5029a75ef0
Merge branch '3.6' into 3 2018-05-01 20:24:07 +01:00
Daniel Hensby
cda61fb1ec
Merge branch '3.5' into 3.6 2018-05-01 20:23:21 +01:00
Daniel Hensby
2a9ef6ef94
Merge pull request #8039 from ngaitahutourism/3.6 
Address issue #8038
 2018-04-27 10:22:46 +01:00
Matthew Walker
766b2a4947
Address issue #8038 
Within TinyMCE, adding a link to "page on the site" generates an error "Target page not found" under the Anchor field.
 2018-04-27 09:50:21 +01:00
Daniel Hensby
c31251911c
Merge branch '3.6' into 3 2018-04-18 13:14:46 +01:00
Daniel Hensby
8359f3dc97
Merge branch '3.5' into 3.6 2018-04-18 13:14:07 +01:00
Daniel Hensby
f30cd61cb7
Merge pull request #8009 from webbuilders-group/duplicate-many-many-fix 
FIX: Duplicating many_many relationships looses the extra fields (fixes #7973)
 2018-04-18 13:11:22 +01:00
UndefinedOffset
36198c482e
Removed extra lookup of the list 2018-04-18 12:16:12 +01:00
UndefinedOffset
af3a9f3ec8
FIX: Duplicating many_many relationships looses the extra fields (fixes #7973) 2018-04-18 12:16:02 +01:00
Damian Mooyman
a761056021
Merge pull request #7994 from creative-commoners/pulls/3.6/phpdocs 
Update some phpdocs that had typos, missing parts or incorrect formats
 2018-04-13 09:07:40 +12:00
Robbie Averill
51d4d2c11e Update some phpdocs that had typos, missing parts or incorrect formats 2018-04-11 20:12:38 +12:00
Robbie Averill
f5c1f181bb
Merge pull request #7990 from lerni/patch-2 
README fix contributing-link, add httpS
 2018-04-11 09:15:04 +12:00
Lukas
6bce88b6ba
README fix contributing-link, add httpS 2018-04-10 17:54:44 +02:00
Robbie Averill
cd7cb225a6
Merge pull request #7945 from kinglozzer/indexual-healing 
FIX: Don't auto-generate indexes for Text field types (fixes #7900)
 2018-04-10 08:23:18 +12:00
Loz Calver
ebd3fb6526 FIX: Don't auto-generate indexes for Text field types (fixes #7900) 2018-04-09 16:44:31 +01:00
Daniel Hensby
b1f726a086
Merge branch '3.6' into 3 2018-03-28 11:08:01 +01: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
fcf0796dbd
Merge pull request #7936 from 3Dgoo/patch-1 
Fixing HTMLEditorField API documentation
 2018-03-15 12:16:23 +00:00
3Dgoo
61ce4771f9
Fixing HTMLEditorField API documentation 
The SS3 API documentation for HTMLEditorField was broken before change #7904:
http://api.silverstripe.org/3/HtmlEditorField.html

This was because there was an unescaped textarea tag in the class description. In #7904 we escaped the tag. 

However in a similar pull request #7927 it was suggested we should use backticks instead. 

This changes the documentation to use backticks around the textarea tag.
 2018-03-15 21:27:45 +10:30
Robbie Averill
d64fedd5e1
Merge pull request #7927 from 3Dgoo/patch-3 
Fixing FormAction API documentation
 2018-03-15 16:12:20 +13:00
3Dgoo
05b2979458
Update FormAction.php 2018-03-15 13:38:15 +10:30
Daniel Hensby
2c6f588785
Merge branch '3.6' into 3 2018-03-14 13:53:37 +00:00
Daniel Hensby
a7931e7a11
Merge branch '3.5' into 3.6 2018-03-14 13:49:29 +00:00
3Dgoo
1d74b3a22d
Update FormAction.php 2018-03-14 13:34:12 +10:30
3Dgoo
97f22cbaa5
Fixing FormAction API documentation 
The API documentation for FormAction is currently broken:
http://api.silverstripe.org/3/FormAction.html

This is because there are unescaped tags in the class description.

This fix changes the tag in the description to be escaped.
 2018-03-14 11:27:15 +10:30
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
Daniel Hensby
cf35aadfe5
Merge pull request #7904 from 3Dgoo/patch-2 
Fixing HTMLEditorField API documentation
 2018-03-01 13:03:08 +00:00
3Dgoo
6523d7a6eb
Fixing HTMLEditorField API documentation 
The API documentation for HTMLEditorField is currently broken:
http://api.silverstripe.org/3/HtmlEditorField.html

This is because there is unescaped start textarea tag in the class description. 

This fix changes the tag in the description to be escaped.
 2018-03-01 16:31:46 +10:30
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
Daniel Hensby
dc8c05519a
Merge pull request #7893 from open-sausages/pulls/3/the-summary-of-all-parts 2018-02-27 11:49:07 +00:00
Aaron Carlino
38a7e1c2d2 Remove short array syntax 2018-02-27 22:36:31 +13:00
Aaron Carlino
c755f77288 Fix indentation 2018-02-27 22:34:16 +13:00
Aaron Carlino
e107512063 Back port 4.0 implementation of numeric/assoc key merging for summary_fields 2018-02-27 16:42:44 +13: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
09726333b7
Merge branch '3.6' into 3 2018-02-13 14:30:59 +00:00
Daniel Hensby
9c50b03b86
Merge branch '3.5' into 3.6 2018-02-13 14:30:29 +00:00