yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,701 Commits 4 Branches 7 Tags
fe003edd02cc7d399ae535d6d7fdf38bafd04874
Commit Graph

98 Commits

Author SHA1 Message Date
sitereactor
fe003edd02 Adding language files from github localization repo. 2012-11-02 09:23:59 -01:00
Sebastiaan Janssen
3c2ac0e90e Include new files for U4-858 Default icons for Media Types 2012-10-31 12:03:52 -01:00
Sebastiaan Janssen
3b5a1ddcdd Fixed the build, forgot to remove file reference from the csproj file 2012-10-23 14:52:58 -02:00
Sebastiaan Janssen
4c667a6a3e Set web.config output to none because it might not exist when running automated 
builds like build.bat or teamcity
 2012-10-17 06:11:31 -02:00
Shannon Deminick
cc34208871 More work on installer update for packages, nearly there. 2012-10-16 03:12:16 +05:00
Shannon Deminick
6f778c26d1 Initial commit of refactoring of package installer for the installer process. Converted a few webforms pages/controls to the new format, created 
new JS class to manage the installation, created new MVC controller for managing the ajax installation
 2012-10-16 01:33:35 +05:00
Sebastiaan Janssen
f6c51205fc Re-include splitbutton.js 2012-10-12 11:41:29 -02:00
Sebastiaan Janssen
d45b5a3139 Re-include ItemEditing javascripts 2012-10-12 11:09:32 -02:00
Sebastiaan Janssen
585eea1c6b Merge 2012-10-10 11:03:27 -02:00
Sebastiaan Janssen
10095a4ee7 Upgrade to CodeMirror 2.34 2012-10-10 11:02:59 -02:00
Shannon Deminick
8f4ccc53d5 Merge 2012-10-09 20:17:51 +05:00
Shannon Deminick
f04db8c52c Converted umbracoPage.master to have the correct codebehind structure. Added base2 as a default lib in umbracoPage. 
Converted EditView to use propery JS class so that we can now better support the editor for the new buttons (i.e. insert macro, etc...)
 2012-10-09 20:17:27 +05:00
Shannon Deminick
747675816d Changed editMacro over to use the correct codebehind structure. 2012-10-08 23:57:27 +05:00
Shannon Deminick
2833a8c5c7 Changed editTemplate over to use the correct codebehind structure 2012-10-08 23:52:37 +05:00
Shannon Deminick
75a686bc07 Changed umbracoDialog.master to have correct codebehind structure. 2012-10-08 23:46:49 +05:00
Shannon Deminick
8fa36f3f22 Converted UmbracoField to use JS class Umbraco.Dialogs.UmbracoField. 
Adds base2 lib o the default umbracoDialog.Master.
 2012-10-08 23:32:43 +05:00
Niels Hartvig
ed3f715988 Container Document Types 2012-10-08 11:53:35 -02:00
tg@umbraco.com
775b2192ff Fixes U4-680: insert Macro split buttons not working 2012-10-08 08:42:47 -02:00
Sebastiaan Janssen
07e75dab15 BaseRestExtensions.Release.config should not be in the build package, output set to None 2012-10-06 11:47:01 -02:00
Shannon Deminick
45c335702d Updated view engine to look only in App_Plugins/ not App_Plugins/Packages/. 
Updated view engine to automatically create the required razor web.config in the packages
Views folder if it is not there already.
 2012-10-01 23:43:47 +05:00
Shannon Deminick
bc04d4f8da Added PluginViewEngine for App_Plugins 2012-10-01 23:22:23 +05:00
Shannon Deminick
42da98e020 Moves codebehind for EditView into UI project 2012-10-01 22:09:49 +05:00
Shannon Deminick
bac038b82d Converted treeInit.aspx so that it's codebehind and designer files are in the UI project and only 
the old TreeInit class exists in the Umbraco.Web project (not the aspx file). It needs to stay there
to maintain backwards compatibility for anyone that may have inherited from that file.
 2012-10-01 03:57:57 +05:00
Shannon Deminick
dd6d0e380e Updated the /umbraco/umbraco.aspx page to have all of it's aspx + codebehind + designer files in the UI project and 
left the original class in the Umbraco.Web project as to not break backwards compatibility for anyone that may have inherited from that
class.
 2012-10-01 03:41:37 +05:00
Shannon Deminick
b40dbf73ca Changes case back to the correct EditView 2012-10-01 03:00:05 +05:00
PerPloug
04e0b35c7d Method Renaming to follow standards 
Marking IOHelper methods as internal
Removing unneeded umbraco setting
Missing icon and missing folder in UI project
 2012-09-28 09:19:16 -02:00
