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
Andrew Aitken-Fincham
64964f7402
unset http scheme on CLIRequestBuilder
2018-05-02 11:43:51 +01:00
Daniel Hensby
80bf0fc487
FIX bad syntax
2018-05-02 11:43:12 +01:00
Daniel Hensby
d5e2d3fa67
Merge branch '3.6' into 4.0
2018-05-01 21:47:17 +01:00
Daniel Hensby
cda61fb1ec
Merge branch '3.5' into 3.6
2018-05-01 20:23:21 +01:00
Daniel Hensby
62631dc3ee
Merge pull request #8013 from open-sausages/pulls/4.1/fix-password-validator-fields
...
BUG Prevent password validator min score producing false negatives
2018-04-30 12:16:56 +01:00
Damian Mooyman
5a831485bf
Merge pull request #8040 from azt3k/patch-3
...
Fixes a count() php warning without an api change
2018-04-30 08:57:07 +12: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
azt3k
6b39b25e20
Fixes a count() php warning without an api change
...
Warning: count(): Parameter must be an array or an object that implements Countable in /path/to/vendor/silverstripe/framework/src/Security/Member.php on line 1355
2018-04-27 09:31:07 +01:00
Maxime Rainville
e7abf11225
Merge pull request #8019 from open-sausages/pulls/4.0/cron-coverage-conditional
...
ENHANCEMENT Only run coverage test as a cron
2018-04-24 15:33:45 +12:00
Damian Mooyman
b07e13d2f8
BUG Fix incorrect installer base tag generation ( #8018 )
...
Fixes #7926
2018-04-24 10:53:08 +12:00
Damian Mooyman
1509a12fdf
ENHANCEMENT Only run coverage test as a cron
...
Fixes #8014
2018-04-19 12:56:54 +12:00
Damian Mooyman
0e2bf7871d
Merge pull request #8016 from webbuilders-group/duplicate-many-many-fix-4-0
...
FIX: Duplicating many_many relationships looses the extra fields in 4.0
2018-04-19 12:17:47 +12:00
UndefinedOffset
d17f424541
Changed checked for UnsavedRelationList to ManyManyList
2018-04-18 12:15:16 -03:00
Daniel Hensby
1019e9dd05
Merge pull request #8015 from open-sausages/pulls/4.0/dev-error-4
...
BUG Make invalid dev actions 404 not 500 error
2018-04-18 16:08:52 +01:00
UndefinedOffset
fe4b90edc0
FIX: Duplicating many_many relationships looses the extra fields in 4.0
2018-04-18 11:49:20 -03: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
f83691e7f7
BUG Make invalid dev actions 404 not 500 error
...
Fixes #8012
2018-04-18 11:37:31 +12:00
Damian Mooyman
9a12fac218
BUG Prevent password validator min score producing false negatives
...
Replaces #7995
2018-04-18 10:35:31 +12:00
Damian Mooyman
73d31d4797
Merge pull request #8008 from blueo/patch-1
...
Add .htaccess to base with public rewrite
2018-04-18 09:38:34 +12:00
Bernard Hamlin
3d2a3198d7
Add .htaccess to base with public rewrite
...
Upgrading from 4.0 to 4.1 we needed this extra file. It is created by default with the cms recipe eg: https://raw.githubusercontent.com/silverstripe/recipe-cms/1/.htaccess
2018-04-16 14:51:12 +12:00
Daniel Hensby
e2c8c80f02
Merge pull request #8004 from DorsetDigital/patch-3
...
Update 06_Themes.md
2018-04-13 12:15:05 +01:00
DorsetDigital
67fbaf3423
Update 06_Themes.md
...
Remove reference to theme picker in settings page which was removed in SS4
2018-04-13 12:12:55 +01:00
Damian Mooyman
5a8c5601a9
Merge remote-tracking branch 'origin/4.0' into 4.1
...
# Conflicts:
# .travis.yml
# composer.json
2018-04-13 09:55:23 +12: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
Damian Mooyman
81a2c15eb0
Merge pull request #7777 from open-sausages/pulls/4.0/selenium-upgrade
...
API Update behat-extension from selenium > chromedriver
2018-04-12 15:37:27 +12:00
Damian Mooyman
c54b07a952
API Update to use new chromedriver + behat-extension + facebook/webdriver
2018-04-12 14:19:14 +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
09b4f26151
Merge branch '4.0' into 4.1
2018-04-10 16:18:08 +12:00
Robbie Averill
b6c6bd6af2
Merge pull request #7989 from open-sausages/pulls/4.0/bulk-through-bug
...
BUG Fix many_many through crashing ModelAdmin
2018-04-10 15:43:25 +12:00
Damian Mooyman
e11ba9a2d7
BUG Fix many_many through crashing ModelAdmin
2018-04-10 14:51:49 +12:00
Damian Mooyman
facaad5a03
Merge pull request #7982 from wilr/pulls/fix-selectiongroup
...
Fix invalid markup in SelectionGroup selected values
2018-04-10 13:16:16 +12:00
Will Rossiter
09cc75a656
MINOR Add visiblity to SelectionGroup test functions
2018-04-05 10:33:27 +12:00
Will Rossiter
2512761587
Fix invalid markup in SelectionGroup selected values
2018-04-05 10:16:25 +12:00
Damian Mooyman
99426cdb05
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-04-04 17:36:45 +12:00
Damian Mooyman
7d05c500ae
Merge pull request #7961 from wilr/features/resourceurl-fixtures
...
Use ModuleResourceLoader for fixtures path
2018-03-29 15:27:38 +13:00
Damian Mooyman
75a29b8b16
Merge pull request #7967 from NightJar/patch-2
...
Reorder HTML to be semantically correct on render
2018-03-29 15:26:22 +13:00
Dylan Wagstaff
c5fcab81df
Reorder HTML to be semantically correct on render
...
Don't close the unordered list every iteration :)
2018-03-29 12:01:27 +13:00
Daniel Hensby
54b6c6f6e8
Merge pull request #7965 from andreaslindahl/DBMultiEnum
...
Fix for "too few parameters" error when using DBMultiEnum
2018-03-28 17:31:12 +01:00
Andreas Lindahl
dd44deacb4
Fix for "too few parameters" error when using DBMultiEnum
2018-03-28 16:42:12 +02:00