Damian Mooyman
|
443501730b
|
Update alias for 1 branch to 1.2
|
2018-02-07 17:29:24 +13:00 |
|
Damian Mooyman
|
1d67f75dc8
|
Update translations
|
2018-02-07 16:07:28 +13:00 |
|
Chris Joe
|
98d1456384
|
Merge pull request #2088 from open-sausages/pulls/4.0/daft-draft
Add missing button styles to restore draft action
|
2018-02-07 15:51:48 +13:00 |
|
Luke Edwards
|
168b899917
|
BUG Add missing button styles to restore draft action
|
2018-02-07 14:06:21 +13:00 |
|
Damian Mooyman
|
4450d150e8
|
Merge remote-tracking branch 'origin/4.0' into 4
|
2018-02-05 18:03:03 +13:00 |
|
Damian Mooyman
|
e84e0236f1
|
Update translations
|
2018-02-05 16:58:21 +13:00 |
|
Loz Calver
|
fb30448033
|
Merge pull request #2085 from creative-commoners/pulls/4.1/warning-classes
NEW Use Bootstrap alerts instead of legacy message classes for install.php warning
|
2018-02-02 09:08:49 +00:00 |
|
Robbie Averill
|
f582954aea
|
NEW Use Bootstrap alerts instead of legacy message classes for install.php warning
|
2018-02-02 13:02:47 +13:00 |
|
Chris Joe
|
07e70148da
|
BUG Add some exist check for tabsets which may not be there (#2079)
|
2018-01-31 10:45:31 +13:00 |
|
Daniel Hensby
|
1db01ecce6
|
Merge pull request #2077 from open-sausages/pulls/4/better-url-reservation
ENHANCEMENT Ensure all base folders are excluded
|
2018-01-25 12:24:36 +00:00 |
|
Damian Mooyman
|
e99bd6f49e
|
ENHANCEMENT Ensure all base folders are excluded
ENHANCEMENT Controller names are now allowed as urlsegments
Fixes #2059
|
2018-01-25 15:33:10 +13:00 |
|
Damian Mooyman
|
540883f9de
|
Merge remote-tracking branch 'origin/4.0' into 4
|
2018-01-25 13:33:47 +13:00 |
|
Damian Mooyman
|
0ba7606828
|
Update translations
|
2018-01-25 12:15:35 +13:00 |
|
Damian Mooyman
|
cdc0aa8a5b
|
Merge remote-tracking branch 'origin/4.0' into 4
# Conflicts:
# client/dist/js/bundle.js
|
2018-01-22 15:16:14 +13:00 |
|
Robbie Averill
|
2694de7d9b
|
Merge pull request #2074 from sachajudd/pulls/4.0/url-button-styles
FIX Add bootstrap styles to url segment field
|
2018-01-18 16:20:07 +13:00 |
|
Sacha Judd
|
f282df89ea
|
FIX Add bootstrap styles to url segment field
|
2018-01-18 12:28:01 +13:00 |
|
Daniel Hensby
|
b9755f0e82
|
Merge pull request #2044 from mikenz/asset-admin-missing-cms-usage
File Form missing CMS Usage information
|
2018-01-16 08:35:26 +00:00 |
|
Damian Mooyman
|
cb2745c737
|
Refactor and cleanup SiteTreeFileFormFactoryExtension
|
2018-01-16 16:53:11 +13:00 |
|
Mike Cochrane
|
8b19afe235
|
File Form missing CMS Usage information
|
2018-01-16 15:48:15 +13:00 |
|
Daniel Hensby
|
d677760b24
|
Merge branch '3' into 4
|
2018-01-15 16:52:47 +00:00 |
|
Daniel Hensby
|
5a77ec8cea
|
Merge branch '4.0' into 4
|
2018-01-15 16:19:22 +00:00 |
|
Daniel Hensby
|
a77a7cfe35
|
Merge branch '3.6' into 4.0
|
2018-01-15 15:49:47 +00:00 |
|
Daniel Hensby
|
54047719c0
|
Merge branch '3.6' into 3
|
2018-01-15 14:56:43 +00:00 |
|
Damian Mooyman
|
23a23043bc
|
Fix successfullyinstalled() (#2069)
Cleanup ContentController.php
|
2018-01-12 14:39:27 +13:00 |
|
Daniel Hensby
|
169f75c7ba
|
Merge pull request #2070 from emteknetnz/fix-history-js
Update page history javascript to fix big performance issue
|
2018-01-11 10:04:03 +00:00 |
|
Steve Boyd
|
12ee49ccbd
|
Use regex with word boundaries to replace 'active'
|
2018-01-11 09:42:27 +13:00 |
|
Steve Boyd
|
fa8b9c143a
|
Update page history javascript so that it does not continously call element.compareDocumentPosition
|
2018-01-10 20:54:02 +13:00 |
|
Daniel Hensby
|
d41cb312e2
|
Merge pull request #2068 from creative-commoners/pulls/4.0/issue-reporting-link
DOCS Update documentation links, remove forums link and helpful robot badge
|
2018-01-09 13:44:12 +00:00 |
|
Robbie Averill
|
29fb386c61
|
DOCS Update documentation links, remove forums link and helpful robot badge
|
2018-01-09 14:24:45 +13:00 |
|
Damian Mooyman
|
eb46974ad4
|
Merge pull request #2066 from creative-commoners/pulls/4.0/update-subsites-namespace
FIX Implement correct subsites namespace in File extension
|
2018-01-08 18:23:14 +13:00 |
|
Robbie Averill
|
157aef8eb7
|
FIX Implement correct subsites namespace in File extension
|
2018-01-08 15:40:48 +13:00 |
|
Chris Joe
|
a5160b963c
|
Merge pull request #2062 from open-sausages/pulls/4/no-view-toggle-when-search
FIX no button view type toggle when searching pages
|
2017-12-21 12:25:01 +13:00 |
|
Daniel Hensby
|
3997470b6a
|
Merge pull request #2060 from open-sausages/pulls/4.1/to-test-or-not-to-test
FIX Amend rules to ignore test files only
|
2017-12-20 14:24:02 +00:00 |
|
Saophalkun Ponlu
|
2fd81eea9e
|
FIX no button view type toggle when searching pages
|
2017-12-20 11:54:27 +13:00 |
|
Christopher Joe
|
646ba57152
|
FIX Amend rules to ignore test files only
|
2017-12-20 11:14:04 +13:00 |
|
Chris Joe
|
d5148e3b38
|
Merge pull request #2056 from open-sausages/pulls/4.0/add-page-root-breadcrumb-title
Add root breadcrumb title to add page form
|
2017-12-19 12:17:08 +13:00 |
|
Saophalkun Ponlu
|
502998bcb6
|
Add root breadcrumb title to add page form
|
2017-12-19 10:36:33 +13:00 |
|
Damian Mooyman
|
4d9a5ce943
|
Merge remote-tracking branch 'origin/4.0' into 4
# Conflicts:
# tests/php/Controllers/CMSMainTest.php
|
2017-12-19 10:33:38 +13:00 |
|
Damian Mooyman
|
c4b2782ce0
|
Automatic linting fixes
|
2017-12-19 10:31:25 +13:00 |
|
Damian Mooyman
|
3efcd09f0a
|
Merge pull request #2053 from open-sausages/pulls/4.1/composer-does-prefer-dist
Feature Set .gitattributes to ignore docs and tests folder, and …
|
2017-12-18 17:50:35 +13:00 |
|
Damian Mooyman
|
6a24daa093
|
Update .travis.yml
|
2017-12-18 16:22:46 +13:00 |
|
Christopher Joe
|
2985b4a6e9
|
Feature Set .gitattributes to ignore docs and tests folder, and some source asset files which are not needed
|
2017-12-18 16:16:42 +13:00 |
|
Damian Mooyman
|
227ce39414
|
Merge branch '4.0' into 4
|
2017-12-18 16:16:20 +13:00 |
|
Damian Mooyman
|
2c034ac501
|
Merge pull request #2049 from open-sausages/pulls/4/remember-pages-viewtype
Remember pages view type
|
2017-12-14 09:21:58 +13:00 |
|
Damian Mooyman
|
210213a455
|
Fix search behaviour
|
2017-12-13 18:16:34 +13:00 |
|
Damian Mooyman
|
073cb77500
|
Trim some unnecessary API
|
2017-12-13 17:10:39 +13:00 |
|
Saophalkun Ponlu
|
8a04e9c46b
|
Fix wrong/confusing url segment
|
2017-12-13 17:10:39 +13:00 |
|
Saophalkun Ponlu
|
b391db4977
|
Fix search view
|
2017-12-13 17:10:39 +13:00 |
|
Saophalkun Ponlu
|
042dbbb13d
|
Remember pages view type
|
2017-12-13 17:10:39 +13:00 |
|
Damian Mooyman
|
6b0863d362
|
Merge pull request #2048 from open-sausages/pulls/4.0/sitetree-can-create-cache
ENHANCEMENT: Cache canCreate in CMSMain
|
2017-12-13 16:55:35 +13:00 |
|