Commit Graph

5279 Commits

Author SHA1 Message Date
Christopher Joe
828e0e973a update webpack settings and switch to yarn 2017-03-06 15:24:19 +13:00
Damian Mooyman
9374c3458c Update translations 2017-03-01 14:08:50 +13:00
Damian Mooyman
20f6ec47c6 Merge pull request #1749 from open-sausages/pulls/4.0/show-diff
Fix history comparison fields
2017-02-28 17:01:53 +13:00
Damian Mooyman
bd1eadcdf6 Merge pull request #1747 from open-sausages/pulls/4.0/cms-view-fields
Fix for viewer and editor groups
2017-02-28 16:49:42 +13:00
Damian Mooyman
8537d6ddb1
Simplify code to use dataFields() 2017-02-28 16:34:46 +13:00
Christopher Joe
2fafff084f Fix history comparison fields will now show diff properly, rather than escaped html diff 2017-02-28 16:26:11 +13:00
Damian Mooyman
b4ad2fc630 Merge branch 'master' into pulls/4.0/cms-view-fields 2017-02-28 16:25:34 +13:00
Damian Mooyman
18a6fa05e8 Merge pull request #1750 from open-sausages/pulls/4.0/fix-test-config-regressions
FIX Config regressions
2017-02-28 16:19:19 +13:00
Damian Mooyman
8766a4c91b
Cleanup unit test classes 2017-02-28 15:46:19 +13:00
Damian Mooyman
dfe25c27f0
BUG Fix allowedChildren() and link tracking 2017-02-28 15:46:07 +13:00
Damian Mooyman
4885736b0e API Upgrade CMS to use new Config API 2017-02-28 11:30:22 +11:00
Christopher Joe
0c47bc3e62 Fix viewer and editor groups to only show when the last option is selected
Fix update package.json for linting and building
2017-02-28 10:35:13 +13:00
Damian Mooyman
a7efeb06d3 Merge pull request #1740 from open-sausages/pulls/4.0/asset-admin-filter
API Remove tests for asset-admin only behaviour
2017-02-27 13:07:32 +13:00
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