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

11974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Shannon Deminick
83f1613eb8 Merge pull request #611 from leekelleher/lk-contentservice-constants 
ContentService - Replaced the hardcoded -1 and -20 values with Constants
 2015-01-05 08:55:34 +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
leekelleher
b449973403 Added the relationship between the trashed node and its former parent node 2015-01-03 20:10:42 +00:00
leekelleher
911e81e4af Added constants for the relation-type aliases. 2015-01-03 20:10:41 +00:00
leekelleher
458e7dde94 Created "relationResource" to expose methods from RelationService to angular controllers. 
Added view for the "restore" menu option.
 2015-01-03 20:10:39 +00:00
leekelleher
0c7826b250 Added 'Restore' action class 
+ menu option for items in the recycle bin.
 2015-01-03 19:52:06 +00:00
leekelleher
ef0ad41c8e New relation type: "Relate Parent Document On Delete" 2015-01-03 19:52:04 +00:00
Shannon
fff1da2a12 Merge branch 'dev-v7' into 7.3.0 2015-01-02 16:25:52 +11:00
Shannon
920084b7c3 Merge branch 'sitereactor-ascii-art' into dev-v7 2015-01-02 16:21:12 +11:00
Shannon
ff2c71367f adds tests 2015-01-02 16:19:51 +11:00
Shannon Deminick
428efed7c3 Merge pull request #597 from chrisjsherm/issue-u4-4158 
Fix for Truncate function stripping out content between tags. This issue...
 2015-01-02 16:03:46 +11:00
Shannon
7c59c71261 updates PR for U4-6054 to just read directly from the file stream, no need to copy it first. 2015-01-02 15:58:31 +11:00
Shannon Deminick
a0c2914ce6 Merge pull request #604 from csharpforevermore/dev-v7 
Fixed: U4-6054 "Unit test 'Umbraco.Tests.IO.AbstractFileSystemTests.Can_...
 2015-01-02 15:54:11 +11:00
Shannon Deminick
dbb70a8646 Merge pull request #607 from gertdc/U4-6060 
Added dutch translations for the grid layout
 2015-01-02 15:49:50 +11:00
Shannon
6a423dd032 Fixes: U4-5940 Feature Request - Disable partial/macro caching when in debug mode 2015-01-02 15:45:33 +11:00
Shannon
73e9ff04e8 Fixes: U4-5943 Cannot render a macro on a virtual page when using UmbracoVirtualNodeRouteHandler and assigning virtual Ids 2015-01-02 15:34:51 +11:00
Shannon
201464cb44 Fixes: U4-5918 Update Underscore.js and also updates our usage of bower with the correct grunt-bower plugin, this massively simplifies bower usage and paves the way to start using bower for all JS components. 2015-01-02 14:25:11 +11:00
Shannon
a68fed42ad Merge branch 'madsoulswe-7.2.1' into dev-v7 2015-01-02 11:58:56 +11:00
Shannon
a427427564 fixes sql for sqlce for data integrity controller 2015-01-02 11:56:27 +11:00
Shannon
2286c0899c reverts UseTempStorage sync from examine settings on dev branch. 2015-01-02 11:55:18 +11:00
Shannon
55eea6e44f Merge branch '7.2.0' into 7.2.0-U4-4049 2015-01-02 11:44:29 +11:00
Shannon
f91f25e5c0 Fixes issue with template model and package installation 2015-01-02 11:04:12 +11:00
gertdc
ae257d0f50 Added dutch translations for the grid layout 2014-12-30 10:18:54 +01:00
Shannon
3f35ca1e77 Fixes merge and file encoding for master pages and templates to have BOM 2014-12-29 14:35:54 +11:00
Shannon
8c619e92d9 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
 2014-12-29 14:30:01 +11:00