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

2290 Commits

Author SHA1 Message Date
Shannon
c2dc896fce working on: U4-6756 Don't ship or generate unnecessary folders 2015-07-16 15:29:46 +02:00
Shannon
ba1d546579 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	src/Umbraco.Core/MainDom.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/UmbracoExamine/UmbracoExamine.csproj
	src/umbraco.MacroEngines/packages.config
	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
 2015-07-15 14:58:19 +02:00
Shannon
f1b9b98f5d Updates to latest examine 2015-07-15 12:32:11 +02:00
Shannon
d9d38b9cc1 Merge remote-tracking branch 'origin/dev-v7' into dev-v7 
Conflicts:
	src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/UmbracoExamine/UmbracoExamine.csproj
	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
 2015-07-15 10:32:55 +02:00
Shannon
1e147f97e1 Updates examine, updates loghelper references. 2015-07-15 10:29:28 +02:00
Stephan
db0cfad6b9 Merge 7.2.7 into dev-v7 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.MacroEngines/packages.config
	src/umbraco.cms/packages.config
	src/umbraco.cms/umbraco.cms.csproj
	src/umbraco.controls/umbraco.controls.csproj
	src/umbraco.editorControls/umbraco.editorControls.csproj
 2015-07-14 19:57:56 +02:00
Stephan
1e3dd4c5cd Cleanup new umbracoApplicationUrl config 2015-07-14 19:28:14 +02:00
Sebastiaan Janssen
a7871abbd9 Update Examine and ClientDependency to latest version 2015-07-14 16:50:45 +02:00
Stephan
0f56fa4baa Bugfix content xml doctype issue 2015-07-13 14:08:50 +02:00
Shannon
3bc4b50d74 updates version 2015-07-08 11:36:50 +02:00
Shannon Deminick
cf16692b5a Merge pull request #741 from abryukhov/patch-2 
UI localization (RU) - All 7.2 and actual at the moment 7.3 keys
 2015-07-08 09:53:23 +02:00
Shannon
a712726065 Updates the logger and how to output process id and app domain id with the default log4net patterns. 2015-07-07 16:18:57 +02:00
Alexander Bryukhov
f93364ab96 All 7.2 and actual at the moment 7.3 keys 2015-07-07 19:17:56 +06:00
Shannon
2cd5551913 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-06 17:57:07 +02:00
Shannon
3a3917c1fc Fixes: U4-4231 remove umbracoUserLogins table 2015-07-06 17:52:07 +02:00
Shannon Deminick
9cb5026a0a Merge pull request #740 from shwld/dev-v7 
update language conf file (ja)
 2015-07-06 17:36:23 +02:00
Shannon
d63f83f7c7 Fixes: U4-6786 Update to CDF 1.8.4 2015-07-03 11:40:41 +02:00
Shannon
53a0c55b14 Implements SignInManager, implements lock out policy for user manager, allows for better implementation of 2 factor auth for developers. Updates to latest owin libs. 2015-07-01 17:07:29 +02:00
Shannon
d76b8d91b1 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-01 13:53:45 +02:00
Shannon
44943e367f Updates async logging to a newer format 2015-07-01 13:46:11 +02:00
Shannon Deminick
89c3c71251 Merge pull request #732 from SoerenDeger/U4-6759 
Added missing language areas/keys to de lang file
 2015-07-01 11:13:48 +02:00
shwld
974f827e8b update language conf file (ja) 2015-07-01 01:18:29 +09:00
Jesse
671026cfc9 Edited swedish translations 
Added a few missing and removed unused translations.
 2015-06-29 08:30:13 +02:00
Sören Deger
30979f92cc Added missing language areas/keys to de lang file 
Added missing language areas and keys to the german language file, i.e.
area with alias: changeDocType, media, placeholders, grid and a lot of
more.
 2015-06-26 14:48:57 +02:00
