swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,583 Commits 73 Branches 219 Tags
a4274ba76727273eb8d7cfb02b97fc5bdcd3e9cc
Commit Graph

5066 Commits

Author SHA1 Message Date
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
perploug 135701b845 change password dashboard form 2013-09-16 09:17:46 +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 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
Kalle Ekstrand 7e1d8a6108 Swedish languagefile 
This is a fully translated languagefile fpr the swedish language.
 2013-09-13 12:10:16 +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
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 8c71195244 Seperates modal columns and panels html 2013-09-12 14:39:36 +02:00
Chriztian Steinmeier b22fd4c5b1 Minor typos 2013-09-11 21:36:45 +02:00
Chriztian Steinmeier e977a8c656 Fix spelling of "publisere" => "publicere" 2013-09-11 21:36:03 +02:00
Chriztian Steinmeier af6eb2724d Casing XSLT (zh) 2013-09-11 21:22:00 +02:00
Chriztian Steinmeier 237ee71177 Casing XSLT (ru) 2013-09-11 21:21:44 +02:00
Chriztian Steinmeier d5604ea427 Casing XSLT (pt) 2013-09-11 21:21:38 +02:00
Chriztian Steinmeier 16f8c61f28 Casing XSLT (pl) 2013-09-11 21:21:31 +02:00
Chriztian Steinmeier f066473f14 Casing XSLT (nl) 2013-09-11 21:21:24 +02:00
Chriztian Steinmeier 1a1641d300 Casing XSLT (ko) 2013-09-11 21:21:15 +02:00
Chriztian Steinmeier 3d46cd1186 Casing XSLT (it) 2013-09-11 21:21:08 +02:00
Chriztian Steinmeier 1d200b6f2f Casing XSLT (fr) 2013-09-11 21:21:03 +02:00
Chriztian Steinmeier 86f0c7c7c9 Casing XSLT (he) 2013-09-11 21:20:55 +02:00
Chriztian Steinmeier 72e1b5a0c6 Casing XSLT (es) 2013-09-11 21:20:36 +02:00
Chriztian Steinmeier 94a78aec4b Correct XSLT casing for da, en & en-us 2013-09-11 21:19:40 +02:00
perploug 7642619407 Updating legacy edtors in developer section 2013-09-11 14:04:26 +02:00
Shannon 968c921829 Finished the new installer screen report, finished and tested the v7 db upgrade script which is working!! :) Changed over all package manifests to have an alias instead of a GUID. 2013-09-11 18:25:51 +10:00