tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-29 07:59:37 +02:00
Code Issues Projects Releases Wiki Activity
4,986 Commits 30 Branches 398 Tags 25 MiB
1cc1aa8dae
Commit Graph

4986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
6be57343f9 Merge pull request #1436 from camfindlay/patch-1 
Add license file
 2016-04-04 18:25:24 +12:00
Cam Findlay
4c419ae4ae License moved to own file 2016-04-04 16:34:04 +12:00
Cam Findlay
1755714210 Add license file 
While this is in the README it's common to have a separate license file to make it clear this is FOSS.
 2016-04-04 16:33:01 +12:00
Damian Mooyman
716baa6b1f API Support renamed Versioned API 2016-04-01 16:17:47 +13:00
Damian Mooyman
d22ad706a9 API Support new DataObject::can() signature 2016-04-01 16:17:47 +13:00
Damian Mooyman
5852cd56a5 Merge pull request #1433 from open-sausages/pulls/4.0/build-tooling-fixes 
Build tooling fixes
 2016-03-31 11:56:06 +13:00
Ingo Schommer
491d532dfa Merge pull request #1413 from chillu/pulls/3.2/disable-xdebug-travis 
Disable xdebug on Travis runs
 2016-03-30 07:49:43 +13:00
Ingo Schommer
5f9077242a Disable xdebug on Travis runs 
We're not using it for code coverage,
and it's slowing down both composer and phpunit builds.

Recommended by Travis:
https://docs.travis-ci.com/user/speeding-up-the-build/#PHP-optimisations
 2016-03-29 17:22:02 +13:00
Daniel Hensby
478d04327b Merge pull request #1434 from open-sausages/pulls/4.0/cms-set-form 
Ensure all form fields have a form set
 2016-03-28 11:04:57 +01:00
David Craig
a9d839396d Ensure all form fields have a form set 2016-03-28 22:25:04 +13:00
Ingo Schommer
b71a3d2b86 Added .gitattributes, ignoring src files and binary diffs 2016-03-28 22:22:43 +13:00
Ingo Schommer
abe565eb01 JS build tooling fixes 
- Relaxed NodeJS dependency to 4.x

- Switch to NPM "dependencies" (rather than dev)
Provides consistency with framework, where these had previously
been broken out between "dependencies" and "devDependencies", which in turn caused issues with "npm shrinkwrap"

- Add npm-shrinkwrap.json: Consistent with framework approach
Using uber's wrapper library since it prevents npm shrinkwrap from failing on file generation,
as well as actually suceeding with an "npm install" once the file is present.

- Don't add comments to dist files via babelify
We've had some issues with different dependencies causing different results based on the environment,
which in turn causes unnecessary diffs - making our work harder to review.
Comments can be read through the ES6 source files, and through source maps when
generated through `npm run build --development`

- Make JS build tooling and naming consistent with framework
 2016-03-28 22:22:21 +13:00
Ingo Schommer
ee3158183f "npm run lock" command 
Uses https://github.com/uber/npm-shrinkwrap instead of the built-in "npm shrinkwrap" since it works more reliably.
Specifically, "npm install" doesn't fail depending on node_modules/ being installed in the local cache or not.
It also makes npm-shrinkwrap.json easier to diff by more consistently ordering its output between runs.

If you need any convincing that this is a problem, look at the over 400 issues related to "shrinkwrap"
in https://github.com/npm/npm/search?q=shrinkwrap&type=Issues&utf8=%E2%9C%93
 2016-03-28 13:45:03 +13:00
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
Damian Mooyman
cf0a19e5a6 Merge pull request #1431 from dhensby/pulls/3.2/link-tracking-fix 
FIX Link tracking not escaping `#`
 2016-03-22 17:57:56 +13:00
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