Shannon
fdf53b8550 puts the Flickr provider back for backwards compat, adds a todo and updates the release config with all providers 2015-06-25 17:10:45 +02:00
Shannon
5487ec1d5f Merge branch 'dev-v7-oembed' of https://github.com/tcmorris/Umbraco-CMS into tcmorris-dev-v7-oembed 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-06-25 16:57:52 +02:00
Shannon
84cac6ac90 Fixes: U4-5741 [7.2] CodeMirror in RTE has issues in IE11 & U4-5781 Update to latest codemirror 2015-06-24 19:06:42 +02:00
Shannon
1f0a4490a6 U4-6737 Add unique id (guid) column to property type 2015-06-24 17:47:20 +02:00
Shannon
40c35e5851 Fixes: U4-6582 RTE "Link To File" missing rel="nodeId" attribute 2015-06-23 10:53:56 +02:00
Shannon
38953212a3 Fixes up some unit tests with changes to migration runner, creates unit tests for ApplicationContext.IsConfigured, updates DatabaseContext to be able to mock some methods. 2015-06-22 18:59:44 +02:00
Shannon
8e1e7a8676 Gets the IsConfigured check checking the migration data, updates the install controller to ensure there's no infinite redirects and to use the IsUpgrading flag. Now to add entries to the table when the migrations have executed. 2015-06-22 16:22:47 +02:00
Shannon
d77f95f29b removes tutorial docs and irrelavent readme and todo files, updates docs build to exclude tutorials header 2015-06-17 11:56:20 +02:00
Shannon
fd6caf5cee updates how scripts render in main view - make it more clear where the callback is 2015-06-16 10:59:47 +02:00
Shannon
20e265491f Updates to latest AutoMapper and HtmlAgility 2015-06-16 10:19:34 +02:00
Shannon Deminick
9765e9cf3a Merge pull request #715 from dampee/fixes/U4-5559 
Fix Typo's build-in and seperate (U4-5559)
 2015-06-15 17:31:23 +02:00
Shannon
1b137bb785 Fixes: U4-5777 Allow Localization of Plugins without having to edit core language files 2015-06-15 17:13:34 +02:00
Damiaan
4f02a13a46 U4-5559 Fix Typo "Build-In" (Code) 2015-06-15 16:07:45 +02:00
Vincent Baaij
4574aa2173 As discussed in cg15 Grid workshop 
If you use more than one grid datatype in one doctype, the editors are shown the text 'Choose a layout for the page' more than once. By showing 'Choose a layout for this section', the text is in line with the documentation
 2015-06-15 10:13:04 +02:00
Vincent Baaij
226f8f60ca As discussed in cg15 Grid workshop 
If you use more than one grid datatype in one doctype, the editors are shown the text 'Choose a layout for the page' more than once. By showing 'Choose a layout for this section', the text is in line with the documentation
 2015-06-15 10:10:05 +02:00
Sebastiaan Janssen
f1d26d0990 Bring web.config in line with the nuget one 2015-06-09 14:35:30 +02:00
Shannon
49417cbce4 Fixes assembly references and assembly redirects 2015-06-06 22:35:24 +02:00
Shannon
6153c70ef6 Fixes: U4-6673 Xml data integrity dashboard 2015-06-05 17:27:18 +02:00
Sebastiaan Janssen
f100d82e2c Bump version 2015-06-03 14:03:04 +02:00
Shannon
9e223eb891 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
 2015-05-20 16:24:17 +10:00
Stephan
dbaf7c0190 U4-6597 - fix issue with caches that would cache exceptions 2015-05-19 09:24:38 +02:00
Stephan
031f70f529 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/Logging/LogHelper.cs
	src/Umbraco.Web.UI.Client/src/less/login.less
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
 2015-05-18 16:23:12 +02:00
Shannon Deminick
62943d391f Merge pull request #692 from bjarnef/dev-v7-U4-6629 
Fix changes in user section labels
 2015-05-18 13:47:13 +10:00
bjarnef
21a4dfe33e Fix changes in user section labels 
Fixed translation in da.xml according to change in en.xml  from 7.2.4 to
7.2.5
 2015-05-17 22:16:39 +02:00
Arjan Woldring
1dda3ce45d Updating Dutch Translations 
Missing keys added, deleted keys deleted, reorderded some keys based on
the english one and corrected couple of wrong translations.
 2015-05-16 19:06:04 +02:00
Shannon Deminick
1e29a4a8ca Merge pull request #688 from sebastian-claesson/dev-v7 
Swedish was using the wrong format for variables
 2015-05-15 15:46:17 +10:00