tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,316 Commits 28 Branches 397 Tags 24 MiB
Commit Graph

5316 Commits

Author SHA1 Message Date
Damian Mooyman 780878e6a1
Remove extraneous gitignore declarations 2017-04-06 09:34:15 +12:00
Chris Joe 3c00c437f4 Merge pull request #1774 from open-sausages/pulls/4.0/6258-update-archive-warning-msg 
ENHANCEMENT Update archive warning message
 2017-04-06 09:20:08 +12:00
Damian Mooyman 8f8553a737 Update translations 2017-04-05 16:08:16 +12:00
Christopher Joe e12a2709d0 Fix syntax error in selector 2017-04-05 15:14:12 +12:00
Saophalkun Ponlu b8db45055c Enhancement Refactor archive message to a separate method 2017-04-05 12:45:41 +12:00
Saophalkun Ponlu 5b90141c03 ENHANCEMENT Update archive warning message 2017-04-04 11:26:46 +12:00
Damian Mooyman 393d392de1 Merge pull request #1775 from open-sausages/pulls/4.0/6626-remove-jquery-datepicker 
HTML5 Date and Time Fields
 2017-04-04 10:57:16 +12:00
Ingo Schommer d07115e665 Use new DateField->setHTML5() 
See https://github.com/silverstripe/silverstripe-framework/issues/6626
 2017-04-03 12:01:12 +12:00
Daniel Hensby 83e0947b24 Merge pull request #1772 from dhensby/pulls/test-update 
Test fixes for upstream changes
 2017-03-30 16:10:37 +01:00
Daniel Hensby 72cbf83507
Test fixes for upstream changes 2017-03-30 15:37:22 +01:00
Daniel Hensby 2cb78e9255 Update PHPUnit version 2017-03-30 15:20:15 +01:00
Daniel Hensby 018766d488 Merge pull request #1769 from open-sausages/pulls/4.0/fix-description-clash 
API Rename SiteTree::description() to SiteTree::classDescription()
 2017-03-30 15:03:47 +01:00
Damian Mooyman 52915db52e Merge pull request #1770 from sminnee/license-file 
FIX: Rename license file to match module standard.
 2017-03-29 17:34:41 +13:00
Sam Minnee ae5b5a95ce FIX: Rename license file to match module standard. 2017-03-29 12:50:43 +13:00
Damian Mooyman 98e77a48a9
API Rename SiteTree::description() to SiteTree::classDescription() to prevent clash 
Fixes #1733
 2017-03-29 11:55:44 +13:00
Ingo Schommer b8d9578679 Merge pull request #1767 from open-sausages/pulls/4.0/fix-builds 
Only git-diff files in client folder
 2017-03-28 19:49:15 +13:00
Ingo Schommer fb0c69f877 Only git-diff files in client folder 
We only care about the dist files. If we diff in the root folder,
we'll get false positives on composer.json changes.

See https://travis-ci.org/silverstripe/silverstripe-cms/jobs/215796957
 2017-03-28 19:30:38 +13:00
Ingo Schommer b7dff27ec1 Merge pull request #1765 from open-sausages/pulls/4.0/campaign-admin-module 
Update class namespace for campaign admin
 2017-03-28 17:50:37 +13:00
Ingo Schommer 6cd98a80bb Added campaign-admin dependency 2017-03-28 16:55:11 +13:00
Damian Mooyman 91933b6c66 Update class namespace 2017-03-28 14:01:02 +13:00
Damian Mooyman 5ce98aced2 API Upgrade to rely on silverstripe/versioned module 2017-03-28 10:35:14 +13:00
Daniel Hensby 672a31e56e Merge pull request #1763 from open-sausages/pulls/4.0/5.6-support 
Drop PHP 5.5 support
 2017-03-20 21:51:08 +13:00
Ingo Schommer d95be0e273 Remove composer self-update, handled by Travis now 2017-03-20 20:06:18 +13:00
Ingo Schommer a642f9b555 Remove PHP dev (rely on framework) 2017-03-20 20:06:18 +13:00
Ingo Schommer 7dfa6fc21c Drop PHP 5.5 support 
See https://github.com/silverstripe/silverstripe-framework/issues/6705#issuecomment-287515832
 2017-03-20 20:06:18 +13:00
Ingo Schommer b05b3bb8c7 Merge pull request #1761 from open-sausages/pulls/4.0/fix-coverage-test 
BUG Fix PHPUNIT_COVERAGE_TEST by moving to php 5 build
 2017-03-15 13:53:55 +13:00
Ingo Schommer c70bd1f115 Merge branch 'master' into pulls/4.0/fix-coverage-test 2017-03-15 13:53:46 +13:00
Ingo Schommer f8d949dfa2 Merge pull request #1760 from open-sausages/pulls/4.0/admin-module 
Add dependency on admin module
 2017-03-15 12:01:36 +13:00
Ingo Schommer 34d08cf458 Merge branch 'master' into pulls/4.0/admin-module 2017-03-15 12:01:28 +13:00
Damian Mooyman bd409bfd30
BUG Fix PHPUNIT_COVERAGE_TEST by moving to php 5 build 2017-03-13 15:48:16 +13:00
Chris Joe 319ce1861e Merge pull request #1758 from open-sausages/pulls/4.0/form-refactor 
Update SearchForm
 2017-03-13 15:22:53 +13:00
Damian Mooyman c7d9947976
Update SearchFormTest 2017-03-13 11:45:29 +13:00
Damian Mooyman c36d35a2d2 Merge pull request #1757 from mikenz/patch-5 
Fix non_virtual_fields being ignored
 2017-03-13 11:20:25 +13:00
Damian Mooyman 5092e0fc65
Add dependency on admin module 2017-03-10 16:33:32 +13:00
Damian Mooyman f65a164818
Update SearchForm 
Fix RedirectorPageTest
 2017-03-10 15:04:02 +13:00
Damian Mooyman 38c7cf710a Merge pull request #1754 from open-sausages/pulls/4.0/a-good-yarn 
Upgrade to Node6 and yarn
 2017-03-10 14:52:51 +13:00
Mike Cochrane cb955f08f7 Fix non_virtual_fields being ignored 
Fix non_virtual_fields and initially_copied_fields being ignored in classes that extent VirtualPage
 2017-03-09 17:45:37 +13:00
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