Aaron Carlino
3f33a5dabd
Merge branch '4.1' into 4.2
2019-01-10 12:02:58 +13:00
Aaron Carlino
4dcfcc073c
Merge branch '4.0' into 4.1
2019-01-10 12:02:41 +13:00
Aaron Carlino
c4a0d5f083
BUGFIX: Publish button text merge regression
2018-12-13 15:21:49 +13:00
Aaron Carlino
34a5ff9eca
BUGFIX: Publish button text merge regression
2018-12-13 15:19:23 +13:00
Aaron Carlino
721884206e
Update translations
2018-12-12 12:50:48 +13:00
Aaron Carlino
79273cf7ae
Update translations
2018-12-12 12:34:52 +13:00
Aaron Carlino
ad56961150
Update translations
2018-12-12 12:21:18 +13:00
Aaron Carlino
acc7f46b02
Merge branch '4.1' into 4.2
2018-12-11 11:42:35 +13:00
Aaron Carlino
a4b78c4041
Merge branch '4.0' into 4.1
2018-12-11 11:42:11 +13:00
Robbie Averill
84db517bfe
Merge branch 'pr-2105' into 4.0
2018-12-02 18:21:40 +00:00
Robbie Averill
7554b61325
Update meta generator tests to use isolated configuration and better assertions
2018-12-02 18:20:44 +00:00
Maxime Rainville
44b600814a
Merge pull request #2287 from sb-relaxt-at/4.2
...
Fixing wrong Live-Preview-Link in SilverStripeNavigatorItem_LiveLink
2018-11-23 10:05:05 +13:00
Guy Marriott
84510f1869
Merge pull request #2334 from creative-commoners/pulls/4.0/search-input-placeholder
...
FIX 'Search' text in default search form should be a placeholder
2018-11-17 15:52:35 +13:00
Robbie Averill
35c3a8c68d
FIX 'Search' text in default search form should be a placeholder
2018-11-16 17:18:12 +02:00
Guy Marriott
d748566054
Merge pull request #2262 from creative-commoners/pulls/4.2/title-corners
...
FIX SiteTree Title field should have rounded corners before Update URL button is shown
2018-11-13 09:55:29 +13:00
Aaron Carlino
cc938ee26c
Update translations
2018-11-08 16:25:42 +13:00
Vagrant Default User
066f9633a5
Update translations
2018-11-07 21:37:37 +13:00
Aaron Carlino
1510658131
Update translations
2018-11-07 17:57:46 +13:00
Aaron Carlino
2f16da936d
Merge branch '4.1' into 4.2
2018-10-15 13:32:33 +13:00
Stephan Bauer
c498aa0337
Fixing wrong Live-Preview-Link in SilverStripeNavigatorItem_LiveLink ( fixes #865 ).
2018-10-06 21:32:58 +02:00
Robbie Averill
7189653b1f
FIX SiteTree Title field should have rounded corners before Update URL button is shown
2018-09-13 17:12:35 +02:00
Maxime Rainville
5c102decbd
FIX Improve performance of CMSMain::getArchiveWarningMessage ( #2231 )
...
* FIX Improve performance of CMSMain::getArchiveWarningMessage
* Remove private method
* Linting
2018-09-13 15:52:54 +12:00
Robbie Averill
eea9127e70
Merge branch '4.1' into 4.2
2018-09-12 14:11:56 +02:00
Luke Edwards
6dac09a03e
Merge pull request #2248 from open-sausages/pulls/4.1/hire-our-quay
...
MINOR: Add CMS specific hierarchy config
2018-09-10 14:43:44 +12:00
Aaron Carlino
463319e52b
Add CMS specific hierarchy config
2018-09-03 16:31:15 +12:00
Robbie Averill
4c8a76f21e
Merge pull request #2226 from creative-commoners/pulls/4.2/uncatch-all
...
FIX Separating ModelAsController catch-all route
2018-08-17 21:35:27 +12:00
Robbie Averill
7b8c2c1449
Merge branch '4.1' into 4.2
2018-08-16 11:47:19 +12:00
Maxime Rainville
8ec551e57b
BUGFIX: Broken "show as list" ( #2232 )
...
* Various refactoring to support viewing list view in context menu and suppressed tree node
* Bugfixes per Maxime review
* Fix URL param collision
* Fix show in list on detail view
* Remove AJAX for show in list. Use hard refresh to keep URL state
2018-08-14 16:08:36 +12:00
Guy Marriott
d4995f5204
FIX Separating ModelAsController catch-all route to apply after all other configuration
2018-08-10 12:21:25 +12:00
Luke Edwards
98ca0c3026
Merge pull request #2223 from creative-commoners/pulls/4.2/afterrr
...
FIX CMS routes are now run after #coreroutes without re-including itself
2018-08-07 14:15:44 +12:00
Robbie Averill
df7396e884
FIX CMS routes are now run after #coreroutes without re-including itself
2018-08-07 11:51:49 +12:00
root
c611c981e4
Update translations
2018-07-30 14:12:45 +00:00
Daniel Hensby
aacb405b41
Merge tag '4.2.0' into 4.2
...
Release 4.2.0
2018-07-30 11:10:04 +01:00
root
d970d57ed9
Update translations
2018-07-24 19:07:48 +00:00
Robbie Averill
0495ff20f5
Update Postgres version in Travis builds for 4.2.x
2018-07-23 19:26:34 +01:00
Daniel Hensby
b653ebfe7a
Merge branch '4.1' into 4.2
2018-07-23 14:50:50 +01:00
Daniel Hensby
df5042dc0f
Merge branch '4.0' into 4.1
2018-07-23 14:48:49 +01:00
Loz Calver
9dce915d78
Merge pull request #2212 from creative-commoners/pulls/4.1/revert-button-class
...
FIX Restore button now has warning colour and correct icon
2018-07-13 09:28:21 +01:00
Robbie Averill
e80c7e712b
FIX Restore button now has warning colour and correct icon
2018-07-13 12:11:33 +12:00
Robbie Averill
21d18951f0
Update Postgres version in Travis builds for 4.2.x
2018-06-25 14:42:02 +12:00
Robbie Averill
5b8242c596
Merge pull request #2198 from creative-commoners/pulls/4.2/update-illegal-extensions
...
Update illegal extensions
2018-06-20 13:38:01 +12:00
Raissa North
6b2a9e4f77
Update class references and array syntax
2018-06-20 13:18:29 +12:00
Robbie Averill
e515423c26
Merge pull request #2197 from creative-commoners/pulls/4.2/update-class-references-and-array-syntax
...
Update class references and array syntax in VirtualPageTest
2018-06-20 10:37:41 +12:00
Raissa North
5f3e95cd64
Update class references and array syntax in VirtualPageTest
2018-06-20 10:17:38 +12:00
Damian Mooyman
6acaa0cd27
Update translations
2018-06-19 16:50:07 +12:00
Damian Mooyman
85c5edd523
Update translations
2018-06-15 15:39:15 +12:00
Damian Mooyman
130c28bc86
Remove obsolete branch-alias
2018-06-15 15:29:57 +12:00
Ingo Schommer
471ecd1148
Merge pull request #2190 from open-sausages/pulls/4/update-recipe-branch
...
Update recipe branching
2018-06-14 16:45:36 +12:00
Damian Mooyman
609b4208bf
Update recipe branching
2018-06-14 13:50:26 +12:00
Damian Mooyman
932eb2b22d
BUG Fix CMS components failing to register on other CMS sections ( #2182 )
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/7996
2018-06-13 13:11:06 +12:00
