yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,152 Commits 4 Branches 7 Tags
5cd197ffe0311bbe20bcff22308d26a30dd4fb71
Commit Graph

6152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Per Ploug Krogslund
5cd197ffe0 Merg listview.controller.js 2013-08-07 13:41:07 +02:00
Per Ploug Krogslund
aeedcae088 Moved additional docs to tutorial section 2013-08-07 13:36:22 +02:00
Shannon
cbc841301b Got more of the sorting stuff working, started implementing much of the back office security checks in the content controller, updates some of the c# unit tests and got a self-hosted test running (but commented out currently until we can mock things properly). 2013-08-07 19:28:32 +10:00
Shannon
d01f3a1012 Got the sort dialog posting the correct data and displaying a success message. Updated the alerts.less to not have a txt shadow as it looks pretty bad with the colors we have. 2013-08-07 15:42:28 +10:00
Shannon
371bf785b0 Changed to jquery 2.0.3, added a few jquery ui bits and pieces, got the sort dialog working with an angular-ui sortable directive and styled it. 2013-08-07 14:25:30 +10:00
Shannon
c3737018e0 Fixes overflow on dialogs when there too much content, fixes date format for content mocks. 2013-08-07 12:27:50 +10:00
Shannon
91a2ffcf1d removes js files we aren't using, if we need them later we can add them back. 2013-08-07 12:26:49 +10:00
Shannon
7125231e43 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/umbraco.sln
 2013-08-07 11:54:12 +10:00
Shannon
5fce741940 another sln update 2013-08-07 11:53:09 +10:00
Shannon
14e4a8061c removes the vs profiling files from the sln. 2013-08-07 11:49:48 +10:00
Shannon
1b9f071581 Fixes: U4-2589 Save and Publish is not creating version of document and adds a few unit tests 2013-08-07 11:39:25 +10:00
Shannon
65d7e04049 fix up merge errors 2013-08-07 10:34:51 +10:00
Shannon
0a26eccd2d Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
	src/Umbraco.Core/Security/UserData.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
	src/umbraco.sln
 2013-08-07 10:29:34 +10:00
Shannon
66fc7e91dd Got the GetChildren wired up to the back end, updated the sort and list view controls to use the new resource with promises, updated unit tests to support. 2013-08-06 18:42:36 +10:00
Sebastiaan Janssen
08609a887c Merge branch '6.1.4' of github.com:umbraco/Umbraco-CMS into 6.1.4 2013-08-06 10:24:42 +02:00
Sebastiaan Janssen
b11932240c Fixes U4-2587 Regression: Hide Preview Button on nodes that have no template 
Now also checks if the template still exists and if it's allowed on that document to determine when to enable the preview button
 2013-08-06 10:24:20 +02:00
Shannon
ec0e5107ea Ensures all controller names are consistent. 2013-08-06 14:24:30 +10:00
Shannon
94a67d12ef Got content/media thumbnails rendering properly even with old legacy ones (file based). 2013-08-06 14:15:35 +10:00
Shannon
801e2dea7b Removes tree icon filters and just ensures the data is formatted on retrieval, this is much better for performance and just makes a lot more sense. 2013-08-06 13:24:49 +10:00
Shannon
d47b4517c1 Fixes unit tests 2013-08-06 13:06:25 +10:00
Morten Christensen
226a13c6e1 Minor adjustment related to U4-2560 Working with ContentService can give 2 versions of a document as "newest" 2013-08-05 14:30:03 +02:00
Per Ploug Krogslund
319da4816a replaces scriptLoader references with assetsService 2013-08-05 14:16:04 +02:00
Per Ploug Krogslund
31aa7a4ff9 Re-adds event bubble to tree, renames scriptLoader to assetsService 
adds docs for assetsService.loadcss and .loadjs
 2013-08-05 14:16:04 +02:00
