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

9663 Commits

Author SHA1 Message Date
Shannon
7e1b20e600 Merge branch 'umbUKFest-U4-5231' of https://github.com/AnthonyCogworks/Umbraco-CMS into 7.3.0 
Conflicts:
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/MockTests.cs
 2015-01-07 16:13:47 +11:00
Shannon
023c7f3fe7 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-01-07 15:54:08 +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
89b8fe93b7 Updes more code for U4-337 2015-01-06 15:36:14 +11:00
Shannon
f6cd597841 Fixes up some things from PR 610 and fixes up quoted values when using the Insert.IntoTable migration. 2015-01-06 13:44:42 +11:00
Shannon
fa48af02a1 Merge branch 'leekelleher-U4-337' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-01-06 12:24:29 +11:00
Shannon
8509aef99a Merge branch 'U4-337' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-337 2015-01-06 12:23:31 +11:00
Shannon
46e939715a Merge branch 'dev-v7' into 7.3.0 2015-01-06 12:22:54 +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
Shannon
2ad86ec83d Merge branch '7.2.0-U4-4049' into dev-v7 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-01-05 10:26:27 +11:00
Shannon
70ddf646be Changed the DefaultUrlProvider's warnings to Debug statements since this can get logged very often when there are unpublished pages and a URL is requested for them which can occur a ton, especially when searching in the back office since a URL is attempted to be created on each search for each result. 2015-01-05 10:08:36 +11:00
Shannon
4de31249fd removes some usages of singletons 2015-01-05 10:01:58 +11:00
Shannon
26c3bb05d6 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-01-05 09:48:08 +11:00
Shannon
b1fe15ed56 fixes a null ref 2015-01-05 09:46:54 +11:00
leekelleher
e8e6f5f807 Replaced the hardcoded integer values for -1 and -20 in ContentService with the Constants values. 
I did this whilst working on PR #610 (U4-337), but separated out to its own branch so not to clutter the other PR.
 2015-01-04 21:02:20 +00:00
leekelleher
8a32f02781 Added custom event handler to create the relation for trashed nodes. 
Removed the additional (AJAX) resource call from the Angular controller, as the relation removal is handled in server-side code during the move.
 2015-01-04 20:46:00 +00:00
leekelleher
573192c33f Amends based @sitereactor's feedback. 2015-01-04 17:09:05 +00:00
leekelleher
56f5789976 Added "restore" language key/value for English (+US). 
Will aim to do other languages in due course.
 2015-01-03 22:24:10 +00:00
leekelleher
f21265c7ae Added "DeleteById" method to the Relation Resource/Service. 2015-01-03 22:22:54 +00:00
leekelleher
eace046342 Moved the SQL insert (to create the new relation type) to a separate DB migration for v7.3.0. 
(This may need to be reviewed by Core team?)
 2015-01-03 22:20:19 +00:00
leekelleher
0a6a41e4c2 Swapped the Action letter to be 'V', as it appeared to be available. 2015-01-03 22:19:03 +00:00