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
4,753 Commits 29 Branches 403 Tags 28 MiB
c8b3ebb7a8
Commit Graph

4753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
c8b3ebb7a8 Merge pull request #1432 from sminnee/php7-support 
FIX: Changes to support php7 and new DBFields
 2016-03-23 10:21:16 +13:00
Sam Minnee
46b35ecb0e FIX: Changes to support php7 and new DBFields 
These changes are necessary for CMS to work with this API breakage:
https://github.com/silverstripe/silverstripe-framework/pull/4551
 2016-03-23 10:05:05 +13:00
Ingo Schommer
209e1568c3 Merge pull request #1423 from open-sausages/pulls/4.0/tinymce-image-shortcode 
TinyMCE image shortcodes
 2016-03-21 15:02:40 +13:00
Damian Mooyman
067d44ac6c API Update link tracking for image shortcodes 2016-03-21 09:08:31 +13:00
Hamish Friedlander
3017028755 Merge pull request #1415 from open-sausages/features/triggered-publishing 
API Update uses of versioned
 2016-03-17 21:20:40 +13:00
Damian Mooyman
4cc7b0806d API Update to use new Versioned API 
API CMS notifications for recursive operations
API Un-deprecated delete action and batch actions
API remove deprecated API
 2016-03-17 13:44:26 +13:00
Damian Mooyman
849cd898a4 Cleanup trailing whitespace 2016-03-09 10:28:45 +13:00
Ingo Schommer
08202f018f Merge pull request #1401 from open-sausages/pulls/4.0/ownership-api 
API Mark image tracking as owned
 2016-03-08 11:55:01 +13:00
Damian Mooyman
de6db9f5c6 API Mark image tracking as owned 2016-03-08 10:58:33 +13:00
Damian Mooyman
a737f9c901 Merge pull request #1410 from open-sausages/features/form-schema 
Form Schema
 2016-03-08 10:55:20 +13:00
Ingo Schommer
6a53e607f5 Replace CMSForm use with new setValidationResponseCallback() API 
Preparing for form schema API, see https://github.com/silverstripe/silverstripe-framework/issues/4938
 2016-03-07 16:49:33 +13:00
Ingo Schommer
b4c4c636f2 Merge remote-tracking branch 'origin/3' 2016-03-04 17:07:23 +13:00
Ingo Schommer
fa8f5b3f2b Merge remote-tracking branch 'origin/3.3' into 3 2016-03-04 14:35:06 +13:00
Damian Mooyman
ffdfac6af4 Merge branch '3.2' into 3.3 
# Conflicts:
#	lang/en.yml
#	lang/sk.yml
 2016-02-29 16:47:11 +13:00
Damian Mooyman
2406881d3e Merge remote-tracking branch 'origin/3.3.1' into 3.3 
# Conflicts:
#	lang/cs.yml
 2016-02-29 16:44:01 +13:00
Damian Mooyman
1eed3608ad Merge branch '3.1' into 3.2 
# Conflicts:
#	code/controllers/CMSMain.php
 2016-02-29 16:41:01 +13:00
Damian Mooyman
ba9c3378e2 Merge remote-tracking branch 'origin/3.2.3' into 3.2 2016-02-29 16:38:38 +13:00
Damian Mooyman
d6292b9b55 Merge remote-tracking branch 'origin/3.1.18' into 3.1 2016-02-29 16:34:26 +13:00
Damian Mooyman
77d506547c Update translations 2016-02-29 15:01:55 +13:00
Damian Mooyman
80959dc441 Update translations 2016-02-29 15:01:10 +13:00
Damian Mooyman
e6f9e71a0f Update translations 2016-02-29 14:57:30 +13:00
Damian Mooyman
05a9c760f8 Update translations 2016-02-27 20:38:29 +13:00
Damian Mooyman
a89debb962 Update translations 2016-02-27 20:38:19 +13:00
Damian Mooyman
be980a50fc Update translations 2016-02-27 20:35:10 +13:00
Damian Mooyman
99c72fce5f Merge remote-tracking branch 'origin/3' 2016-02-25 14:52:55 +13:00
Ingo Schommer
d9e292ba28 Require-dev for PHPUnit 
If not set, it breaks the root composer.json generation in travis-support, since it falls back to PHPUnit 3.7.
See https://github.com/silverstripe-labs/silverstripe-travis-support/blob/master/src/ComposerGenerator.php
 2016-02-25 08:43:02 +13:00
