tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
16,039 Commits 31 Branches 527 Tags 162 MiB
b2e8fd96ec
Commit Graph

16039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
2cc03bf97d Merge pull request #5085 from tylerkidd/3186-versioned-config-enhancement-revised 
ENHANCEMENT Ability to alter Versioned.versionableExtensions via config API
Fixes #5085
 2016-02-24 10:59:30 +13:00
Damian Mooyman
572ce8b278 Merge pull request #4404 from chillu/pulls/remove-dev-tests 
API Remove TestRunner and JSTestRunner
 2016-02-24 10:35:48 +13:00
scott1702
a67b8144b0 Fix incorrect height on main nav after toggle 2016-02-24 10:23:16 +13:00
Tyler Kidd
375bbf954e Enhancement and fix for issue #3186 2016-02-23 14:53:52 -06:00
Daniel Hensby
758c0273fa Merge pull request #4584 from Olliepop/feature-config-charset-collation 2016-02-23 15:42:09 +00:00
Oliver Shaw
ec647ed007 UPDATE: Add support for user defined charset and collation 2016-02-23 15:40:30 +00:00
Ingo Schommer
589fee1a8a Removed obsolete TestRunner->$skipTests flag 
Taken care of by the default PHPUnit implementation of markTestSkipped()
 2016-02-23 22:29:58 +13:00
Loz Calver
8ac1b28ef8 Merge pull request #5080 from scott1702/gridfield-overflow 
Fix dropdown cutoff on gridfield
 2016-02-23 09:16:25 +00:00
Ingo Schommer
d1af214ef5 API Removed custom dev/tests/ execution 
Rely on standard vendor/bin/phpunit via CLI instead.
See https://github.com/silverstripe/silverstripe-framework/issues/4254

