Commit Graph

20370 Commits

Author SHA1 Message Date
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
Andrew Aitken-Fincham
47bcac930d ENHANCEMENT Add config var to skip confirm logout (#7977) 2018-04-04 09:43:49 +12:00
Loz Calver
e3b9fb3036
Merge pull request #7969 from xcopy/patch-2
Update 02_Routing.md
2018-03-29 09:15:54 +01:00
Kairat Jenishev
c4c598000b
Update 02_Routing.md 2018-03-29 14:07:57 +06:00
Loz Calver
1a75a27f17
Merge pull request #7963 from open-sausages/pulls/4/fix-polymorphic-reciprocal-again
BUG Change inverse polymorphic inference to silent-empty instead of explicit error
2018-03-29 09:03:03 +01: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
Aaron Carlino
9cb974c619 Fix several mistakes in example code 2018-03-29 14:35:56 +13:00
Aaron Carlino
b2e9ed673e Minor docs update 2018-03-29 14:35:56 +13:00
Aaron Carlino
0368a98888 Minor documentation updates 2018-03-29 14:35:56 +13:00
Aaron Carlino
364a5e84a3 Documentation for graphql customisation 2018-03-29 14:35:56 +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
Damian Mooyman
878dc1f86d
BUG Change inverse polymorphic inference to silent-empty instead of explicit error 2018-03-29 09:38:07 +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
Daniel Hensby
94f9882539
Merge branch '3' into 4 2018-03-28 11:28:42 +01:00