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,070 Commits 29 Branches 403 Tags 28 MiB
6524d60f75
Commit Graph

5070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
9d62d9d381 FIX Link tracking not escaping # Fixes #1409 2016-03-21 15:22:00 +00: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
Daniel Hensby
19cc7037c9 Merge pull request #1429 from jonom/file-icons 
Remove redundant CSS
 2016-03-20 07:48:25 +00:00
Daniel Hensby
e4a198401a Merge pull request #1426 from SilbinaryWolf/created-readonly-sitetreeurlsegmentfield 
NEW: Added readonly version of SiteTreeURLSegmentField
 2016-03-19 10:16:35 +00: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
Jonathon Menz
0e47583c9a Remove redundant CSS 
StripThumbnail now provides icon for all file types
 2016-03-15 12:07:20 -07:00
Jake Bentvelzen
68694c01b7 Added readonly version of SiteTreeURLSegmentFiled, small quality of life thing when a user is looking at readonly data and wants to easily view the frontend of that page. 2016-03-15 10:48:46 +11:00
Loz Calver
b05892e377 Merge pull request #1425 from tractorcow/revert-1416-pulls/title-attr 
Revert "FIX: Incorrect title attribute on CMS tabs"
 2016-03-14 09:09:05 +00:00
Damian Mooyman
d247a99769 Revert "FIX: Incorrect title attribute on CMS tabs" 2016-03-14 10:32:12 +13:00
Damian Mooyman
5dc30bc79b Merge pull request #1422 from dhensby/pulls/report-links 
FIX Use `Controller::join_links()` in Reports
 2016-03-14 09:23:28 +13:00
Daniel Hensby
bc31d9ca9c FIX Use Controller::join_links() in Reports 2016-03-10 16:39:00 +00:00
Mike Cochrane
70062ebc9c FIX 'Settings' fields being overwritten by 'Content' fields 
CMSMain::getEditForm wasn't passing the $fields parameter to the parent. The the "Settings" fields we being replaced with the "Content" settings when requesting /admin/pages/settings/show/123345
 2016-03-09 17:40:43 +13:00
Damian Mooyman
849cd898a4 Cleanup trailing whitespace 2016-03-09 10:28:45 +13:00
Daniel Hensby
11aadbe1d0 Merge pull request #1416 from kinglozzer/pulls/title-attr 
FIX: Incorrect title attribute on CMS tabs
 2016-03-08 16:07:42 +00:00
Loz Calver
036420470d FIX: Incorrect title attribute on CMS tabs 2016-03-08 15:00:29 +00: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
Damian Mooyman
a8d48b51b1 Merge pull request #1414 from Andrew-Mc-Cormack/patch-1 
Fix decide typo in comment
 2016-03-08 10:00:04 +13:00
Andrew Mc Cormack
e6078be52e Update SiteTree.php 
Minor type fix
 2016-03-07 20:37:29 +00: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
Damian Mooyman
774920363c Merge pull request #1411 from micmania1/translatable-dependency 
Removed dependency for translatable module
 2016-03-07 15:34:26 +13:00
Ingo Schommer
a3ee8b92be Merge remote-tracking branch 'origin/3.3' into 3 2016-03-07 08:49:47 +13:00
Ingo Schommer
859fd5562f Behat "insert link" regression 
See 361c9a03fe62431ea9f3fda200df80470334835f
 2016-03-07 08:48:02 +13:00
Ingo Schommer
b4c4c636f2 Merge remote-tracking branch 'origin/3' 2016-03-04 17:07:23 +13:00
Ingo Schommer
397f9670b5 Fixed core release constraint in travis.yml 2016-03-04 16:57:49 +13:00
Ingo Schommer
fa8f5b3f2b Merge remote-tracking branch 'origin/3.3' into 3 2016-03-04 14:35:06 +13:00
micmania1
7c5f29ce19 Removed dependency for translatable module 2016-03-03 23:11:49 +00: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