Daniel Hensby
33d2df1bf5
Merge pull request #8129 from creative-commoners/pulls/3/memory-limit
...
Increase memory limit to 2G in Travis builds
2018-06-04 11:39:57 +01:00
Robbie Averill
e73baf32db
Increase memory limit to 2G in Travis builds
2018-06-02 20:44:33 +12:00
Damian Mooyman
cf8f12009f
Merge pull request #8101 from creative-commoners/pulls/3.7/php53-compat
...
FIX PHP 5.3 compat for referencing $this in closures
2018-06-01 15:00:42 +12:00
Loz Calver
f43361ad66
Merge pull request #8107 from open-sausages/pulls/3/docs-remove-old-changelogs
...
Removed old changelogs (fixes #8035 )
2018-05-30 09:10:08 +01:00
Ingo Schommer
16c296756f
Removed old changelogs ( fixes #8035 )
2018-05-30 16:04:41 +12:00
Robbie Averill
7b23a548aa
FIX PHP 5.3 compat for referencing $this in closure, and make method public for same reason
...
sdf
2018-05-29 14:55:21 +12:00
Robbie Averill
f688bcb1a3
Merge pull request #72 from silverstripe-security/pulls/3/security-password-fix
...
SECURITY: Ensure passwords do not get added to session on submission failure
2018-05-28 18:54:27 +12:00
Aaron Carlino
e4c0f271b0
[ss-2018-013] Ensure passwords do not get added to session on submission failure
2018-05-28 18:53:02 +12:00
Robbie Averill
4a9e991edb
Merge branch '3.6' into 3
2018-05-28 17:44:48 +12:00
Robbie Averill
d21660971f
Merge branch 'heads/3.6.6' into 3.6
2018-05-28 17:44:28 +12:00
Robbie Averill
dae8fefb1e
Merge remote-tracking branch 'origin/3.5' into 3.6
2018-05-28 17:43:55 +12:00
Robbie Averill
df4648a308
Merge branch 'heads/3.5.8' into 3.5
2018-05-28 17:42:31 +12:00
Robbie Averill
912dc60cf3
Added 3.5.8 changelog
2018-05-28 15:50:54 +12:00
Robbie Averill
91327ab63e
Added 3.6.6 changelog
2018-05-14 10:59:58 +12:00
Robbie Averill
097f16282d
Added 3.6.6-rc1 changelog
2018-05-10 16:03:20 +12:00
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
