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
b346d2b4d3
silverstripe-framework/admin
History
Mateusz Uzdowski 8bf3853887 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
2014-08-14 09:08:26 +12:00
..
code Merge remote-tracking branch 'origin/3.1' 2014-08-14 09:08:26 +12:00
css Merge remote-tracking branch 'origin/3.1' 2014-02-04 08:19:04 +13:00
images Dialog icon size 2013-12-21 16:11:06 +13:00
javascript Merge remote-tracking branch 'origin/3.1' 2014-08-14 09:08:26 +12:00
scss Merge remote-tracking branch 'origin/3.1' 2014-02-04 08:19:04 +13:00
templates added logout url to Security and deprecated Security::set_login_url in favour of config 2013-12-20 21:55:54 +00:00
tests Merge remote-tracking branch 'origin/3.1' 2014-08-14 09:08:26 +12:00
thirdparty Updated history.js dependency 2013-03-20 00:46:32 +01:00
_config.php Fix: WYSIWYG now returns valid HTML in tables 2014-04-01 10:16:07 +13:00
.gitignore MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
config.rb Set default encoding for compass 2013-10-30 16:11:11 +00:00