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

1217 Commits

Author SHA1 Message Date
perploug
f456e5b83e One last icon class update in tree.config 2013-09-27 14:21:06 +02:00
perploug
840047335a removes folder.gif references 2013-09-27 13:48:06 +02:00
perploug
0c8a7f3466 Updates missing dashboard paths 2013-09-27 11:35:59 +02:00
perploug
23822a97ef fixes dialog legacy redirects 2013-09-27 11:23:03 +02:00
perploug
c4984bffc7 Nodetype create dialog 2013-09-27 11:22:39 +02:00
perploug
812ed78cd9 made mediatype editor async 2013-09-27 11:21:56 +02:00
Shannon
bf124cb326 Fixes: U4-2957 Member type saving generates YSOD 2013-09-27 12:39:52 +10:00
Shannon
49554b7983 updates macro script web.config to what it should be 2013-09-27 09:30:08 +10:00
perploug
c9ce0117b9 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-26 21:44:08 +02:00
perploug
7c66d26973 Latest edits dashboard 2013-09-26 21:43:42 +02:00
Sebastiaan Janssen
1138e54672 Unignore macroscripts/web.config and add an empty config as a placeholder for now 2013-09-26 15:52:16 +02:00
perploug
757178b90b Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-26 15:35:59 +02:00
perploug
33b4a73794 Beginning work on localization 2013-09-26 15:34:58 +02:00
Shannon
63f5d0acaf Fixes: U4-2787 Copy dialog results in YSOD, converts move/copy dialog to only use the new API. removes xhtmlConformance from web.config. 2013-09-26 17:17:18 +10:00
Shannon
ac755d7a22 Fixes: U4-2943 Insert macro dialog no longer works when editing mvc views, U4-2930 Get macro picker dialog working with partial views and partial view macros 2013-09-26 13:20:19 +10:00
Shannon
f5f25ed017 Completes: U4-2900 remove explicit declarations in web.config 2013-09-26 11:57:45 +10:00
Shannon
bb78e38a67 Updated the default release config for umbracoSettings.config 2013-09-26 11:03:28 +10:00
Shannon
5ba1ad5e93 Completes: U4-2900 remove explicit declarations in web.config, U4-2940 Remove old spellchecker for now 2013-09-26 10:50:19 +10:00
perploug
b918462e40 Missing csproj files + minor css updates 2013-09-25 15:39:23 +02:00
perploug
2415e39e43 merge 2013-09-25 15:17:21 +02:00
perploug
7d50d0fc6c Replaces all the old core dashboards 2013-09-25 15:14:09 +02:00
Shannon
1e9a17babe Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen. 2013-09-25 19:23:41 +10:00
Shannon
cf462bd28e Fixes starter kit installer with no skins 2013-09-25 18:49:19 +10:00
Shannon
b2e2a2b004 removes the old skinning.config and updates the installer to not show that option. 2013-09-25 18:18:36 +10:00
Shannon
a939c14de9 Completes: U4-2917 Remove canvas/live editing support, U4-2916 Remove skinning support 2013-09-25 17:57:44 +10:00
Shannon
c739146f24 Completes: U4-2917 Remove canvas/live editing support, U4-2919 Remove defaultToLiveEditing column, U4-2825 Remove default permissions column 2013-09-24 19:27:13 +10:00
perploug
6ab4d177e4 fixes xslt dialog ysod 2013-09-23 13:31:12 +02:00
perploug
bd4ecafc74 Richtext null ref exception fixed 2013-09-23 10:45:12 +02:00
Shannon
4c77e0de0e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-23 13:51:14 +10:00
Shannon
61654a370a Got TinyMCE insert macro button/dialog inserting into the rich text editor - now need to ensure it is written out correctly and then parsed on the server properly so that it works! 2013-09-23 12:15:15 +10:00
Shannon
334b09f351 Moves insert macro dialog to common, creates a tinymce service to put our plugin logic inside instead of having the logic in the controller. 2013-09-23 10:36:21 +10:00
Shannon
6340afce69 Fixes change doc type to use the prop alias instead of the guid 2013-09-21 12:40:04 +10:00
Shannon
7037f0626a completes U4-2706 Change form watching in the validators over to use functions , test using other manifest property editors as parameter editors, fixes up validation in the dialog. 2013-09-20 17:00:34 +10:00
Sebastiaan Janssen
d12b0b857e Update web.Template.config 2013-09-20 08:30:10 +02:00
Shannon
7396b01466 Got macro parameter editors inserting macros into the template editor for both webforms and mvc, created unit tests for macro syntax in macroservice. Removed the hard coded span8 for input elements for property editors - need to figure out a different way to set their width. 2013-09-20 14:24:39 +10:00
Shannon
3d3ea12aba Gets the parameter editor resolver to resolve parameter editors from: c# parameter editors, c# property editors that have been flagged as a param editor, manifest parameter editors and manifest property editors flagged as param editor. Fixes more of the macro editor. 2013-09-20 09:47:01 +10:00
Shannon
f62546a308 Adds some other macro parameters fixes up more of the macro editor, all seems to be working there now and have added validation (which never existed before :( 2013-09-19 18:36:36 +10:00
Shannon
c0a303b328 Gets macro editor working with new db changes and using new MacroService data layer 2013-09-19 17:34:57 +10:00
Shannon
bbd5747177 Differentiates between a property and parameter editor, though they are similar they are still different. Renames ValueEditor to PropertyValueEditor, creates new parameter editor base classes. 2013-09-19 14:55:00 +10:00
Shannon
a4717c5cb9 Creates all of the macro parameter db upgrade scripts, fixes folder browser alias 2013-09-19 12:53:12 +10:00
perploug
2cea746644 Updates legacy editor visuals 2013-09-18 13:11:03 +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
c6ab36503d Updated doctype editor styles 2013-09-18 09:00:23 +02: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
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
Shannon
55cf2bd790 Fixes new aspx inline config references. 2013-09-17 12:31:39 +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
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