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
f89f203392
silverstripe-framework/admin
History
Ingo Schommer 25b6175e67 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	forms/FormField.php
2013-10-20 13:52:56 +02:00
..
code Merge remote-tracking branch 'origin/3.1' 2013-10-20 13:52:56 +02:00
css Merge remote-tracking branch 'origin/3.1' 2013-10-20 13:52:56 +02:00
images FEATURE: Disable specific tree nodes in TreeDropdownField 2013-10-02 12:53:23 +01:00
javascript Merge remote-tracking branch 'origin/3.1' 2013-10-20 13:52:56 +02:00
scss Merge remote-tracking branch 'origin/3.1' 2013-10-20 13:52:56 +02:00
templates Merge remote-tracking branch 'origin/tmp-3.1.0' into 3.1 2013-10-07 15:19:07 +02:00
tests Unit test coverage for CMSMenuItem 2013-10-09 10:43:53 +01:00
thirdparty Updated history.js dependency 2013-03-20 00:46:32 +01:00
_config.php Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-07 16:18:20 +02:00
.gitignore MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
config.rb MINOR Removing compass asset_cache_buster functionality, as it wrongly changes the hashes even if files haven't changed, causing merging hassles - leave cache control to the webserver 2011-12-20 17:46:43 +01:00