Stephan
6c4869f931 merge 2012-09-28 07:08:37 -02:00
Stephan
a469e3dbe3 fix base/rest service - cleanup + new config file 2012-09-27 15:37:21 -02:00
PerPloug
c409cfa421 Create/Ui.xml file for templates 
umbracoSettings.config file
 2012-09-27 06:29:41 -02:00
Shannon Deminick
530e7ae44e removed ref to missing template file 2012-09-27 07:06:14 +07:00
Sebastiaan Janssen
f76e90990f Include packages.config anyway, just tell it to not output in the build 2012-09-26 11:58:52 -02:00
Sebastiaan Janssen
587542ace7 The build.bat file now won't exit when there's an error so you can inspect it, if there's no errors it will just exit 
Excluded missing index.cshtml file from project (was giving build error)
 2012-09-26 06:48:11 -02:00
Shannon Deminick
9b5fd3d67b Merge 2012-09-26 13:42:44 +07:00
Shannon Deminick
332b42aa49 Changed how surface controllers are routed: because we don't load plugins in via App_Plugins/[PackageName] like we did in v5 which meant that we can autoroute all plugin controllers with their own areas, in v4 we have to do something different. 
Instead (because we still want areas), we have an attribute called PluginControllerAttribute which allows a dev to assign an area name as a string. A package developer should always ensure that all of their plugin controllers are assigned to the same
area. This also lets us get rid of the GUID id part of the plugin (hopefully we can leave it out, just need to run some tests). Since we have areas, package devs can then put their views into
their own folders and not clutter up the local devs ~/Views folder. Perhaps we use App_Plugins/[PackageName] for the views like we did in v5 but need to ask on the mail list. Otherwise it will be the standard MVC:
~/Areas/[AreaName]/Views which will still also clutter up the local devs view folder if they are using Areas.
 2012-09-26 11:04:07 +07:00
Sebastiaan Janssen
48a3a920d2 Web.config file was not included, making the build fail 2012-09-25 11:53:27 -02:00
Shannon Deminick
083b18139a Adds code to RenderViewEngine to ensure the /Views folder exists and also that the razor web.config file exists there too. 
I've also added this web.config file to the sln so it should output in the build by default though it will still be created automatically if
its not there.
 2012-09-25 11:20:05 +07:00
sebastiaan
eb9937c33a Packages.config should not be included in the project as it shouldn't be in the builds 2012-09-20 10:24:56 -02:00
Morten@Thinkpad-X220
7a38d7f845 Adding TinyMCE language files for plugins and themes. There are still a few missing for the umbraco theme though. 2012-09-20 06:45:23 -02:00
Morten@Thinkpad-X220
745707dc4b Removing TinyMCE3 language files before they can be properly attached 2012-09-20 06:36:34 -02:00
sebastiaan
1f4ceaa75c Included the tinyMCE language files in the project so they'll actually be in the build 
#U4-277 Fixed
 2012-09-20 06:27:09 -02:00
Shannon Deminick
f912d465c5 Moved BaseRestHandler out of the BaseRest namespace. 
Updated PublishedMediaStore and wrote a bunch of unit tests for it which are all now passing.
 2012-09-20 07:13:45 +07:00
Stephan
2c204d9d9e refactor base/rest module into a handler so that it works again with the new UmbracoModule 2012-09-18 08:54:54 -02:00
Darren@Darren-VAIO
b5099c37c7 Standard doc type properties no longer prefixed with @ in "Insert Umbraco page field" dialogue 
Fixed #U4-859
 2012-09-16 10:49:19 -02:00
Morten@Thinkpad-X220
48c69b9335 Fixes U4-781 Removed duplicate swedish language file. 2012-09-12 05:57:27 -02:00
sebastiaan
a864fc1fe8 Fix merge problem 2012-09-11 05:29:36 -02:00
sebastiaan
8a5cd21603 Merge with default 2012-09-11 05:02:33 -02:00
sebastiaan
fe92947d72 TeamCity build fails on missing Views\Home.cshtml in Umbraco.Web.UI, removed it. 2012-09-10 12:15:03 -02:00
sebastiaan
b9165a8b70 TeamCity build fails on missing App_Code\TestClass.cs in Umbraco.Web.UI, removed it. 2012-09-10 12:10:17 -02:00
Shannon Deminick
9127061194 Added support for determining rendering engine based on template chosen. 2012-09-07 07:57:25 +07:00
Morten Christensen@ThinkPadX220.ab-nat1.dk
fa33563a36 Embed classes internal -> public. 
Renaming Embed.config to EmbeddedMedia.config
 2012-09-06 15:23:42 -02:00