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

6958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sebastiaan Janssen
9d243c6c46 Merge pull request #139 from greystate/pedantic-casing 
Minor corrections to language files
 2013-09-15 04:24:44 -07: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
Sebastiaan Janssen
8f8da5a7ec Merge pull request #138 from kalletoxic/6.2.0 
Swedish languagefile
 2013-09-13 03:27:14 -07:00