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
4f9d4928aa
silverstripe-framework/admin/templates/Includes
History
Damian Mooyman e6b877df27 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.md
#	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/01_Tutorials/04_Site_Search.md
#	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
#	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
2016-01-20 13:16:27 +13:00
..
BackLink_Button.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
CMSLoadingScreen.ss Upgrade template translation syntax 2015-07-22 14:17:03 +01:00
CMSProfileController_EditForm.ss admin/myprofile layout after validation (fixes #2644) 2013-11-07 16:19:40 +01:00
CMSSectionIcon.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
CMSSettingsController_SilverStripeNavigator.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
Editor_toolbar.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
LeftAndMain_Content.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
LeftAndMain_EditForm.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
LeftAndMain_Menu.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
LeftAndMain_SilverStripeNavigator.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
ModelAdmin_Content.ss Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
ModelAdmin_EditForm.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
ModelAdmin_ImportSpec.ss Merge remote-tracking branch '3.2' into 3 2015-08-17 11:59:24 +00:00
ModelAdmin_Tools.ss Upgrade template translation syntax 2015-07-22 14:17:03 +01:00