Commit Graph

5266 Commits

Author SHA1 Message Date
Damian Mooyman
358bb8baec API Remove insert-media tests (now covered by asset-admin, not cms) 2017-02-27 11:00:10 +13:00
Damian Mooyman
6befcee3c5 Fix issue with CI installing non-dev dependencies 2017-02-27 08:48:55 +11:00
Ingo Schommer
6bae804744 API Use symfony/cache
See https://github.com/silverstripe/silverstripe-framework/issues/6252
2017-02-26 14:57:52 +13:00
Daniel Hensby
dd5c050108 Merge pull request #1734 from open-sausages/pulls/4.0/i18n-locale
Update CMS for new i18n API
2017-02-15 22:35:17 +00:00
Damian Mooyman
945eba8efb Update CMS for new i18n API 2017-02-09 16:11:11 +13:00
Daniel Hensby
a7c3befd8f
Merge branch '3' 2017-02-08 10:54:34 +00:00
Daniel Hensby
8a76a2ea8f
Merge branch '3' 2017-02-08 10:27:35 +00:00
Damian Mooyman
12377fcc9b Merge 3.5 into 3 2017-02-08 11:56:39 +13:00
Damian Mooyman
f35e62afc5 Merge 3.4 into 3.5 2017-02-08 11:55:10 +13:00
Damian Mooyman
db2b55c3da Merge 3.4.5 into 3.4 2017-02-08 11:52:41 +13:00
Damian Mooyman
ba43d120cd Update translations 2017-02-08 11:05:29 +13:00
Damian Mooyman
6fec151f2b Update translations 2017-02-08 10:29:07 +13:00
Daniel Hensby
68b49921f9
Merge branch '3.5' into 3 2017-02-07 17:41:18 +00:00
Daniel Hensby
c088ee5332
Merge branch '3.4' into 3.5 2017-02-07 17:39:58 +00:00
Daniel Hensby
75115bc490
Merge tag 'refs/tags/3.4.4' into 3.4
Release 3.4.4
2017-02-07 17:39:01 +00:00
Daniel Hensby
27f8acf373 Merge pull request #1705 from dhensby/pulls/3/cleanup
Remove redundant label
2017-02-03 11:20:37 +00:00
Daniel Hensby
f032fe2301 Merge pull request #1730 from robbieaverill/bugfix/redirector-page-remapping
FIX Remap redirector and virtual page class names during build
2017-02-01 01:01:47 +00:00
Daniel Hensby
aa2d0fb247
Merge branch '3.4' into 3.5 2017-01-31 20:09:00 +00:00
Daniel Hensby
1f3802d48d
Merge remote-tracking branch 'upstream/3.4.4' into 3.4 2017-01-31 20:06:54 +00:00
Dan Hensby
9917cee7bd Update translations 2017-01-31 11:39:08 +00:00
Ingo Schommer
e7e184d90e Merge pull request #1727 from open-sausages/pulls/4.0/psr2-cms
PSR2 for CMS + linting
2017-01-31 16:52:58 +13:00
Damian Mooyman
ac6083c9a2 Merge pull request #1731 from trewq/asset-upload-directory-fix
Fix error when uploading file and ASSETS_DIR is a subdirectory
2017-01-31 15:47:16 +13:00
Damian Mooyman
a80b8aef60 Lint php coding standards via CI 2017-01-31 15:12:25 +13:00
Robbie Averill
d8fe6d020f FIX Remap redirector and virtual page class names during build 2017-01-31 14:10:27 +13:00
Damian Mooyman
c7214b4dcd Auto-convert to psr2 2017-01-31 13:59:35 +13:00
Brendan Halley
10d9f9080b Fix to allow ASSETS_DIR to be a subdirectory 2017-01-31 09:46:14 +11:00
Damian Mooyman
5c84f7ac14 Merge pull request #1728 from dhensby/pulls/4/travis-npm-dist-build
CI Check dist files are correctly built
2017-01-31 09:53:12 +13:00
Daniel Hensby
90b6c9d942
CI Check dist files are correctly built 2017-01-30 20:23:52 +00:00
Dan Hensby
ce9b05d21d Update translations 2017-01-26 21:02:38 +00:00
Dan Hensby
94cdea8e65 Update translations 2017-01-26 18:30:10 +00:00
Daniel Hensby
554bbc90a2 Merge pull request #1724 from open-sausages/pulls/4.0/i18n-symfony
Upgrade cms for new i18n backend
2017-01-26 09:06:16 +00:00
Damian Mooyman
fa2b87172c
Upgrade cms for new i18n backend 2017-01-26 11:39:20 +13:00
Dan Hensby
47b6b2cd0e Update translations 2017-01-25 16:46:33 +00:00
Daniel Hensby
36de854707 Merge pull request #1726 from open-sausages/pulls/4.0/fix-install-template
BUG Fix reference to Install_deleteinstallfiles
2017-01-25 10:59:04 +00:00
Damian Mooyman
732b1f0a57
BUG Fix reference to Install_deleteinstallfiles
Fixes #1719
2017-01-25 18:03:18 +13:00
Daniel Hensby
8a89876658
Building JS bundle 2017-01-24 13:00:16 +00:00
Daniel Hensby
3659704f75 Merge pull request #1725 from mikenz/patch-4
FIX: Javascript .addAttr() doesn't exist
2017-01-24 12:14:23 +00:00
Mike Cochrane
00de0989f4 FIX: Javascript .addAttr() doesn't exist
When there's no templates that can be added in the root /admin/pages/add/ hits a JS error and never completes loading
2017-01-24 16:28:26 +13:00
Daniel Hensby
afd98a2ac0 Merge pull request #1720 from colintucker/fix-controller-init-visibility
Changed init() visibility to protected
2017-01-23 16:37:45 +00:00
Colin Tucker
00c81d8672 Changed init() visibility to protected 2017-01-22 09:35:14 +11:00
Daniel Hensby
3f53da050c
Merge branch '3' 2017-01-17 12:33:26 +00:00
Daniel Hensby
6f05242e3b
Merge branch '3.5' into 3 2017-01-17 12:33:03 +00:00
Daniel Hensby
cb3008956f
Merge branch '3.4' into 3.5 2017-01-17 12:31:18 +00:00
Ingo Schommer
cfe23dd5aa Update translations 2017-01-17 16:11:43 +13:00
Damian Mooyman
540a80766d Merge pull request #1713 from hailwood/patch-1
Clean up code for url-segment checks
2017-01-16 17:44:12 +13:00
Matthew Hailwood
df0ce184bf Clean up code
Just making it a little clearer what's going on by changing the variable names and removing some redundant code.
2017-01-16 13:20:44 +13:00
Ingo Schommer
9f01cce694 Merge pull request #1712 from robbieaverill/bugfix/update-page-fixture-for-psr-2
FIX Separate PageController fixture into its own file (PSR-2 compat)
2017-01-12 11:34:18 +13:00
Robbie Averill
773c848c0f FIX Separate PageController fixture into its own file (PSR-2 compat) 2017-01-12 10:05:05 +13:00
Daniel Hensby
05b5e545e0 Merge pull request #1703 from robbieaverill/feature/psr2-compliant-controller-names
API Allow controller discovery without underscore (PSR-2 compliance)
2017-01-11 15:28:11 +00:00
Ingo Schommer
5ec902463c Merge pull request #1699 from open-sausages/features/4.0/ui-button-refresh
Refresh CMS UI buttons to new flat style and bootstrap classes
2017-01-11 23:00:57 +13:00