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

209 Commits

Author SHA1 Message Date
Shannon
39d7676bee Got the legacy editors working and iframe implementation almost done! 2013-06-25 08:54:36 +10:00
Shannon
ed1aee5047 Implements: #U4-1770 - no more umbracoDebugMode, will use the compilation setting in the web.config 2013-06-21 16:20:18 +10:00
Shannon
c81cd0fd1d Merge branch '6.1.2' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/config/ClientDependency.config
 2013-06-21 15:49:40 +10:00
Shannon
3f626b444f re-enables CDF logger 2013-06-21 10:55:38 +10:00
Shannon
c5b8931aa6 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
 2013-06-21 10:50:35 +10:00
Shannon
818d22ba61 updates CDF config examples (#U4-2331) 2013-06-21 10:49:27 +10:00
Shannon
27fdb1ebab removed custom dashboard, re-put back in the external index (must have got removed by accident) 2013-06-21 09:19:50 +10:00
Shannon
24a76f53b4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/Xml/XmlNodeExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.config
	src/Umbraco.Web/DefaultPublishedContentStore.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
 2013-06-20 15:49:55 +10:00
Shannon
86ce48ddc8 Fixes: #U4-2312 - Moving content with the new API (and in the old api when calling library.UpdateDocumentCache(p.Id)) The document is actually moved properly in the content XML structure without republishing it and then rebuilding the entire XML structure, it just does it inline. Have also updated MoveAndCopy.aspx dialog to use the new API which now saves on about 20+ queries that were not needed. Also updated the MoveAndCopy dialog to have the correct code behind structure. 2013-06-20 15:34:57 +10:00
Per Ploug Krogslund
8810f7d742 gitignore file 2013-06-11 12:27:05 +02:00
Shannon
1da4f2379f Temp removes uGoLive since the old TypeFinder isn't there anymore. 2013-06-09 06:19:08 -02:00
Sebastiaan Janssen
78bfb6a8cc Fix missing Examine dashboard 2013-05-30 10:26:54 -02:00
Sebastiaan Janssen
ddbe15de08 Config file formatting, remove logger from CD for now as it was throwing errors 2013-05-30 08:47:17 -02:00
Shannon Deminick
5041e6fcc4 Updated to latest CDF version that has a few bug fixes and added a CDF logger. 2013-05-28 13:24:48 -10:00
Shannon Deminick
6f26f7b57c Patching from 6.1 2013-05-08 18:08:55 -10:00
Shannon Deminick
0762decd92 Fixes up tree syncing for views, stylesheets and partial views. Now ensures we can actually 
sync a tree for a file based node that doesn't have a static id. Also ensures that when we change a
Partial view name that we don't end up duplicating some files when we change it twice in the
same session.
 2013-05-08 14:18:18 -10:00
Shannon Deminick
1f87470f89 Fixes up tree syncing for views, stylesheets and partial views. Now ensures we can actually 
sync a tree for a file based node that doesn't have a static id. Also ensures that when we change a
Partial view name that we don't end up duplicating some files when we change it twice in the
same session.
 2013-05-08 14:18:18 -10:00
Shannon Deminick
f808aac4cd Fixes: #U4-644 - DynamicNode and MVC don't output RTE values for media 2013-05-06 14:36:47 -10:00
Sebastiaan Janssen
0ca52fcc60 Fix merge issues, update version number 2013-04-29 12:29:15 -02:00
Shannon Deminick
d2a285c120 Merge with 6.0.5 2013-04-25 19:43:03 -10:00
Sebastiaan Janssen
ab37f9ae35 Closing 6.0.4 2013-04-25 11:16:29 -02:00
Shannon Deminick
d6d630cb2c Merge with 6.0.4 2013-04-19 04:40:49 +06:00
Shannon Deminick
35a698cdc9 Merge with 4.11.7 2013-04-19 04:40:13 +06:00
Shannon Deminick
6c9e82e735 fixed typo 2013-04-19 04:31:55 +06:00
Shannon Deminick
c0fd974cc1 fixes typo on word disallow 2013-04-19 04:20:24 +06:00
Shannon Deminick
979fe46e9b Updated CDF to 1.6.0.0 2013-04-18 00:55:40 +06:00
Shannon Deminick
01290f8174 Merge with 4.11.7 2013-04-12 02:14:59 +06:00
Shannon Deminick
26a7bf8187 Fixes: #U4-2087 2013-04-12 02:11:01 +06:00
Shannon Deminick
f716ba380c Merge with 6.0.4 2013-04-12 03:02:40 +06:00
Shannon Deminick
01bf0bcfa5 Fixes merge issues 2013-04-06 01:41:06 +06:00
Shannon Deminick
7dcfcaf339 Merge with 6.0.4 2013-04-06 01:23:29 +06:00
Shannon Deminick
e22988e435 Merged with 4.11.7 2013-04-06 00:21:06 +06:00
Shannon Deminick
165d9c7dff Fixed nonodes to now show version information and updated it so that it redirects to root if there 
is actually content so the page is actually not accessible unless you actually have no nodes.
 2013-04-05 21:58:13 +06:00
Sebastiaan Janssen
bea50f4562 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:50:27 -02:00
Sebastiaan Janssen
ff337457f8 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:31:03 -02:00
Shannon Deminick
a7e939e71f Merge with 6.0.4 2013-04-02 22:39:39 +06:00
Shannon Deminick
d976fbe4de Merge with 6.0.3 2013-03-22 22:03:50 +06:00
Shannon Deminick
1db7f808c9 Merge with 4.11.6 2013-03-22 21:59:52 +06:00
Shannon Deminick
780a9632f0 Merge 2013-03-19 23:49:51 +06:00
Sebastiaan Janssen
259fbcb8f0 Fixed U4-1934 Error in comments of config files 2013-03-18 08:50:24 -01:00
Shannon Deminick
2dea4a1d70 updates more cache handling, fixes syntax error in examineindex.release.config, fixes the DefaultServerMessenger ctor 
to be lazy since the db context isn't initialized yet (will speed up start a bit too), ensures that the macro/xslt caching
clearing is only done on the single server instead or re-posing another distributed call.
 2013-03-16 01:37:05 +06:00
Shannon Deminick
4baecfe833 Merge with 6.0.3 2013-03-11 21:56:47 +06:00
Shannon Deminick
c6f29a50d6 Merge with 4.11.6 2013-03-11 21:17:57 +06:00
Shannon Deminick
d07212c89b Fixed changes with new MacroErrors config and how macros are rendered so it supports all macro types and also fixes up a bit of code 
in the umbraco.macro class.
 2013-03-11 21:06:02 +06:00
Shannon Deminick
fd58017e97 imported patches for pull request spudstuff/u4497 2013-03-11 18:49:45 +06:00
Morten Christensen
928d92fce4 Making the Sql Syntax Providers public and changing a few names and bits for consistency. 
Adding resolver for the syntax providers and wiring it up in the boot manager.
 2013-03-09 10:43:34 -01:00
Shannon Deminick
da331b7408 Changed how model mappers work for persistence objects so we don't have to statically associate the mapper. 2013-03-07 22:27:47 +06:00
Stephan
32e6604cf7 Web.Routing - add InternalRedirectPreservesTemplate setting (U4-1222...) 2013-03-01 13:56:12 -01:00
Shannon Deminick
f9b7e1b7fa Merge with 6.0.1 2013-02-27 23:20:34 +06:00
Sebastiaan Janssen
5b00501d21 trySkipIisCustomErrors was defined twice in the Release config 2013-02-27 14:38:15 -01:00