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

6877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
7681fb1925 Updated icon and media picker htm to new styles 2013-09-16 14:51:48 +02:00
perploug
53e9bd187e Thumbnails styles improvement 2013-09-16 14:51:26 +02:00
perploug
46db322538 Improved ng-error styles 2013-09-16 14:51:13 +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
99dc128b8f user dialog scaling issue 2013-09-16 09:17:19 +02:00
perploug
078c698601 dashboard headline padding 2013-09-16 09:17:07 +02:00
perploug
8400ad82ab added examine constants to core 2013-09-16 09:16:47 +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
perploug
ad62b96909 Categorised directives into seperate folders 2013-09-16 09:15:54 +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
34bc27745e Adds loader animation 2013-09-13 14:22:01 +02:00
Tim Geyssens
2a16e05699 Some more small changes to the embed dialog 2013-09-13 14:13:58 +02:00
Tim Geyssens
d3f1d6bb6b Small change to embed controller js 2013-09-13 14:06:56 +02: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
Shannon
36d82dc43b Created umbraco config holder object which is exposed on the application context, updated the web.config with the new section and the transform to ensure it get's added. 2013-09-13 14:06:36 +10:00
Shannon
e16e2917c9 Interfaced all the new config elements with unit tests... hooray for fully mockable configs ! 2013-09-13 13:41:07 +10:00
Stephan
da05196023 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-12 22:21:40 +02:00
perploug
805ebd950e Fixes: U4-2725 broken headline validation 2013-09-12 14:52:13 +02:00
perploug
03aeb9775a iconpicker legacy file 2013-09-12 14:40:49 +02:00
perploug
0c8f63487d Clean up the legacy doctype editor 2013-09-12 14:40:30 +02:00
perploug
0037283c75 Adds a notifications test 2013-09-12 14:40:07 +02:00
perploug
8c71195244 Seperates modal columns and panels html 2013-09-12 14:39:36 +02:00
perploug
852a946051 Fixes the grid height issues 2013-09-12 14:38:53 +02:00
Stephan
ff76e58e1c Core.Attempt - replace calls to obsolete members 2013-09-12 13:09:07 +02:00
Stephan
d1af20424e merge branch '6.2.0' into '7.0.0' 2013-09-12 13:09:04 +02:00
Stephan
67a632aa43 Merge branch '6.2.0' into zb-cleanup 2013-09-12 11:13:07 +02:00
Shannon
5aed53162e Implemented the remaining default values for the new configuration section with tests. 2013-09-12 19:12:21 +10:00
Shannon
8990a2fe61 Fixes a unit test 2013-09-12 15:31:01 +10:00
Shannon
dcd5decd3a Fixes up the events in the new MacroRendering event stuff 2013-09-12 14:55:29 +10:00