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

710 Commits

Author SHA1 Message Date
Stephan
22eea2b7db Fix tests 2015-12-03 12:56:59 +01:00
Sebastiaan Janssen
c7aa3d63fb Merge branch 'temp-U4-7372' into 7.4.0 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs
 2015-12-03 09:22:19 +01:00
Sebastiaan Janssen
d863ff364e U4-7321 Update Doc type edit link on content item for 7.4 since it will be different 
#U4-7321 Fixed
 2015-12-02 14:41:37 +01:00
Sebastiaan Janssen
9949e2676d Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-12-01 15:16:57 +01:00
engern
855e3b3dcc Add the possibility to sort the macro parameters 2015-11-29 12:06:19 +01:00
Shannon
fd66f08520 Fixes setting auth cookie during install, removes some try/catch/swallow with some error messaging, converts some String -> string and == false updates. 2015-11-26 13:07:22 +01:00
Stephan
3fe235fa35 Sanitize content types .ContentTypeComposition and .PropertyTypes 2015-11-20 18:36:55 +01:00
Shannon
4c544acb42 fixes links so that working with vdirs works too. 2015-11-19 19:21:55 +01:00
Shannon Deminick
c7c5f481f1 Merge pull request #879 from danieland/U4-4794--nodebug 
U4 4794  nodebug
 2015-11-19 19:10:35 +01:00
Stephan
eb5589e064 Remove PropertyGroup.ParentId, sanitize Property groups/types 2015-11-17 16:55:14 +01:00
Sebastiaan Janssen
05c592860d Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-11-17 13:43:19 +01:00
AndyButland
a05cc03254 Allows position of the list view child items tab to be positioned within the tab list 2015-11-15 21:18:21 +01:00
Shannon
d3f5090150 Fixes up a couple of missing path updates and incorrect icon resolution and fixed another issue with webservice path reference 2015-11-13 13:38:30 +01:00
Shannon
6a7faf457b Merge branch 'dev-uk-U4-1117' of https://github.com/JeffreyPerplex/Umbraco-CMS into JeffreyPerplex-dev-uk-U4-1117 2015-11-13 11:35:29 +01:00
Shannon
d379b98c57 Gets data type folders working/creating, data types being able to be created in folders, tree syncing with data type paths, fixes up some localization stuff and fixes up some issues with media type folders with parent ids 2015-11-12 18:59:43 +01:00
Stephan
6fd185df2d Replace evil magic number with constant 2015-11-12 15:32:53 +01:00
Shannon
a351f6cfc8 Fixes up the error handling with move/copy dialogs. 2015-11-09 17:58:43 +01:00
Shannon
a0761b92b8 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/RevertToCleanInstall.bat
	build/RevertToEmptyInstall.bat
	src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbavatar.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/views/components/application/umb-avatar.html
	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
 2015-11-09 12:33:53 +01:00
Daniel
a9ad0ae8eb removed the debug check 2015-11-02 23:34:33 +01:00
Jeffrey Schoemaker
9c8b9f8bb4 U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:25:41 +01:00
Jeffrey Schoemaker
a4bd3abfbe U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:25:15 +01:00
Stephan
da85e4eb28 fixes list view ancestor check fix 2015-10-29 12:20:10 +01:00
Shannon
fbc08d66f1 fixes list view ancestor check 2015-10-29 12:05:46 +01:00
Sebastiaan Janssen
44e76f741f Merge pull request #840 from umbraco/temp-U4-7021 
Fixes: U4-7021 "Actions" dropdown not available to children in listvi…
 2015-10-28 14:52:48 +01:00
Shannon
64c983eb07 Updates PR with fixes for code and implementation logic for the url list. 2015-10-28 12:28:29 +01:00
Shannon
f0b68ac31e Fixes: U4-7021 "Actions" dropdown not available to children in listview nodes 2015-10-27 18:13:18 +01:00
Shannon
8f7add203e Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
 2015-10-27 10:29:11 +01:00
Daniel
738815170c more nullchecks needed? 
null check that we can access user
 2015-10-23 00:21:42 +02:00
Daniel
ef091e8c3a U4-7296 
http://issues.umbraco.org/issue/U4-7296
 2015-10-22 23:41:18 +02:00
Shannon
fd26f98356 fixes template mapping issue when saving content types 2015-10-22 15:10:44 +02:00
Shannon
41c5f6a8bf Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
 2015-10-22 12:12:03 +02:00
Shannon
33c206d820 Wires up the correct saving logic for media types + validation, refactors the logic so it can be reused everywhere. 2015-10-15 14:48:50 +02:00
Rasmus John Pedersen
78475b0686 Added recursive option to copy dialog 2015-10-09 20:25:51 +02:00
Shannon
6017e9ddf9 Gets group and property level validation wired up to the fields, ensures things like duplicate field warnings are created with the correct indexed field names. Fixes a few old directives to correctly watch for attribute interpolation changes which is need for some of this validation to work since it's dynamically populating the field names. 2015-10-09 17:28:22 +02:00
Shannon
c477f7a840 Gets more validation bits wired up. Server side validation is now working which is based on val-server-field since we can use this natively with the asp.net ModelState result instead of the val-server which is actually to be used with PropertyType (Property Editors). Next up is validation for the different tabs of the editor. 2015-10-08 17:13:38 +02:00
Shannon
97c352030a Gets a little more validation working and creating using the new Save models 2015-10-07 17:16:42 +02:00
Shannon
1b21e04dc2 WIP for model mappers to new content editor save model, udpates to js to use that 2015-10-06 17:19:08 +02:00
Per Ploug
1d23d2b7c6 Fixed: New document types fails to save 2015-09-23 20:40:03 +02:00
Stephan
9c9ba477aa Merge dev-v7 into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Core/Constants-ObjectTypes.cs
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/loader.dev.js
	src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
	src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
	src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-09-16 13:25:32 +02:00
Per Ploug
81f206090d Default listview name on mediatypes 2015-09-11 10:42:48 +02:00
Stephan
7848ea5ec0 U4-7038 - IPublishedContentWithKey for contents, members 2015-09-01 15:00:27 +02:00
Shannon
05e17e1c7f Fixes: U4-6973 Given custom permissions user can create, but cannot save 2015-08-31 18:04:13 +02:00
Shannon
e3598b99a5 Ensures tempdata is set on our member controllers in the correct place and ensures that the RegisterModel doesn't explicitly set the RedirectUrl because we want it to be empty by default. 2015-08-27 14:56:42 +02:00
Per Ploug
94b09a4568 Fixes issues with the merged contenttype mapper 
Mediatype, membertype and contenttype all use the same core mapper, with
small variations between each type - it is however important in what
order the mappers are added.
 2015-08-26 12:07:43 +02:00
Claus
f44875d072 Prevent internal member groups from showing up in group list on member properties. 
Prevent internal member groups from showing up in the member group tree listing.
 2015-08-24 16:14:29 +02:00
Shannon
685aea1728 Fixes: U4-6879 Validation issues when creating new content and cancelling save event. 2015-08-20 11:50:32 +02:00
Per Ploug Krogslund
0f4596c897 Cleanup the mappers and the display classes 2015-08-19 22:38:08 +02:00
Per Ploug Krogslund
e1fd1ab5e5 include property type editor 2015-08-11 13:22:33 +02:00
Per Ploug Krogslund
1ff7b34b86 revalue flag on basic datatype 2015-08-11 11:52:29 +02:00
Shannon
2f1877c2cd Merge branch 'dev-v7' into dev-v7-contenttypeeditor 2015-08-05 13:39:30 +02:00