yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,991 Commits 4 Branches 7 Tags
3ea7f8a226e469704df41d5490157facda3aee2e
Commit Graph

11991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon Deminick
3ea7f8a226 Merge pull request #628 from sparkalyn/dev-v7 
Fixes: U4-4565 Add margin to bottom bar
 2015-01-30 10:37:12 +11:00
Shannon
2617016e3b Merge branch 'umbUkFest-U4-4400' of https://github.com/ja0b/Umbraco-CMS into dev-v7 2015-01-30 10:33:07 +11:00
Shannon
90b3bf59e0 Fixes: U4-2038 Violation of PRIMARY KEY constraint 'PK_cmsContentPreviewXml' YSOD occurs when publishing content 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-01-30 10:32:46 +11:00
Shannon
0f7b902bba Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-01-29 17:50:18 +11:00
Shannon
b899ab6557 Fixes: U4-5834 Change password description text is confusing 2015-01-29 17:49:58 +11:00
Shannon Deminick
7c3ff7d746 Fixes: U4-6165 Make Enum<T> public 2015-01-29 17:09:04 +11:00
Sunshine Lewis
c1cc8a3824 U4-4565 Add margin to bottom bar 2015-01-27 09:57:51 -05:00
Stephan
9695ccea0a Merge pull request #623 from zpqrtbnk/dev-v7-6154 
U4-6154 - fix unpublishing a document with changes
 2015-01-21 16:03:33 +01:00
Shannon
bbcca7f3e5 fixes test 2015-01-21 13:26:09 +11:00
Stephan
7b4a82eb8d U4-6154 - bugfix 2015-01-20 19:58:57 +01:00
Stephan
12d51b292c U4-6154 - fix unpublishing a document with changes 
Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
 2015-01-19 14:03:58 +01:00