Shannon
968e6224c7 Changed over the content/media type mappers to be auto-mapper based 2013-08-05 19:29:47 +10:00
Shannon
ab594db5fc Got the media tree converted to new tree structure. 2013-08-05 19:22:00 +10:00
Shannon
603e698621 Fixes issue with ensuring the correct section is assigned to each menu item 2013-08-05 18:48:01 +10:00
Shannon
4b996ac693 Got the legacy refresh action working (should work for all trees) 2013-08-05 18:27:05 +10:00
Shannon
4b7345bfbd Ensures auth proceeds for /base request too 2013-08-05 16:20:39 +10:00
Shannon
8aa547123f Fixes deleting, ensures it is moved to the recycle bin when necessary or deleted permanently if already in there and fixes finding a node even if the Ids are of a different clr type 2013-08-05 16:13:27 +10:00
Shannon
c40084c625 updates the forms auth stuff to be more inline with how v6 operates. Cookie is always stored for 1 day and we need to ensure that https and httponly is checked. 2013-08-05 15:39:18 +10:00
Shannon
d78a03a610 Massively improves performance for the packaging service (converting docs to XML) which is used in republishing the tree. 2013-08-05 13:11:47 +10:00
Shannon
b7a1123319 U4-2579 BulkPublishController causes YSOD when there are invalid child elements due to InvalidProperties having a null reference 2013-08-02 16:23:32 +10:00
Shannon
7e9cad34db Creates an SQL Server version check for bulk sql imports. 2013-08-02 16:01:54 +10:00
Shannon
c4b44ea0e3 Fixes: U4-2577 Can't save umbraco user - without re-filling in the password 
Fixes: U4-541 Wrong dictionary key when using in backend template names
This changes the way that the value that is stored in the auth cookie. Previously we just stored a GUID which was the user's contextid stored in the db, now we store encrypted values of a few necessary user objects. In 6.2 we'll actually set a real .Net user object on the HttpContext. For now, the http module will simply just ensure that the culture is set correctly for the currently logged in user.
 2013-08-02 15:16:04 +10:00
Sebastiaan Janssen
3435a75e9e U4-2553 Double tabs when installing package that makes use of Dictionary Items to translate document types 
Forgto to commit a file :)
 2013-08-01 14:39:22 +02:00
Sebastiaan Janssen
bdb6c5768a U4-2553 Double tabs when installing package that makes use of Dictionary Items to translate document types 
Added GetRawCaptionById method for the packager so the generated XML is correct
 2013-08-01 13:40:23 +02:00
Shannon
62aafc6606 Lots of work on trees and menus. Got delete and empty recycle bin working as well as refresh (first menu action). 2013-08-01 18:35:55 +10:00
Shannon
2ebf6d09c6 Gets delete and empty recycle bin working, adds unit tests for tree service, ensures that the recycle bin shows children whenever something is deleted (though, i now realize i need to refresh the recycle bin node and expand it when something is deleted). Renames some namespaces for content/media/etc... controllers and makes the file names more readable. 2013-08-01 14:51:35 +10:00
Shannon
f63988639f Updates content tree class heirarchy, updates all IActions to have the correct icon in c# and udpates the icon mapping 2013-08-01 12:20:28 +10:00
Sebastiaan Janssen
87a3c53e22 Merge branch '6.1.4' of github.com:umbraco/Umbraco-CMS into 6.1.4 2013-07-31 18:31:56 +02:00
Sebastiaan Janssen
898d25f3cb Include lang files in project so they'll actually end up in the final build 2013-07-31 18:31:39 +02:00
Shannon
60b40b09ff fixes tree item option showing 2013-07-31 19:25:06 +10:00
Shannon
813750b0a9 Fixes merge issues 2013-07-31 19:14:02 +10:00
Shannon
66c2157bea Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/MediaController.cs
	src/Umbraco.Web/Install/UmbracoInstallAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoApiController.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
 2013-07-31 18:52:14 +10:00
Shannon
4e24016052 adds a region 2013-07-31 18:32:14 +10:00
Shannon
d8630a3ec1 Fixes cast issue 2013-07-31 18:28:18 +10:00
Shannon
dcf730a1bc ensures the ui cultures are set in the back office. adds WebSecurity as a dependency for UmbracoContext. 2013-07-31 18:21:27 +10:00
Shannon
9bc3fdd555 Makes UmbracoContext disposable and fixes the module's DisposeHttpContextItems to actual perform the disposal of each item. 2013-07-31 17:34:42 +10:00
Shannon
cbda86fe92 Fixes build error, streamlines all calls to validate a user for base controllers. 2013-07-31 17:24:36 +10:00
Shannon
6f464567bb Implements real FormsAuthentication for back office cookie authentication... finally :) 2013-07-31 17:08:56 +10:00