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

11976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Shannon
95f68b8bde Another attempt at fixing: U4-4049 Some images fail when uploading multiple media files 2015-01-06 11:45:08 +11:00
Shannon
485621b03a Revert "Merge branch '7.2.0-U4-4049' into dev-v7" 
This reverts commit 2ad86ec83d, reversing
changes made to 70ddf646be.
 2015-01-06 11:22:40 +11:00
Shannon
3f1b031789 fixes OverridableAuthorizationAttribute to ensure that the class level filter is applied if there are no child filters 2015-01-06 11:19:44 +11:00
Shannon
d0f125a51b moves file cleanup to outside of the loop 2015-01-06 11:19:19 +11:00
Shannon
a4f7c49f50 Merge branch 'Alain-es-Fix_for_U4-5875' into dev-v7 - And updates quite a lot: changes directive name to valPropertyValidator and changes how it works to be ultra flexible for custom validation of property data. Updates umbProperty directive to expose an API for other directives to utilize (like the new set setPropertyError method). Updates valServer to use the better way to access the current property object from the umbProperty directive API. Updates both valServer and valPropertyMsg to only perform a watch when necessary when there has been server side errors, this will speed up client side performance quite a bit. Now the tags, color picker and upload property editors performs correct client side and server side validation for the required validation flag. 2015-01-06 10:55:38 +11:00
Alain
a378d0c202 Update UserServiceTests.cs 2015-01-05 21:30:22 +00:00
AndyButland
d235340ec6 Populated NodeCount property for tag queries retrieving tags across all types 2015-01-05 22:23:05 +01:00
AndyButland
93ca536b14 Added noindex, nofollow to default page to discourage search engines indexing the back-office 2015-01-05 21:20:50 +01:00
Alain
dea78c5d13 Update UserServiceTests.cs 2015-01-05 19:04:59 +00:00
Alain
d06ff5f108 Update IUserService.cs 2015-01-05 19:02:32 +00:00
Alain
d94fe7df68 Update UserService.cs 2015-01-05 18:55:31 +00:00
Anton Gildebrand
11b53a5dcc Fix for macrocontainer making it possible to edit 2015-01-05 15:17:50 +01:00
Shannon
d4c0ea9c48 working on U4-5875 - Updated RequiredManifestValueValidator to automatically check for empty json strings if the value type is JSON. Updates the TagsPropertyEditor to check for empty json in it's required validator. Updated the tags JS to always update the model value so if there's a server side validation, it gets cleared on change. 2015-01-05 14:25:16 +11:00
Shannon
459d9b34e7 Fixes: U4-5974 User which is not administrator getting logged out when clicking recycle bin 2015-01-05 12:22:49 +11:00