Ingo Schommer
8f2e486dc5 Forcing Behat 2.x dependency 
Due to `"prefer-stable": true`, composer will use the 1.0.0 release which had a wrong dependency constraint (not limited to 3.x). It's too early to tag behat-extension 2.0.0 already in terms of semver - so we opt for installing the 2.x dev version instead.
 2016-02-24 23:50:48 +13:00
Ingo Schommer
dd71c8d9df Remove Behat-related code dependant on PHPUnit 3.x 
We've upgraded SilverStripe core to PHPUnit 4.x now
 2016-02-24 20:11:21 +13:00
Ingo Schommer
1a8caad950 Merge pull request #1400 from open-sausages/pulls/4.0/fix-behat 
BUG Fix behat tests for asset abstraction
 2016-02-24 18:21:32 +13:00
Damian Mooyman
2734f1a18e Merge remote-tracking branch 'origin/3.3' into 3 2016-02-24 17:35:46 +13:00
Damian Mooyman
208497ea42 Merge remote-tracking branch 'origin/3.2' into 3.3 
# Conflicts:
#	lang/en.yml
#	lang/lt.yml
 2016-02-24 17:32:58 +13:00
Damian Mooyman
65aa5bccae Merge remote-tracking branch 'origin/3.3.0' into 3.3 2016-02-24 17:31:47 +13:00
Damian Mooyman
a5e1a93948 Merge remote-tracking branch 'origin/3.2.2' into 3.2 2016-02-24 17:04:32 +13:00
Damian Mooyman
af02352c8c Merge remote-tracking branch 'origin/3.1.17' into 3.1 2016-02-24 16:55:12 +13:00
Damian Mooyman
a5444c3eeb Update translations 2016-02-24 16:06:03 +13:00
Damian Mooyman
4c3761f42c Update translations 2016-02-24 15:20:40 +13:00
Damian Mooyman
4849aa828e Update translations 2016-02-24 15:14:58 +13:00
Damian Mooyman
beba0f2551 BUG Fix behat tests for asset abstraction 
Requires https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/111
 2016-02-24 15:01:40 +13:00
Ingo Schommer
94fcfa48ed Merge pull request #1381 from open-sausages/pulls/4.0/versioned-asset-control 
API Support versioned File management
 2016-02-23 14:15:13 +13:00
Ingo Schommer
4acc256095 Merge pull request #1394 from open-sausages/pulls/4.0/tinymce 
Upgrade TinyMCE to 4.x
 2016-02-23 10:39:00 +13:00
Damian Mooyman
1c907dd227 API Support versioned File management 
API Decouple File and ErrorPage
API Link tracking is now only performed on stage (in lieu of versioned relationships)
API Refactor versioned API methods out of SiteTree and into Versioned
 2016-02-22 12:25:25 +13:00
Daniel Hensby
c8748f58f3 Merge pull request #1395 from tractorcow/pulls/4.0/cleanup-object 
API Remove references to class aliases; Use correct classname
 2016-02-19 23:30:26 +00:00
Damian Mooyman
aeea8b55a2 Merge remote-tracking branch 'origin/3.2.2' into 3.2 2016-02-19 12:52:11 +13:00
Damian Mooyman
2ac0a555ea Merge remote-tracking branch 'origin/3.1.17' into 3.1 2016-02-19 12:49:10 +13:00
Damian Mooyman
33bf5f9519 Update translations 2016-02-19 10:54:36 +13:00
Damian Mooyman
42cedb70b9 Update translations 2016-02-19 10:21:02 +13:00
Damian Mooyman
5a4ef9b408 Merge pull request #1397 from scott1702/fix-lang 
Correctly require CMS lang files
 2016-02-19 09:39:38 +13:00
scott1702
26613dc39e Correctly require CMS lang files 2016-02-18 12:05:27 +13:00
Damian Mooyman
13f21231d6 Merge pull request #1396 from andrewandante/3.1-rollback-exemption 
BUG Use correct formaction for doRollback exemption #1378
 2016-02-17 16:29:58 +13:00
Andrew Aitken-Fincham
644c807031 BUG Use correct formaction for doRollback exemption #1378 2016-02-17 10:20:38 +13:00