- Not disabling xdebug. That should be harmful, and is actively harming test development
- No longer able to specifically skip tests via the `SkipTests` request parameter. Use phpunit.xml groups and the `--exclude-group` CLI argument instead
- No longer able to specify multiple comma-separated module folders. use phpunit.xml groups and the `--group` CLI argument instead
- Not explicitly calling `SSViewer::flush_template_cache()` (was never the case on running `phpunit` CLI anyway, and shouldn't be required any more)
 2016-02-23 20:19:35 +13:00
Ingo Schommer
a16588aac3 API Removed JSTestRunner 
See https://github.com/silverstripe/silverstripe-framework/issues/4254
 2016-02-23 20:19:12 +13:00
scott1702
b2e30a50b1 Fix hidden dropdown on gridfield 2016-02-23 17:34:50 +13:00
Ingo Schommer
c96dd629e1 Merge pull request #5001 from open-sausages/pulls/4.0/versioned-asset-control 
API File is now Versioned
 2016-02-23 14:14:55 +13:00
Damian Mooyman
510c556739 API File has Versioned extension 
API Improved support for versioned DataObject
API GridField extensions for versioned dataobjects
API De-couple File and ErrorPage
API File::handle_shortcode now respects canView()
API AssetControlExtension is now able to delete, publish, or protect files
API Upload now protects new assets by default
 2016-02-23 13:46:28 +13:00
Daniel Hensby
caf0ec3c5f Merge pull request #5074 from tractorcow/pulls/3.2/fix-publish-version 
BUG Correct behaviour of publish with $createNewVersion = true
 2016-02-22 22:52:10 +00:00
Ingo Schommer
275f726e03 Merge pull request #5046 from open-sausages/integrate-bootstrap 
Added Bootstrap Alpha.2
 2016-02-23 11:33:54 +13:00
Ingo Schommer
9079c1110a 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`
 2016-02-23 11:12:24 +13:00
David Craig
5a42a4181a Added Bootstrap Alpha.2 
- Managed by npm
- Created an `npm run css` task to compile
- Updated shrinkwrap
- Updated changelog
 2016-02-23 11:11:24 +13:00
Ingo Schommer
e7163c56d6 Merge pull request #5037 from open-sausages/pulls/4.0/tinymce 
API Update TinyMCE to 4.x
 2016-02-23 10:38:55 +13:00
Damian Mooyman
65a0981c08 BUG Correct behaviour of publish with $createNewVersion = true 
Fixes #5040
Cleanup code to make behaviour more apparent
 2016-02-23 10:15:49 +13:00
Damian Mooyman
f20ad434ce API Update TinyMCE to 4.x 
API Allow HtmlEditorField to be individually configured
BUG Fix incorrect change detection
BUG Fix missing i18n files
 2016-02-23 10:10:02 +13:00
Damian Mooyman
2e037881b6 Merge pull request #5076 from flamytwista/patch-2 
FEATURE Passing $tmpFile to extension.
 2016-02-23 09:52:39 +13:00
Taras Yemtsov
01c8d38885 FEATURE Passing $tmpFile to extension. 2016-02-22 15:11:26 +03:00
Damian Mooyman
4e265b1319 Merge pull request #5073 from benmanu/pulls/remove-jquery-livequery 
Removing unused thirdparty dependency - jquery-livequery.
 2016-02-22 16:12:53 +13:00
Damian Mooyman
b4ea87a3bf Merge pull request #5072 from robbieaverill/5071-new-line-after-cli-script-message 
Fix #5071 - add newline to default no-arg message in cli-script.php
 2016-02-22 16:08:27 +13:00
Ben Manu
dbe248500c Removing unused thirdparty dependency - jquery-livequery. 2016-02-22 14:12:41 +13:00
Robbie Averill
5d2a86db47 Fix #5071 - add newline to default no-arg message in cli-script.php 2016-02-22 13:52:12 +13:00
Damian Mooyman
e217132808 Merge pull request #5034 from scott1702/compass-gulp 
Replace Compass with gulp-sass
 2016-02-22 11:38:51 +13:00
Damian Mooyman
7df1d790d6 Merge pull request #5070 from vinstah/model-admin-buttons 
GridField export and print buttons updated to new style
 2016-02-22 10:49:51 +13:00
vinnie watson
a66ecf3591 GridField export and print buttons updated to new style 2016-02-22 10:03:39 +13:00
Damian Mooyman
94cec68c7e Merge pull request #5065 from SpiritLevel/typo 
typo in api link
 2016-02-22 09:14:51 +13:00
Damian Mooyman
1851c45535 Merge pull request #5064 from benmanu/pulls/remove-jquery-validate 
API Removing unused thirdparty dependency - jquery-validate.
 2016-02-22 09:13:28 +13:00
Damian Mooyman
c98a102121 Merge pull request #5061 from benmanu/pulls/remove-jquery-effen 
Removing unused thirdparty dependency - jquery-effen.
 2016-02-22 09:07:26 +13:00
Daniel Hensby
1468db494b Merge pull request #4992 from tractorcow/pulls/4.0/cleanup-object 
Remove Object::useCustomClass and break Object into traits
 2016-02-19 23:29:12 +00:00
David Alexander
23c6b25c6c typo in api link 2016-02-18 23:11:31 -07:00
Ben Manu
195e1a4d0d Removing unused thirdparty dependency - jquery-validate. 2016-02-19 16:55:13 +13:00
Damian Mooyman
17b42a3f89 Merge pull request #5032 from patricknelson/issue-5028-yaml-errors-empty 
FIX for #5028: Ensure empty YML configs don't break when merging them in.
 2016-02-19 15:34:17 +13:00
Damian Mooyman
1c3709371e Merge pull request #5059 from benmanu/pulls/remove-tabstrip 
Removing unused thirdparty dependency - tabstrip.
 2016-02-19 15:33:03 +13:00
Damian Mooyman
8ae0eccce5 Merge pull request #5058 from benmanu/pulls/remove-jquery-metadata 
Removing unused thirdparty dependency - jquery-metadata.
 2016-02-19 15:32:50 +13:00
Damian Mooyman
23a06776e6 Merge pull request #5057 from benmanu/pulls/remove-jquery-selector 
Removing unused thirdparty dependency - query-selector.
 2016-02-19 15:32:41 +13:00
Ben Manu
8ac92ffcf9 Removing unused thirdparty dependency - jquery-effen. 2016-02-19 15:12:43 +13:00
Damian Mooyman
beb32e2cb9 Merge pull request #5055 from benmanu/pulls/remove-greybox 
Removing unused thirdparty dependency - greybox.
 2016-02-19 14:47:57 +13:00
Damian Mooyman
676fe4c722 Merge pull request #5054 from benmanu/pulls/remove-firebug-lite 
Removing unused thirdparty dependency - firebug-lite.
 2016-02-19 14:47:34 +13:00
Ben Manu
4d907b5b1d Removing unused thirdparty dependency - jquery-live-extension. 2016-02-19 14:47:19 +13:00
Ben Manu
1902600012 Removing unused thirdparty dependency - tabstrip. 2016-02-19 14:40:16 +13:00
Ben Manu
7e116aa908 Removing legacy TODO reference for data-urlviewfile on MediaForm once metadata dep is removed. 2016-02-19 14:33:20 +13:00
Damian Mooyman
f1f662fd49 Merge pull request #5050 from SpiritLevel/3.2 
DOCS 3.2 : fixing api: links now that api: tag parser working
 2016-02-19 14:28:20 +13:00
Damian Mooyman
4ba2eb6244 Merge pull request #5053 from robbieaverill/patch-1 
Typo fixes
 2016-02-19 14:27:07 +13:00
Damian Mooyman
73ee4e5458 Merge pull request #5049 from SpiritLevel/3.1 
DOCS 3.1 : fixing api: links
 2016-02-19 14:18:37 +13:00
Damian Mooyman
7a12a5926d Merge pull request #5043 from jonom/image-deprecations 
Image deprecations and optimisation
 2016-02-19 13:58:54 +13:00
Ben Manu
abfc1d0a6c Removing unused thirdparty dependency - jquery-metadata. 2016-02-19 13:57:55 +13:00