tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
5,384 Commits 29 Branches 403 Tags 28 MiB
8953c09e9a
Commit Graph

5384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
d820b26b46 Merge branch 'ishannz-master' 2017-04-22 11:45:12 +12:00
Ingo Schommer
cf2b0417cb Fix coding conventions 2017-04-22 11:44:49 +12:00
Christopher Joe
4b19987ad2 FIx tweak visibility around the slideDown/slideUp animation 2017-04-21 16:38:34 +12:00
Ishan Jayamanne
3b69a47158 fix Hidden listbox #1785 2017-04-21 14:59:27 +12:00
Damian Mooyman
2225af75c3 Update RedirectorPageTest 2017-04-20 11:16:14 +12:00
Ingo Schommer
8fc0703d8f Merge pull request #1787 from open-sausages/pulls/4.0/tree-dropdown-react 
API Major refactor of Hierarchy
 2017-04-18 08:42:51 +12:00
Damian Mooyman
03a2a907ce
Fix whitespace in templates causing double arrows 2017-04-12 09:33:56 +12:00
Damian Mooyman
d75a3cb0e9 API Update site tree hierarchy to use a MarkingSet and template 2017-04-12 08:57:09 +12:00
Ingo Schommer
904f18cc48 Pin PHP7 build to 7.1.2 
7.1.3 breaks with segfaults: https://travis-ci.org/silverstripe/silverstripe-cms/jobs/220828001

Same fix as framework: 6cfeb7f07e
 2017-04-12 08:43:36 +12:00
Ingo Schommer
32c2353314 Merge pull request #1735 from dhensby/pulls/4/code-cov-after-success 
Move code coverage report upload to after_success
 2017-04-12 08:32:39 +12:00
Ingo Schommer
9cad8ba01b Fixed linting 2017-04-12 08:21:02 +12:00
Ingo Schommer
53b4c779f2 Merge branch 'master' into pulls/4/code-cov-after-success 2017-04-12 08:12:14 +12:00
Ingo Schommer
d677694f2e Merge pull request #1776 from open-sausages/pulls/4.0/fix-gitignore 
Remove extraneous gitignore declarations
 2017-04-12 08:08:32 +12:00
Ingo Schommer
41badd9bbb Merge pull request #1783 from open-sausages/pulls/4.0/leftandmain-cleanup 
BUG Ensure all CMS forms include full ID / VersionID in path
 2017-04-11 17:25:36 +12:00
Damian Mooyman
b1b0c6af63
BUG Ensure all CMS forms include full ID / VersionID in path 
Fixes #1510
Refactor tree operations into CMSMain
Cleanup CMSMain and subclasses
 2017-04-06 13:40:46 +12:00
Chris Joe
78143a32f8 Merge pull request #1762 from open-sausages/pulls/4.0/manifest-cache 
Update module_priority to use full module name
 2017-04-06 09:39:30 +12:00
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
Damian Mooyman
58c14298db Update module_priority to use full module name 2017-03-15 15:20:35 +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