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

4845 Commits

Author SHA1 Message Date
perploug
c5000b9656 Better click detection for closing dialogs 2013-09-18 13:11:19 +02:00
perploug
2cea746644 Updates legacy editor visuals 2013-09-18 13:11:03 +02:00
perploug
408740b3dd Iconpicker dialog to use promise 2013-09-18 13:10:16 +02:00
perploug
13baaf5182 Changes icon loading into a promise 2013-09-18 13:10:03 +02:00
perploug
445e749372 Fixes: Legacy dialogs couldnt close 2013-09-18 13:09:40 +02:00
perploug
9e7cd28ab4 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-18 09:01:43 +02:00
perploug
725b3f9bd9 Updated stylesheet property editor 2013-09-18 09:01:32 +02:00
perploug
80d2407aab Updated user editors 2013-09-18 09:01:11 +02:00
perploug
aa708b82aa Dictionary editor updates 2013-09-18 09:00:53 +02:00
perploug
af20f16bc5 Updated user tress 2013-09-18 09:00:37 +02:00
perploug
c6ab36503d Updated doctype editor styles 2013-09-18 09:00:23 +02:00
perploug
fe71974ce4 updated docs to use alias 2013-09-18 08:59:51 +02:00
Shannon
09b2a1f5d0 updated entity resource docs 2013-09-18 15:39:17 +10:00
Shannon
503d28ae92 Fixes up entity resource to use the correct methods of entity controller and anything that was referencing those methods. 2013-09-18 15:35:52 +10:00
Shannon
6155eb709a Updated EntityController to be consistent and now uses a new enum of all umbraco obj that should be accessible. 2013-09-18 15:00:32 +10:00
Shannon
422a22f150 Adds unique db index to macro alias since there can never be duplicates. 2013-09-18 14:14:48 +10:00
Shannon
2a143aec46 Fixed up remaining macro service tests 2013-09-18 14:05:00 +10:00
Shannon
67171db955 Fixes merge issues... but now have to fix all the unit tests 2013-09-18 13:26:09 +10:00
Shannon
81365cec25 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Tests/Models/DataValueSetterTests.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/FakeHttpContextFactory.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
 2013-09-18 12:59:46 +10:00
Shannon
c8fa881bc5 Ensures all service tests do not use any caching in their underlying repos. This change has been made to the base database test classes so any repo/service access done for inheritors also ensure that no cache is used for tests. 2013-09-18 12:54:06 +10:00
Shannon
b17db9f143 Fixed last failing unit test with repo's 2013-09-18 12:42:18 +10:00
Shannon
23b7e94ce3 Fixes pretty big issue with MediaType's not implementing the same IsDirty property check rules as ContentType when they should have shared the same rules. After removing caching on the unit tests, this bug became known. 2013-09-18 12:36:38 +10:00
Shannon
8fe7c0da9e Changed all repository tests to ensure they are not testing with cache enabled... now to fix the problems :( 2013-09-18 11:40:40 +10:00
Shannon
3e03fea1ae Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-18 10:49:18 +10:00
Shannon
544bb4eb81 Added ability to launch a native angular modal window from an iframe, starts creating the macro parameter dialog for templates. 2013-09-18 10:49:10 +10:00
perploug
526f2f2e81 Fixes broken doctype editor 2013-09-17 13:43:47 +02:00
perploug
4b3db20d90 Fixes bug with multiple TinyMCE editors on the same page 2013-09-17 13:43:38 +02:00
perploug
b8ae98ab13 Updates TinyMCE to 4.0.6 2013-09-17 13:43:19 +02:00
perploug
2ac84a467d rte.controller 2013-09-17 12:50:20 +02:00
perploug
e452ff6e36 Adds editor context 
Enables property editors to access the complete entity when editing
 2013-09-17 12:44:52 +02:00
Shannon
75c913cced Updated macro repo and services and ensures correct data joins 2013-09-17 20:19:27 +10:00
perploug
6a026ab489 Fixes broken datatype editor 2013-09-17 11:15:20 +02:00
perploug
96c426f8c7 Adds userpicker alias and guid mapping 2013-09-17 11:15:09 +02:00
perploug
aee411517b Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-17 10:25:34 +02:00
perploug
740a3fd534 force commit to refresh 2013-09-17 10:25:19 +02:00
Shannon
89f2c0e38f Finishes macro repository + tests. 2013-09-17 17:54:09 +10:00
Shannon
f2f8004599 Have the macro repository working, just need to write more unit tests regarding macro properties. 2013-09-17 17:18:54 +10:00
Tim Geyssens
193a991349 Fixes error with rte embed dialog 2013-09-17 08:10:56 +02:00
Shannon
44d01e3868 Started creating a MacroRepository + tests and pretty much have it working for basic data but realized Morten has already done this before so will commit this work and see what I can find from the previous code. 2013-09-17 15:07:15 +10:00
Shannon
55cf2bd790 Fixes new aspx inline config references. 2013-09-17 12:31:39 +10:00
Shannon
9054ec0125 Fixes U4-2859 Cannot save content, authorization errors 2013-09-17 12:11:01 +10:00
Shannon
5b943ca866 fixed couple tests 2013-09-17 11:53:57 +10:00
Shannon
abe3efa9a1 Replaces Rhino mocks with Moq... so much nicer/easier. 2013-09-17 11:35:08 +10:00
Shannon
9351710579 Changes default UrlProviderMode to AutoLegacy, fixes a few unit tests, adds ability to set Set<T> for UmbracoConfiguration for testing. Fixes razor static mapping section template. 2013-09-17 10:55:04 +10:00
Shannon
6357d8f6ce Fixed merge issues 2013-09-17 00:33:02 +10:00
Shannon
371b1817ea Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias 
Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs
 2013-09-17 00:27:17 +10:00
Shannon
86a5d16e25 Added moq (need to replace all rhino mock later) allowing us to nicely mock umbraco settings, fixing up more unit tests. 2013-09-17 00:14:15 +10:00
perploug
bb641c937c Userpicker propertyeditor 2013-09-16 16:06:11 +02:00
perploug
0a2fa12b58 New treepicker 2013-09-16 16:05:56 +02:00
perploug
681ce4abb3 init load on folderbrowser 2013-09-16 15:19:46 +02:00