Shannon Deminick
e85ef38218 Merge pull request #621 from AndyButland/u4-6135 
Fixes U4-6135 (node name disappears in certain situations when tree is synched
 2015-01-19 18:20:47 +11:00
AndyButland
4775b638a4 Reverted previous commit and changed anchor removal to target the correct tag (the elipsis) 2015-01-19 08:05:32 +01:00
Shannon
db3b8a1acd Merge remote-tracking branch 'origin/dev-v6' into dev-v7 
Conflicts:
	src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs
 2015-01-19 12:53:54 +11:00
AndyButland
17906b505d Removed code in tree synchronisation that removes anchor tag containing node name for certain nodes 2015-01-18 21:13:24 +01:00
Sebastiaan Janssen
7a644b6681 U4-6133 Update builtin razor snippets to follow Query Builder conventions 
#U4-6133 Fixed
 2015-01-15 10:38:07 +01:00
Shannon Deminick
48c127fefd Merge pull request #619 from arknu/U4-6103 
U4-6103: Replace style with ng-style (again)
 2015-01-14 19:08:18 +11:00
Asbjørn Riis-Knudsen
778d8e0afa Added missing apostrophes 2015-01-14 09:00:12 +01:00
Sebastiaan Janssen
59aa28bf3b Update Installer.cs 2015-01-13 17:34:40 +01:00
Niels Hartvig
cea002fd61 Typos in regards to previous commit (U4-6115) 2015-01-13 17:19:11 +01:00
Niels Hartvig
f8c1cc684b U4-6115 Add which user installs/uninstalls packages to the audit trail 2015-01-13 17:14:54 +01:00
Shannon
3663fd9f99 Fixes: U4-6106 Threading/Performance issue with MappingResolver and LazyManyObjectsResolverbase/ManyObjectsResolverBase 2015-01-13 19:39:46 +11:00
arknu
f8ed9e60f6 U4-6103: Replace style with ng-style (again) 2015-01-12 22:13:01 +01:00
Shannon
00895ff7a9 Fixes: U4-6096 Links in Translator emails incorrect - germain and danish were still incorrect. 2015-01-12 22:10:15 +11:00
Shannon
da778e277f Fixes: U4-6093 ContentService.SaveAndPublishDo changes Culture 2015-01-12 21:45:52 +11:00
Shannon
6fcfd49cf0 Merge branch 'U4-5658' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-5658 2015-01-12 19:43:20 +11:00
Shannon
6457a1a2ca Fixes: U4-6088 Publicize all partial view methods on IFileService & U4-6087 Fix Partial View macro repository usage so that when a macro is created from the FileService, the MacroService events are raised 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-01-09 19:15:01 +11:00
Shannon Deminick
4bbd278007 Merge pull request #618 from devinbost/dev-v7 
Fixed a syntax error in the spelling of the name of a method.
 2015-01-08 15:27:57 +11:00
devinbost
f6677aa19e Merge pull request #1 from devinbost/master 
Fixed a syntax error in the spelling of the name of a method.
 2015-01-07 19:40:23 -08:00
unknown
a1bca2eba1 Fixed a syntax error in the spelling of the name of the method GetAllManifestFileContents(..). 2015-01-07 19:25:09 -08:00
Sebastiaan Janssen
4c5cc93a67 U4-6052 Umbraco 7.2.1 web app installed with Nuget fails at start with error :"Cannot create an MVC Area path without the umbracoPath specified" 
#U4-6052 In Progress
 2015-01-07 11:28:23 +01:00
Shannon
7590bd86dd Merge branch 'dev-v6' of https://github.com/umbraco/Umbraco-CMS into dev-v6 2015-01-07 15:44:05 +11:00
Shannon
6b25e5299f fixes unit test 2015-01-07 15:43:47 +11:00
Shannon
76ab09bfc8 Fixes remaining tests 2015-01-07 15:36:17 +11:00
Shannon
d6f47366d4 fixes how bytes are read with utf8 BOM for templates and master pages, fixes unit test 2015-01-07 15:11:27 +11:00
Shannon
dc846e7ff6 Fixes installer email validation. Ensures all validation directives are registered under the correct module: umbraco.directives.validation, then we load this module in the installer so we can use the correct email validation directive. 2015-01-07 15:02:58 +11:00
Shannon
322bd4e41e Fixes: U4-5717 Member email validation does not allow valid domains (Umbraco 7.1.4) 2015-01-07 14:32:39 +11:00
Shannon
282550f402 Fixes: U4-6080 Server side email validation doesn't occur on existing members when they are saved 2015-01-07 13:17:44 +11:00
Shannon
699713346c Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-01-07 10:39:11 +11:00
Shannon
d4f28fcd85 fixes a couple of tests 2015-01-07 10:39:00 +11:00
Shannon Deminick
11e946d61c Merge pull request #614 from Alain-es/patch-2 
Fix bug U4-6071: Feature request - Add a specific section to all users
 2015-01-07 10:24:54 +11:00
Shannon
341239648d bumps version 2015-01-07 09:17:22 +11:00
Alain
f3b23a15c9 Update UserServiceTests.cs 2015-01-06 12:18:08 +00:00
Alain
cc61c34cdf Update UserService.cs 2015-01-06 12:15:32 +00:00
Alain
91b599b213 Update IUserService.cs 2015-01-06 12:14:13 +00:00
Shannon Deminick
106873732c Merge pull request #615 from AndyButland/u4-6044 
U4-6044 - prevent search engines from indexing login page
 2015-01-06 15:48:40 +11:00
Shannon Deminick
462467a7d8 Merge pull request #616 from AndyButland/u4-6061 
U4-6061 - NodeCount for tags is not populated
 2015-01-06 15:44:47 +11:00
Shannon
ea12da99ea moves RelateOnCopyHandler to Core and changes from ApplicationStarting to ApplicationStarted 2015-01-06 12:22:11 +11:00
Shannon
97a05008b3 Makes the umbProperty directive check optional since these validators can exist outside of an umbProperty directive (i.e. like in a dialog for a parameter editor) 2015-01-06 12:03:19 +11:00
Shannon Deminick
69e1dd1c73 Merge pull request #612 from gildebrand/patch-3 
Fix for macrocontainer making it possible to edit
 2015-01-06 11:50:31 +11:00