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
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
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
Daniel Hensby
773511a6c3
Merge branch '4.0' into 4.1
2018-03-28 11:18:08 +01:00
Daniel Hensby
0adbc6b21f
Merge branch '3.6' into 4.0
2018-03-28 11:14:21 +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
Will Rossiter
20c6ddd354
Use ModuleResourceLoader for fixtures path
...
This adds the ability to refer to a fixture file path by the ModuleResourceLoader path (e.g protected static $fixture_file = 'vendor/module:tests/fixtures.yml')
2018-03-28 10:36:56 +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
Daniel Hensby
89866d2323
Merge pull request #7953 from ntd/pr6
...
DOCS rerun composer on undefined MODULE_FILTER (#7948 )
2018-03-22 22:32:55 +00:00
Nicola Fontana
9c7306e575
DOCS rerun composer on undefined MODULE_FILTER ( #7948 )
2018-03-22 22:18:49 +01:00
Lukas
78896a73e2
Update link forum
2018-03-20 22:14:23 +01:00
Daniel Hensby
9f4c836072
Merge pull request #7940 from kinglozzer/docs-memcached
...
DOCS: fix memcached example (closes #7934 )
2018-03-18 08:33:46 +00:00
Loz Calver
cd6923965c
DOCS: fix memcached example ( closes #7934 )
2018-03-16 16:30:48 +00:00
Daniel Hensby
9ed3cd4042
Merge branch '4.0' into 4.1
2018-03-16 14:57:05 +00:00
Damian Mooyman
548e9358b0
Merge pull request #7939 from lekoala/patch-9
...
Ensure tmpData exists
2018-03-16 10:03:59 +13:00
Thomas Portelange
2e1c70b56c
Ensure tmpData exists
...
Otherwise you might get illegal string offset
2018-03-15 20:40:05 +01:00
Daniel Hensby
c41ebd3279
Merge pull request #7930 from creative-commoners/pulls/4.1/return-self
...
FIX Ensure consistent return type for FieldList::removeByName
2018-03-14 14:21:47 +00:00
Daniel Hensby
ec6ff71107
Merge branch '4.0' into 4.1
2018-03-14 14:09:40 +00:00
Daniel Hensby
d28a1b5cfc
Merge branch '3.6' into 4.0
2018-03-14 14:08:41 +00:00
Daniel Hensby
a7931e7a11
Merge branch '3.5' into 3.6
2018-03-14 13:49:29 +00:00
Robbie Averill
a9cc4d4844
FIX Ensure consistent return type for FieldList::removeByName
2018-03-14 19:40:17 +13:00
Damian Mooyman
caefab774e
Added 4.1.0 changelog
2018-03-14 10:16:31 +13:00
Damian Mooyman
3700c0a33d
Update translations
2018-03-14 09:45:54 +13:00
Damian Mooyman
625f7b4eee
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-03-13 14:26:18 +13:00
Daniel Hensby
35f28a824a
Merge pull request #7922 from mooror/3.6
2018-03-12 13:18:23 +00:00
Benjamin Blake
6fb8d27ac5
Updated the DocBlock for ManyManyList's add() method
2018-03-11 14:49:17 -06:00
Daniel Hensby
da5e73c115
Merge pull request #7918 from silverstripe-terraformers/pulls/updated-docs
...
Updated docs for Rate Limiting.
2018-03-09 10:52:12 +00:00
Damian Mooyman
cb372f7a34
Merge pull request #7919 from christopherdarling/patch-10
...
DOCS add missing trailing ; in code block
2018-03-09 15:30:57 +13:00
Christopher Darling
278f19068e
DOCS add missing trailing ; in code block
2018-03-08 20:41:11 +00:00
cpenny
fdbf4c2134
Updated docs for Rate Limiting.
2018-03-09 08:15:11 +13:00
Loz Calver
ef63e42e35
Merge pull request #7917 from Quadra-Digital/bug-fix-change-password
...
Bug Fix - Change Password Page
2018-03-07 15:14:49 +00:00
Joe Harvey
bf2cee3989
Bugfix - Correct duplicate nesting of 'Content' to be returned to template
...
In scenarios where:
- No member is logged in
- An 'AutoLoginHash' is provided via the 't' (token) query param
- The token isn't valid (determined by Member::validateAutoLoginToken())
The message which is intended to be returned to the end-user via $Content
in the template, is mistakenly double nested in ['Content' => ['Content' => 'Message']]
this leads to "The method forTemplate() doesn't exist on ArrayData" errors.
See - https://github.com/silverstripe/silverstripe-framework/issues/7866
2018-03-07 14:14:05 +00:00
Chris Joe
f4caa5101f
Merge pull request #7914 from open-sausages/pulls/4.0/fix-deleted-files
...
BUG Files dataobjects with missing asset shouldn't un-attach themselves on save
2018-03-07 15:10:22 +13:00
Damian Mooyman
5fee4a81aa
BUG Files dataobjects with missing asset shouldn't un-attach themselves from parent object on save
2018-03-07 11:17:17 +13:00
Chris Joe
6ae07d100c
Merge pull request #7603 from open-sausages/pulls/4.0/error-trace-included
...
ENHANCEMENT Don't infer trace if explicitly provided
2018-03-07 10:10:40 +13:00
