Commit Graph

19689 Commits

Author SHA1 Message Date
Martin D
adfe275cde Small fix to nginx.conf
Source: https://github.com/silverstripe/silverstripe-framework/blob/4.0/docs/en/00_Getting_Started/01_Installation/How_To/Setup_Nginx_and_HHVM.md
2017-10-18 05:52:45 -04:00
Loz Calver
2f4f601497 Merge pull request #7489 from open-sausages/pulls/4.0/many_many_queries_for_images
BUG cache the cacheKey in TreeDropdownField, so it doesn't need to query for it multiple times in the same request
2017-10-18 09:26:51 +01:00
Daniel Hensby
749f74b0d5 Merge pull request #7491 from SilbinaryWolf/doc-icon-menu-icon
DOC Add example for using resource location for pages / modeladmin
2017-10-18 09:01:41 +01:00
Jake B
97dfd9ac47 DOC Add example for using resource location for pages / modeladmin 2017-10-18 15:55:50 +11:00
Christopher Joe
0b3363d0a0 BUG Fix documentation for permissions 2017-10-18 13:21:55 +13:00
Christopher Joe
076d7d78c6 BUG cache the cacheKey in TreeDropdownField, so it doesn't need to query for it multiple times in the same request 2017-10-18 11:49:28 +13:00
Damian Mooyman
2b09216b0c Merge pull request #7270 from robbieaverill/pulls/3.6/fix-trailing-period-on-duplicate-folder-name
FIX Files without extensions (folders) do not have a trailing period added
2017-10-18 10:26:05 +13:00
Robbie Averill
2f579b64cb FIX Files without extensions (folders) do not have a trailing period added 2017-10-18 09:25:27 +13:00
Daniel Hensby
3e9dc5c7d2 Merge pull request #7483 from zanderwar/patch-1
get_environment_type() still exists in SS4
2017-10-17 13:55:49 +01:00
Daniel Hensby
36826a07a1 Merge pull request #7480 from Firesphere/7339-Password_reset_message
[FIX] Password reset message
2017-10-17 13:39:07 +01:00
Reece Alexander
8a1e466c75
get_environment_type() still exists in SS4 2017-10-17 13:00:24 +01:00
Daniel Hensby
dcc21ea21b Merge pull request #7485 from open-sausages/pulls/4.0/sake-path-fixesmore
BUG Ensure sake works when called from any directory
2017-10-17 12:54:37 +01:00
Damian Mooyman
884fdd61b1
BUG Ensure sake works when called from any directory 2017-10-17 13:52:39 +13:00
Chris Joe
cafa3fc29a BUG switch to trigger_error() when a resource is not found (#7468)
* BUG switch to `trigger_error()` when a resource is not found rather than throw an exception

* Add unit test for module url failing
2017-10-16 16:11:42 +13:00
Simon Erkelens
6506a5b958 Don't add a . when there's no extension 2017-10-16 11:56:35 +13:00
Daniel Hensby
8ce6d89e78 Merge pull request #7410 from creative-commoners/pulls/3.7/mark-image-title-as-alt-text
NEW Add (alt text) to title field for clarity
2017-10-13 11:16:37 +01:00
Damian Mooyman
e9e7bd649e Merge pull request #7479 from creative-commoners/pulls/4.0/remove-forums-in-controller-template
DOCS Remove forums link and replace with Slack and Stack Overflow in default controller template
2017-10-13 16:57:47 +13:00
Robbie Averill
eb1ee32571 DOCS Remove forums link and replace with Slack and Stack Overflow in default controller template 2017-10-13 15:03:45 +13:00
Chris Joe
11817592fd Merge pull request #7477 from open-sausages/pulls/4.0/intercept-incorrect-deletes
ENHANCEMENT Allow extensions to intercept incorrect deletes on unpublish
2017-10-13 11:49:26 +13:00
Damian Mooyman
7e97f04e47
ENHANCEMENT Allow extensions to intercept incorrect deletes on unpublish 2017-10-13 10:12:08 +13:00
Daniel Hensby
a244884117 Merge pull request #7476 from webbuilders-group/win-base-url-fix
BUGFIX: Fixed issue on Windows where the BASE_URL constant would get set wrong if the site was in a sub-folder of the web root
2017-10-12 15:31:53 +01:00
UndefinedOffset
7ff707df73 BUGFIX: Fixed issue on windows where the BASE_URL constant would get set wrong if the site was in a sub-folder of the web root 2017-10-12 10:54:27 -03:00
Daniel Hensby
3824655df4 Merge pull request #7473 from open-sausages/pulls/4.0/fix-sake-path
BUG Fix sake path lookup to find vendor framework
2017-10-12 08:39:34 +01:00
Damian Mooyman
5ccbabd36c
BUG Fix sake path lookup to find vendor framework
Remove legacy sapphire lookup
2017-10-12 15:45:43 +13:00
Chris Joe
d876e36424 Merge pull request #7467 from open-sausages/pulls/4.0/adjust-field-onbeforerender
Adjust FormField::onBeforeRendor so that it can influence both context and passed properties
2017-10-12 12:11:32 +13:00
Damian Mooyman
8d36d55205
Merge remote-tracking branch 'origin/4.0' into 4 2017-10-12 11:54:38 +13:00
Damian Mooyman
0c52623ad0
Update composer.json 2017-10-12 11:53:12 +13:00
Damian Mooyman
315a387a87
Update aliases 2017-10-11 17:59:44 +13:00
Damian Mooyman
f35b1c9926
Merge remote-tracking branch 'origin/4.0' into 4 2017-10-11 17:58:34 +13:00
Damian Mooyman
cacd3fbae4 Added 4.0.0-beta4 changelog 2017-10-11 17:46:52 +13:00
Damian Mooyman
37bc6e5099 Update translations 2017-10-11 17:46:48 +13:00
Damian Mooyman
f685c8c111 Remove obsolete branch-alias 2017-10-11 17:31:36 +13:00
Damian Mooyman
c3f321459b Merge pull request #7449 from creative-commoners/pulls/4.0-updatebreadcrumbs
Add updateBreadcrumbs hook to GridFieldDetailForm
2017-10-11 12:17:33 +13:00
Damian Mooyman
eff5c28f24
Adjust FormField::onBeforeRendor so that it can influence both context and passed properties
Fixes #7466
2017-10-11 11:43:57 +13:00
Damian Mooyman
e3086d31a1 Merge pull request #7465 from dhensby/pulls/4/composer-bin
Expose sake via vendor/bin dir with composer
2017-10-11 10:07:29 +13:00
Daniel Hensby
96f04d6686
Expose sake via vendor/bin dir with composer 2017-10-10 15:51:11 +01:00
Daniel Hensby
c09dec5958 Merge pull request #7456 from open-sausages/pulls/4.0/decimal-scaffolding
BUG Fix decimal scaffolding
2017-10-10 15:46:38 +01:00
Daniel Hensby
1cffdd923e Merge pull request #7463 from open-sausages/pulls/4/docs-upgrading-htaccess
Clarify index.php and .htaccess upgrading
2017-10-10 10:27:50 +01:00
Ingo Schommer
feadca875c Clearer .htaccess upgrading instructions 2017-10-10 10:28:02 +02:00
Ingo Schommer
823bc3b9ce Simplified upgrading docs around index.php
No need to paste the file there if we're auto upgrading it.
The guide is long enough already :)
2017-10-10 10:26:11 +02:00
Loz Calver
7afab3043d Merge pull request #7461 from open-sausages/pulls/4.0/fix-icon-urls
Fix references to resource paths / urls
2017-10-10 09:08:08 +01:00
Chris Joe
3c3cdc3452 Merge pull request #7460 from open-sausages/pulls/4.0/better-beta4-upgrade
ENHANCEMENT Improve upgrade experience for beta3 -> beta4 upgrade
2017-10-10 17:00:34 +13:00
Damian Mooyman
6a55dcfc16
Fix references to resource paths / urls 2017-10-10 16:51:47 +13:00
Will Rossiter
dc9307bd99 Add updateBreadcrumbs hook to GridFieldDetailForm 2017-10-10 16:03:20 +13:00
Damian Mooyman
11b2c74533
ENHANCEMENT Improve upgrade experience for beta3 -> beta4 upgrade 2017-10-10 15:27:41 +13:00
Damian Mooyman
7f5ca56e36 Merge pull request #7455 from dhensby/pulls/fix-circular-ref-issue
FIX Dont use var_export for cache key generation
2017-10-10 10:16:16 +13:00
Damian Mooyman
fd630a99b0
BUG Fix decimal scaffolding
Fixes #7454
2017-10-10 10:13:26 +13:00
Damian Mooyman
5d6a10ca58 Merge pull request #7444 from open-sausages/pulls/4/fix-docs-paths
Fixed docs paths (fixes #7075)
2017-10-10 09:53:17 +13:00
Daniel Hensby
b38942b3fa Merge pull request #7453 from open-sausages/pulls/4.0/i-said-good-day-surname
Fix surname behat test
2017-10-09 14:45:13 +01:00
Ingo Schommer
31c43c8c33 Merge pull request #7432 from open-sausages/pulls/4/request-uri
Use index.php for serving content
2017-10-09 10:39:44 +01:00