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

2130 Commits

Author SHA1 Message Date
Tim Geyssens
1a38e3ccb9 Oops didn't want to commit this file in preview commit 2013-09-19 13:00:56 +02:00
Tim Geyssens
a233c30f07 List view editor, make create link to correct place 2013-09-19 12:23:01 +02:00
perploug
43bbc89a07 Removing unneeded button icons 2013-09-19 10:38:37 +02:00
perploug
ab35718e95 Listview datatype 2013-09-19 10:37:57 +02:00
perploug
4891c54ef5 Migrated the old content picker to the new dialogs 2013-09-18 15:44:50 +02:00
perploug
44e7a915b4 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-18 13:11:43 +02:00
perploug
2cea746644 Updates legacy editor visuals 2013-09-18 13:11:03 +02:00
Shannon
44cc095163 Gets macro resource and controller working to return macro param data, now to start looking at how to get this all working. 2013-09-18 18:20:14 +10:00
Shannon
29b7892e14 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-18 17:31:45 +10:00
Shannon
ccf3442992 Getting the macro picker dialog working slowly. 2013-09-18 17:31:41 +10: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
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
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
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
96c426f8c7 Adds userpicker alias and guid mapping 2013-09-17 11:15:09 +02: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
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
6288c672e1 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-16 14:52:41 +02:00
perploug
3965413d5d Fixes: U4-2647 adds folderbrowser with drag/drop support 2013-09-16 14:52:26 +02:00
perploug
fdfb019ea7 User password change dashboard 2013-09-16 14:50:56 +02:00
Tim Geyssens
f38fc69ec7 More changes to rte embed stuff related to Shannons comments 2013-09-16 12:31:07 +02:00
Shannon
48db556d1b Updated SettingsForTest to return mockable umbraco settings so we can set whatever we want. Fixing up unit tests. Removes calls to CleanUmbracoSettingsConfig and EnsureUmbracoSettingsConfig since we should be dealing with the mockable settings. 2013-09-16 19:33:21 +10:00
Tim Geyssens
940f7f4534 Some more minor updates to the tiny mce embed stuff 2013-09-16 11:31:27 +02:00
Tim Geyssens
ecbaa94ab5 Update to rte embed stuff following Shannons comments 2013-09-16 10:05:33 +02:00
Shannon
b043ee577f Renamed config interfaces properly with Section suffix, re-implemented the For<T> UmbracoConfiguration method to retreive specific settings... might use this entirely instead of the nested access as it might make it easier to mock. 2013-09-16 17:39:45 +10:00
perploug
b6d00cca63 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-16 09:18:02 +02:00
perploug
135701b845 change password dashboard form 2013-09-16 09:17:46 +02:00
perploug
c4049bcf84 Added changepwd to usercontroller 2013-09-16 09:16:21 +02:00
perploug
8c85be6683 Added search support in entityController 2013-09-16 09:16:10 +02:00
Shannon
bd644bc707 Simplifies more of the interface config collection to reduce nesting. 2013-09-16 16:16:42 +10:00
Shannon
09b68a75be Simplifies the IContentSection so that there's no nesting of interface classes and updates some unit tests 2013-09-16 15:52:59 +10:00
Shannon
81b43545c1 Updated the remainder of the legacy UmbracoSettings calls to use the new format, now to just fix up the unit tests 2013-09-16 12:36:12 +10:00
Shannon
046dcdcaf7 Replaces more calls to legacy UmbracoSettings with the new configuration section, fixes loads of null checks when dealing with package repository APIs 2013-09-16 11:22:11 +10:00
Tim Geyssens
dd4b094b66 Adds a comment to the embed controller 2013-09-13 13:54:15 +02:00
Tim Geyssens
bc7bbea650 Initial checkin of the rte embed option 2013-09-13 13:46:19 +02:00
Shannon
7538698e7b updated most of the calls from the legacy UmbracoSettings to use the new way - nearly done. 2013-09-13 18:36:41 +10:00
Shannon
f38a6e1561 Makes some massive headway with the real config section, have got all code re-delegated to using it and have migrated the baserest config to the core project, all configs will be shared out of the UmbracoConfiguration singleton, now to get the unit tests all wired up and using mocks for the most part. 2013-09-13 18:11:20 +10:00
Stephan
da05196023 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-12 22:21:40 +02:00