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

4158 Commits

Author SHA1 Message Date
Shannon
3169b52bf4 Updates more of WebSecurity to use the new user api. 2013-08-09 13:45:57 +10:00
Shannon
0228d745f9 Fixes recursive lock on cache providers 2013-08-09 13:41:45 +10:00
Shannon
a1b6917c10 Changes the port back to what it should be 2013-08-09 13:39:17 +10:00
Shannon
c5a80ccb03 Changed WebSecurity to expose IUser instead of User, then fixed up the knock-on effect, obsoleted all calls to the legacy User object in the base classes to point to use the WebSecurity class to access the new user object. 2013-08-09 13:24:26 +10:00
Shannon
f5c4aad270 Added overload to User object to be created from an IUser object. Added GetUserSections to IUserService. 2013-08-09 13:23:27 +10:00
Shannon
8d4c8ab10e Adds more tests for caching 2013-08-09 12:24:29 +10:00
Shannon
f4bd10065e Fixes up some v7 failing tests. 2013-08-09 12:10:42 +10:00
Shannon
01510ce126 Fixes up the tests with changes to cache helper 2013-08-09 11:42:20 +10:00
Shannon
75ceb539b4 Streamlines cache helper ctor's 2013-08-09 11:37:57 +10:00
Shannon
4d55122cd4 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 2013-08-09 11:18:32 +10:00
Shannon
cc5912f7e1 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-08-09 11:17:38 +10:00
Shannon
b62d5125d5 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-08-09 11:16:34 +10:00
Shannon
6522193118 Simplifies the caching interfaces and updates the CacheHelper to expose the different caching levels (obsoletes it's normal methods) 2013-08-09 11:16:10 +10:00
Shannon
61fbf2cfc6 reverts PersistDeletedItem transaction because i forgot that the Commit() method of the UOW already takes care of the transaction. 2013-08-09 10:52:24 +10:00
Shannon
ce847e97a8 Updates the PetaPocoRepositoryBase to ensure that the deletion process is wrapped in a transaction so if any of the processes fail, it all gets rolled back. 2013-08-09 10:07:03 +10:00
Shannon
1e61563f79 Ensures the deletions are wrapped in a transaction - for performance and to mitigate db corruption if one of the deletes fails. 2013-08-09 10:01:28 +10:00
Per Ploug Krogslund
2ef0b1d56e Fixes dialog closing too fast 2013-08-08 16:01:21 +02:00
Per Ploug Krogslund
3d39fa8f03 Boolean type change 2013-08-08 15:40:13 +02:00
Per Ploug
155873cb43 Changes Request.properties contentItem lookup 
Content by id failed due to key not found exception
 2013-08-08 15:39:32 +02:00
Morten Christensen
b4f9985695 Last bits to implement U4-2571 Need to optimize empty recycle bin 2013-08-08 15:12:26 +02:00
Per Ploug Krogslund
0578d30711 Mocked generic properties, removes the tab filter again 2013-08-08 14:05:57 +02:00
Per Ploug Krogslund
2222e1356e Changes the property editor to use model again 2013-08-08 13:48:02 +02:00
Shannon
8fea9530b5 Simplified the base cache provider, no generics, these will be taken care of by extensions 2013-08-08 20:25:26 +10:00
Shannon
8c55946b1b Worked on the application cache, added request cache, changed some stuff over to be interfaces, added unit tests suite (need mroe) to test all caching providers. 2013-08-08 19:46:58 +10:00
Morten Christensen
82f19ede8c Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4 2013-08-08 10:22:38 +02:00
Shannon
a72512da72 Changed the outgoing date/time format to the base content controller 2013-08-08 16:31:55 +10:00
Shannon
66595a53c1 Fixes issue with saving to filter out the extra custom generic tab properties before submitting. Removes date filter because we aren't dealing with JS date objects from the server, only strings which are always formatted consistently. 2013-08-08 16:10:05 +10:00
Shannon
8d8d62c3bc Fixed most of the remaining issues with validation 2013-08-08 15:13:03 +10:00
Shannon
918366ef25 Fixes up issues with the refactoring of how properties are being rendered, fixes up the validation bits and pieces and unit tests. Adds a new validatable property in the mock data so that validation actually occurs. 2013-08-08 14:51:23 +10:00
Shannon
0fbc32a87f Fixes up logic for creating new versions (U4-2589 Save and Publish is not creating version of document) 2013-08-08 10:42:06 +10:00
Per Ploug
2ca894f605 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-07 13:48:21 +02:00
Per Ploug
55385d6374 Removes hardcoded reference to shannons users dir from sln file 2013-08-07 13:48:12 +02:00
Per Ploug Krogslund
8ddaee9e00 basic indent on content editor 2013-08-07 13:45:55 +02:00
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
Morten Christensen
79141ef86d Initial work on U4-2571 Need to optimize empty recycle bin 2013-08-06 15:08:05 +02: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