Commit Graph

20134 Commits

Author SHA1 Message Date
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
Robbie Averill
04bf73bff3
Merge pull request #8017 from open-sausages/pulls/4/fix-broken-versioning-link
Fix a broken link to the versioning page
2018-04-19 11:07:39 +12:00
Maxime Rainville
4585b0b382 Fix a broken link to the versioning page. 2018-04-19 10:53:36 +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
5e39dc3687
Merge pull request #8011 from open-sausages/pulls/4/upgrader-env-cmd-doc
Update framework doc to reflect upgrader environment functionality
2018-04-18 16:32:53 +12: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
Maxime Rainville
d4f61b4001
Add a new New upgrader command section 2018-04-17 16:25:58 +12:00
Maxime Rainville
ee2774de31 Add some info about the environment upgrader command. 2018-04-17 14:22:03 +12:00
Daniel Hensby
df3b0a90fd
Merge pull request #8007 from open-sausages/pulls/4/readonly-this-form
API Form::makeReadonly() returns self
2018-04-16 15:18:36 +01: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
Damian Mooyman
c8b3593090
API Form::makeReadonly() returns self
Fixes #8006
2018-04-16 14:01:49 +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
Ingo Schommer
1b882e802e Docs for personal data usage in core
See https://github.com/silverstripe/silverstripe-framework/issues/7791
2018-04-13 13:23:05 +12:00
Damian Mooyman
d21e03d4ed
Fix branch alias 2018-04-13 10:14:06 +12:00
Damian Mooyman
87c7a53511
Merge remote-tracking branch 'origin/4.1' into 4
# Conflicts:
#	.travis.yml
2018-04-13 09:56:58 +12: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
b55c9dfa86
Merge pull request #7998 from open-sausages/pulls/4/docs-upgrading-ftp
Docs for vendor expose through FTP
2018-04-13 09:08:10 +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
Ingo Schommer
86b1665fd2 Docs for vendor expose through FTP
See https://forum.silverstripe.org/t/upgrade-from-4-0-3-to-4-1-0-unspported-browser-message/272/7
2018-04-12 14:11:26 +12:00
Robbie Averill
51d4d2c11e Update some phpdocs that had typos, missing parts or incorrect formats 2018-04-11 20:12:38 +12:00
Damian Mooyman
741a7f200c
Merge pull request #7985 from open-sausages/pulls/4/appy-days
DOCS Upgrading notes for app/src folder
2018-04-11 15:16: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
Damian Mooyman
7c2886d87c
[ss-2018-003] Update docs for oembed 2018-04-10 16:50:51 +12:00
Robbie Averill
af2c3886b9 Merge branch '4.1' into 4 2018-04-10 16:27:00 +12: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
Damian Mooyman
be8287fef8 BUG Prevent failover / extensions interfering with composite field properties (#7988) 2018-04-06 14:48:24 +12:00
Damian Mooyman
ff7e9e5d8e
Merge pull request #7956 from open-sausages/pulls/4/answer-my-query-queries
Documentation for graphql customisation
2018-04-06 14:47:29 +12:00
Damian Mooyman
d78be1d424
DOCS Upgrading notes for app/src folder 2018-04-06 09:21:27 +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
c23d21a255 Upgrading docs (#7960) 2018-04-05 09:42:07 +12:00
Damian Mooyman
f29ceec70d
Merge pull request #7980 from silverstripe/revert-confirm_logout_config_var
Revert "ENHANCEMENT Add config var to skip confirm logout (#7977)"
2018-04-05 08:02:22 +12:00
Daniel Hensby
70effc7046
Revert "ENHANCEMENT Add config var to skip confirm logout (#7977)"
This reverts commit 47bcac930d.
2018-04-04 13:51:18 +01:00
Damian Mooyman
5ff6874dbc
Merge remote-tracking branch 'origin/4.1' into 4 2018-04-04 17:38:26 +12:00
Damian Mooyman
99426cdb05
Merge remote-tracking branch 'origin/4.0' into 4.1 2018-04-04 17:36:45 +12:00