Compare commits

...

8421 Commits

Author SHA1 Message Date
Sebastiaan Janssen adea6dd2f6 Final addition to disallowed upload files 2014-11-27 15:28:38 +01:00
Sebastiaan Janssen cad0650223 #U4-5901 Fixed Due in version 7.2.0
Remote Code Execution
2014-11-27 14:29:49 +01:00
Sebastiaan Janssen d8909fe09c Also adds migration for U4-5837 2014-11-27 14:11:18 +01:00
Sebastiaan Janssen bf5acf6724 #U4-5837 Fixed Due in version 7.2.0
Missing Indexes
2014-11-27 13:57:39 +01:00
Sebastiaan Janssen 9bf33f0eea #U4-5893 Fixed
Related Links - rearranging a link will completely remove all link content fields
2014-11-27 13:24:23 +01:00
Sebastiaan Janssen 0155a094b1 Bump Version 2014-11-27 12:12:31 +01:00
Sebastiaan Janssen 08432e8b23 U4-5895 follow up on U4-5889 2014-11-27 12:05:38 +01:00
Stephan 717f67874a Fix nodeType.ascx merge issue 2014-11-27 11:57:38 +01:00
Shannon dc27368397 Fixes: U4-5891 2014-11-27 17:57:33 +11:00
Morten Christensen de7900cd2e Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-26 22:47:51 +01:00
Morten Christensen c288c2b9a3 Improves sorting of doc types before importing. Related to U4-5868 2014-11-26 22:47:36 +01:00
Sebastiaan Janssen 26032e46dd Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-26 14:42:41 +01:00
Sebastiaan Janssen caee5c6baf #U4-5889 Fixed Due in version 7.2.0
Cross Site Scripting through umbraco uploader
2014-11-26 14:42:24 +01:00
Morten Christensen ea9c37d500 Implements U4-5868 Packager should include compositions 2014-11-26 14:22:31 +01:00
Sebastiaan Janssen a1c223bc2b Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken.
Leaves the additional reference to System.Web.Http in web.config so that you don't get the System.Web.Http.ApiController when 4.0.0.1 is indeed in the GAC.
2014-11-26 10:43:46 +01:00
Shannon 6afd9b37a6 Merge branch '7.1.9' into 7.2.0 2014-11-26 15:29:18 +11:00
Shannon 1930022f19 Fixes: U4-5714 Calling Index() on IPublishedContent level 1 media fails 2014-11-26 10:52:30 +11:00
Shannon bece953fa3 fixes a null check 2014-11-26 10:20:19 +11:00
Shannon a41d37b1cf Fixes assembly error msg. 2014-11-26 09:44:31 +11:00
Shannon 31603f7063 Fixes assembly error msg. 2014-11-26 09:43:44 +11:00
Sebastiaan Janssen 4520c06454 Fixes missing filename in the log 2014-11-25 19:21:10 +01:00
Sebastiaan Janssen 9f0c00827d Fixes build, still had some wrong paths preventing build.bat from working 2014-11-25 18:54:25 +01:00
Sebastiaan Janssen 2a66f95873 #U4-5453 Fixed
#U4-5871
Enabling IIS Compression gives ERR_CONTENT_DECODING_FAILED in backoffice
2014-11-25 18:22:27 +01:00
Sebastiaan Janssen 3330c617b4 Merge branch '7.1.9' into 7.2.0
Conflicts:
	src/SQLCE4Umbraco/SqlCEHelper.cs
2014-11-25 17:04:47 +01:00
Sebastiaan Janssen 0df0b78b90 #U4-5453 Fixed
Enabling IIS Compression gives ERR_CONTENT_DECODING_FAILED in backoffice
2014-11-25 16:56:44 +01:00
Sebastiaan Janssen c6b6685dc7 Fixes the build for VS15 2014-11-25 16:55:59 +01:00
Sebastiaan Janssen 2db45eaca3 Merge pull request #516 from nul800sebastiaan/vs2014
Fixes VS14 build.
2014-11-25 15:52:05 +01:00
per ploug b876e34586 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-25 14:41:50 +01:00
per ploug 935436203e Adds razor helper comments to all grid razor views 2014-11-25 14:41:43 +01:00
Stephan 9580c8965f Merge branch '7.1.9' into 7.2.0
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
2014-11-25 11:34:49 +01:00
Stephan 7c3c477f18 Merge remote-tracking branch 'origin/7.1.9' into 7.1.9
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
2014-11-25 11:28:48 +01:00
Stephan d7cc626396 U4-1083 - proper error message on content type alias duplicate 2014-11-25 11:25:04 +01:00
Shannon e2cc342adf Removes non-completed/tested/used code for templates which was during a WIP of the grid some time ago. 2014-11-25 17:36:44 +11:00
Shannon ea785a6585 Fixes: U4-5867 Installer, no starter kit link moves when starter kit list is populated 2014-11-25 13:14:18 +11:00
Shannon 46a8e586ce Fixes: U4-5872 Using list view editor as a standard property on media type causes error 2014-11-25 12:51:55 +11:00
Shannon fa0f15f5c4 fix merge 2014-11-25 10:05:10 +11:00
Shannon 6a15c2603d Merge branch '7.1.9' into 7.2.0
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
	src/Umbraco.Web.UI/umbraco/config/lang/he.xml
	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
	src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
	src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
	src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
	src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
2014-11-25 09:59:08 +11:00
Shannon 9d50a4d2a5 Re Fixes: U4-5220 XSLT Extensions in App_Code or /bin not working in 7.1.4 - this is just a work-around fix, the real problem is the dll's in the user's bin folder. 2014-11-25 09:50:16 +11:00
Shannon 60263c9040 Re Fixes: U4-5220 XSLT Extensions in App_Code or /bin not working in 7.1.4 - this is just a work-around fix, the real problem is the dll's in the user's bin folder. 2014-11-25 09:48:54 +11:00
per ploug ba6a5825fa Fixes: U4-5742 Grid "thumbnail" property for media 2014-11-24 09:16:53 +01:00
Shannon Deminick 321e2f9de0 Merge pull request #546 from readingdancer/UmbUkFest-U4-3979
Updated the language files to fix issue #U4-3979
2014-11-24 13:12:56 +11:00
Sebastiaan Janssen 4e68380c32 Update en.xml 2014-11-23 15:12:40 +01:00
Chris Houston 9834352de2 - Added all the missing Key's to the Spanish file
- Updated the help documentation URL's
- Updated the Community Contributor URL's
2014-11-23 03:30:18 +00:00
Shannon da87ba8bc7 Merge remote-tracking branch 'origin/7.1.9' into 7.2.0
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
2014-11-21 09:59:31 +11:00
Shannon d34255b1fc Fixes display order (U4-4347) 2014-11-21 09:49:29 +11:00
Shannon Deminick 9b6ab24890 Merge pull request #562 from tompipe/umbukfest-U4-4347
If no doctypes exist then hide Master Doc Type dropdown
2014-11-21 09:47:21 +11:00
Shannon Deminick 2341622243 Merge pull request #558 from LottePitcher/7.1.9
U4-5851
2014-11-21 09:31:02 +11:00
Shannon Deminick 956a51ab67 Merge pull request #557 from AnthonyCogworks/umbUKFest-u4-5307
Issue U4-5307 - Added umb-editor css class to allow text box stretching.
2014-11-21 09:30:14 +11:00
Shannon 0fdf69be8b Merge branch 'tompipe-umbukfest-U4-4731' into 7.2.0 2014-11-21 09:26:30 +11:00
Shannon ee040eb04f Merge branch 'umbukfest-U4-4731' of https://github.com/tompipe/Umbraco-CMS into tompipe-umbukfest-U4-4731
Conflicts:
	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
2014-11-21 09:25:57 +11:00
Shannon Deminick e358d3b170 Merge pull request #555 from ismailmayat/umbUKFest-906
fix for u4-906
2014-11-21 09:20:08 +11:00
Shannon Deminick 752ce55cfa Merge pull request #551 from kristianschneider/UmbUkFest-5737
Fix for U4-5737 Create package: ContentType Tab index not saved
2014-11-21 08:55:30 +11:00
Shannon Deminick d1e684cb40 Merge pull request #550 from tompipe/umbukfest-U4-5848
Reset the template when converting a doctype and the new doctype does no...
2014-11-21 08:46:16 +11:00
Shannon Deminick e6d6d3dd69 Merge pull request #545 from kristianschneider/UmbUKFest-5657
Fix for U4-5657 List view typo: "There are no items show in the list."
2014-11-21 08:19:43 +11:00
Shannon Deminick 98b41256c1 Merge pull request #547 from Alain-es/umbUkFest-U4422
Bug fix U4-4422
2014-11-21 08:18:42 +11:00
Tom Pipe bc446a63fe If no doctypes exist then hide Master Doc Type dropdown
Fixes U4-4347
2014-11-20 17:04:34 +00:00
Lotte Pitcher dca14f3eb4 U4-5851 - Typo of 'seperate' when creating new MNTP data type : changed to 'separate' 2014-11-20 15:41:06 +00:00
Anthony Dang 1abdca2432 Issue U4-5307 - Added umb-editor css class to allow text box stretching. 2014-11-20 15:22:13 +00:00
Tom Pipe 8a214b5181 Correctly translate property label and description on ALL Tabs
Fixes U4-4731
2014-11-20 15:19:58 +00:00
Ismail Mayat 6db4fedcad some reason there is double quote escape which is not needed as peta poco handles any encoding 2014-11-20 15:12:34 +00:00
Kristian Schneider 3e66235932 amendment to U4-5737 Create package: ContentType Tab index not saved to ensure that the sortorder gets updated when importing doctypes 2014-11-20 14:23:47 +00:00
Tom Pipe 91f087141b Reset the template when converting a doctype and the new doctype does not have a template assigned
Fixes U4-5848
2014-11-20 14:22:19 +00:00
Kristian Schneider 1ab321c7b1 Fix for U4-5737 Create package: ContentType Tab index not saved 2014-11-20 14:04:13 +00:00
Chris Houston dffcf10032 Fixed ticket U4-4840 invalid Italian words in the Italian language file. 2014-11-20 12:44:41 +00:00
per ploug 6265354327 Fixes grid auto-resizing fields on hidden tabs 2014-11-20 13:39:28 +01:00
Chris Houston 054033c73f Updated the language files to fix issue #U4-3979 and also corrected invalid URL's across all the language files. 2014-11-20 12:24:49 +00:00
Kristian Schneider 4fcd23d8dc Fix for U4-5657 List view typo: "There are no items show in the list." 2014-11-20 12:04:54 +00:00
Alain 86f39aee03 Bug fix U4-4422 2014-11-20 12:32:46 +01:00
per ploug 9190930f49 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-19 15:08:52 +01:00
per ploug 11ec43c5c1 Have grid refresh editor config automatically 2014-11-19 15:08:43 +01:00
per ploug 1b83c5c180 Fluid grid views in seperate files 2014-11-19 10:37:17 +01:00
Shannon 8a98b66cfd removes un-needed lock on data type service 2014-11-19 12:47:33 +11:00
Shannon 9638bd8bd2 Fixes: U4-5758 Unable to add pre values to checkbox/dropdown list datatype after removing previous values correctly 2014-11-19 12:37:49 +11:00
Shannon Deminick 362717c05d Merge pull request #541 from jforage/issue-U4-5758
Fix to issue U4-5758. Branched off from 7.2.0
2014-11-19 12:03:36 +11:00
Shannon 16d9b9f527 fix last failing test 2014-11-19 11:58:00 +11:00
Shannon 3ae57100c8 fix merge 2014-11-19 11:52:37 +11:00
Shannon 6d33cf6c69 Merge branch '7.1.9' into 7.2.0
Conflicts:
	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
2014-11-19 11:50:10 +11:00
Shannon 209ccb9ae7 removes a MoveNext() call since we're no longer dealing with xdocuments and instead xelements 2014-11-19 11:49:13 +11:00
Shannon 2850c8aa05 Fixes build and fixes how published media cache gets root nodes - if people have done this in the past it would have been horrible for site performance 2014-11-19 11:35:37 +11:00
Shannon 87a9a57e6d Fixes media tests and updates how the IPublishedContent is created from the xpath iterator 2014-11-19 11:11:14 +11:00
Shannon 3e6273d073 Fixes: U4-5768 Partial View Macro path is wrong on create 2014-11-19 11:09:45 +11:00
Shannon 8d98813440 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-19 10:21:19 +11:00
Shannon d0b409341e Fixes media tests and updates how the IPublishedContent is created from the xpath iterator 2014-11-19 10:21:08 +11:00
per ploug 84489f612b Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-18 23:41:07 +01:00
per ploug ee6c9a3b05 Updates grid render cshtml
Better single/multi section layout support
Cleaned up the templates with a helper for cleaner code
2014-11-18 23:40:53 +01:00
per ploug d12162cca5 Grid Media rendering + sets save url correct 2014-11-18 23:39:56 +01:00
Sebastiaan Janssen 1117f96597 Spellchecker performed action again.. ;) 2014-11-18 18:09:15 +01:00
per ploug d3f3e161e0 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/installer/installer.service.js
2014-11-18 17:45:23 +01:00
per ploug 90d78d1b60 Install fact, minor tweak 2014-11-18 17:43:30 +01:00
Sebastiaan Janssen 5673b1907b Grid also renders the macro, so added to that description as well 2014-11-18 17:37:13 +01:00
Sebastiaan Janssen bc9ebb24f9 Makes it clear the checkbox is for both RTE and the grid 2014-11-18 17:12:03 +01:00
Sebastiaan Janssen 084e9e00ce Fix spelling mistake in new installer fact 2014-11-18 17:07:43 +01:00
per ploug 96e4f723b1 Fixes issue with grid media without size config 2014-11-18 13:58:49 +01:00
per ploug 163a03986c force add base.cshtml 2014-11-18 13:22:56 +01:00
per ploug 7007389505 New installer fact 2014-11-18 13:14:33 +01:00
Stephan 2336905dae Merge remote-tracking branch 'origin/7.2.0' into 7.2.0 2014-11-18 13:10:20 +01:00
Stephan a2164819f5 Safe compositions for 7.2 2014-11-18 13:09:57 +01:00
Morten Christensen 6b345bfc75 Ignoring *_Without_Examine tests which seem to cause eternal loop. 2014-11-18 12:41:22 +01:00
Morten Christensen a699f32178 Correcting invalid tests related to Compositions 2014-11-18 12:40:31 +01:00
Stephan e597886d0f Merge remote-tracking branch 'origin/7.2.0' into 7.2.0 2014-11-18 10:32:28 +01:00
Stephan 10e53de029 Safe compositions for 7.2 2014-11-18 10:29:46 +01:00
Shannon Deminick c9336ba32f Merge pull request #520 from Jeavon/U4-5698
Fix for U4-5698 - EntityService.GetObjectType throws for deleted Id's
2014-11-18 17:15:12 +11:00
Shannon 55190b7318 Fixes: U4-5707 Cannot upgrade 6.2.2 site to 7.2 2014-11-18 15:59:15 +11:00
Shannon 0328ba1aec Working on U4-5707 Cannot upgrade 6.2.2 site to 7.2 2014-11-18 15:06:27 +11:00
Shannon 1accc6275a Updates how the validation works in the member model mapper to use the native validation stuff instead of custom pre-values. 2014-11-18 14:32:51 +11:00
Shannon Deminick ce80c9a244 Merge pull request #540 from AndyButland/u4-5619
U4-5619 - Applied required setting for text field client-side validation to handle both native and custom properties
2014-11-18 14:22:25 +11:00
Shannon 2d9bd394ae Updates the codemirror plugin for tinymce so that it uses it's own alias: codemirror, so the code and codemirror plugins can be enabled individually. 2014-11-18 14:06:43 +11:00
Shannon b3c291206a Merge branch '7.1.9' into 7.2.0 2014-11-18 12:23:51 +11:00
Shannon f3f6504398 Working on: U4-5711 Media cache valueDictionary exception 2014-11-18 12:23:32 +11:00
Shannon 52629f829d Working on: U4-5711 Media cache valueDictionary exception 2014-11-18 12:05:03 +11:00
Shannon 3496c5aece Fix merge issue 2014-11-18 11:08:14 +11:00
Shannon 613f56107d Merge branch '7.1.9' into 7.2.0
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
2014-11-18 10:52:50 +11:00
Shannon c47d59a257 Fixes: U4-5820 List View showing content of complete site after deleting last page of data 2014-11-18 10:50:56 +11:00
Shannon 8fe0e4223b fixes media service paged query so recycle bin works properly 2014-11-18 10:13:21 +11:00
per ploug 9abda14530 fixes U4-5541 Update copy for tag property editor to clearly state to press 'enter' after entering a tag
Instead of requiring enter to save, it will also add tags on blur so
entered data isnt lost
2014-11-18 00:08:16 +01:00
Shannon Deminick 9df2979d7d Merge pull request #539 from AndyButland/u4-5757
U4-5757 - Recycle bin list view issue
2014-11-18 10:07:55 +11:00
Shannon f4a81bfc04 Fixes: U4-5822 Can't create my own implementation of a PropertyvalueConverter for MacroContainer 2014-11-18 09:44:40 +11:00
Shannon bff7aba778 updates naming conventions in csproj 2014-11-18 09:41:02 +11:00
Shannon Deminick ade7278724 Merge pull request #542 from OrbintSoft/7.2.0
Fix to :
2014-11-18 09:15:05 +11:00
Stefano Balzarotti f5835baa27 Fix to :
http://issues.umbraco.org/issue/U4-5475
http://our.umbraco.org/forum/getting-started/installing-umbraco/56540-Could-not-install-packages
http://our.umbraco.org/forum/getting-started/installing-umbraco/57035-Installing-Package-Error-invalid-search
http://issues.umbraco.org/issue/U4-5571

Ecc...

This is only  a temporary workaround, because this is a stupid way of parsing a URI!!
1) It's not a real parsing, it uses browser DOM API with correlated compability problems (Invalid Protocol in Internet Explorer)
2) Check the validity of url clientside is useless...
2014-11-17 23:00:43 +01:00
per ploug d7f6bd0d20 Missing grid cshtml file in csproj 2014-11-17 22:35:41 +01:00
per ploug d92e5ca2e3 Fixes U4-5586 HTML in property descriptions is not supported in v7 2014-11-17 22:31:57 +01:00
per ploug 94465892ed Adds radiobuttonlist prevalue editor 2014-11-17 22:23:03 +01:00
per ploug 4b59caf18f PR from andy butland manually added
Adds Pixes unit to rte config field, close buttons to grid config
dialogs
2014-11-17 22:23:00 +01:00
Per Ploug a0994ff105 Merge pull request #538 from AndyButland/u4-5608
U4-5608 - fixed styling issue with embedded items in grid
2014-11-17 21:39:54 +01:00
per ploug 9b3a7b8abc Allows the grid to crop images 2014-11-17 21:24:54 +01:00
per ploug bb93f0a4a2 Fixes U4-5723 Only enable macros allowed in RTE in grid 2014-11-17 21:24:52 +01:00
per ploug 3c8be919da Fixes U4-5824 Grid editor lacks localized labels 2014-11-17 21:24:51 +01:00
per ploug 168893a888 Fixes issues with image directives
Didnt work properly outside property editor
2014-11-17 21:24:46 +01:00
jforage eb4076399e Fix to issue U4-5758. Branched off from 7.2.0 2014-11-17 13:24:58 +00:00
Shannon d61d6008da Adds internal event for when a package is installed which gives access to the InstalledPackage instance which contains a PackageInstance reference that contains all of the files installed in the package 2014-11-17 18:00:51 +11:00
AndyButland 47a78c1bcb Applied required setting for text field client-side validation to handle both native and custom properties 2014-11-16 23:53:36 +01:00
AndyButland dfdf85fc0b Fixed filter that was returning all nodes for list view display of recycle bin 2014-11-16 22:12:21 +01:00
AndyButland 8862b99e6a Added css style to ensure embedded items don't take up more width than the column they are within when editing 2014-11-16 21:44:08 +01:00
Sebastiaan Janssen a1a1b9ebb5 Merge branch '7.1.9' into 7.2.0 2014-11-15 14:19:51 +01:00
Sebastiaan Janssen 403f64eeed Only set comment to blank if there's command line arguments 2014-11-15 14:19:26 +01:00
Sebastiaan Janssen 5a26a52157 Merge branch '7.1.9' into 7.2.0
Conflicts:
	build/Build.bat
	build/UmbracoVersion.txt
2014-11-15 14:18:34 +01:00
Sebastiaan Janssen 5aa29cc150 Adds version comment to UmbracoVersion.txt and makes it possible to overrule by adding arguments to build.bat 2014-11-15 14:04:19 +01:00
Sebastiaan Janssen 9be3bdb8a5 Makes sure that the very first build on a fresh machine works immediately (previously you'd get an error saying that some NuGet packages were restored and you need to run the build again). 2014-11-15 13:14:40 +01:00
Sebastiaan Janssen c0baac2b38 Should fix the build for real now. Sets GenerateSerializationAssemblies to Off which then doesn't produce umbraco.XmlSerializers.dll any more.
Should be safe as this is only used for updatechecker and packageinstaller. From:  http://hashtagfail.com/post/5255977780/sgen-loaderexceptions-error - "Visual Studio attempts to generate a serialization assembly containing the types in your solution, to improve XmlSerializer serialization performance, should you choose to serialize your types."

Conflicts:
	build/NuSpecs/tools/install.core.ps1
2014-11-15 12:38:28 +01:00
Sebastiaan Janssen 31903c8ead Merge pull request #536 from yannisgu/fixDotLess
Fix dotless reference in csproj
2014-11-14 17:17:21 +01:00
Sebastiaan Janssen e59b14b7e7 Makes sure that the very first build on a fresh machine works immediately (previously you'd get an error saying that some NuGet packages were restored and you need to run the build again). 2014-11-14 17:16:33 +01:00
Sebastiaan Janssen cb869b9064 Merge branch '7.1.9' into 7.2.0
Conflicts:
	build/Build.bat
2014-11-14 16:53:34 +01:00
Sebastiaan Janssen b20fc22577 U4-5814 Apply MVC 4.0.0.1 security update 2014-11-14 16:51:51 +01:00
yannisgu df0c297f55 Fix dotless reference in csproj
In the packages.config the version 1.4.1 of dotless is referenced while in the csproj the version 1.4.0 was referenced.
2014-11-14 11:16:20 +01:00
Stephan e36dc368d9 U4-5802 - fix Ancestor<T>, AncestorOrSelf<T> + document 2014-11-14 10:27:57 +01:00
antoine 656ba98b1b U4-5793 prevent drag element off screen vertically 2014-11-13 21:29:18 +01:00
per ploug 5c17201006 Fixes custom grid view lookup 2014-11-13 15:42:36 +01:00
per ploug d86a1946a7 Filter grid cell and row settings
Settings and styles can now be specifically applied to a cell or a row,
by default on both
2014-11-13 10:58:42 +01:00
per ploug 18bf4a87b4 Grid component editors should only open on insert 2014-11-13 10:57:51 +01:00
per ploug 91475c7103 Fixes the bottom floating buttons
On datatype editor buttons floated randomly at the bottom
2014-11-13 09:22:54 +01:00
per ploug 88934a3f14 Darkens the grid layout editor 2014-11-13 09:22:49 +01:00
per ploug 80b5c99111 Sanitizes empty grid items 2014-11-13 09:22:47 +01:00
Shannon 658a045168 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-13 18:07:10 +11:00
Shannon ccd438ba26 Fixes: U4-5801 macro container property needs to be type TEXT 2014-11-13 18:06:58 +11:00
per ploug 71863f8ba1 Sets a horizontal overflow on grid cells
To avoid that cell editors go beyond the cell horizontally
2014-11-13 07:52:19 +01:00
Shannon 6df6e3bdad Fixes: U4-3737 macro container make sure you can define the allowed macros + the max number 2014-11-13 17:44:03 +11:00
Shannon 9019c49ee8 Merge branch '7.1.9' into 7.2.0
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs
	src/UmbracoExamine/BaseUmbracoIndexer.cs
	src/UmbracoExamine/DataServices/UmbracoContentService.cs
	src/UmbracoExamine/DataServices/UmbracoMediaService.cs
	src/UmbracoExamine/UmbracoContentIndexer.cs
	src/UmbracoExamine/UmbracoMemberIndexer.cs
2014-11-13 16:32:50 +11:00
Shannon 74ebf67aef updates the local storage sync, simplifies options and does more error checking in case sync cannot occur - which will default to normal storage. 2014-11-13 15:49:34 +11:00
Shannon 33036f80fe Fixes: U4-5789 Add native option to UmbracoExamine library to run the indexes locally 2014-11-13 14:01:13 +11:00
Shannon 0688550143 start integrating the local templ storage option for examine 2014-11-13 13:09:29 +11:00
Shannon d43b673092 Merge branch '7.1.9' of https://github.com/umbraco/Umbraco-CMS into 7.1.9 2014-11-13 13:06:53 +11:00
Shannon 4ec37b9d3a Fixes: U4-5391 Create config to explicitly set the 'base url' for a website that is not running as a load balanced site - used for scheduled tasks/publishing/keepalive 2014-11-13 13:05:27 +11:00
Shannon Deminick a5240a852e Merge pull request #527 from designagencytom/patch-4
Flip ternary to prevent defaults being overridden from false to true.
2014-11-13 10:46:58 +11:00
Shannon Deminick c74c269b9a Merge pull request #535 from zpqrtbnk/7.2.0-wherein
Add WhereIn PetaPoco Sql Extension
2014-11-13 09:35:00 +11:00
per ploug 0cbdebc9b0 Merge remote-tracking branch 'origin/7.2.0' into 7.2.0
Conflicts:

	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
2014-11-12 15:44:11 +01:00
per ploug 4f655acda5 Splits the grid layout config into 3 2014-11-12 15:37:23 +01:00
Stephan 0cb396825f Add WhereIn PetaPoco Sql Extension 2014-11-12 14:42:03 +01:00
Sebastiaan Janssen 4eb0981552 Bump version 2014-11-12 14:28:13 +01:00
antoine 4257a89cc1 U4-5793 The three icons (delete, move, settings) seems to fail to appear if the cursor is coming from inside the row. I need to move the cursor out of the row entirely and then back in. Seems like a bug to me. 2014-11-12 14:14:02 +01:00
antoine 7300316780 grid add button always centered 2014-11-12 14:14:00 +01:00
antoine 94da555fea Some styles unification for the grid's prevalues 2014-11-12 14:13:57 +01:00
Sebastiaan Janssen ed8cc2ad0d Also fixes U4-5592 and U4-5746 for 7.1.9 2014-11-12 12:40:24 +01:00
Sebastiaan Janssen ae47ad882d #U4-5592 Fixed, Due in version 7.2.0
#U4-5746 Fixed, Due in version 7.2.0
Note: dotless is required for the artist formerly known as tuning
2014-11-12 10:40:31 +01:00
Shannon 10bc7d0c1e Makes the section scanning and loading from the xml lazy so this no longer happens on startup but instead when sections are required, this ensures during startup there is no IO or scanning for sections, this should assist with U4-5126 config files get cleared out with zero size and of course also help a bunch with startup time. 2014-11-12 18:32:51 +11:00
Shannon aa11d3504d Makes the tree scanning and loading from the xml lazy so this no longer happens on startup but instead when trees are required, this ensures during startup there is no IO or scanning for trees, this should assist with U4-5126 config files get cleared out with zero size and of course also help a bunch with startup time. 2014-11-12 18:06:10 +11:00
Shannon 6903ebda1f even slightly better locking 2014-11-12 16:45:36 +11:00
Shannon 6c6e398c53 Fixes locking check on tree collection, will speed things up a little 2014-11-12 16:36:08 +11:00
Shannon bccb9655d0 Fixes: U4-5715 On startup when detecting if the db is configured we need to ensure it can also be connected to 2014-11-12 16:30:01 +11:00
Shannon dd143681f1 By default, changes all log output for NH to be Warn 2014-11-12 16:02:02 +11:00
Shannon b1d4a99510 U4-5728 - Do not run KeepAlive, ScheduledPublishing, without an url
Updates the scheduler and the scheduled tasks to use a background task runner (ported from new courier codebase with tests) so that they are web aware and wind down properly.
2014-11-12 16:00:17 +11:00
Shannon 79d9412b31 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-12 10:05:28 +11:00
Shannon f6c39362cd reverts codemirror tinymce editor from release until we can fix the IE issue with it, people can still enable it if they want though. 2014-11-12 10:05:20 +11:00
Shannon Deminick 48fb2a2fcc Merge pull request #534 from kipusoep/Textbox-trimming-disabled
Disabled trimming (U4-5603)
2014-11-12 09:09:59 +11:00
antoine 4562237a96 U4-5778 Grid: Not all of the add-circle/button is clickable 2014-11-11 22:04:30 +01:00
antoine 3420694cca Some grid view css adjustments 2014-11-11 21:56:25 +01:00
antoine c68067eb09 highlight area for setting, not control. 2014-11-11 21:27:38 +01:00
antoine a8c73296ea Right info and warm highlight for rows' and controls' options (remove, move and setting) 2014-11-11 20:58:35 +01:00
Stefan Kip 805c1bf8d0 Disabled trimming
Set ngTrim to false.
2014-11-11 13:59:09 +01:00
Shannon 15119fc8d0 removes other refs to $scope.cfg, this is never necessary 2014-11-11 18:03:37 +11:00
Shannon Deminick e2f8a73561 Merge pull request #528 from robertjf/7.2.0
Fixes issue U4-5754 Attempt to set start node on Media Picker sends user...
2014-11-11 17:57:26 +11:00
Shannon 4d9f6ccd22 Fixes: U4-5780 RenderActionInvoker needs a perf fix with caching when it's using reflection 2014-11-11 17:52:40 +11:00
Sebastiaan Janssen 9112c05477 Merge pull request #531 from Jeavon/GridCodeStandards
A few small tweaks to the C# part of the Grid editor for coding standard...
2014-11-10 15:46:50 +01:00
Jeavon Leopold c0c624d62e A few small tweaks to the C# part of the Grid editor for coding standards 2014-11-10 14:43:43 +00:00
per ploug 306a30265e Remove ace from bower and directives folder 2014-11-10 13:36:57 +01:00
per ploug 1ee6fc8514 Update build.bat to beta2 2014-11-10 13:33:42 +01:00
Rune Hem Strand 1003ac42df Grid template preview
New template preview for content section
2014-11-10 12:17:39 +01:00
Robert Foster ca951aa56b Fix for issue U4-5755 Issue: Multiple mixins with same tab cause content node edit crash 2014-11-08 01:13:17 +11:00
Robert Foster 6ea7b32363 Fixes issue U4-5754 Attempt to set start node on Media Picker sends user to Content section 2014-11-08 00:57:37 +11:00
Per Ploug Krogslund db4495cf50 Grid mock data and modified tests
all client side changes, will not affect live sites
2014-11-07 11:13:28 +01:00
designagencytom c35fa7c975 Flip ternary to prevent defaults being overridden from false to true. 2014-11-07 09:43:46 +00:00
per ploug ed8cccdf5a Minor visual annoyances + changed output html
changes made due to feedback from Adam, Rune and Simon on how to make
the grid as flexible as possible
2014-11-06 22:58:35 +01:00
per ploug 9cd8ce5626 Grid layout changes to support breaking rows 2014-11-06 14:13:27 +01:00
per ploug 990f271c63 Merge 2014-11-05 20:10:06 +01:00
per ploug adfdbaec46 Adds support for grid row configuration and styling 2014-11-05 15:44:29 +01:00
Stephan 0f4436a465 U4-5728 - Do not run KeepAlive, ScheduledPublishing, without an url 2014-11-03 20:20:10 +01:00
Sebastiaan Janssen 8ccbf70b39 Making sure lower-case "Change password" is also removed 2014-11-03 18:05:12 +01:00
antoine ddd26f3ad4 Move/remove row button hover wasn't correct, point on control's methods instead of row's 2014-11-03 14:04:59 +01:00
Sebastiaan Janssen 316e7531a0 #U4-5738 Fixed Due in version 7.2.0
Umbraco 7.2 installation via NuGet fails
2014-11-03 13:13:23 +01:00
Shannon Deminick 0f068f5fb1 Merge pull request #524 from Odie20XX/patch-1
Update MembershipHelper.cs
2014-11-01 05:53:52 +10:00
antoine 8f6b76f9fc U4-5730 7.2.0 Grid - edit parameters of macro added into grid content 2014-10-31 16:29:22 +01:00
Odie20XX 468c281d7d Update MembershipHelper.cs
The parameter "logMemberIn" wasn't used so setting "LoginOnSuccess" on the RegisterModel didn't have any effect. By checking the parameter you can disable automatically logging in the user after registration. If registration failed, it would have returned null in an earlier stage so it's safe to say registration succeeded at this point.
2014-10-31 15:30:20 +01:00
Jeavon Leopold 419531f373 Fix for U4-5698 - using method logic from NPoco as it works :) 2014-10-31 13:29:03 +00:00
Jeavon Leopold 3457768646 Merge branch '7.2.0' into U4-5698 2014-10-31 12:31:06 +00:00
Antoine Giraud f7cb188210 Merge pull request #522 from arknu/U4-5638-grid-prevalue-editor
U4-5638: Replace style with ng-style to ensure styling is applied in IE
2014-10-31 12:55:18 +01:00
antoine 00518d0de7 Add the startNodeId option for the grid media editor 2014-10-31 09:59:13 +01:00
Sebastiaan Janssen 892a8d2a8a Update gruntFile.js 2014-10-30 10:12:43 +01:00
arknu ced6c011aa U4-5638: Also replace style with ng-style in the property editor 2014-10-29 15:25:59 +01:00
arknu efc2008783 U4-5638: Replace style with ng-style to ensure styling is applied in IE 2014-10-29 12:58:38 +01:00
Shannon acb987a451 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-29 18:20:10 +10:00
Shannon 4a1ea6e2d8 Fixes: U4-5710 UmbracoVirtualNodeRouteHandler does not allow for SurfaceController forms 2014-10-29 18:20:01 +10:00
Antoine Giraud cc23d57803 Merge pull request #521 from enricleon/7.2.0
Add new colorpicker directive to the canvasdesigner to improve reusability into the canvasdesigner editors
2014-10-29 09:18:32 +01:00
Enric León 81fdae3dc4 Change spectrumpicker to colorpicker in all editors 2014-10-28 16:27:04 +01:00
Enric León 2859eb560c Add new directive colorpicker that wraps spectrumpicker into a dialog 2014-10-28 16:27:03 +01:00
Sebastiaan Janssen 7c5ad67a9f Update to config transform adding a <remove /> too late and assembly bindings not transforming correctly 2014-10-28 14:41:52 +01:00
Sebastiaan Janssen 8c69bb400b Error in powershell, more backups and updates readme for beta 2014-10-28 10:56:30 +01:00
per ploug 0c33fa0421 Removes protocol from vimeo forms video link 2014-10-28 10:02:23 +01:00
Jeavon Leopold 69c3962f21 Fix for U4-5698 - EntityService.GetObjectType throws for deleted Id's 2014-10-28 08:46:07 +00:00
per ploug 0605f9d7ba Links forms dashboard video to vimeo 2014-10-28 09:01:51 +01:00
Sebastiaan Janssen 214c41f835 Revert "Disabling mini editor for now"
This reverts commit ff8f9bb6f4.
2014-10-28 08:31:18 +01:00
Shannon 3853e086a0 Fixes: U4-5654 U7.2 - Creating a media type with inheritance throws a YSOD and also fixes legacy icons with media/content types 2014-10-28 16:45:59 +10:00
Shannon 24695948d2 Fixes API compatibility issues with new date picker, moves moment to it's own folder since it might be used for other things. 2014-10-28 16:16:00 +10:00
Shannon Deminick 5595d2ea73 Merge pull request #519 from arknu/datepicker-locale2
U4-5520: Localize date/time picker (2nd try)
2014-10-28 15:42:47 +10:00
Shannon 7a42b5dae3 streamlines and simplifies contentpicker.controller.js, ensures that filtering is performed properly even based on search results and differently based on members 2014-10-28 15:37:47 +10:00
Shannon cc8f07c0d8 Fixes: U4-5694 When searching in a picker, the filtering rules are ignored 2014-10-28 15:23:05 +10:00
Shannon 67b9fcd295 Allows a callback for advanced filtering on the tree picker, also ensures that the "search..." nodes are never filtered since these are functional nodes and not selectable by default. 2014-10-28 12:20:34 +10:00
Shannon c44a129e68 fixes js spec 2014-10-28 12:19:25 +10:00
Shannon e4a8edd64c streamlines and simplifies member group picker code 2014-10-28 12:19:00 +10:00
Shannon e282d45397 streamlines and simplifies mediapicker pre-value code 2014-10-28 12:18:40 +10:00
Shannon 215f2462e4 streamlines and simplifies memberpicker code 2014-10-28 12:17:38 +10:00
Shannon 2babb2373d ensures new member types have correct default icon 2014-10-28 12:17:05 +10:00
Shannon b6d0b46332 Fixes: U4-5691 Search in backoffice pickers not working 2014-10-28 09:28:53 +10:00
per ploug 870b611871 Missing url in forms dashboard due to typo 2014-10-27 22:35:34 +01:00
Sebastiaan Janssen ff8f9bb6f4 Disabling mini editor for now 2014-10-27 16:35:46 +01:00
Sebastiaan Janssen ad1473e52f Fix some more config transforms 2014-10-27 16:35:45 +01:00
per ploug 1de59f048b Fixed U4-5664 Change icon overlay on system list views 2014-10-27 14:29:01 +01:00
per ploug 03060f7de9 Fixed U4-5606 Style on grid items are ignored in Internet Explorer 2014-10-27 14:08:14 +01:00
Sebastiaan Janssen 4521e31ec5 #U4-5582 Fixed Due in version 7.2.0
v7 JS exposes version number
2014-10-27 13:07:10 +01:00
arknu 0c4d574fe4 add moment.js 2014-10-27 12:57:24 +01:00
arknu b541fe6b3f U4-5520: Localize date/time picker (with improved compatibiility and other fixes) 2014-10-27 12:56:47 +01:00
per ploug e9e83d3958 Updates forms video player js + css 2014-10-27 11:55:46 +01:00
antoine 4bb0f41ead menor style issue 2014-10-27 10:43:51 +01:00
antoine 0469c206aa force overflow = hidden to prevent no needed scrolls 2014-10-27 10:43:51 +01:00
Antoine Giraud d4c79ccf03 Merge pull request #515 from Will-i-am-/7.2.0
Fix for width percentage on template selection not being rendered in gri...
2014-10-27 10:43:32 +01:00
Antoine Giraud 730c9c8403 Merge pull request #518 from enricleon/7.2.0
Fix issues of the canvas designer
2014-10-27 10:40:41 +01:00
Shannon 87db6d672a Revert "U4-5520: Localize datepicker" 2014-10-27 17:47:50 +10:00
Shannon e6eb25b58a working on U4-5687 Fix issues with mini content editor that is launched from new Edit button in MNTP 2014-10-27 17:19:06 +10:00
Shannon c45b3b7c3a working on U4-5687 Fix issues with mini content editor that is launched from new Edit button in MNTP 2014-10-27 17:10:33 +10:00
Shannon bf6a74b36b working on U4-5687 Fix issues with mini content editor that is launched from new Edit button in MNTP 2014-10-27 16:29:24 +10:00
Shannon 40de02ca5d working on U4-5687 Fix issues with mini content editor that is launched from new Edit button in MNTP 2014-10-27 16:11:20 +10:00
Shannon ec86c92753 working on U4-5687 Fix issues with mini content editor that is launched from new Edit button in MNTP 2014-10-27 16:03:03 +10:00
Shannon cf444e1702 working on U4-5687 Fix issues with mini content editor that is launched from new Edit button in MNTP 2014-10-27 15:24:04 +10:00
Shannon 145229122c working on U4-5687 Fix issues with mini content editor that is launched from new Edit button in MNTP - fixes the fileManager part. 2014-10-27 14:09:25 +10:00
Shannon 67ffeebe0d Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-27 13:02:02 +10:00
Shannon 7d3a66de07 Working on U4-5687 Fix issues with mini content editor that is launched from new Edit button in MNTP 2014-10-27 13:01:51 +10:00
Shannon Deminick 58f4d2a6c5 Merge pull request #475 from KevinJump/v7.1.6.packagecontentfix
Package Installer - Moving content.setValue back out of PropertyType if block (back to v7.1.4 pos)
2014-10-27 10:27:29 +10:00
Sebastiaan Janssen f0256e2bd5 Makes the check for Microsoft.WebApplication.targets file explicit 2014-10-25 17:06:35 +02:00
per ploug 3ec6e8a1ea Adds forms to the default app.config 2014-10-25 01:10:08 +02:00
per ploug 48cb51e1e1 Updates forms installer dashboard
Requires a web.config update to support .mp4 mimetypes
2014-10-25 01:09:40 +02:00
Enric León 91491e4627 Add ability to open all the categories of the canvas designer. Also sow a scrollbar in the panel if its height it's bigger than the window. 2014-10-24 12:53:08 +02:00
Enric León 97cdea8fea Remove console.info of the over canvasdesigner element 2014-10-24 12:53:07 +02:00
Enric León 9397655395 Fix incorrect icons to show hide categories on canvas designer main panel 2014-10-24 12:53:05 +02:00
Enric León c03a1424be Highlight item on left panel when hover in the canvas designer item 2014-10-24 12:53:04 +02:00
Enric León 801458d05c Rename "refrech" to "refresh in the canvas designer methods 2014-10-24 12:53:03 +02:00
Sebastiaan Janssen 6c2750b0cc Moves fix for VS14 to the SqlCEHelper class itself, InternalsVisibleTo didn't seem to work in VS (worked on command line build though) 2014-10-24 10:32:41 +02:00
Shannon 5d9c7d9068 adds note 2014-10-24 17:15:38 +10:00
Shannon 302e9ec11c renames to GetModelAsync 2014-10-24 17:15:21 +10:00
Shannon Deminick a44123f064 Merge pull request #504 from arknu/datetimepicker-locale
U4-5520: Localize date/time picker
2014-10-24 12:17:45 +10:00
Shannon 905cf830e6 Ok, the loader styles should now be good for everything! 2014-10-24 13:02:46 +10:00
Sebastiaan Janssen abc672e348 Fixes VS14 build. SqlCEHelper.cs - the compiler in Vs14 doesn't like that we're callng public IRecordsReader ExecuteReader(string commandText, params IParameter[] parameters) like this: ExecuteNonQuery("alter table [" + table + "] drop constraint [" + constraint + "]");
Added two internal method overloads that just send an empty parameter array instead.
2014-10-23 17:52:14 +02:00
Sebastiaan Janssen c273c94d57 Should fix the build for real now. Sets GenerateSerializationAssemblies to Off which then doesn't produce umbraco.XmlSerializers.dll any more.
Should be safe as this is only used for updatechecker and packageinstaller. From:  http://hashtagfail.com/post/5255977780/sgen-loaderexceptions-error - "Visual Studio attempts to generate a serialization assembly containing the types in your solution, to improve XmlSerializer serialization performance, should you choose to serialize your types."
2014-10-23 17:08:35 +02:00
Sebastiaan Janssen 231b3062b8 Should fix Teamcity build, Umbraco 7 can't build on VS10 anyway 2014-10-23 10:35:03 +02:00
Shannon b4be203b2a Added a new dashboard to rebuild xml structures for content, members, media. I haven't put it in the release dashboard config for now. Also added methods to the examine controller to check the index integrity which we can use for th 7.3 task. 2014-10-23 18:52:11 +10:00
Shannon 44a39e7ca6 Fixes: U4-5055 Umbraco update fails with large set of media content due to timeout in RebuildXmlStructures. Adds RebuildXmlStructures to content, media, member services as public APIs (though people won't really use them), the underlying repositories now rebuild these structures using a single transactions but queried by pages of 5000 which should reduce memory overhead if there's a ton of media, etc... Added tests for this too. Added CountPublished to ContentService too. 2014-10-23 18:31:08 +10:00
Shannon 238f5fc5f3 Fixes: U4-5676 Styling in template editors is poor with the scrollbars and padding , the problem was due to a few too many umb-scrollables defined which causes multiple resizing, this should also improve the UI performance for legacy editors. Have also removed the hard coded width/heights in the code editors, have disabled codemirror from autoscaling as well in these editors since that causes additional scrollbars and overhead. Have tested all these changes in all browers and it's much better. 2014-10-23 14:01:16 +10:00
Shannon e8a2ddb2a4 Simplifies NamespaceHttpControllerSelector and should be better with regards to locking instead of enumerating over a concurrent collection. 2014-10-23 10:51:33 +10:00
Will df4d2f8c3b Fix for width percentage on template selection not being rendered in grid property editor 2014-10-22 16:02:32 +01:00
Shannon 9717a6962a adds tests 2014-10-22 16:46:22 +10:00
Shannon 56a8b771c1 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-22 16:44:55 +10:00
Shannon 86e82c7674 Updates PartialView & PartialViewMacros models/services/repositories, streamlines their operations, fixes up other underlying problems with the FileRepository, fixes tree syncing for partial views, partial view macros and scripts, fixes scripts being created in folders, allows partial views and partial view macros to be managed and created in folders, fixes FileUnitOfWork to use a queue, publicizes some internal test classes, fixes tree syncing when dealing with invariant case, adds correct validation to the create dialogs of scripts and partial views (and partial view macros) 2014-10-22 16:44:45 +10:00
Shannon 9ffaa8aabb Fixes some of the PhysicalFileSystem issues with paths vs relative paths, this should fix up inconsistencies. 2014-10-22 15:52:32 +10:00
Shannon Deminick f88144cbbe Merge pull request #513 from filipw/feature/cache-httpcontrollerdescriptor
Cache HttpControllerDescriptor in NamespaceHttpControllerSelector
2014-10-22 12:13:06 +10:00
filipw 9e7d2884b9 do not recreate HttpControllerDescriptor every time 2014-10-21 08:39:21 +02:00
filipw fe31ed5cb2 changed NamespaceHttpControllerSelector to use a helper class NamespaceHttpControllerMetadata rather than raw Type caching 2014-10-21 08:37:40 +02:00
Shannon 4494d8cc91 Merge branch 'partial-view-folders' of https://github.com/pynej/Umbraco-CMS into 7.2.0 2014-10-21 13:21:12 +10:00
Shannon 967030a9c4 Fixes up issues when tracking dirty changes on numerical or empty string values because json.net converts numerical to long and we were setting those values on the Property.Value which means that comparing long -> int will always return false and thus the property is flagged as dirty. Same goes with string and null when dealing with an object. This is all fixed up now and have added another method to see if we shold actually persist any changes for content when saving. This all relates to fixing: U4-5510 Previewing a content item saves that item 2014-10-21 13:12:31 +10:00
Shannon 95c0f80df4 Removes all the unecessary casting to ICanBeDirty - not sure why we've had it like this for so long. 2014-10-21 11:43:58 +10:00
Shannon 0e23c9e69f Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-21 10:35:02 +10:00
Shannon 8388ec12cd Ensure preview button is not shown when the content is being created 2014-10-21 10:34:52 +10:00
Stephan 81928a5948 bugfix PublishedContentType cache key 2014-10-20 18:50:07 +02:00
Shannon 15413a75fe Fixes: U4-4698 Properties on 'Info' tab of Membertype not saving correctly on Umbraco 7.1.1 2014-10-20 19:50:55 +10:00
Shannon 720ed0f457 Adds another check to old migrations to ensure some required FKs are dropped when needed 2014-10-20 14:26:22 +10:00
Sebastiaan Janssen 043139caae Fixes build for people without git in path and with various VS versions installed (no more need to have at least VS2012 installed) 2014-10-19 13:00:54 +02:00
Sebastiaan Janssen 54642590cc Took a page out of Json.Net's book and solved the problem with initial installs while keeping the upgrade transform behavior 2014-10-17 20:13:23 +02:00
Sebastiaan Janssen f4231b1692 Upgrade to System.Web.Mvc 4.0.0.1 (or 4.0.40804.0 whatever you want to call it) 2014-10-17 17:24:32 +02:00
arknu 144a4fdd62 Update format string for date picker without time 2014-10-17 11:24:26 +02:00
Shannon 334e7da40f Fixes full screen scrolling issue due to buttons in breadcrumb being bigger than they should 2014-10-17 11:51:24 +10:00
Shannon e177ad57cc Fixes: U4-5397 Header in modal left sidebar breaks out of sidebar width 2014-10-17 11:43:23 +10:00
Shannon b01ed76350 ensures loader bar is relative in modals/dialogs 2014-10-17 11:35:32 +10:00
Shannon 732d37054b re-fixes loader bar styling 2014-10-17 11:30:59 +10:00
Shannon d9195122d5 Fixes null check in template repo 2014-10-17 11:13:12 +10:00
Shannon 03e4ad6c4b adds transforms/tools to the sln folder 2014-10-17 10:48:33 +10:00
Shannon Deminick 31f4b32277 Merge pull request #511 from arknu/translate-da
U4-5655: Update Danish language file
2014-10-17 08:56:10 +10:00
arknu a3ce5f82d4 U4-5655: Missed media saved message 2014-10-16 15:39:46 +02:00
arknu 843397d793 U4-5655: Update Danish language file 2014-10-16 15:08:15 +02:00
Sebastiaan Janssen bfd79277fd Adds two more required transform files and updates web.config with forgotten key 2014-10-16 13:41:03 +02:00
Sebastiaan Janssen 0811951c04 Remove already defined variable 2014-10-16 13:41:02 +02:00
Sebastiaan Janssen 49aa6b40cc Require json.net to make old version (<6.2.0) upgrades succeed 2014-10-16 13:41:02 +02:00
Sebastiaan Janssen 6b43c0c761 Still try to backup web.config (might be too late though, will test) and remove test entry from install.core 2014-10-16 13:41:01 +02:00
Sebastiaan Janssen 1346621a79 Few more nuget updates 2014-10-16 13:41:00 +02:00
Sebastiaan Janssen 9f4d72e137 Improve NuGet upgrades 2014-10-16 13:41:00 +02:00
arknu 5baa721eb7 add cursor: pointer to datepicker button 2014-10-16 13:40:50 +02:00
Shannon ca58e8f98f Fixes: U4-4176 v7, cannot disable users in right-click-menu. 2014-10-16 18:45:02 +10:00
arknu caa4f3ed45 reference non-minified files 2014-10-16 10:03:55 +02:00
arknu f5447e1bc1 remove minified version 2014-10-16 09:48:52 +02:00
arknu da64215bc5 forgot to update the datepicker format string in a couple of places 2014-10-16 09:48:50 +02:00
arknu eb348d60a8 styling tweaks for new datepicker 2014-10-16 09:48:49 +02:00
arknu a916686d2e add moment.js 2014-10-16 09:48:47 +02:00
arknu 6adf04eddc U4-5520: Localize datepicker 2014-10-16 09:48:46 +02:00
Shannon 26059ebad0 updated some of the table styling, updated the path to be relative and updated the release config. 2014-10-16 17:38:36 +10:00
Shannon f48a218456 Merge branch 'tinymce-codemirror' of https://github.com/pynej/Umbraco-CMS into pynej-tinymce-codemirror 2014-10-16 17:06:22 +10:00
Shannon fa2337f806 Fixes: U4-5649 Ensure NodeCount is on TagModel for TagQuery 2014-10-16 16:23:13 +10:00
Shannon c66b1f7e25 removes macro scripts from build files 2014-10-16 16:05:00 +10:00
Shannon 133d7c92cb If the legacy razor macro engine is executed, ensures that the folder and required web.config exist before execution. 2014-10-16 16:01:25 +10:00
Shannon 10c0d26a17 Fixes: U4-4828 Disable "Scripting Files" tree and don't ship the macroScripts folder 2014-10-16 15:37:32 +10:00
Shannon Deminick 328103c4ac Merge pull request #507 from danlister/7.2.0-U4-5602
U4-5602 Dropdown List data type now shows an empty option after a page is saved
2014-10-16 13:55:23 +10:00
Shannon 8697829982 fixes some minor things in PRs 2014-10-16 14:53:55 +10:00
Shannon Deminick b68f79d569 Merge pull request #509 from kalletoxic/7.2.0
Making the sort dialog responsive also in height. Before you had to scro...
2014-10-16 13:49:17 +10:00
Shannon 25b8a12aad removes the contour lang keys that shouldn't be there. 2014-10-16 14:46:52 +10:00
Shannon Deminick 3846d1a4f7 Merge pull request #510 from scottleaver/7.2.0
Make input box on search visible
2014-10-16 13:44:54 +10:00
Shannon 142a5ec922 Removes demo packages from source control, we don't need these, they were just committed POCs at the beginning of v7 development 2014-10-16 14:31:44 +10:00
Shannon 3b53aca31f Ensures the mousemove on document event is unbound when unloading the umbcontentname directive. 2014-10-16 14:28:58 +10:00
Shannon 297f564b1d removed the min version, we minify anyways. 2014-10-16 14:20:38 +10:00
Shannon 87f0586cdd Fixes date picker, ensures today's date is not shown when hiding, ensures that a null value is set when it's empty 2014-10-16 14:18:41 +10:00
Shannon 582357557f Had to remove the duplicate index updates, otherwise it will try to do it twice (U4-4133) 2014-10-16 13:33:38 +10:00
Shannon f779f3dbf4 Fixes examine unit tests 2014-10-16 13:01:33 +10:00
Shannon 7df39efa7b Ensures missing indexes are added that are required for the other constraints, even though these are now added for 6.0, if the version is detected as greater than 6.2 they still need to be added. (U4-4133) 2014-10-16 12:15:39 +10:00
Shannon cab8ea86fb Fixes related links data upgrader when there invalid old data stored (U4-4133) 2014-10-16 12:01:08 +10:00
Shannon 7b99efb061 Working on: U4-4133 Database key changes are not fixed in the Umbraco 7 installer! 2014-10-16 11:24:29 +10:00
Shannon ed3a5a7ee3 Avoids an exception if data in the db is inconsistent, this can occur with very old upgrades, adds a warning if this is the case. 2014-10-16 11:23:24 +10:00
Shannon e41e95d377 Instantly improves perf of content/media trees by updating the RecycleBinSmells methods - they were loading in ALL content that was in the bin before just to return a boolean! :( 2014-10-16 11:22:44 +10:00
Shannon bd0a1e66f2 Fixes issue with tree picker and search where the already selected nodes would be cleared when searching and not selecting anything. Adds transition to go to search. 2014-10-15 15:57:04 +10:00
scottleaver a784e36980 Make input box on search visible
UX improvement. Without a box it is not obvious where to click to perform search.
2014-10-14 18:39:37 +01:00
Shannon 4121e3a427 Fixes: U4-5616 Cannot sort tabs/groups 2014-10-14 15:22:28 +11:00
Shannon 315e9a0d03 Search now works in copy/move dialogs, also fixed up the styling on the loader and streamlined it's usage 2014-10-14 09:36:35 +11:00
Shannon 7804e8aa44 Copy dialog with search is basically working, just needs a few tweaks. 2014-10-13 18:31:35 +11:00
Shannon f42b7adc0e Link picker now working with search + list view search 2014-10-13 18:20:18 +11:00
Shannon 48d34af7bb Gets tree picker working better with searching and list views. 2014-10-13 17:27:22 +11:00
Shannon 12a23abbbf Gets the new way of searching list views working 2014-10-13 16:31:46 +11:00
Shannon 7a7f31b7a6 Updates tree item directive to have far less angular bindings and sets up much of the DOM manually, this improves perf in a big way when lots of nodes are rendered... still needs more of this though! 2014-10-13 14:27:07 +11:00
Stephan 3c7fb8aeff U4-2581 - public UmbracoContext.UrlProvider 2014-10-10 11:35:40 +02:00
Shannon f43fa499bf Fixes: U4-5628 Publicize PublishContentRequest.Prepare, U4-5574 UmbracoVirtualNodeRouteHandler doesn't handle culture properly 2014-10-10 14:45:38 +11:00
Shannon 34152867fa Fixes: U4-5627 Publicize PublishedContentRequest constructor 2014-10-10 10:58:06 +11:00
Shannon 18e0aabdb2 adds some notes 2014-10-10 10:49:47 +11:00
Kalle Ekstrand 8a822a8400 Updated Swedish language file 2014-10-09 18:31:05 +02:00
Kalle Ekstrand 71d879842f Making the sort dialog responsive also in height. Before you had to scroll... 2014-10-09 18:14:17 +02:00
Shannon 0407bec67b Moves more logic into directives 2014-10-10 01:05:48 +11:00
Shannon f5746a1a3c Moves some of the search parts into directives so we can start re-using them. 2014-10-10 00:42:37 +11:00
Shannon ea6708e55a Ensures search listing and tree view is fully synced, if you uncheck an item that's already selected from either tree view or search result, all ui is synced. 2014-10-09 17:28:16 +11:00
Shannon 83528f932e Ensures that any already visible tree nodes are selected if they are selected in the search list 2014-10-09 17:15:32 +11:00
Shannon 7f5a117a67 Ensures that new nodes that are shown in the tree that have already been selected via the search results are shown as selected 2014-10-09 17:01:36 +11:00
Shannon e709a759ed Gets the icon for each content/media item indexed so it can be mapped and shown when showing search results. 2014-10-09 16:39:12 +11:00
Shannon 41da2fab98 Revert "WIP - quick test to move the tree node style above search bar" - back to yesterday's behavior until we figure out exactly what the plan is 2014-10-09 16:11:09 +11:00
Shannon 38621c61ba WIP - quick test to move the tree node style above search bar 2014-10-09 16:03:10 +11:00
Shannon 6b36b01491 fixes media move to use the correct check enabled tree 2014-10-09 14:36:35 +11:00
Shannon 49164ce6ef Updates move/copy to use the correct usage of checked nodes 2014-10-09 14:31:53 +11:00
Shannon 9cbea5764d fixes umbtreeitem with ng-show instead of ng-if which wasn't working for the copy dialog for some reason 2014-10-09 13:39:10 +11:00
Shannon f8503b4c68 Fixes (and massively simplifies) the member group picker to use the correct way of using checks in tree nodes 2014-10-09 12:51:07 +11:00
Shannon 0ff1c9915d Updates tree to natively support check boxes as an option, same with search icons, fixes tree directive to pass the current tree scope correctly, removes the requirement for the cache key on the umbtreeitem directive. Fixes the link picker to use the correct way to show check boxes instead of hacking with jquery. 2014-10-09 12:36:52 +11:00
Shannon c58a9429e1 Member picker now using standard treePicker and search is working 2014-10-09 11:08:09 +11:00
Shannon 18efe25167 removes unneeded contentpicker dialog and just uses the standard tree picker that has the correct search built in, now search is working for the link picker. 2014-10-09 00:04:25 +11:00
Shannon 5c5a0e6140 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-08 23:24:40 +11:00
Shannon 05d5e981af Search working pretty nicely with tree picker and list views, now to get it working like this consistently for all of them. 2014-10-08 23:24:27 +11:00
Sebastiaan Janssen ea7d52a353 Update version 2014-10-08 13:56:26 +02:00
Shannon 8136b3ecb0 Got searching working from a particular node id, got the UI nearly working 2014-10-08 19:03:45 +11:00
Shannon 13ea17c225 Merge branch '7.1.8' into 7.2.0
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2014-10-08 18:04:47 +11:00
Shannon b8ea50d644 Merge remote-tracking branch 'origin/6.2.4' into 7.1.8
Conflicts:
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
	src/Umbraco.Tests/Services/EntityServiceTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2014-10-08 17:30:45 +11:00
Shannon 1eab26c0f6 reverts IQuery 2014-10-08 17:26:55 +11:00
Shannon 0543c620eb bumps version 2014-10-08 17:25:06 +11:00
Shannon 646e5f173d Fixes descendant queries to ensure that the comma is suffixed to the path, otherwise strange things could happen when there are longer ids! 2014-10-08 17:23:14 +11:00
Shannon b5594517bd Fixes: U4-5583 Can no longer link to Media Items from RTE in 6.2.3 - Due to a cherry pick/merge issue since the newer 7.x EntityRepository deals with NVarchar and NText values whereas the 6.x one did not. Have backported the mapping poco classes to now also support NVarchar and NText for the EntityRepository. Have also fixed the basic query to ensure that there are no left joins before inner joins which can also cause problems. Fixed up the duplicate where clause. Adds more tests to entity service. 2014-10-08 17:13:28 +11:00
Shannon c61c130ddf WIP: working on tree picker with search for list views 2014-10-08 14:35:57 +11:00
Shannon 818c699d60 WIP: working on tree picker with search for list views. updates all pickers to ensure that they unbind any events. 2014-10-08 14:26:18 +11:00
Shannon Deminick f5ec2139f0 Renaming to correct file naming conventions 2014-10-08 09:34:24 +11:00
Shannon Deminick 983d7610e4 Renaming to correct file naming conventions 2014-10-08 09:33:57 +11:00
Shannon Deminick 504c477037 Renaming to correct file naming conventions 2014-10-08 09:33:37 +11:00
Shannon Deminick 7b8932a5d6 Renaming to correct file naming conventions 2014-10-08 09:33:14 +11:00
Shannon Deminick 504f53439a Renaming to correct file naming conventions 2014-10-08 09:32:42 +11:00
Shannon Deminick e58c7f46c7 Renaming to correct file naming conventions 2014-10-08 09:32:16 +11:00
Shannon Deminick 1953e23560 Rename src/Umbraco.Web.UI/Views/Partials/grid/bootstrap2.cshtml to src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml 2014-10-08 09:31:40 +11:00
Shannon c266f9f58e updates sort dialog prog bar 2014-10-08 09:30:12 +11:00
Shannon 7296643f2d Fixes remaining link picker issue: U4-4974 Umbraco v7.1.3 - Users cannot insert images in RTE 2014-10-08 09:29:52 +11:00
per ploug 0057421f98 Update grid partials to grid/ instead of canvas/ 2014-10-07 14:40:45 +02:00
Sebastiaan Janssen bb5d373923 Merge pull request #506 from sitereactor/7.2.0-compositions-fix
Fixes U4-5077 doc types with compositions
2014-10-07 14:11:09 +02:00
per ploug be8e4b9fe5 grid partials 2014-10-07 14:01:48 +02:00
Morten Christensen e6820ad52a Fixes U4-5077 Umbraco 7.2 Alpha - doc types with compositions get moved in doc type tree
Return 0 if parent is the root
2014-10-07 13:59:22 +02:00
per ploug b6fd0489e2 Renames canvas editor into grid again 2014-10-07 13:39:18 +02:00
Dan Lister 936b903b24 Fixes: U4-5602 Dropdown List data type now shows an empty option after a page is saved 2014-10-07 10:43:37 +01:00
Sebastiaan Janssen 5501c9531b Bump version 2014-10-07 11:22:51 +02:00
per ploug bba4db46d2 Breaking change: Renames GetGridHtml() to RenderCanvas() 2014-10-07 11:17:24 +02:00
Shannon ec30251271 Fixes most tree pickers to show/hide the header correctly, updates the entitycontroller to be able to search from a start node and use the user's assigned start node if one is not passed in. Ensure the search bar is visible for the treepicker at all times. Now to get the remaining bits working... 2014-10-07 17:22:26 +11:00
Shannon Deminick 173d298d21 Merge pull request #503 from arknu/angular-test-fixes
U4-5589: Fix broken Angular app test setup
2014-10-07 16:38:50 +11:00
Shannon 98eeaca5d5 Fixes: U4-5597 ServerVariables cannot include dynamic data like a users start node Ids 2014-10-07 14:59:07 +11:00
Shannon 6ab03d4c98 puts website proj back in sln 2014-10-07 14:09:46 +11:00
Shannon 7a172c4253 Fixes: U4-4974 Umbraco v7.1.3 - Users cannot insert images in RTE 2014-10-07 14:08:22 +11:00
Shannon b28f1d86c9 Merge branch '7.1.8' into 7.2.0 2014-10-07 12:57:47 +11:00
Shannon 8824ab2b27 reverts JS from tree controller and updates the c# method to create the tree child node URLs to ensure the custom start node param is ignored, this is a bit cleaner. 2014-10-07 12:52:02 +11:00
Shannon b60e292d5f Fixes: U4-5578 MNTP with root node, recursive output 2014-10-07 11:51:11 +11:00
Shannon e1dcf6b061 reverts IQuery 2014-10-07 11:50:35 +11:00
Shannon Deminick 9058358004 Merge pull request #501 from Alain-es/U4-5400-Bugfix
U4-5400 BugFix
2014-10-07 10:14:57 +11:00
per ploug 6d4deb8da5 Fixes U4-5531 7.2.0 Nightly: Preview of desktop, height is 150px 2014-10-06 13:54:30 +02:00
per ploug 4da98c1697 temp forms copy 2014-10-06 13:31:43 +02:00
per ploug 7ae9a2bda6 Canvas add delay to overlay 2014-10-06 11:55:34 +02:00
arknu 95c4fb740a Fix broken Angular app test setup 2014-10-04 23:37:46 +02:00
Alain-es ad4b90dbe5 U4-5400 BugFix
BugFix: U4-5400 Tags Data Type Doesn't Always Auto-Complete/Typeahead.
New feature: Filters the shown list items to not show the tags that are
currently selected.
2014-10-04 08:48:04 +02:00
antoine 0ce83630d7 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-03 09:45:19 +02:00
antoine bc733132a6 Right ng-include for the canvas additem 2014-10-03 09:44:50 +02:00
Shannon 58a0de086f fixes unit test 2014-10-03 17:07:27 +10:00
Shannon cc9ca02843 Merge branch 'BatJan-7.1.5-localizatiob-5025' into 7.2.0
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
2014-10-03 13:29:04 +10:00
Shannon 12e49f186e Merge branch '7.1.5-localizatiob-5025' of https://github.com/BatJan/Umbraco-CMS into BatJan-7.1.5-localizatiob-5025
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
2014-10-03 13:28:02 +10:00
Shannon 967df0949b Merge branch 'abryukhov-7.1.0' into 7.2.0 2014-10-03 13:15:30 +10:00
Shannon a0602e6b2a merges PR #243 2014-10-03 13:03:52 +10:00
Shannon c078a1c12f Merge branch 'U4-5512' of https://github.com/arknu/Umbraco-CMS into arknu-U4-5512
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
2014-10-03 13:01:00 +10:00
Shannon 8cfb5915ac Manually merge branch 'allyen-6.1.4-shibboleth' into 7.2.0 2014-10-03 12:58:30 +10:00
Shannon 19595ba887 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-03 12:51:38 +10:00
Shannon 2b2891b6f4 Merge branch '7.1.5' of https://github.com/henrikrossen/Umbraco-CMS into henrikrossen-7.1.5 2014-10-03 12:51:27 +10:00
Shannon Deminick 0b41f1e85e Merge pull request #488 from jhauge/7.2.0
This commit fixes U4-1115
2014-10-03 12:03:49 +10:00
Shannon 1d42a9225f Removes desktop media uploader - not used anymore AFAIK 2014-10-03 11:53:06 +10:00
Shannon 8012c909c0 removes angular web app from sln 2014-10-03 11:50:10 +10:00
Shannon 7368cc6b28 Style fixes 2014-10-03 10:37:30 +10:00
Shannon 68480ebd56 Fixes: U4-5492 Distributed calls won't work if IIS sites between servers have the same HttpRuntime.AppDomainAppId 2014-10-03 09:44:17 +10:00
Shannon 0d74642e56 fixes U4-5492 Distributed calls won't work if IIS sites between servers have the same HttpRuntime.AppDomainAppId 2014-10-03 09:44:03 +10:00
Shannon Deminick cce63d6eaa Merge pull request #498 from AndyButland/u4-5461
U4-5461 - Further amends to date picker behaviour
2014-10-03 09:21:23 +10:00
AndyButland 3090339962 Removed incorrect option value 2014-10-02 22:08:19 +02:00
AndyButland d9074da3fd Removed close of date/time picker on date selection when set up with time picker; close picker on click on document 2014-10-02 22:02:41 +02:00
Sebastiaan Janssen 246dfba8ac Bump version 2014-10-02 18:06:15 +02:00
Shannon 8e89a43311 Merge branch '7.1.7' into 7.2.0 2014-10-03 00:33:10 +10:00
Shannon c0c7d21001 Merge remote-tracking branch 'origin/6.2.3' into 7.1.7 2014-10-03 00:29:33 +10:00
Shannon 7d189a6fb8 Backports the @ symbol escaping fixes 2014-10-03 00:28:49 +10:00
Shannon e60dcfa144 Merge branch '7.1.7' of https://github.com/umbraco/Umbraco-CMS into 7.1.7 2014-10-03 00:26:25 +10:00
Shannon 3f8b779ae4 adds note 2014-10-03 00:23:38 +10:00
Shannon 72dc5fc477 Removes unused method 2014-10-03 00:23:28 +10:00
Shannon 737f2fb707 Fixes: U4-5566 Quite a few hard coded queries with incorrect escape syntax for mysql 2014-10-03 00:07:40 +10:00
Shannon a13ead0d10 unescapes @ symbols now that sql params are in place 2014-10-03 00:06:09 +10:00
Shannon 93e864494b Merge branch 'bjarnef-7.2.0_progressbar' into 7.2.0 2014-10-02 21:47:03 +10:00
Shannon 1c16764605 Merge branch '7.2.0_progressbar' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0_progressbar
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
2014-10-02 21:46:39 +10:00
Shannon 414dbe45a6 Fixes: U4-5460 User with start content set won't see the selected node. 2014-10-02 13:38:44 +02:00
Shannon Deminick 69494c20f4 Merge pull request #491 from AndyButland/u4-5461
U4-5461 - Close date picker once date is selected
2014-10-02 21:18:21 +10:00
Shannon Deminick caa0e82d77 Merge pull request #495 from AndyButland/u4-5012
U4-5012 Moved preview step for RTE embed dialog to a button press
2014-10-02 21:16:44 +10:00
Shannon d2592bd79f Fixes: U4-5456 Cannot access all properties of member via MembershipHelper methods 2014-10-02 21:05:20 +10:00
Shannon b90f28731c Ensures the return to list button isn't shown on items in the recycle bin since that would navigate back to their original parent. Updates the recycle bin list views to respect the list view configuration of their associated sections. 2014-10-02 19:55:24 +10:00
Sebastiaan Janssen 340328aeba Fixes merge issue 2014-10-02 11:44:41 +02:00
Shannon c8264cff1e Updates the content type editor to have the list view customization inline instead of in a dialog. 2014-10-02 18:52:38 +10:00
Shannon 3400c52e45 Fixes: U4-5443 Unable to add images using markdown editor, U4-5442 Markdown editor breaks on navigation 2014-10-02 13:18:35 +10:00
Shannon 613dd76f81 removes removed db column from document dto 2014-10-02 12:52:26 +10:00
Shannon 7c7ef42216 fixes typo on downgrade 2014-10-02 12:27:29 +10:00
Shannon 0e736a8d32 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-02 12:23:55 +10:00
Shannon 08ea69caae Fixes paging for MySQL (actually makes it a better query anyways), fixes null ref for member indexer, Fixes MNTP after upgrade from v6, fixes typo on migration downgrade. 2014-10-02 12:23:43 +10:00
antoine 2380217c21 Very Basic shadow for the canvas designer 2014-10-01 18:28:25 +02:00
antoine 1231975a78 Bad path refer to grid instead of canvas 2014-10-01 18:27:35 +02:00
antoine 14e241bf21 Layout Editor editor without default box value 2014-10-01 18:26:57 +02:00
antoine c3c755755d Canvas designer, palette config path in EnableCanvasDesigner fixed 2014-10-01 15:01:16 +02:00
antoine 50d3b81ed9 Blank font style issue in canvas designer google font editor 2014-10-01 12:57:33 +02:00
antoine 371e4382cb set a no disposable unique row ID for row styling 2014-10-01 12:56:45 +02:00
antoine 45dde8717b Canvas designer Color editor issue 2014-10-01 12:55:32 +02:00
AndyButland af256e754d Moved preview step for RTE embed dialog to a button press 2014-10-01 11:28:00 +02:00
Shannon f875dc15f7 Merge branch '6.2.3' into 7.1.7
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/DeepCloneHelper.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/dashboard/DesktopMediaUploader.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx
2014-10-01 16:47:49 +10:00
Shannon 71242430da Fixes a query that would cause the new petapoco changes to have issues since it was asking for the wrong type 2014-10-01 16:37:42 +10:00
Shannon 2ec8d124fd renames new ssl attribute and updates proj 2014-10-01 16:06:19 +10:00
Shannon eb31ce3b44 Fixes a query that would cause the new petapoco changes to have issues since it was asking for the wrong type 2014-10-01 16:05:54 +10:00
Shannon 8a65ea7e97 Fixes: U4-5566 Quite a few hard coded queries with incorrect escape syntax for mysql 2014-10-01 15:40:48 +10:00
Shannon e960f8dca9 Fixes query for mysql 2014-10-01 15:22:20 +10:00
Shannon c5677233e3 Fixes install upgrade step to run during new install and upgrade - that is used when a db is found at the specified location but the version is empty, the upgrader still needs to run. Updates new upgrade steps to check if the changes are required so no errors occur when re-upgrading. 2014-10-01 14:58:30 +10:00
Shannon 9f80911b00 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-01 14:57:13 +10:00
Shannon f3df082695 fixes hard coded sql server bracket syntax 2014-10-01 14:56:54 +10:00
Shannon Deminick ac309f5a65 Merge pull request #493 from Bitmapped/7.2.0
Force HTTPS Redirect on UmbracoUseSSL (U4-4737)
2014-10-01 11:06:42 +10:00
Brian Powell 8aa9326e10 Add UmbracoUseSSL filter to redirect to HTTPS if umbracoUseSSL is set. Fixes U4-4737 2014-09-30 20:58:12 -04:00
Shannon fc47cdf9b0 proj file update 2014-10-01 10:25:06 +10:00
Shannon bad341613f Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-01 10:19:04 +10:00
Shannon 863e8b5024 Changes PetaPoco UOW to use a Queue instead of trying to order by a date which even in ticks is sometimes the same. Changes some content ext to accept the service it needs instead of relying on the app ctx singleton and obsoletes others. Fixes ContentBase.ContentTypeId to check if the Id has been set on it's true ContentTypeBase which is required with the new foreign key to insert entities (this was actually a bug without the foreign key). Updates media/content services with paging to use parameters correctly. Fixes tests. 2014-10-01 10:18:51 +10:00
Shannon Deminick f2d4e6541d Merge pull request #492 from Bitmapped/7.2.0
Fix for U4-5564
2014-10-01 08:57:25 +10:00
antoine 2b066b3dbc Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-30 21:42:30 +02:00
antoine 1e1b8b7ae6 Delete canvas designer style fixed 2014-09-30 21:41:13 +02:00
antoine 4021b680f8 No more dependency with bootstrap and some comments in less file 2014-09-30 21:39:51 +02:00
antoine 2733dc3129 Canvas grid row editor 2014-09-30 21:38:41 +02:00
antoine 97ed172472 Canvas designer Selector based on schema instead of name 2014-09-30 21:38:05 +02:00
antoine 4ed496921a Reload Page after reset canvas designer style 2014-09-30 21:37:17 +02:00
Brian Powell be55c11554 Fix for U4-5564 2014-09-30 12:44:52 -04:00
Shannon 228c8ac8e0 Merge remote-tracking branch 'origin/7.2.0' into 7.2.0 2014-09-30 18:47:21 +10:00
Shannon 55a7f7c23b Updates GetProfile ext method to accept an IUserService so they can be mocked, this is now used by the entity serializer. Fixed examine unit tests that required this. Fixed: U4-5508 Remove cmsDocument.alias column from db, update the order in which tables are created since with the new foreign key, that order was incorrect. 2014-09-30 18:46:02 +10:00
antoine b8034fa325 canvasdesigner.*.js added to ignore file
Conflicts:
	.gitignore
2014-09-30 09:24:38 +02:00
Shannon 54b11ea871 Fixes: U4-5503 cmsContent.contentType requires a foreign key 2014-09-30 17:05:18 +10:00
Shannon ad1075a1ce Fixes: U4-2120 cmsDataTypePreValues 'value' column should be nvarchar(MAX) or ntext instead of nvarchar(2500) 2014-09-30 15:34:49 +10:00
Shannon 4c0f95a93a Adds GetPagedDescendants to media/content services. Fixes PDF reader disposal. Updates the umb examine indexers to use the services layer, now reindexing is far more efficient. Fixes the examine mgmt dashboard with $timeout. Updates GetPagedResultsByQuery to be more readable. Fixes GetPagedResultsByQuery to use SQL parameters. 2014-09-30 15:13:10 +10:00
Shannon c49560f39d Updates the member indexer to re-index all members WAY faster than before. Updates the search controller to limit search results to 200 otherwise a ton of CPU can be used if there's thousands of results. 2014-09-30 12:08:21 +10:00
Shannon 1f01001d16 Removes all of the med trust bits from umb examine 2014-09-30 11:38:02 +10:00
Shannon 78141630b7 After a lot of benchmarking i found the bottleneck for building the prop collection. Even though this new bottleneck is leaps and bounds faster than it was before... with this new fix it is epically fast 2014-09-30 11:37:26 +10:00
AndyButland 2c871e635f Modified datetimepicker to allow passing of a view mode parameter to the hide method; called from datepicker controller to only hide on date change when in day view mode 2014-09-29 23:15:06 +02:00
Shannon 1e04735826 updates iis port 2014-09-29 16:47:00 +02:00
Shannon b975a02bfa Updates version to 7.1.7 2014-09-29 16:46:53 +02:00
Shannon 88ec514630 fixes entity repo merges, this also means that the n+1 fixes for entity repository will be in this release. 2014-09-29 16:46:46 +02:00
Shannon 6f7ec84f18 Backports fixes to SQL parameterization and PetaPoco mem updates 2014-09-29 16:46:37 +02:00
Shannon 4ee4f296fc updates version 2014-09-29 17:31:24 +10:00
Shannon b9e4950e36 fixes up entity repo merges to support old db schema 2014-09-29 17:30:09 +10:00
Shannon ba52f9235e Backports fixes to SQL parameterization and PetaPoco mem updates 2014-09-29 17:11:58 +10:00
Shannon e0321138ea updates UmbracoExamine.PDF to version 0.7.0 2014-09-29 16:39:09 +10:00
Shannon 7ce07cdd95 updates UmbracoExamine.PDF to use latests version of iTextSharp 2014-09-29 16:37:54 +10:00
Shannon 438e985d9e Ensures the custom list view data type's PKs don't interfere with ones that might already exist. 2014-09-29 13:50:28 +10:00
AndyButland 518353c877 Close date picker once date is selected 2014-09-27 22:23:49 +02:00
Sebastiaan Janssen a39c1455e2 Merge pull request #489 from AndyButland/u4-5555
Minor pluralisation, spacing and wording improvements on list view bulk actions
2014-09-27 17:56:33 +02:00
AndyButland 110521f0d8 Minor pluralisation, spacing and wording improvements on list view bulk actions 2014-09-27 17:52:04 +02:00
Sebastiaan Janssen 5a0d7329b6 Also clean UmbracoExamine zips 2014-09-27 15:35:42 +02:00
Sebastiaan Janssen 900dcfdc33 #U4-1503 Fixed
Adds UmbracoExamine.PDF to the output of the build (both a ZIP and NuGet package)
Adds canvas.editors.config.js to the output in the config folder
2014-09-27 15:35:03 +02:00
Shannon cfb2d3c974 Merge branch '7.2.0-sqlexpressions' into 7.2.0 2014-09-26 15:32:36 +10:00
Shannon d402f762ae adds another test to ensure the cache expiry is working 2014-09-26 15:31:37 +10:00
Shannon 62327a9b58 Updates more of the test to see why the query cache continues to expand... Unfortunatley there's nothing we can do about it at this point due to the 'IN' clause queries. Good thing we now have sliding expiration on each of these! 2014-09-26 13:55:25 +10:00
Shannon 9d5f3089c8 Updates petapoco to have a sliding expiration for the delegates cache, updates the keys it uses to be short hashes, fixes some null checks in content/media services, adds new test for checking that peta poco caches aren't growing with the same queries. 2014-09-26 11:19:54 +10:00
Shannon 4084ff8a24 Changes the key used for the PocoFactories to be a small hash 2014-09-26 08:35:13 +10:00
Shannon 23b214e4f9 Fixes remaining tests 2014-09-25 13:52:16 +10:00
Shannon 88f79cfca5 Fixes remaining service tests and adds a couple more expression tests 2014-09-25 13:38:32 +10:00
Shannon 893855f8bd More tests fixed 2014-09-24 20:20:27 +10:00
Shannon 0f3408c288 lots more tests fixed and few bits and pieces of the query stuff fixed. 2014-09-24 19:17:49 +10:00
Shannon afacdc12ad More work on parameterized queries, all tests for repos passing now. 2014-09-24 16:59:45 +10:00
Shannon 2c12b06bd7 Fixes the paging queries for media/content with sql params 2014-09-24 15:04:26 +10:00
Shannon 00f86ffef7 More work on sql parameterization with sql expressions, lots of tests passing but a few fixes still required. Streamlines IQuery to actually have the correct method implementations so we're not casting everywhere. 2014-09-24 13:51:16 +10:00
antoine a9cf1aa874 contour reference deleted 2014-09-23 20:18:46 +02:00
antoine ad868b9598 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-23 20:14:55 +02:00
per ploug b3769e4117 Removes 3rd party app + trees from app+tree.config 2014-09-23 19:53:12 +02:00
antoine 7fcb982e33 disable canvasdesigner css link on the preview mode (with canvasdesigner enable) 2014-09-23 19:45:35 +02:00
antoine 6d1ccaa7a4 Renames Tuning to canvasdesigner (code and comments) 2014-09-23 19:10:51 +02:00
antoine 6035971a88 Various Styles Bug fixed and improvement
Conflicts:
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.html
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/color.html
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/slider.html
2014-09-23 17:58:44 +02:00
antoine 3aedb69490 New design for the tuning, all panel at the left sight
Conflicts:
	src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js
	src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.front.js
	src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
2014-09-23 17:57:41 +02:00
antoine 699a88558e use thumbnail in media list 2014-09-23 17:51:17 +02:00
antoine ae66c422ab improvement and rename of the wide/layout less editor
Conflicts:
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/wide.html
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/wide.js
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/wide.less
2014-09-23 17:51:16 +02:00
per ploug 8194fb7b32 Canvas views 2014-09-23 16:36:04 +02:00
per ploug ae0fa3bf14 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-23 16:32:50 +02:00
per ploug 0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02:00
Jesper Hauge a2eda1e8dd This commit fixes U4-1115, by allowing other backend admin users than the root user, the possibility of allowing access to not used sections.
Right now the EditUser.aspx.cs codebehind only lists out sections the currently logged in user already has access to, unless the currently logged in user is the "root user", ie. the user with Id = 0
2014-09-23 15:36:43 +02:00
Stephan ca8a819590 U4-5540 - property value converter for TextBoxMultiple 2014-09-23 14:54:49 +02:00
Shannon d3365bc751 starts updating sqlexpressions to include sql params 2014-09-23 18:38:42 +10:00
Shannon 5dbedcf67b Fixes: U4-5460 User with start content set won't see the selected node. 2014-09-23 16:50:05 +10:00
per ploug e1793ad95c merge 2014-09-23 08:48:36 +02:00
per ploug 9dd803fb73 Fixes up missing .less merge 2014-09-23 08:47:14 +02:00
per ploug c63f152c8f last .less change for empty sections 2014-09-23 08:45:20 +02:00
Shannon 58db323eee fixes U4-5430 2014-09-23 12:40:30 +10:00
Shannon fa2ed768db Adds forms dashboards and sections to normal development config 2014-09-23 12:40:10 +10:00
Shannon Deminick 28e812580a Merge pull request #482 from codegecko/7.2.0
U$-5430: Fixed issue with user login with single-access to custom section
2014-09-23 12:07:20 +10:00
Shannon a2a3d2e6c7 removes unused/unneeded files 2014-09-23 11:57:19 +10:00
Shannon 01649c509f Fixes sqlserver column escaped strings 2014-09-23 11:53:49 +10:00
Shannon 43603d0f97 fixes up the usage of the Repository.cs class since it is not disposing of the web service correctly. 2014-09-23 11:43:04 +10:00
per ploug 872aff0c96 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2014-09-22 21:06:15 +02:00
per ploug 375fda2007 Merge remote-tracking branch 'origin/7.2.0-WIPFormsInstallDashboard' into 7.2.0
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2014-09-22 21:03:09 +02:00
per ploug 808efea246 Adds clientDependency reset to installer 2014-09-22 20:56:46 +02:00
per ploug 5f5c8c7693 Forms section + dashboard 2014-09-22 20:07:35 +02:00
per ploug 9464d2a648 Adds support for hiding navigation when tree is empty 2014-09-22 20:07:03 +02:00
Sebastiaan Janssen ef617fa5ed Fixes #U4-5529 properly. Reverts changes to RepositoryBase and alters queries instead. The check for Mandate.That(contentTypeIds.Any() was wrong when trying to select all conent types.
Maybe there's a better fix than this, feel free to update.
2014-09-22 17:48:04 +02:00
Sebastiaan Janssen e2ec9230b9 Bring preview badge waaay to the foreground 2014-09-22 16:05:28 +02:00
Sebastiaan Janssen 357187a7fd #U4-5530 Fixed Due in version: 7.2.0
Check if getElementById actually has a result before using it
2014-09-22 15:38:38 +02:00
Sebastiaan Janssen b433d0a35c #U4-5529 Fixed Due in version: 7.2.0
Performing actions on empty arrays will fail
2014-09-22 15:19:00 +02:00
Sebastiaan Janssen 3d9ea6c359 Merge pull request #485 from TimoPerplex/7.2.0
U4-5412: Updated the gravatar url`s to load secure content if needed
2014-09-22 14:16:06 +02:00
Stephan db0fd1e686 Merge pull request #484 from sniffdk/patch-1
U4-5527: DefaultShortStringHelper ignores white space rule
2014-09-22 12:41:38 +02:00
TimoPerplex 34510e288b Load gravatar image securely if needed 2014-09-22 12:22:35 +02:00
TimoPerplex 6814aefb33 Load gravatar image securely if needed 2014-09-22 12:21:49 +02:00
Mads Krohn dd0f510b5e Fix for InitializeLegacyUrlReplaceCharacters
When using IsNullOrWhiteSpace the white space rule that will replace white spaces with dashes are ignored. This leads to unexpected behavior. Changed the code to use IsNullOrEmpty instead to match the behavior of the LegacyShortStringHelper.
2014-09-22 12:14:32 +02:00
Shannon 34d7a13e14 fixes ids 2014-09-22 19:06:25 +10:00
Shannon bcfdeeda77 Ensures that there are nice defaults for the default member list view data type 2014-09-22 18:59:17 +10:00
Shannon d87a426294 Implements the ability to have customized and configurable list views for specific content types 2014-09-22 18:18:09 +10:00
antoine d4be8036f0 Shadow to the grid sortable box 2014-09-19 11:40:52 +02:00
antoine 9ccba9ec77 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/gridview.less
2014-09-19 11:38:15 +02:00
antoine 8e455257ef Grid control and row sortable bug fixed and improvement 2014-09-19 11:34:35 +02:00
Shannon 41b585aed4 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-19 18:31:49 +10:00
Shannon 2548e4c8dd makes the list view pager super awesome 2014-09-19 18:31:37 +10:00
per ploug 2ef54c5bc4 Grid view sortable css update 2014-09-19 09:58:11 +02:00
Shannon 7e1cc8c040 Ensures the create drop down isn't displayed with custom membership provider, shows a header label instead of nothing for a custom membership provider member in the header. 2014-09-19 17:21:21 +10:00
Shannon e3284c8833 Fixes up the providerkey mapping with our normal members, fixes up some other mappings with custom membership providers. 2014-09-19 17:06:15 +10:00
Shannon 5f95957e5b Makes sure custom membership providers work with the list view 2014-09-19 15:56:39 +10:00
Shannon 7c76cbf509 Allows for email and username to be fields in list view, fixes up the list view usage to display members from a custom membership provider. 2014-09-19 15:34:26 +10:00
Shannon b12985558a Fixes up all list views for all content types with regards to the delete button, now if you delete an child of a list view while viewing it it will redirect to it's container. 2014-09-19 13:55:30 +10:00
Shannon a26904a298 Fixes all the tree syncing with list views, fixes tree syncing to the root of an app 2014-09-19 12:45:17 +10:00
Shannon 51061e10a9 Gets the 'return to list' button working for all content types 2014-09-19 11:52:13 +10:00
Shannon 0264a72762 Ensures default list view data types are installed by default, includes these in the upgrade script. Now the default list views are used when rendering them per type (content, media, member). Updated the member tree to list nodes by member type and 'all members', each of these now renders a list view containing the members which is fully paged and searchable. Updates list view prop editor to deal with members appropriately. 2014-09-19 09:47:42 +10:00
Shannon 7a0430e6ba fixes list view search button and ensures that the checkboxes don't track dirty changes 2014-09-18 12:05:58 +10:00
Shannon 89ebc80bd5 Gets the installer to install default list views, updates list view tree to show them as 'system' items which are not deletable, upgrader installs default list views, now property resolver gets the correct system list view for the correct content type with it's pre-values that are defined. 2014-09-18 11:52:12 +10:00
Shannon ab2db0b37f Fixes: U4-3542 Create a container node style (overlay) like the pending/protected overlays 2014-09-18 10:58:11 +10:00
Shannon b2c260c42f list views for media and content working nicely with correct sorting, now to get the defaults in there with default settings. 2014-09-18 10:29:07 +10:00
Shannon fd07dcccb7 Reverts the 'special property' for list views as that is no longer required. 2014-09-18 09:48:08 +10:00
benjamin.howarth d1dfb738c9 U$-5430: Fixed issue with user login with single-access to custom section failing login (being defaulted to "content" as part of route resolution). 2014-09-17 22:43:19 +01:00
Shannon 3437d95eb4 updates migration and base data creation to create the 3 default list views 2014-09-18 01:12:23 +10:00
Shannon 5bf9bf5175 Gets all content, media, members to get paged queries consistently, fixed up issues with the page sql created for SQL server, need to test mysql. Removes the non-needed readonly dtos for members, since we are retrieving property values consistenty between all repositories. 2014-09-18 00:51:30 +10:00
Shannon 43f4f7f8f0 Fixes: U4-5505 Fix MemberService.FindMembersByDisplayName 2014-09-18 00:11:02 +10:00
Shannon 175f299253 Gets the content repo to use the base paging helper, fixes up the paging helper's inner query to use the paged SQL used to retrieve the node Ids 2014-09-17 20:42:17 +10:00
Shannon 4828869713 Improves the paging for member repository, no longer doing an IN clause and instead an inner join = far better. Created a helper method to do this on the base repository so i can share the logic with content and media repository. 2014-09-17 18:32:13 +10:00
Shannon 102b97fa82 streamline repo's get by paged results to have a zero based index for page index/number. Refactors member repo to use the same queries as content/media (U4-5469) this should save a lot of perf 2014-09-16 23:21:27 +10:00
Shannon 1d4e80904e updated test proj 2014-09-16 11:51:10 +10:00
Shannon 311639332d added some tests for cache refresher 2014-09-16 11:19:33 +10:00
Shannon 7437240d09 Fixes: U4-5491 Distributed calls won't work if IIS sites between servers have the same HttpRuntime.AppDomainAppId 2014-09-16 11:03:20 +10:00
Shannon 7a1d62967a Ensures the list view prop and tab are created when the check box is selected and removed when unselected. 2014-09-16 10:41:18 +10:00
Shannon c43be77288 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-15 19:01:49 +10:00
Shannon b38acdd654 List view config complete: U4-4972 Make list view configurable, 2014-09-15 19:01:28 +10:00
Shannon 96d570e760 Gets most of the configurable list view working, need to add some validation to the pre-value editor, some styling for the sorting of a field, add another system field for 'published date' (if possible), fix up the localized text for return to list view, fix up the persisting of the last page viewed in a list view 2014-09-15 13:53:33 +10:00
Shannon ac29542f8e Revert "Fixes PetaPoco to support Medium trust." - I'm reverting this fix so that we are back using the baseline logic of PetaPoco since we don't need med trust support and this known logic that has been working for many years. 2014-09-15 10:47:34 +10:00
Stephan 34011df80a U4-5114 - chained marco parameters 2014-09-12 18:28:04 +02:00
Shannon afbeb50d55 List view pre-values working with fields and headers, list view now rendering data again, removed the config ui bits from the content type editor 2014-09-12 14:07:42 +10:00
Shannon 74a113646d typeo and fixes a return value 2014-09-12 12:52:32 +10:00
Shannon 6ab2f8300c Fixes: U4-5473 Image cropper data type is not installed by default, ensures the List View data type is created on install, creates a new migration to ensure it exists when upgrading, fixes an old migration with improper use of a transaction. 2014-09-12 12:51:41 +10:00
Shannon 7ff0e6bafb Fixes typo: Updator -> Updater 2014-09-12 11:53:09 +10:00
Shannon 6c77000ba7 updates content type resource with new getAllPropertyTypeAliases 2014-09-12 11:51:50 +10:00
Shannon 9bb5869cde reverting all things to do with additional list view column in db which is no longer necessary and removing additions to ui changes in the content tyep editor which are also no longer necessary 2014-09-12 11:50:56 +10:00
Shannon 1844b048be Adds new method to IContentTypeService to return all user defined property type aliases, updates the default pre-values for the list view to underscore system aliases, 2014-09-12 11:35:20 +10:00
Shannon eb9e7d0e31 removes migration, this will not be necessary 2014-09-12 11:32:52 +10:00
Shannon 73b8a0987d moves directive to correctly named location (utill is not an abbreviation) 2014-09-12 11:31:38 +10:00
per ploug 5d2ac582b7 Gridview design polish 2014-09-11 14:50:05 +02:00
Stephan a3ad8e2cab Die, Marco, die. 2014-09-11 08:24:01 +02:00
Shannon 03cf0113d5 Merge branch 'list-view-properties' of https://github.com/pynej/Umbraco-CMS into pynej-list-view-properties
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
2014-09-11 16:07:58 +10:00
Shannon d3bfb5e94d Updates the versionable repo (content, members, media) to far more efficiently load in property and pre-value data, in fact the performance tests have show that this improves performance even more! The real underlying reason for these changes is so that we don't end up with a giant SQL 'IN' clause for these queries, and that these queries are far faster than IN clause queries. 2014-09-11 16:04:16 +10:00
Shannon 5195822435 Fixes queryable extensions to ignore case for props when sorting 2014-09-11 16:02:23 +10:00
Shannon e3bf5d3487 Renames ContentAndMediaTypeBaseController, adds migration to add new db column for list view config 2014-09-10 15:47:01 +10:00
Shannon 7422238087 Merge branch 'AndyButland-u4-4972' into 7.2.0
Conflicts:
	src/Umbraco.Web/Editors/MediaTypeController.cs
2014-09-10 15:35:57 +10:00
Shannon 6afead5207 Merge branch 'u4-4972' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-4972
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
2014-09-10 15:35:05 +10:00
Shannon 5bc00e3e48 Fixes: U4-4989 Media with image cropper doesn’t get removed from disk after delete. 2014-09-10 15:07:20 +10:00
Shannon 55c3653910 Fixes null check on content 2014-09-10 14:32:02 +10:00
Shannon Deminick d7b02f0a30 Merge pull request #476 from joshua-stewart/7.2.0
U4-5457 & U4-5458 - Updates /Trees/UserTypes.cs and settingsdashboardintro.html
2014-09-10 11:29:08 +10:00
bjarnef 7f3ab15eaa Fix for progressbar styling
Modified the styling for the progressbar as the last fix didn't seem to
work in latest updates of Chrome.
2014-09-09 23:12:23 +02:00
Stephan 09a2d660c7 Fix mappers test / TemplateMapper 2014-09-09 11:31:29 +02:00
Shannon 3ba6d6b0a1 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-09 18:53:57 +10:00
Shannon eb6326487f Fixes grunt watches, Fixes: U4-3138 Examine mgmt dashboard styling is broken, rebuilds the mgmt dashboard in angular 2014-09-09 18:53:47 +10:00
Joshua Stewart ea9975b2c1 Updates settingsdashboardintro.html to use http://umbraco.com for URLs since .org is no longer used for the main website and updates the Editor's Manual link to use the newer version 7 editor's manual created by Matt Wootton. 2014-09-08 16:28:07 -05:00
Joshua Stewart 229575d3b0 Revert "Updates settingsdashboardintro.html to use http://umbraco.com for URLs since .org is no longer used for the main website and updates the Editor's Manual link to use the newer version 7 editor's manual created by Matt Wootton."
This reverts commit 226d3715b9.
2014-09-08 16:17:51 -05:00
Joshua Stewart 226d3715b9 Updates settingsdashboardintro.html to use http://umbraco.com for URLs since .org is no longer used for the main website and updates the Editor's Manual link to use the newer version 7 editor's manual created by Matt Wootton. 2014-09-08 16:16:15 -05:00
Joshua Stewart 0661b12b56 This commit updates /Trees/UserTypes,cs to use userType.Name rather than userType.Alias for displaying the tree item text. 2014-09-08 10:02:36 -05:00
Stephan 322c3e0664 U4-5301 - fix AppendDocumentXml + nodes sorting 2014-09-08 12:03:13 +02:00
Shannon 549f0555ab don't cache too much when using get all 2014-09-08 19:16:30 +10:00
Shannon 8fcd2200d0 Fixes the calls to the member service paged queries to do a normal GetAll without parameters if the int.max value is used. Ensures that if too many id params are sent to GetAll an exception is raised 2014-09-08 19:04:28 +10:00
antoine fd8cd4be99 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-08 09:59:09 +02:00
antoine 82107ab146 Sorting controls styling improvement and small bug fixed 2014-09-08 09:58:42 +02:00
Stephan 185e5d9b7f Create missing ITemplate TemplateMapper 2014-09-08 08:52:09 +02:00
antoine 28f8194876 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-07 16:23:54 +02:00
antoine 8db67c0ba3 sorting row with last release ui.sortable lib and sorting control published 2014-09-07 16:23:24 +02:00
Kevin Jump ce521c7624 Reverting SetValue change on CreateContent
Move the content.SetValue out of the if (propertyType == null) call - as
this causes inherited values not to be saved.
2014-09-07 01:59:02 +01:00
antoine ef6e181eb1 control sorting with editor control (with ui.sortable last version) 2014-09-06 17:40:52 +02:00
antoine 142c4c09e1 control sort before ui.sortable upgrade 2014-09-06 17:35:13 +02:00
Jeremy Pyne 3d0e74522d Fix for dialog size logic.
Fix for css not associated with legend.
2014-09-05 15:32:39 -04:00
Jeremy Pyne fba6d8ec66 Added codemirror plugin to tinymce v4 used in Umbraco7.
This is a tinymce plugin to seamlessly use the already existing code mirror package in umbraco as the source editor.
The tinymceconfig.config is updated to seamlessly replace the code plugin with the new codemirror plugin. (And the user can switch back to code here if they need to for some reason.)
2014-09-05 15:00:54 -04:00
Shannon 4230668c8b creates new UmbracoTreeAuthorizeAttribute which helps make tree and editor security with webapi a bit more flexible with a different option to authorize against an assigned app based on a tree alias. 2014-09-05 16:08:41 +10:00
Shannon 66e5843ef7 Creates new attribute: WebformsPageTreeAuthorizeAttribute for auto-authorizing webforms editors for a specific tree and thus for a specific application. 2014-09-05 15:47:45 +10:00
Shannon bb4dd9c418 Merge branch '7.1.5-perf' into 7.2.0 2014-09-05 15:20:46 +10:00
Shannon Deminick 50b49f9ee2 Merge pull request #465 from mattbrailsford/7.1.6-movable-dictionary-tree
Fix U4-5413 Makes the dictionary tree moveable
2014-09-05 15:15:24 +10:00
Shannon Deminick cf0eb87d03 Merge pull request #468 from codegecko/7.2.0
Made ICultureDictionary, CultureDictionaryFactoryResolver and UmbracoCul...
2014-09-05 15:08:32 +10:00
Shannon Deminick 75f2de2cc8 Merge pull request #467 from danlister/patch-2
Update Dashboard.Release.config
2014-09-05 09:27:48 +10:00
Shannon Deminick 927bf1d3a2 Merge pull request #471 from pynej/markdown-property-type
Markdown property should store to text not varchar.
2014-09-05 09:25:06 +10:00
Jeremy Pyne 24724ca6e8 Markdown property should store to text not varchar. 2014-09-04 16:05:34 -04:00
Jeremy Pyne fbed14a9e0 Partial Views and Partial View Macro's should allow for folder hierarchy for organization. This changes makes them work much like the Scripts and css folders.
I didn't add a Type drop down like the scripts screen has.  This is unnecessary and cumbersome.  Instead it works like other screens and the user can generate a hierarchy in their files by adding /'s in the names.  This is how it works in Stylesheets works and its a lot cleaner.  I added a note of this to the creation dialogs as well.

For example create a view file with the name myFolder/myView and the system will take care of folder creation automatically.  There is also a delete option.

Other errors fixed:
 Selecting a folder in the scripts lists was generating an error.
 Stylesheets would not create a new folder(but they wold make nested children in existing folders.
 Partial and Macro Views would not use the proper elpers for generating syncTree code.
2014-09-04 10:17:54 -04:00
Shannon Deminick a0ade0e183 Merge pull request #469 from kolchy/patch-1
Update Gravatar to use protocol relative URL
2014-09-04 10:06:28 +10:00
Kolchy 40fbcc5a99 Update Gravatar to use protocol relative URL
Stops warnings over SSL.
2014-09-04 10:05:43 +10:00
antoine c04fee2aba Grid controls sortable first approach 2014-09-03 17:26:18 +02:00
benjamin.howarth 8aa5a64883 Made ICultureDictionary, CultureDictionaryFactoryResolver and UmbracoCultureDictionary public instead of internal (cause they're useful to query, and obsoleted umbraco.MacroEngines.ICultureDictionary was/is public) 2014-09-03 09:40:34 +01:00
Dan Lister dfe89b50ae Update Dashboard.Release.config
Amended dashboard.release.config 'Change password' tab caption casing to match other tab captions
2014-09-02 15:55:34 +01:00
Shannon db0a87e3ca fixes n+1 queries in MediaRepository.PerformGetAll 2014-09-02 16:40:17 +10:00
Shannon a75f6d2afd Fixes n+1 on ContentRepository.PerformGetAll 2014-09-02 16:13:31 +10:00
Shannon b3b813a649 Fixes n+1 queries on DataTypeDefinitionRepository 2014-09-02 14:33:11 +10:00
Shannon bf401ed7a9 fixes n+1 queries on user type repo 2014-09-02 13:50:35 +10:00
Shannon 34699dc4e1 Fixes some null checks and updates a member test 2014-09-02 13:18:35 +10:00
Shannon 42fe4c77f6 Fixes n+1 queries on template repository 2014-09-02 12:47:46 +10:00
Shannon c76d09c9b0 fixes n+1 query when assigning user types to users in user repo 2014-09-02 12:21:29 +10:00
Shannon 03f9b89810 fixes the n+1 queries on content and media type controllers and ensures if there are no ids that the query doesn' texeucte. 2014-09-02 11:53:12 +10:00
Shannon c21dcb0279 Fixes n+1 queries for content and media types when resolving their properties and groups, this fixes the n+1 queries with the scheduled publishing too. Adds a test for template mappings, fixes call for GetAll on EntityController to not be called when there are no ids. 2014-09-02 11:50:04 +10:00
Shannon eec734783c Fixes n+1 query on UserRepository.GetByQuery 2014-09-02 10:28:21 +10:00
Shannon df416ccde4 Fixes n+1 query on UserRepository.GetAll with id params 2014-09-02 10:26:11 +10:00
Shannon 9336d21c25 updates to where clause 2014-09-01 18:58:52 +10:00
Shannon 2d36341118 Fixes n+1 queries in the EntityRepository 2014-09-01 18:50:10 +10:00
Shannon 202f582661 Renames TagsRepository to TagRepository, Fixes n+1 queries on entity repository, fixes n+1 queries on tag repository, updates umbraco member types to specify an entity type for IMember and IMemberType so the entity repository can use it. 2014-09-01 18:06:24 +10:00
Shannon 6cacfe599f Gets MediaRepository.PerformGetByQuery, MediaTypeRepository.PerformGetByQuery & MediaTypeRepository.PerformGetAll to not have n+1 2014-09-01 16:27:18 +10:00
Shannon 3822c83dbb fixes content type mappings 2014-09-01 15:14:45 +10:00
Shannon 07035f6b23 Fixes issue with duplicate dictionary entries when wiring up property data 2014-09-01 12:55:10 +10:00
Shannon 8b9397160b Merge branch '7.2.0' into 7.1.5-perf 2014-09-01 10:55:50 +10:00
mattbrailsford 7bcf8c17e5 Makes the dictionary tree moveable by looking up the application alias from the trees registration rather that hard coding to a specific section. 2014-08-28 14:10:22 +01:00
Shannon Deminick 5ac4b2b305 Merge pull request #461 from warrenbuckley/NG-Documentation
NG Documentation improvements
2014-08-28 17:45:51 +10:00
Shannon Deminick 07a52f659d Merge pull request #463 from kgiszewski/feature/rte-config
Fix for U4-5409 headline justification in the RTE
2014-08-28 08:14:19 +10:00
Kevin Giszewski 5420be483c Add style attribute to the headline white-listed attributes 2014-08-27 10:32:29 -04:00
warrenbuckley 29afebdb60 Initial starting work on ng-doc fleshing out for auth.resource.js (Also to see if Core team happy with this before investing too much time) 2014-08-26 15:08:40 +01:00
warrenbuckley 9784a3d868 Add new Grunt Task 'docserve' to rerun ng-docs task & spin up a test server to browse to along with new watch task to recompile generated docs 2014-08-26 15:07:40 +01:00
warrenbuckley 4b46cf9a42 Update .gitignore for output files generated by ng-docs 2014-08-26 14:54:37 +01:00
Shannon 2f2d55e24f ensure normal browser cache is busted for auth upgrade view 2014-08-26 09:39:07 +10:00
Shannon ada2492c44 Merge branch '7.1.6' into 7.2.0
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2014-08-26 09:25:36 +10:00
Shannon e9b137cde8 Fixes duplicate key error (U4-5385) 2014-08-26 09:20:32 +10:00
Sebastiaan Janssen 33ccf490ab Update nuspec to ask for a valid nuget pkg 2014-08-25 15:53:45 +02:00
Sebastiaan Janssen 101e116baf Bump version number 2014-08-25 15:14:21 +02:00
Shannon ebf24d69b5 Fixes: U4-5384 Custom ApiController routes not working after upgrade to 7.1.5 2014-08-25 14:33:50 +02:00
Shannon c94662e49c Fixes: U4-5388 YSOD after doctype rename & U4-5387 Deleting Properties in document types causes "Object reference not set to an instance of an object" 2014-08-25 14:33:03 +02:00
Sebastiaan Janssen 5d37eaf993 #U4-4673 Fixed Due in version: 7.1.6 2014-08-25 14:32:35 +02:00
Sebastiaan Janssen 1ded2c9baf #U4-5385 fixed Due in version: 7.1.6 2014-08-25 14:32:14 +02:00
Sebastiaan Janssen 2daacd8d57 #U4-5379 Fixed Due in version: 7.1.6
Some users have not set an email, don't strip out empty entries
2014-08-25 14:31:50 +02:00
Shannon 3f4fa8b8ed Fixes: U4-5380 Booting.aspx security issue 2014-08-25 14:31:04 +02:00
Sebastiaan Janssen 03ba8c9e14 Update to 6.2.2, removes airinstallbadge 2014-08-25 13:46:21 +02:00
Shannon da8469e4e4 Merge branch 'Nicholas-Westby-7.1.5' into 7.2.0 2014-08-25 17:02:12 +10:00
Shannon 16a4e425cb Merge branch '7.1.5' of https://github.com/Nicholas-Westby/Umbraco-CMS into Nicholas-Westby-7.1.5 2014-08-25 17:01:56 +10:00
Shannon ab092b8814 typo 2014-08-25 16:58:01 +10:00
Shannon 97a0e72e65 Merge branch 'bjarnef-7.2.0' into 7.2.0 2014-08-25 16:57:49 +10:00
Shannon 88da00cdd3 Merge branch '7.2.0' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0
Conflicts:
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
2014-08-25 16:57:10 +10:00
Shannon 4b8042ceb1 Merge branch 'u4-5003' of https://github.com/AndyButland/Umbraco-CMS into 7.2.0 2014-08-25 16:51:51 +10:00
Shannon 7326541ce3 Merge branch 'AndyButland-u4-5365' into 7.2.0 2014-08-25 16:47:44 +10:00
Shannon d2c7420c4c Merge remote-tracking branch 'origin/6.2.2' into 7.2.0
Conflicts:
	src/Umbraco.Core/Models/DeepCloneHelper.cs
2014-08-25 16:42:19 +10:00
Shannon 13b57c7638 adds some logging 2014-08-25 16:40:45 +10:00
Shannon 39987d5f7d Fixes: U4-5384 Custom ApiController routes not working after upgrade to 7.1.5 2014-08-25 16:24:23 +10:00
Shannon a8b297903d Ensures we don't get any ysods when changing doc type properties and the content re-creation since it's running on an async thread (U4-5388 , U4-5387 ) 2014-08-25 16:16:42 +10:00
Shannon 4cec6a3213 Fixes: U4-5388 YSOD after doctype rename & U4-5387 Deleting Properties in document types causes "Object reference not set to an instance of an object" 2014-08-25 16:13:21 +10:00
Shannon 45f44e1797 Changes the admin lookup back to just use the id 2014-08-25 13:42:57 +10:00
Shannon e2d04e2b3a Merge branch '7.1.5' into 7.2.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/modals.less
	src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
2014-08-24 21:35:08 -06:00
AndyButland 934f58284a Added checks to ensure if paged requests for media are made they have valid page parameter values 2014-08-24 23:41:15 +02:00
AndyButland 274e2c18e1 Added checks to ensure if paged requests for content are made they have valid page parameter values 2014-08-24 23:37:10 +02:00
AndyButland d16a733d9d Added support for paging queries at the database level for media 2014-08-24 23:22:32 +02:00
bjarnef 8609427d3c Fix for U4-3953 (modified)
I overlooked the installing message, so here the message is still
visible below the progressbar. Furthermore the same is fixed for the
uninstalling progressbar, which I didn't noticed previously.
2014-08-24 20:51:36 +02:00
Sebastiaan Janssen f3937b8b15 #U4-4673 Fixed Due in version: 7.2.0 2014-08-22 18:30:32 +02:00
Sebastiaan Janssen 3b618b475d #U4-5385 fixed Due in version: 7.2.0 2014-08-22 17:05:47 +02:00
Sebastiaan Janssen eae0087307 #U4-5379 Fixed Due in version: 7.2.0
Some users have not set an email, don't strip out empty entries
2014-08-22 11:15:46 +02:00
Shannon 89b5774106 Fixes: U4-5380 Booting.aspx security issue 2014-08-21 14:39:06 -06:00
Sebastiaan Janssen 3a4d0a02eb Fix redirect issue 2014-08-21 14:16:58 +02:00
Sebastiaan Janssen 2666742851 The admin (0) user in UaaS always has password "default" (unencrypted), checking for that for
now until we can fix this properly. If we didn't update this scheduled publishing would be broken
2014-08-21 14:10:54 +02:00
Sebastiaan Janssen 38c1e154d4 Fixes broken relation type manager 2014-08-21 12:08:43 +02:00
Shannon 774f201514 Adds a simple cache mechanism to hold reflected property info when cloning - reduces perf to 10% of what it used to be 2014-08-20 20:09:05 -06:00
Shannon bfb411a280 Merge branch '7.1.5' into 7.1.5-perf
Conflicts:
	src/Umbraco.Tests/packages.config
2014-08-20 19:37:44 -06:00
Shannon 067eceffce adds a couple of benchmark tests if we need to refer to them in the future (they are ignored so won't run as part of the normal build) 2014-08-20 19:36:03 -06:00
Shannon 573c08295a Adds a simple cache mechanism to hold reflected property info when cloning - reduces perf to 10% of what it used to be 2014-08-20 19:27:53 -06:00
Shannon fc558198d2 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-20 18:04:11 -06:00
Shannon de1b69d5ae adds some notes 2014-08-20 18:04:05 -06:00
Shannon Deminick 03358ca1ca Merge pull request #454 from leekelleher/U4-5005
U4-5005 - YesNoValueConverter fails for int
2014-08-20 13:10:57 -06:00
Shannon 81d8a90f59 Adds some simple request based caching for the retrieval of the current member in the Umbraco helper. 2014-08-20 12:31:54 -06:00
Shannon 6a28f246f6 Removes the examine 'Azure' proj's from the sln, we don't currently ship these and the azuredirectory proj has been unlisted from nuget 2014-08-20 11:08:11 -06:00
Shannon 15a1887ccb Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 2014-08-20 10:30:51 -06:00
Sebastiaan Janssen 2d5e5e9b3c Refactored initial relationtype creation as well and "Relate on copy" is now also using the relationservice so it fires events 2014-08-20 17:01:12 +02:00
Sebastiaan Janssen 03a845c957 Update relation type editors to use new RelationService so we can subscribe to it's events 2014-08-20 15:58:57 +02:00
Sebastiaan Janssen b0d03e7493 Fixed #U4-5373
Also cleaned up code a little
2014-08-20 15:16:39 +02:00
Sebastiaan Janssen ee2410ebe2 Fixed #U4-4287 Due in version 7.1.5
Added the locale name after each language so you know what exactly you're picking
2014-08-20 14:50:31 +02:00
Morten Christensen 7d52ed873e Merge pull request #449 from nul800sebastiaan/uaas-events
Adding events for use by Courier/UaaS
2014-08-20 14:12:38 +02:00
Sebastiaan Janssen de34379ddf Updating PR after feedback from @sitereactor 2014-08-20 14:08:45 +02:00
leekelleher b176d7dca0 Amends CreateTable, so if 'overwrite' is enabled, the table is dropped, then recreated. 2014-08-20 10:46:37 +02:00
Sebastiaan Janssen 12e2aa679b Merge pull request #455 from leekelleher/U4-4249
U4-4249 - PetaPocoExtensions CreateTable doesn't recreate the table
2014-08-20 10:45:56 +02:00
Sebastiaan Janssen 873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
leekelleher 1978930fa2 Amends CreateTable, so if 'overwrite' is enabled, the table is dropped, then recreated. 2014-08-19 18:56:15 +01:00
leekelleher d2ee281bfa Refactored the YesNoValueConverter to evaluate non-string objects.
Added supporting unit-tests.
2014-08-19 18:40:03 +01:00
Sebastiaan Janssen 468cdf64ff Merge pull request #447 from Jeavon/UpdateImageProcessor
Update ImageProcessor to v1.9.0 and ImageProcessor.Web to v3.3.0
2014-08-19 14:37:34 +02:00
Sebastiaan Janssen 5752bb0d18 Merge pull request #412 from BatJan/7.1.5-ux-4913
Fix for U4-4913
2014-08-19 14:20:47 +02:00
Sebastiaan Janssen a0f5a717f2 Merge pull request #410 from BatJan/7.1.5-installer-fix-4493
Fix for U4-4493
2014-08-19 14:18:10 +02:00
Sebastiaan Janssen 8b34b4e8a1 Merge pull request #416 from Graphicnerd/7.1.5
Updated the sortable frame in Umbraco Backoffice
2014-08-19 14:02:28 +02:00
Sebastiaan Janssen 6152079af1 Merge pull request #450 from bjarnef/7.1.5
Fix for U4-5313 and U4-5330
2014-08-19 13:44:02 +02:00
Sebastiaan Janssen e638cbf4e6 Merge pull request #444 from netmester/7.1.5-packaging-bugfix
7.1.5 packaging bugfix
2014-08-19 13:16:55 +02:00
Sebastiaan Janssen a9277113b1 Added TODO's for when we want to make some methods public 2014-08-19 12:59:25 +02:00
Sebastiaan Janssen 1805857eea Refactor PartialView.IsValid with logic found in SaveFileController
Refactor FileService.CreatePartialView to use Attempt so that it gets rid of PartialView.SaveSucceeded
Refactor SaveFileController to move all saving logic into the FileService
Added SavingPartialView and SavedPartialView events to the FileService
2014-08-19 12:51:07 +02:00
Sebastiaan Janssen 32057bd7ee Macro instead of Macr. Removed events for SaveTemplate as the old Template class already has events 2014-08-19 10:39:52 +02:00
Sebastiaan Janssen 747ce1c013 Making sure memorystream is disposed 2014-08-19 10:21:01 +02:00
per ploug 3a0a839503 Increasing the search debounce from 100 to 300ms 2014-08-19 00:04:53 +02:00
Shannon f4c2b7419a Fixes: U4-4782 Duplicate content after validation error correction 2014-08-18 15:02:45 -06:00
Shannon bbe8c8e8e6 moves no-dirty-check directive to validation folder 2014-08-18 14:49:41 -06:00
Shannon 49d1171a99 renames utill folder to have a single l 2014-08-18 14:48:36 -06:00
per ploug 9aa9de5a7a WIP on background package installs 2014-08-18 20:42:56 +02:00
Shannon b44699ff4a typo on docs 2014-08-18 11:55:31 -06:00
Shannon 086d81438c Merge branch 'AndyButland-u4-5003' into 7.1.5 2014-08-18 11:40:50 -06:00
Shannon 895ecf5f16 Merge branch 'u4-5003' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-5003 2014-08-18 11:38:09 -06:00
Shannon Deminick 9d95e9f4d3 Merge pull request #452 from kgiszewski/feature/rte-config-cache
Add caching to the RTE config
2014-08-18 10:34:07 -06:00
Sebastiaan Janssen bba0a58bac AssignedApp property is of no concern to FileService 2014-08-18 18:08:01 +02:00
Sebastiaan Janssen 14cbef5edf Add some logging to the cancelled event 2014-08-18 18:02:35 +02:00
Sebastiaan Janssen 65a2b79189 Moves PartialView save/delete to the FileService 2014-08-18 17:47:55 +02:00
Kevin Giszewski 42dd38fb29 Add caching to the RTE config 2014-08-18 09:23:46 -04:00
Shannon Deminick 023a8da5ba Updated DetectIsEmptyJson with more robust sln 2014-08-15 14:23:21 -06:00
Shannon 4dc559a8d1 Removes class constraint on RenderModel<T> and UmbracoTemplatePage<T> which will make things more flexible. 2014-08-15 14:14:05 -06:00
Shannon 1686e2f4bf Fixes: U4-5333 Datepicker starts on today's date instead of current value when you switch nodes 2014-08-15 13:48:07 -06:00
Shannon 69244f6991 Fixes: U4-4263 U7 - HasValue method returns true for Json editors when there is no value 2014-08-15 13:21:00 -06:00
Shannon 4fe029a695 Fixes: U4-5291 UmbracoVirtualNodeRouteHandler throws exception: parameter culture cannot be null and publicizes some routing extensions. 2014-08-15 12:47:50 -06:00
Shannon 0fd37d708d Merge branch 'U4-5332' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-U4-5332 2014-08-15 12:04:54 -06:00
Shannon f6abb0f603 fixes more of the photo arrangements in the photo folder which also fixes unit tests 2014-08-15 11:58:41 -06:00
Shannon 9bb8ee5f95 ensure even when using the legacy api that the icon for media folder is correct 2014-08-15 11:57:01 -06:00
Shannon ac55724231 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-15 09:34:47 -06:00
Morten Christensen 5789ac28d2 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-15 14:45:54 +02:00
Morten Christensen bc6ef58235 Making a few consistency updates to the TagService 2014-08-15 14:45:26 +02:00
Morten Christensen 9236225bdf Adding and updating code comments for the Membership service interfaces and implementations 2014-08-15 14:42:05 +02:00
Morten Christensen 6dbc30e094 Correcting a few comments on the UserService 2014-08-15 14:41:25 +02:00
Morten Christensen 1d4d8066ed Adds and updates code comments on the UserService 2014-08-15 11:13:00 +02:00
Morten Christensen 7a39751101 Adds code comments to the TagService and surrounding classes 2014-08-15 10:30:12 +02:00
Stephan c4e4f9579b U4-4931 - fix tests 2014-08-15 09:54:04 +02:00
Stephan 43ae301683 U4-4931 - fix tests 2014-08-15 09:50:55 +02:00
bjarnef d978db588c Fix for U4-5313 and U4-5330
Make the bottom bar overlap the image cropper focal point and display
the scrollbar if there is overflow. I know the buttons are located a bit
(10px) closer to the top, but you can see the horizontal scrollbar then,
when there is one in e.g. a package. E.g. depending on the screen
resolution, I would in Matrix Property Editor (There is no spoon) prefer
the Umbracos editing section to scroll than add scroll inside the
property editor wrapper, because it give more editing space.
2014-08-15 01:06:20 +02:00
Stephan 9782f66507 U4-5084 - fix commit 2014-08-14 22:24:12 +02:00
Stephan 16f8db9dea U4-5084 - fix commit 2014-08-14 22:21:24 +02:00
Stephan e9938afc83 Merge pull request #418 from zpqrtbnk/6.2-4931
U4-4931 - lock contention & potential application lockdown
2014-08-14 20:52:13 +02:00
Stephan fcda9821d0 Merge branch '6.2.2' into 6.2-4931 2014-08-14 20:50:37 +02:00
Stephan bdc234b18a U4-5084 - DynamicPublishedContentList ext methods confusion 2014-08-14 20:49:49 +02:00
Stephan 648cf69d45 U4-5084 - DynamicPublishedContentList ext methods confusion 2014-08-14 20:37:04 +02:00
Stephan a0fcd2c7f9 Merge pull request #423 from zpqrtbnk/7.1-4931
U4-4931 - lock contention & potential application lockdown
2014-08-14 20:28:18 +02:00
Stephan d603c08e1f Merge branch '7.1.5' into 7.1-4931 2014-08-14 20:22:56 +02:00
AndyButland 53097a9b84 Moved added method from PetaPoco file to an extension method 2014-08-14 18:16:49 +02:00
AndyButland beda0968ae Removed debug line 2014-08-14 18:07:21 +02:00
Sebastiaan Janssen 1ccee3f305 Moved all logic of PartialViewTasks and PartialViewMacroTasks to a base class as the only difference was 3 variables
Added events: PartialView(Macro): Create, Save and Delete
Added events: Template: Save (there's already a legacy event, this is a new one to transition to)
PartialViewMacro.ascx.cs was adding ".cshtml" just so that it could strip it of again, crazy
2014-08-14 17:20:25 +02:00
Sebastiaan Janssen 908afbd264 #U4-2238 Fixed
Issue when saving/publishing special characters - '' hexadecimal value 0x03, is an invalid character
2014-08-14 10:26:38 +02:00
Sebastiaan Janssen c548ad6a98 Update failing unit test now that MaxInvalidPasswordAttempts is 20 by default 2014-08-14 10:16:02 +02:00
AndyButland ca2dd3eb47 Fixed issue with list view filter; further unit tests for list view paging 2014-08-14 08:42:36 +02:00
AndyButland 8ea5b6fb46 Unit tests for content repository paged queries; amends to fix ordering issues 2014-08-14 00:16:37 +02:00
AndyButland f6ec4798a6 Prevented list view filter box from setting dirty flag on form. Without this you get the save changes warning after using the filter, but there's nothing to save. 2014-08-13 22:11:41 +01:00
AndyButland 096e10aad4 Moved list view no results message into table body as otherwise if you apply a filter that returns no results, you can't clear it again 2014-08-13 20:06:55 +01:00
AndyButland 817d5aab0d Moved list view filter to repository, so can be applied with a database query 2014-08-13 20:02:51 +01:00
Shannon Deminick 0aff4b4d05 Merge pull request #446 from nul800sebastiaan/U4-2238-hexadecimal
U4-2238 6.0.5 - Issue when saving/publishing special characters - '' hexadecimal value 0x03, is an invalid character
2014-08-13 09:57:30 -06:00
per ploug 5e738a2b7b Fixed: U4-4734 Remove default alt text on images from RTE 2014-08-13 11:01:56 +02:00
per ploug 652b9d1a86 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-13 10:42:54 +02:00
per ploug dd72fd04bd Fixed: U4-5025 Backoffice spelling errors 2014-08-13 10:42:46 +02:00
per ploug 231c50319f Fixed: U4-5343 Move grid.config out of Umbraco folder 2014-08-13 10:04:54 +02:00
Sebastiaan Janssen 83668db6e3 Update failing unit test now that MaxInvalidPasswordAttempts is 20 by default 2014-08-13 09:44:25 +02:00
Sebastiaan Janssen ba7a5a0e8a #U4-2238 Fixed
Moved some methods around, made them internal, removed cleaning of tags as that's already done by cleaning each property
2014-08-13 09:38:40 +02:00
AndyButland a71bfaa14c Amends to generated SQL pre-paging to ensure only the latest content versions are returned 2014-08-12 23:32:13 +01:00
Jeavon Leopold 6b455aaa19 Add ImageProcessor httpmodule to web.template.config 2014-08-12 17:51:30 +01:00
Jeavon Leopold b2ca814fdb Update ImageProcessor to v1.9.0 and ImageProcessor.Web to v3.3.0 2014-08-12 16:59:31 +01:00
Sebastiaan Janssen 9523e5c854 U4-2238 6.0.5 - Issue when saving/publishing special characters - '' hexadecimal value 0x03, is an invalid character 2014-08-12 14:18:49 +02:00
Sebastiaan Janssen 99b2a2da38 #U4-5337 fixed Due in version: 7.1.5,6.2.2
Too easy to lock yourself out of the backoffice
2014-08-12 11:06:24 +02:00
Sebastiaan Janssen db22dfcf7d #U4-5337 fixed Due in version: 7.1.5,6.2.2
Too easy to lock yourself out of the backoffice
2014-08-12 11:05:25 +02:00
Sebastiaan Janssen 15ed458ad3 #U4-5258 Fixed
RelationService AreRelated should accepts two entity IDs and a relationTypeAlias
2014-08-12 10:25:33 +02:00
Sebastiaan Janssen 9fc51d8a12 #U4-5258 Fixed
RelationService AreRelated should accepts two entity IDs and a relationTypeAlias
2014-08-12 10:23:11 +02:00
AndyButland dc32138006 Set up database level paging for retrieving child content for list view 2014-08-12 08:15:43 +01:00
antoine 15cdc85e42 Last tuning change and TXT template config 2014-08-11 13:13:39 +02:00
jakobdyrby 1a3d3994c3 added some ToArray() to ensure execution 2014-08-11 12:35:55 +02:00
jakobdyrby 4aedfc419e copy past error 2014-08-11 10:07:27 +02:00
jakobdyrby 21c6cf71cb fixed bug where root element is documents and not documentSet 2014-08-11 09:52:16 +02:00
Shannon 247b5b648d Merge branch '7.1.5_U4-5316' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.1.5_U4-5316
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
2014-08-08 12:29:17 -06:00
Shannon fa4a268556 Updates some naming conventions and code formatting 2014-08-08 12:08:34 -06:00
Shannon 1449966537 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-08 12:00:35 -06:00
Shannon 24a6ae4e32 Fixes: U4-4634 Image preview in Media is stretched 2014-08-08 12:00:30 -06:00
antoine 05c6166040 Preview open in new tab instead of a popup (chrome) 2014-08-08 13:14:03 +02:00
per ploug d2f9bd6896 Fixed: U4-5324 Users with a content root node, cant have custom tree roots 2014-08-08 10:54:05 +02:00
Shannon 6e3d0b5d91 fixes tests 2014-08-07 11:15:34 -06:00
Shannon bf58359eed fixed tests 2014-08-07 11:10:40 -06:00
antoine 9789fbdb79 tuning config for current umbraco kit starter 2014-08-07 18:11:50 +02:00
Shannon Deminick 59b4940979 Merge pull request #439 from AndyButland/u4-5290
U4-5290 - allow for retrieval of a tag's count as well as it's text
2014-08-06 18:58:00 -06:00
AndyButland 8f2f4b579e Added unit test for tags NodeCount property 2014-08-06 22:38:46 +02:00
AndyButland 5efabee0bd Added ignore attribute to NodeCount property on TagDto 2014-08-06 22:38:14 +02:00
Shannon fc19748fbf Fixes: U4-5304 7.1.4 Media Picker can't view images RangeError: Maximum call stack size exceeded 2014-08-06 11:20:24 -06:00
AndyButland 6ea64c84d8 Removed parameter for requesting count for tags and made including the count the default behaviour 2014-08-06 07:36:25 +02:00
Shannon 7dfa633fb3 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Conflicts:
	src/Umbraco.Core/Sync/DefaultServerMessenger.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
2014-08-05 12:49:51 -06:00
Shannon 6ce303a918 Completes: U4-5264 Add Count methods to IContentService, IMediaService, etc... 2014-08-05 12:37:20 -06:00
Shannon 62d3dc78fa Ensures all caching is disabled for editing templates (master pages and views) 2014-08-05 10:59:54 -06:00
Shannon 3374f9e023 Ensures that the batched distributed calls doesn't cache refresh the server executing the distributed calls since tht will already be done locally. 2014-08-05 10:32:07 -06:00
Stephan 2675992d82 Merge branch '6.2.2' into 6.2-4931 2014-08-05 18:20:04 +02:00
Stephan 0a321e37fc Merge branch '7.1.5' into 7.1-4931 2014-08-05 18:15:51 +02:00
Stephan f3ca9e067b Merge remote-tracking branch 'origin/7.1.5' into 7.1.5 2014-08-05 18:08:20 +02:00
Stephan 4814fb3e96 U4-5276 - get package installer to respect binding redirects 2014-08-05 18:07:50 +02:00
antoine e701f0d8a1 new editor for the ui designer 2014-08-05 18:01:04 +02:00
Stephan ce29f54663 U4-4837 - bugfix Umbraco.Core.EnumerableExtensions.InGroupsOf 2014-08-05 17:52:43 +02:00
per ploug 173d4c9655 Fixed: U4-4485 Unsaved changes prompt not appearing for RTE 2014-08-05 13:43:12 +02:00
per ploug a0bf366c85 Fixed: U4-4485 Unsaved changes prompt not appearing for RTE 2014-08-05 13:43:07 +02:00
per ploug a8bcb16303 Fixed: U4-4016 Script folder should not be clickable, or should render a view 2014-08-05 13:43:04 +02:00
Shannon 7261162d8a Fixes some of U4-2633 Bundle all cache refresher transmissions into a single call per request for much better performance. See last note on issue. 2014-08-04 17:50:19 -06:00
Shannon Deminick 5f9b6c14f4 Merge pull request #441 from countrywide/U4-5110
U4-5110 Prevent IE Compatibility Mode
2014-08-04 10:59:27 -06:00
Shannon Deminick 7685e53cfe Merge pull request #440 from countrywide/7.1.5
Fix for issue U4-4162 - MacroContainer editing
2014-08-04 10:56:02 -06:00
Declan Cook 60e81a051d U4-5110 Prevent IE Compatibility Mode 2014-08-04 16:18:43 +01:00
Declan Cook b2436bd9b6 Fix for issue U4-4162 - MacroContainer editing
Allows editing of first element in a macro container.
2014-08-04 16:07:07 +01:00
Sebastiaan Janssen 5fd59a6450 Fix merge problems 2014-08-04 13:56:51 +02:00
Sebastiaan Janssen dba180d809 Merge remote-tracking branch 'origin/7.1.5' into 7.2.0
Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
2014-08-04 13:32:44 +02:00
Sebastiaan Janssen 1c83114c78 Merge pull request #436 from lucasch/U4-5109
U4-5109 - Added an icon for the Visual Blocks tinymce plugin to the skins CSS files
2014-08-04 09:11:54 +02:00
Sebastiaan Janssen 46c07e55e4 Merge pull request #438 from AndyButland/u4-5221
U4-5221 - Ensured multi-value data type prevalues are rendered sorted according to defined sort order
2014-08-04 08:57:35 +02:00
AndyButland 6ee078108d Added NodeCount property to ITag/Tag and an optional flag to tag retrieval methods on TagsService, in order to retrieve the count for the tag as well as it's text 2014-08-03 23:09:56 +02:00
AndyButland 90eb5dc7ac Ensured multi-value data type prevalues are rendered sorted according to defined sort order 2014-08-03 20:00:04 +02:00
user d6833c9b86 Updated the Umbraco TinyMCE skin to use the templates icon for visual blocks,
Visual blocks had no icon in the css
2014-08-01 11:58:33 -05:00
Sebastiaan Janssen aceef2b318 Add missing grid view files. 2014-08-01 12:12:25 +02:00
Shannon Deminick 2325c8a64f Merge pull request #434 from naepalm/7.1.5
Updated the dictionary table icons and the CSS
2014-07-31 18:46:29 -06:00
AndyButland d8bddd80bb Fixed issue with hard-coded colspan for list view table footer and updated to reflect the number of columns 2014-07-31 17:54:10 +02:00
per ploug d8a0502055 Updates to the grid editor
Updates the active grid with correct width, permissions etc on config
changes
2014-07-31 14:45:49 +02:00
per ploug 4e1214085e Split grid rendering into seperate editor views 2014-07-31 14:45:48 +02:00
Sebastiaan Janssen d4e205a47a Merge branch 'AndyButland-wip-u4-3963' into 7.1.5 2014-07-31 12:43:03 +02:00
Sebastiaan Janssen 84df6e5315 Merge branch 'wip-u4-3963' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3963 2014-07-31 12:42:45 +02:00
Sebastiaan Janssen 9957bbfb5d Remove unnecessary reference to ace.js that resulted in javascript errors 2014-07-31 10:08:31 +02:00
AndyButland a9c130d498 Amended tracking of last list view page viewed to store content Id as well as page, so it only restores the page for the appropriate list view 2014-07-31 09:43:19 +02:00
AndyButland 964e18b84f Set up return to list button for list view children that on click returns to the list with the last viewed page restored 2014-07-30 23:14:24 +02:00
AndyButland 45c344a0ca Localisation of container config fields; applied sortable to list of additional columns 2014-07-30 22:05:43 +02:00
Janae Cram af3b655073 Updated the dictionary table icons and the CSS to make the section more usable. 2014-07-30 09:12:06 -07:00
AndyButland 9a0451e1ad Improvements to UI for selecting additional columns for container list view 2014-07-30 09:43:37 +02:00
Shannon f8e366bb4a fixes minor bool check in js for jslint 2014-07-29 11:23:58 -06:00
Shannon Deminick 6439d7337d Merge pull request #433 from arknu/rte_imagesizing
U4-4729: Make max image dimension in RTE configurable
2014-07-29 10:59:43 -06:00
Stephan 56dddbca1c U4-5275 - use IPublishedContentModelFactory for members 2014-07-29 10:56:49 +02:00
Stephan 53ea491bd6 U4-5286 - add property converter for color picker 2014-07-29 09:52:00 +02:00
Shannon b5f900e789 added a couple of tests for member names 2014-07-28 19:37:44 -07:00
AndyButland 222f8b8744 Prevented and removed visual indication of sorting by custom columns 2014-07-28 23:08:20 +02:00
AndyButland eba2ed842b Formatting of dates in list view 2014-07-28 22:46:18 +02:00
AndyButland 180e93a3bf Refactor of ContentTypeContainerConfiguration to use a collection instead of multiple delimited strings 2014-07-28 22:34:30 +02:00
AndyButland 50f1a995e9 Set up headings with localization for container list view custom columns 2014-07-28 22:07:57 +02:00
AndyButland e1cf330638 Display or otherwise the bulk action buttons (publish, unpublish and delete) according to the container config 2014-07-27 20:52:06 +02:00
AndyButland 4d19826d98 Store and retrieval of flags for allowing bulk publish, unpublish and/or delete on container doc types 2014-07-27 15:36:18 +02:00
AndyButland eec6fe2115 Changed selection of default order by column for container document types to drop down list 2014-07-27 15:09:35 +02:00
AndyButland 5ad8ebfa6e Store, retrieve and use default order by and direction for list container document type 2014-07-27 15:04:15 +02:00
AndyButland ef2c7e2d3a Ensured that the default container options are used if no configuration has been defined 2014-07-27 14:40:55 +02:00
arknu cad946905c Bugfix: 0 value was ignored 2014-07-27 13:06:02 +02:00
arknu 49c26f4a5e Followup: make sure that defualt value is applied in RTE 2014-07-27 12:46:52 +02:00
AndyButland df04a90698 Only save container config if provided 2014-07-27 10:35:51 +02:00
AndyButland 332220acc4 Amend of container page size from structure tab of document type editing screen 2014-07-27 10:28:52 +02:00
AndyButland 988e025d12 Refactored content and media type controllers to have inherit from a common abstract class, that implements the retrieval of the container config 2014-07-27 09:03:31 +02:00
AndyButland 599872a310 Created new field in cmsContentType and related models for storing the configuration for a container doc type; implemented configurable page size 2014-07-27 08:53:32 +02:00
arknu 45b173c0db U4-4729: Make max image dimension in RTE configurable 2014-07-27 01:25:39 +02:00
Stephan 5165d70fbb Merge branch '7.1.5' into 7.1-4931 2014-07-25 11:05:31 +02:00
Stephan c2816e759b Fail IPublishedContentFactory faster 2014-07-25 11:00:56 +02:00
Shannon Deminick 7ab8ea4da4 Merge pull request #432 from AndyButland/u4-5138
U4 5138 - fixed a couple of issues with list view styling and function
2014-07-24 15:24:51 -07:00
Shannon 1e8f016234 Fixes: U4-5111 7.1.4 JavaScript runtime error: 'UmbClientMgr' is undefined 2014-07-24 15:13:41 -07:00
Shannon d07ba12e73 Fixes merge 2014-07-24 14:50:06 -07:00
Shannon 7d7fa0e389 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
	src/Umbraco.Web/Umbraco.Web.csproj
2014-07-24 09:42:44 -07:00
Shannon fdab6d5de5 Merge branch '6.2.2' of https://github.com/umbraco/Umbraco-CMS into 6.2.2 2014-07-24 09:39:12 -07:00
Shannon ff94eba3a7 Fixes: U4-5273 6.2: Umbraco.Field no longer rendering macro container 2014-07-24 09:39:05 -07:00
Shannon 834de2099f updates manifest watcher just to ensure we don't try to shut down the app domain more than once. 2014-07-24 09:06:45 -07:00
Shannon 904ee40a34 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-07-24 08:57:07 -07:00
Shannon 99973841e3 Fixes up packaging service - problem with setting property values properly on import due to a wip portion of getting tag values set correctly, though this was solved at the repo level and i unfortunately forgot to re-update this code. 2014-07-24 08:57:02 -07:00
Sebastiaan Janssen e200e2fc48 Removes obsolete cachebrowser 2014-07-24 16:17:40 +02:00
Sebastiaan Janssen 69c7ecad59 Got bitten by stray files that were left behing in _BuildOutput folder, clean before build 2014-07-24 14:43:40 +02:00
Sebastiaan Janssen b1350fa4a6 Customize button was displayed lower than installer button 2014-07-24 14:40:33 +02:00
Sebastiaan Janssen 6014608d5a Microsoft.AspNet.WebApi.Host doesn't exist ;) 2014-07-24 14:24:13 +02:00
Shannon 929180224f Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 2014-07-23 14:07:47 -07:00
Shannon 22dde5a421 U4-4738 Backoffice search should support node ID search 2014-07-23 14:07:21 -07:00
Shannon ee5c532be7 Fixes: U4-4738 Backoffice search should support node ID search 2014-07-23 14:07:05 -07:00
Shannon c9b27b5a70 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2014-07-23 12:32:53 -07:00
Shannon 7f510c107a updates proj's with correct specific version attributes 2014-07-23 12:31:38 -07:00
Shannon 2ebfd8f3d4 updates nuspec to have latest versions for all dependencies 2014-07-23 12:31:16 -07:00
Shannon 6e20be993b updates nuspec to have latest versions for all dependencies 2014-07-23 12:31:03 -07:00
Shannon 84fad1300b All nuget refs are now up to date and installed correctly with copy local set correctly for all non gac 4.5 assemblies as well as the specific version attribute. 2014-07-23 12:19:40 -07:00
Shannon fd7930256b Uninstalls package CodeSharp.Package.AspNetWebPage and removes refs to Nuget.Core and Webpages.Administration - neither of which are used anywhere... but we've been shipping Umbraco with them for some reason. 2014-07-23 10:53:30 -07:00
Shannon 6319b10881 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Conflicts:
	src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
	src/SQLCE4Umbraco/app.config
	src/Umbraco.Core/app.config
	src/Umbraco.Tests/App.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/umbraco.MacroEngines/App.Config
	src/umbraco.businesslogic/app.config
	src/umbraco.datalayer/app.config
	src/umbraco.editorControls/app.config
2014-07-23 10:08:01 -07:00
Shannon c24775adb0 re-installs mvc, webapi and ensures running the latest 2.0.x versions of webpages and razor, now all proj's are consistent with correct versions referenced and copy local set correctly. 2014-07-23 10:03:26 -07:00
Shannon 0d164ffb08 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-07-23 09:04:01 -07:00
Shannon dd83dced4c Fixes up back office search, U4-5048, U4-5021, U4-5167, U4-5194 2014-07-23 09:03:54 -07:00
Sebastiaan Janssen ea56363f6d Adds logging to the RteEmbedController when there's an exception, instead of silently swallowing the error 2014-07-23 14:04:50 +02:00
Sebastiaan Janssen f86902bc89 Microsoft.Bcl 1.1.7 requires NuGet 2.8.1 - also registering MyGet feed from the build.bat file so that it actually works for everybody 2014-07-23 11:39:40 +02:00
antoine fbe49acc77 preview cell with fixed 2014-07-23 10:55:07 +02:00
antoine 677983a59e markup and layouts sortable issue 2014-07-23 09:30:33 +02:00
Shannon b207521f4b Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
2014-07-22 16:15:02 -07:00
Shannon a2aaa9a1ea updates proj references to have SpecificVersion set to false 2014-07-22 16:14:13 -07:00
Shannon 217f591db0 updates proj references to have SpecificVersion set to false for libs 2014-07-22 16:13:26 -07:00
Shannon b835cfb76d Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
2014-07-22 15:55:06 -07:00
Shannon 82cfbab17a Ensures all WebApi DLLs are copied local 2014-07-22 15:51:44 -07:00
Shannon d453aedd0d Microsoft.Net.Http required a reinstall command for the UI project as noted by it's persisted 'requiresReinstall' attribute in the packages.config - also ensures that ALL of the WebApi DLLs are copied local 2014-07-22 15:51:13 -07:00
Shannon 851181f861 Microsoft.Net.Http required a reinstall command for the UI project as noted by it's persisted 'requiresReinstall' attribute in the packages.config - and then the project wouldn't actually build anymore. 2014-07-22 15:39:07 -07:00
Shannon Deminick 4680b643f6 Merge pull request #426 from arknu/searchimprovements
Fix U4-5194 and U4-5167: Handle multiple spaces and quoted searches in the backoffice correctly
2014-07-22 15:26:38 -07:00
Shannon 05be2a5e86 adds test 2014-07-22 15:13:01 -07:00
AndyButland 8445c9c29b Applied styling to list view paging (active class on page numbers, disabled on prev and next when not available 2014-07-22 23:11:22 +01:00
AndyButland e8eea039e1 Reset page number to one when applying filter on list view 2014-07-22 22:35:58 +01:00
Shannon cd8b8dc704 Fixes: U4-5212 Preview button only greyed and not disabled while previewing. (was save button) 2014-07-22 11:33:58 -07:00
Shannon e98ed8561a Fixes: U4-5252 2014-07-23 04:10:48 +10:00
Shannon 626e155c07 Fixes SO issue when tags contain an empty string 2014-07-23 03:54:27 +10:00
Shannon Deminick de968a18dd Merge pull request #431 from AndyButland/u4-5097
U4-5097 - fixed issue with inital value of slider not being saved
2014-07-23 01:47:43 +10:00
AndyButland 8d1d2f2414 Initialised slider scope model value if not already set from a previous save 2014-07-21 22:27:04 +02:00
Stephan 4bb38609ad Merge pull request #429 from leekelleher/U4-5253
U4-5253 PublishedContentModelFactory case-sensitive dictionary
2014-07-21 16:45:13 +02:00
leekelleher 0370a1bcf2 PublishedContentModelFactory: Changes the private 'constructors' dictionary to be case-insensitive. 2014-07-21 15:32:16 +01:00
arknu 188613e5e7 U4-5167: Handle quoted searches in the backoffice correctly 2014-07-18 17:42:47 +02:00
arknu a9261d217e U4-5194: Fix handling of multiple words in backoffice search 2014-07-18 17:00:59 +02:00
Shannon 4693fb23c8 removes unneeded lock on master controller factory - must have been left over from some v5 stuff for some reason :( this will speed things up a bit! 2014-07-18 16:28:54 +10:00
Shannon 6e78a9f98f fix merge 2014-07-16 14:14:02 +10:00
Shannon 92c19ba76c Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Conflicts:
	src/Umbraco.Core/IO/UmbracoMediaFile.cs
2014-07-16 14:13:05 +10:00
Shannon 7848a3095d Fixes: U4-5207 User Type with a space in the name breaks User Content 2014-07-16 14:12:04 +10:00
Shannon 1a75e7beb1 Fixes: U4-5207 User Type with a space in the name breaks User Content 2014-07-16 14:10:24 +10:00
Shannon 388eea95e5 fixes a single vs first check with render route handler when there might be duplicate routes assigned to a controller, fixes short/int parse 2014-07-16 13:46:15 +10:00
Shannon fdf1218a9e fixes another short/int parse 2014-07-16 13:43:08 +10:00
Shannon 1a1aba92ef Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-07-16 13:41:11 +10:00
Shannon 39ee22cbd6 fixes a single vs first check with render route handler when there might be duplicate routes assigned to a controller 2014-07-16 13:41:02 +10:00
Shannon Deminick 119acaa28a Merge pull request #425 from jbreuer/patch-3
Fix for U4-5223
2014-07-16 13:36:30 +10:00
Jeroen Breuer e22282c1e8 Fix for U4-5223 2014-07-15 14:24:27 +02:00
Shannon 6167d1584a Fixes an xss vulnerability 2014-07-15 11:37:31 +10:00
Shannon 0c2d1f72b9 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-07-15 11:36:13 +10:00
Shannon 8c36dac67a Fixes an xss vulnerability 2014-07-15 11:36:03 +10:00
Antoine Giraud 92ae6c5b5d Merge pull request #422 from theDiverDK/7.2.0
Changed minimum bootstrap column span from 2 to 1 in the grid view
2014-07-12 09:32:12 +02:00
Stephan d7f8b10b28 Merge pull request #424 from semmeo/7.1.5
Update fr.xml
2014-07-11 12:36:20 +02:00
Semmeo 7e8be5fd67 Update fr.xml
Updated french umbraco translation from scratch, by translating en.xml. Tested and working.
2014-07-11 12:31:20 +02:00
Stephan e515b716f0 U4-4931 - also for ObjectCacheRuntime provider
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
2014-07-10 10:40:20 +02:00
Stephan fd49c81940 U4-4931 - fixing & refactoring
Conflicts:
	src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
2014-07-10 10:39:52 +02:00
Stephan cc6099c953 U4-4931 - fixing & refactoring
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
	src/Umbraco.Core/CacheHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Cache/HttpRequestCacheProviderTests.cs
2014-07-10 10:39:28 +02:00
Stephan fdadd80414 U4-4931 - do not cache exceptions
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
2014-07-10 10:37:46 +02:00
Stephan fcd7e9517d U4-4931 - fixing & refactoring
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/DictionaryCacheWrapper.cs
	src/Umbraco.Core/Cache/DictionaryItemWrapper.cs
	src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
2014-07-10 10:37:15 +02:00
Stephan 72f53e4645 U4-4931 - fixing & refactoring
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
2014-07-10 10:36:10 +02:00
Stephan 2c9a287bda U4-4931 - fixing & refactoring 2014-07-10 10:35:40 +02:00
Stephan e2f4cfaf82 U4-4931 - fixing & refactoring
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
2014-07-10 10:35:12 +02:00
Stephan 8729156fbf U4-4931 - lock contention & potential application lockdown
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/umbraco.cms/Actions/Action.cs
2014-07-10 10:34:17 +02:00
Stephan bfd0c5e309 U4-4931 - also for ObjectCacheRuntime provider 2014-07-10 10:25:51 +02:00
Stephan 43669e62b4 Merge branch '6.2.2' into 6.2-4931 2014-07-10 10:25:12 +02:00
Shannon 6b128ea7d4 Fixes: U4-5208 RenderActionInvoker needs to be able to run async so needs to inherit from AsyncControllerActionInvoker 2014-07-10 17:29:34 +10:00
Shannon 60d6ae44b5 Fixes: U4-5208 RenderActionInvoker needs to be able to run async so needs to inherit from AsyncControllerActionInvoker 2014-07-10 17:28:33 +10:00
Shannon b3035d160c adds another test 2014-07-10 13:48:32 +10:00
Shannon f27f458a5d Adds another test 2014-07-10 13:46:31 +10:00
Shannon 3f09453345 Fixes: U4-5198 Tags still appearing from items tagged in recycle bin 2014-07-10 13:40:22 +10:00
Shannon 4857107b5e Fixes: U4-4852 ContentService can add new permissions but not remove them 2014-07-10 12:24:36 +10:00
Shannon 080bf7293d replaces the tuple collection for bulk permission assignment to use a new model: EntityPermissionSet 2014-07-10 12:11:47 +10:00
Shannon b3288f0c91 fixes merge issue 2014-07-10 12:11:10 +10:00
Shannon d5993a4783 Backports fix from 7 for GetDimensions call to ensure the file exists 2014-07-10 12:09:26 +10:00
Shannon b254f81f4a Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 2014-07-10 11:54:05 +10:00
Shannon 17b0547cfc Merge commit '874f464a2b51000920e2323f93bea116546e9b88' into 7.1.5
Conflicts:
	src/Umbraco.Core/IO/FileSystemExtensions.cs
	src/Umbraco.Core/IO/UmbracoMediaFile.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
2014-07-10 11:53:45 +10:00
Shannon 86c2a6e8a9 updates physical file system, now that files are being disposed of properly we don't need to delete first 2014-07-10 11:51:48 +10:00
Shannon 874f464a2b Fixes: U4-5190 Overwrite Media File in 6.2.1 - process cannot access along with a bunch of other undisposed disposables :/ 2014-07-10 11:45:57 +10:00
Shannon 93151a43ac Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Conflicts:
	src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
	src/Umbraco.Web/Security/MembershipHelper.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
2014-07-10 11:14:20 +10:00
Shannon b3c41e051f Fixes: U4-5199 Appending certain query strings to URLs cause InvalidOperationException (The UmbracoContext.Current is null) 2014-07-10 11:10:49 +10:00
Shannon a88637910f updates content xml bits so if it's called outside a web req it still executes.
Conflicts:
	src/Umbraco.Web/umbraco.presentation/content.cs
2014-07-10 10:45:26 +10:00
Shannon 1af7649a87 updates content xml bits so if it's called outside a web req it still executes. 2014-07-10 10:44:40 +10:00
Søren Reinke fdafd07117 Changed minimum bootstrap column span from 2 to 1 in the grid view 2014-07-09 12:24:33 +02:00
Shannon 431e93000e Fixes: U4-5157 Membership.GetUser() causes 13 SQL queries, including duplicates 2014-07-08 19:04:38 +10:00
Shannon f83bbdbf90 Fixes: U4-5157 Membership.GetUser() causes 13 SQL queries, including duplicates 2014-07-08 18:54:36 +10:00
Shannon 5a810b584e Fixing: U4-5157 Membership.GetUser() causes 13 SQL queries, including duplicates 2014-07-08 18:07:59 +10:00
Shannon bcae3afa45 fixes null check on tag extractor 2014-07-07 16:21:53 +10:00
Shannon 3aff474648 Fixes: #U4-4685 Default sorting of listview items 2014-07-07 16:21:12 +10:00
Shannon 9f34c72cb4 Updates the GetAll of ContentTypeRepository to use the new mapper which no longer executes one by one this means far less queries, updates GetByQuery to get all int ids and then use GetAll 2014-07-04 14:23:53 +10:00
Shannon 5eb253c4eb Fix up right join query to use a proper select and left join (less confusing), fix up getall call when getting a content type, reduce another query and include child ids in the main query. 2014-07-04 12:26:34 +10:00
Shannon 7fbda1dc7d Fixes performance for Get(id) on ContentTypeRepository = much faster now, now to work on getall/query 2014-07-04 10:54:12 +10:00
Shannon 9bae8173fc Updated the ContentTypeRepository PerformGet method to map all property groups and types in a single query and added test to test the query, this reduces the lookup by about 30% but still lots of improvements to be made. 2014-07-03 14:25:21 +10:00
antoine 8f66258a94 Top min margin to avoid that rte hidden 2014-07-01 17:35:54 +02:00
antoine aa8f7a9394 Remove control issue, it wasn't using the right index 2014-07-01 17:29:20 +02:00
antoine 5c24759234 RTE unique id issue, replace unique ID base on date by GUID 2014-07-01 17:15:48 +02:00
antoine b84a52c760 Tuning style selector improvement 2014-07-01 16:13:04 +02:00
antoine 54c3e68f32 Ignore Preview folder 2014-07-01 13:57:04 +02:00
antoine 2e1e1eee1c Link to current tuned css file in preview mode 2014-07-01 13:55:39 +02:00
Shannon e60b621110 Huge perf enhancement to GetByQuery on the content repo, so much more like this is easy to fix with massive benefit. For example, the Retrieving_All_Content_In_Site used to run for 143795ms and now runs at 14249ms which is 90% savings. 2014-07-01 18:07:00 +10:00
Shannon 1a821b4073 super quick performance win in the case where people don't pass in distinct values 2014-07-01 17:41:22 +10:00
Shannon efda233fcf super quick performance win in the case where people don't pass in distinct values 2014-07-01 17:40:41 +10:00
Shannon ed2e409707 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Conflicts:
	src/Umbraco.Web/Security/MembershipHelper.cs
2014-07-01 12:54:48 +10:00
Shannon 8645e0b193 Fixes: U4-5140 Tags are not respected with bulk publish operations - just need to ensure all tests are passing and run some local tests 2014-07-01 12:53:07 +10:00
Shannon a89b9e9da6 ignores log4net tests 2014-07-01 11:16:57 +10:00
Shannon 8917701fa3 ignores failing test - need stephane to look 2014-07-01 11:03:47 +10:00
Shannon 68b17bff08 Ensures no membership user writing when checking public access 2014-07-01 10:52:29 +10:00
Shannon 9b2b961f83 Ensures no membership user writing when checking public access 2014-07-01 10:51:56 +10:00
Shannon 7a12060c37 Potentially fixes U4-5069 Deadlock occurring in MemberService.GetByUsername
Conflicts:
	src/Umbraco.Web/Security/MembershipHelper.cs
2014-07-01 10:46:52 +10:00
Shannon f3c7533796 Potentially fixes U4-5069 Deadlock occurring in MemberService.GetByUsername 2014-07-01 10:43:44 +10:00
antoine 89ed75f5dc Right .gitignore file 2014-06-30 19:36:45 +02:00
antoine ec294cefd8 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-06-30 19:29:38 +02:00
antoine 16d8481ad9 Tuning new concept, config throught json config or/and html5 data tags 2014-06-30 19:28:33 +02:00
Shannon 59116fc7fa un-does the tag export/import, instead need to look at the internal of a simple publish (without save) to see if tags get written or not. 2014-06-30 17:05:34 +10:00
Shannon a66670263f fixes null check 2014-06-30 17:04:59 +10:00
Shannon 1e1d49f305 fixes U4-5140 Package installation for content does not respect tags, however need to check with Morten if it's required because if we never actually publish content on package install then this wouldn't really matter. But surely we must publish on package install for some thing because starter kits are published... hrm. 2014-06-30 16:43:51 +10:00
Shannon 1be2706c30 fix merge 2014-06-30 15:09:41 +10:00
Shannon eaf2956524 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Conflicts:
	src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
2014-06-30 14:26:33 +10:00
Shannon 525280d466 fixed some tests 2014-06-30 14:09:36 +10:00
Shannon 496beca8f2 This Can_Find_Targetted_Migrations test needed a valid database to pass. This update ensures that the database is created with the old version 4.8 db schema. 2014-06-30 14:02:43 +10:00
Stephan 637a22293d U4-4931 - fixing & refactoring 2014-06-28 18:33:31 +02:00
Stephan 3c8517edcb Merge branch '6.2.2' into 6.2-4931 2014-06-28 16:26:44 +02:00
Stephan 45e6127d00 U4-4866 - fix the build 2014-06-28 16:26:27 +02:00
Stephan 6eb5d3f7ef Merge branch '6.2.2' into 6.2-4931 2014-06-28 16:06:30 +02:00
Stephan e6986432df U4-4931 - fixing & refactoring 2014-06-28 12:24:02 +02:00
Sebastiaan Janssen 5bee398d09 #U4-3838 fixed Due in version 7.1.5
Fixes ContentService Copy uses IOHelper.MapPath but should use fs.GetFullPath and a few other instances where IOHelper was used
2014-06-27 17:22:51 +02:00
Sebastiaan Janssen c53d812742 #U4-3154 Fixed Deleting single media item in recycle bin does not use the FileSystemProvider 2014-06-27 16:26:22 +02:00
Sebastiaan Janssen 966a29954c #U4-5010 fixed
Package editing view missing in distribution
2014-06-27 16:25:57 +02:00
Morten Christensen 9f28aea10d This Can_Find_Targetted_Migrations test needed a valid database to pass. This update ensures that the database is created with the old version 4.8 db schema. 2014-06-27 13:23:54 +02:00
Morten Christensen 097014454f Fixing issue in MacroRepository which was causing a test to fail.
Changing the alias of a macro property didn't alias work, so added a fallback to the Id of the property in the cases where the Alias wouldn't work.
2014-06-27 12:42:15 +02:00
Morten Christensen 48143bc0c3 Minor updates to the Package installation and extraction as part of PR #417 2014-06-27 12:37:56 +02:00
per ploug 601fef873a Found a couple of minor issues while testing 2014-06-27 11:50:03 +02:00
Morten Christensen 75c26e4d92 Merge pull request #417 from netmester/package_installer_service
Package installer service
2014-06-27 10:58:10 +02:00
Shannon ad4135f629 does a toarray to make sure it doesn't reiterate 2014-06-27 14:04:35 +10:00
Shannon 8e7ed865f0 Fixes: U4-5151 Backoffice controllers collide on name even if different namespace 2014-06-27 13:34:15 +10:00
per ploug 49a374dbca Fixing various grid bugs with the new structure 2014-06-26 23:36:04 +02:00
per ploug 7edd7cbd8a Friendlier YSOD modal 2014-06-26 23:35:25 +02:00
per ploug 51e9ef21aa Adding comment + docs to checboxlistmodel 2014-06-26 11:33:35 +02:00
per ploug d0ebbf2359 project file 2014-06-26 11:31:39 +02:00
per ploug c8c2d2d601 GridView Configaration UI 2014-06-26 11:27:45 +02:00
per ploug 8a93c8371c Moves templatequery models into the right folder 2014-06-26 11:24:57 +02:00
per ploug 4fea55e751 More efficient grunt execution 2014-06-26 11:24:05 +02:00
Shannon f627de2433 tweaks orange 2014-06-26 17:38:24 +10:00
Shannon 303aa07235 migrates most of the xml serialization from the packaging service to the EntityXmlSerializer 2014-06-26 17:32:38 +10:00
Shannon b404cc6438 Fixes: U4-5141 Packager doesn't respect 'allow at root' or 'list view' 2014-06-26 17:18:00 +10:00
Shannon 80103e6155 Fixes: U4-4866 Select content root when creating a package 2014-06-26 16:55:44 +10:00
Shannon 4fbf65e684 Fixes: U4-4866 Select content root when creating a package 2014-06-26 16:45:59 +10:00
Shannon 0aeac407c5 removes extremely silly try catch all when using the packager - why was this here !? So that nobody would ever know why creating their package failed? 2014-06-26 16:33:56 +10:00
Shannon be98ceea6c Fixes: U4-5011 Auto collapsing tree structure 2014-06-26 16:14:50 +10:00
Shannon 07e0cd2957 uses a better orange 2014-06-26 14:08:51 +10:00
Shannon 9da7d56b9c Fixes styling on installer alert box so it's contained within the pane 2014-06-26 13:58:09 +10:00
Shannon 5a3890159f Fixes: U4-5142 Fix the horrible orange warning color in the back office 2014-06-26 13:52:59 +10:00
Shannon 70da51113c Streamlines form error colors to be inline with the rest of our color scheme 2014-06-26 13:31:39 +10:00
Shannon 0f7c407a7c Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Services/LocalizationServiceTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs
2014-06-26 11:51:25 +10:00
Shannon 392634eb76 bumps nuspec versions 2014-06-26 11:44:28 +10:00
Shandem 7bc5588d6d Merge pull request #420 from bjarnef/7.1.5_U4-3953
Fix for U4-3953
2014-06-26 11:38:25 +10:00
Shannon 259bc863f0 Removes Examine.dll deploy from nuspec 2014-06-26 11:32:43 +10:00
bjarnef 70514b88c5 Fix for U4-3953
Installing package - installing message progressbar causes horizontal
scrollbar
2014-06-26 02:57:47 +02:00
Shannon 582bafdefd Updates version 2014-06-26 10:02:09 +10:00
Shannon 9924ef2381 Merge branch '6.2.1' into 6.2.2 2014-06-26 09:57:16 +10:00
Morten Christensen 12cdd3326a The CopyFile extension method was not disposing the file stream, so any attempt to delete the source file afterwards would fail.
Removing unused using statements.
2014-06-25 16:00:21 +02:00
Shannon 859fbaaa05 Fixes: U4-5121 umbraco.content launches threadpool threads to reload the xml cache which causes lots of other issues
Conflicts:
	src/Umbraco.Web/umbraco.presentation/content.cs
2014-06-25 19:02:49 +10:00
Shannon 27764a2c82 merge issue 2014-06-25 18:58:29 +10:00
Shannon 5fdcec6904 Fixes: U4-5121 umbraco.content launches threadpool threads to reload the xml cache which causes lots of other issues 2014-06-25 18:56:51 +10:00
Shannon 0b678f1d3b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5
Conflicts:
	src/umbraco.cms/businesslogic/Packager/Installer.cs
2014-06-25 15:59:20 +10:00
Shannon 72991334c4 little bit of code cleanup 2014-06-25 15:55:52 +10:00
Shannon 309adbfb20 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5
Conflicts:
	src/Umbraco.Tests/Umbraco.Tests.csproj
2014-06-25 14:36:09 +10:00
Shannon c659d5b85e fixes dll ref 2014-06-25 14:35:14 +10:00
Shannon 3ecc974325 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
2014-06-25 14:33:32 +10:00
Shannon a4bf4b0977 Fixes: U4-5118 Examine not storing XML fragments - updates to latest examine 2014-06-25 14:19:31 +10:00
Shannon bef6ce66f1 Updated core nuspec to include Examine 2014-06-25 14:19:06 +10:00
Shannon a18a2198a8 removes comment 2014-06-25 12:25:27 +10:00
Shannon 38c4bc72cd Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 2014-06-25 12:03:53 +10:00
Shannon 7cf7ac687c last issue with state/keep alive timer 2014-06-25 12:03:31 +10:00
Shannon 6b626baffb Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 2014-06-25 11:56:56 +10:00
Shannon 7ce0272169 updates state param with timers to use singleton 2014-06-25 11:56:36 +10:00
Shannon acb934e3f1 ensures timer's are not GCd 2014-06-25 11:52:48 +10:00
Shannon 6485e625b1 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 2014-06-25 11:37:21 +10:00
Shannon 3aa486a463 another log 2014-06-25 11:36:58 +10:00
Shannon 5aa0621c90 adds some notes 2014-06-25 11:36:14 +10:00
Shannon 625b8f7e65 Ensures the 'Index' portion of the path is used for scheduled publishing 2014-06-25 11:26:08 +10:00
Shannon 72b7b443e9 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 2014-06-25 11:02:04 +10:00
Shannon 53c1c97aeb Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-25 11:01:03 +10:00
Shannon 5011eee037 fixes merge issue 2014-06-25 11:00:53 +10:00
Shannon e27163f3a7 adds logging to scheduled bits 2014-06-25 11:00:11 +10:00
Shandem 22bace9545 Merge pull request #419 from imulus/fix/u4-5128
Support virtual paths when defining PropertyEditors via Attributes (U4-5128)
2014-06-25 09:53:31 +10:00
jakobdyrby 8c36a683e6 Change some class from public to internal 2014-06-24 11:27:04 +02:00
Tom Fulton a23fb7bc74 Support virtual paths when defining PropertyEditors via Attributes (U4-5128) 2014-06-23 12:16:14 -04:00
Shannon 2ccec3be33 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/LegacyScheduledTasks.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/publishingService.cs
2014-06-23 15:08:04 +10:00
Shannon 65ea6f94d3 adds authorization to the scheduled publishing , this new attribute can be used to secure scheduled tasks as well. 2014-06-23 15:02:23 +10:00
Nicholas-Westby abe925b946 Fixed typo "loaction".
Replaced "icon-map-loaction" with "icon-map-location".
2014-06-20 15:17:09 -07:00
Morten Christensen 3af3e054d7 Minor refactoring of the MigrationRunner to allow a bit more flexibility for using it for non-Core migrations.
Allowing the list of migrations to be changed through the two migration events using the MigrationEventArgs.
2014-06-20 12:57:33 +02:00
Shannon 9158ea1ace fixes url returned in GetCurrentServerUmbracoBaseUrl 2014-06-20 14:45:45 +10:00
Shannon e8f7f77bb6 Fixes: U4-581 Automatic publishing not working in load balanced setup - added some more convention and configuration to distributed calls so that servers are aware of the master and how to call into themselves for scheduled tasks, ping and scheduled publishing. Will need to update the docs on LB regarding this too. Cleaned up the code that does the scheduling and separates it into proper segments. Obsoletes the old presentation classes that were doing it. 2014-06-20 14:34:21 +10:00
Shannon 6b5cb3a9cf Fixes: U4-4947 Tag Editor twitter typeahead 2014-06-19 18:04:32 +10:00
Shannon bb655afd72 Fixes: U4-5080 Error deleting property type that references tags 2014-06-19 17:39:31 +10:00
Shannon ad3502d438 Fixes: U4-5004 Pressing escape in the login screen causes a blank screen 2014-06-18 19:28:16 +10:00
Shannon dfb40802ff makes grunt vs and grunt dev a little faster 2014-06-18 17:31:00 +10:00
Shannon 8ded6fff93 adds vs task to grunt 2014-06-18 17:15:09 +10:00
Shannon 56111be82d Properly fixes: U4-4893 Inconsistent display of file extensions in the UI 2014-06-18 17:11:47 +10:00
Stephan 75e003185a U4-4931 - do not cache exceptions 2014-06-17 19:34:24 +02:00
Stephan 9d12e1c7df Merge branch '6.2.2' into 6.2-4931 2014-06-17 19:19:17 +02:00
Shannon f25463babe Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 2014-06-17 19:05:22 +10:00
Shannon b8575ef158 Started writing test implementation to mimic what developers might test in their controllers to expose the pitfalls of umbraco testing so we can make this simpler - identifying what needs to be public and how to re-strcuture some objects constructors, etc... to simplify and make this possible. 2014-06-17 18:53:23 +10:00
jakobdyrby 3e0cd0a605 Now it works with a notimplimentet exception 2014-06-17 09:13:54 +02:00
Shannon 1c23940b0b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5
Conflicts:
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
2014-06-17 16:09:29 +10:00
Shannon d3bb750f98 Updated to latest Examine with lock fixes 2014-06-17 16:07:08 +10:00
jakobdyrby 7ec13146b2 more revert 2014-06-17 07:34:49 +02:00
jakobdyrby 48e0e5da75 revert to org files 2014-06-17 07:31:22 +02:00
jakobdyrby 448bfc166f revert to org files 2014-06-17 07:12:59 +02:00
jakobdyrby 7b48a59ca2 added events 2014-06-17 07:06:07 +02:00
Shandem 1f161b2b9c Merge pull request #395 from Excommunicated/7.1.5
Close user dialog on logout
2014-06-17 14:07:45 +10:00
Morten Christensen 6f27f839e0 Related to U4-4199 lets get rid of all these Console.WriteLine's 2014-06-16 16:29:15 +02:00
jakobdyrby f7e046deaf Undo some non changes 2014-06-16 14:01:59 +02:00
jakobdyrby 09b34625b9 removed change to src/Umbraco.Core/Services/DataTypeService.cs 2014-06-16 13:58:50 +02:00
jakobdyrby 3b3e412450 Undo some changes 2014-06-16 12:29:32 +02:00
jakobdyrby 3c6bf1ce92 Removed some complex objects that didn't need to be complex 2014-06-16 12:13:01 +02:00
jakobdyrby dfb08b9ec7 Removed IStyleSheet 2014-06-16 12:13:00 +02:00
jakobdyrby eef7ce45d3 cleanup 2014-06-16 12:13:00 +02:00
jakobdyrby 697d4e3b23 more logical code 2014-06-16 12:12:59 +02:00
jakobdyrby 6d77121c05 Test for support stylesheets 2014-06-16 12:12:58 +02:00
jakobdyrby a7928f87ee small ajustments 2014-06-16 12:12:58 +02:00
jakobdyrby 07d431f52e more moving 2014-06-16 12:12:57 +02:00
jakobdyrby bb71efd4fa Move moving classes around 2014-06-16 12:12:57 +02:00
jakobdyrby 48b60961b5 removed unused code 2014-06-16 12:12:56 +02:00
jakobdyrby 2bea8c5691 back to const 2014-06-16 12:12:56 +02:00
jakobdyrby 32ed0de4f6 Moved and renamed classes to fit standard 2014-06-16 12:12:55 +02:00
jakobdyrby c67f0baf74 Method renaming and zip allowed 2014-06-16 12:12:54 +02:00
jakobdyrby 95ff1a03fb some renaming 2014-06-16 12:12:53 +02:00
jakobdyrby c0b22c4349 renamed a class 2014-06-16 12:12:53 +02:00
jakobdyrby 5d3d2e9331 added comments to IUnpackHelper 2014-06-16 12:12:52 +02:00
jakobdyrby de266351d1 Refactoring to move redundant code and added sanity check for doublet filenames in package 2014-06-16 12:12:52 +02:00
jakobdyrby f8b4caea85 Fixes
now the package does not die hard if data type not found
directories in umb packages are now ignored - not sure if this is th right behaver
small logical errors
2014-06-16 12:12:51 +02:00
jakobdyrby 5691bb0de8 Xml elements case sensitive problems 2014-06-16 12:12:50 +02:00
jakobdyrby fa56413d02 undo rename of argument 2014-06-16 12:12:50 +02:00
jakobdyrby cb5fa8ac13 Removed "double" file 2014-06-16 12:12:49 +02:00
jakobdyrby 531eba6e28 corrected comment 2014-06-16 12:12:49 +02:00
jakobdyrby 4c6ec3ac4b Removed som out commentet code 2014-06-16 12:12:48 +02:00
jakobdyrby 46eaba668c Missed this in last commit 2014-06-16 12:12:48 +02:00
jakobdyrby 889736f63b now loosely testet. 2014-06-16 12:12:47 +02:00
jakobdyrby a03e46339d small layout stuff 2014-06-16 12:12:46 +02:00
jakobdyrby 37fbc3bab4 Now uses new constants 2014-06-16 12:12:46 +02:00
jakobdyrby 9f146753b5 used the right method that returns a single object 2014-06-16 12:12:45 +02:00
jakobdyrby acc6d46b4b splittet into more single resposebility classes 2014-06-16 12:12:45 +02:00
jakobdyrby d57c572116 moved strings to constants 2014-06-16 12:12:44 +02:00
jakobdyrby 70fcd6fab7 more updates 2014-06-16 12:12:44 +02:00
jakobdyrby 45076491cb Added new PackagingService 2014-06-16 12:12:43 +02:00
Sebastiaan Janssen c34f83e231 U4-5092 Czech language support 2014-06-16 10:11:19 +02:00
Henrik Andersen 6019ab13df Updated sortdiaglog frame
Updated the dialog frame to use dynamic height.
2014-06-13 09:28:57 +02:00
Henrik Andersen 83fd0ab7e3 Updated modals.less
Added background color to umb-dialog footer
2014-06-13 09:21:45 +02:00
Sebastiaan Janssen fd2fe1939a Adds new installer image 2014-06-11 10:22:13 +02:00
Morten Christensen 81e56bed9e Implementing Document Type Compositions in the Document Type Editor.
Adds changes to the CMSNode and doc type related class which improves the internal usage of the new model based on IUmbracoEntity.
2014-06-11 07:08:38 +02:00
Sebastiaan Janssen 52457fea21 Bump version number 2014-06-10 18:47:02 +02:00
Sebastiaan Janssen 07ec9aa813 Undo formatting of query for now 2014-06-10 18:11:14 +02:00
Sebastiaan Janssen ba89aec34f Merge pull request #415 from rustyswayne/7.1.5-templatequery
Query Builder - Fix Date sort fields and format returned query
2014-06-10 17:48:59 +02:00
Jeavon Leopold 29533820ab Query Builder - Fix Date sort fields and format returned query to be on new lines and tabbed 2014-06-10 16:43:28 +01:00
Sebastiaan Janssen 4366500fad Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.2.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
2014-06-10 17:15:07 +02:00
Sebastiaan Janssen ee6e1a9d8b Disable extra templates tree 2014-06-10 17:13:58 +02:00
antoine 3b95184f04 empty video or media issue 2014-06-10 17:06:13 +02:00
antoine 9da7e108da double )) in embed open windows 2014-06-10 16:52:29 +02:00
antoine cb491d45ab open preview issue fixed 2014-06-10 16:50:03 +02:00
Sebastiaan Janssen 344b880ba7 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.2.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.controller.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
2014-06-10 15:22:31 +02:00
Sebastiaan Janssen c958f12bc1 Merge pull request #413 from rustyswayne/7.1.5-templatequery
Template Query Editor Prototype
2014-06-10 15:11:57 +02:00
Shannon 9a973d0ccc fixes csproj 2014-06-10 15:06:41 +02:00
Jeavon Leopold b170053e87 Support for multiple "and" conditions in the query builder 2014-06-10 14:05:57 +01:00
antoine db4509de2b link picker removed 2014-06-10 14:35:57 +02:00
antoine 5c91b822e3 legacy grid's configs removed 2014-06-10 13:45:52 +02:00
Shannon e6ddf63e56 re-adds old providers 2014-06-10 13:19:52 +02:00
Shannon 84ac029372 re-add segment provider 2014-06-10 13:18:54 +02:00
antoine 5d59741612 iframe resize with the tuning panel 2014-06-10 12:52:33 +02:00
Jeavon Leopold 2ffd0413e8 Adding query builder button to View editor 2014-06-10 11:27:26 +01:00
Jeavon Leopold dc4e6ee01c Adding Visible to template query builder 2014-06-10 08:40:33 +01:00
Nicholas-Westby 23b6170106 Set value type for Textarea to "TEXT".
This should fix http://issues.umbraco.org/issue/U4-5063
2014-06-09 15:48:27 -07:00
Jeavon Leopold 1d8e217c6f Template Query builder prototype working! 2014-06-09 23:23:31 +01:00
Jan Skovgaard 4421681538 Fix for U4-4913 2014-06-09 22:38:49 +02:00
Jan Skovgaard f430698e29 Replaced "umbraco" with "Umbraco 2014-06-09 21:03:44 +02:00
Jan Skovgaard bd7533f0bf Replaced "umbraco" with "Umbraco 2014-06-09 21:03:37 +02:00
Jan Skovgaard 748dddf25b Replaced "umbraco" with "Umbraco 2014-06-09 21:03:33 +02:00
Jan Skovgaard 48518d8f42 Replaced "umbraco" with "Umbraco 2014-06-09 21:03:29 +02:00
Jan Skovgaard d234297791 Replaced "umbraco" with "Umbraco 2014-06-09 21:03:25 +02:00
Jan Skovgaard 8b752dbc63 Replaced "umbraco" with "Umbraco 2014-06-09 21:03:17 +02:00
Jan Skovgaard 2d87a2ae2b Replaced "umbraco" with "Umbraco 2014-06-09 21:03:12 +02:00
Jan Skovgaard 05ea0b5ac4 Replaced "umbraco" with "Umbraco 2014-06-09 21:03:07 +02:00
Jan Skovgaard 15d84759f6 Replaced "umbraco" with "Umbraco 2014-06-09 21:03:00 +02:00
Jan Skovgaard c344e7247c Replaced "umbraco" with "Umbraco 2014-06-09 21:02:54 +02:00
Jan Skovgaard 74d84d909d Replaced "umbraco" with "Umbraco 2014-06-09 21:02:50 +02:00
Jan Skovgaard 30462d72e6 Replaced "umbraco" with "Umbraco 2014-06-09 21:02:45 +02:00
Jan Skovgaard b8849fc1b1 Replaced "umbraco" with "Umbraco 2014-06-09 21:02:39 +02:00
Jan Skovgaard d80f707b69 Replaced "umbraco" with "Umbraco 2014-06-09 21:02:32 +02:00
Jan Skovgaard 8d4d0d2f53 Replaced "umbraco" with "Umbraco 2014-06-09 21:02:26 +02:00
Jan Skovgaard 22993cf185 Replaced "umbraco" with "Umbraco 2014-06-09 21:02:20 +02:00
Jan Skovgaard c9717d22ea Replaced "umbraco" with "Umbraco 2014-06-09 21:02:07 +02:00
Jan Skovgaard cdcef49ff8 Replaced "umbraco" with "Umbraco 2014-06-09 21:01:54 +02:00
Sebastiaan Janssen e59768dda0 Capitalize Caturday 2014-06-09 20:57:15 +02:00
Sebastiaan Janssen 0b114c88f0 Merge pull request #397 from lesleyauk/7.1.5
Correct English days of the week on login screen
2014-06-09 20:55:31 +02:00
Rusty Swayne 0b3136cf20 Patched Contains query & implemented SortExpression 2014-06-09 09:14:26 -07:00
Rusty Swayne b0e96b256a Merge branch '7.1.5' into 7.1.5-templatequery 2014-06-09 08:44:19 -07:00
Jeavon Leopold 72a966b0fa Template Query Editor - Angular and hooking up to the API controller 2014-06-09 16:42:57 +01:00
Rusty Swayne bf222f26cd Merge remote-tracking branch 'umbraco/7.1.5' into 7.1.5 2014-06-09 08:41:33 -07:00
Rusty Swayne be9f4b70e2 Added JasonCamelCaseFormatter to the .Web project 2014-06-09 08:40:47 -07:00
Jan Skovgaard 4238b79c67 Fix for U4-4493
Makes it possible to go back if you don't want to customize.
2014-06-09 16:48:27 +02:00
Stephan d9374c34d1 Add IPropertyValueConverterMeta interface
Conflicts:
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
	src/Umbraco.Core/Umbraco.Core.csproj
2014-06-09 15:31:35 +02:00
Sebastiaan Janssen 2b7526ab2e Merge pull request #409 from JimBobSquarePants/7.1.5
Improving grammar in installer facts.
2014-06-09 15:30:46 +02:00
Shannon 2fde10494c Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-09 15:32:52 +02:00
Shannon 0da4879400 downgrades mini profiler to what it used to be 2014-06-09 15:32:44 +02:00
Sebastiaan Janssen 07172067ab Merge pull request #408 from BatJan/7.1.5-wording-fix-4382
Fix of U4-4382
2014-06-09 15:28:36 +02:00
James South 681a3e3046 Improving grammar in installer facts. 2014-06-09 15:20:28 +02:00
Rusty Swayne 0060f0019e Merge branch '7.1.5' into 7.1.5-templatequery 2014-06-09 05:41:16 -07:00
Rusty Swayne 632cd221d9 Attribute for WebApi controllers that camel cases object property names when serialized to Json 2014-06-09 05:39:14 -07:00
Jeavon Leopold 46d5215d9e Merge remote-tracking branch 'upstream/7.1.5' into 7.1.5-templatequery 2014-06-09 13:21:07 +01:00
Jeavon Leopold aa43656cb9 Revisions to QueryModel. Added Sorting and Take functionality. 2014-06-09 13:18:35 +01:00
Sebastiaan Janssen e5dea8e4be Merge pull request #407 from BatJan/7.1.5-translation-fix-4538
Fix of U4-4538
2014-06-09 14:09:19 +02:00
Sebastiaan Janssen 087dd1fe9e Merge pull request #404 from BatJan/7.1.5-installer-fix-4416
Fix of U4-4416
2014-06-09 13:58:08 +02:00
Sebastiaan Janssen 37afe6dd29 Merge pull request #406 from BatJan/7.1.5-spelling-fix-5007
Fix of  issue U4-5007
2014-06-09 13:51:57 +02:00
Sebastiaan Janssen 338a125eaa Merge pull request #405 from JimBobSquarePants/7.1.5
Fixing broken preview dialog U4-4977
2014-06-09 13:49:45 +02:00
Jan Skovgaard 18fc6ccc99 Fix of U4-4382 2014-06-09 13:23:01 +02:00
Stephan 8a1db41fc4 Implement content.FirstChild 2014-06-09 13:04:40 +02:00
James South d2119c17c1 Fixing broken preview dialog U4-4977 2014-06-09 13:01:00 +02:00
Jan Skovgaard 9d4afbd007 Fix of U4-4538 2014-06-09 12:44:07 +02:00
Jan Skovgaard c4f764d5fc Fix of issue U4-5007 2014-06-09 12:28:29 +02:00
Sebastiaan Janssen db3d86aeca Merge pull request #402 from leekelleher/U4-3596
U4-3596 Recycle bin, use the listview on the recycle bin instead of showing the deleted items as children
2014-06-09 10:56:24 +02:00
Sebastiaan Janssen c17e60f709 Merge pull request #401 from leekelleher/U4-5066
U4-5066 Display message on empty list-view.
2014-06-09 10:45:13 +02:00
Sebastiaan Janssen 68860b6c54 Update Umbraco version everywhere 2014-06-09 10:32:09 +02:00
Sebastiaan Janssen 5834757476 Merge pull request #403 from BatJan/7.1.5-installer-fix-5040
Fix of U4-5040
2014-06-09 10:15:06 +02:00
Jeavon Leopold e4837d1962 Changing DescendantOrSelf to DescendantOrSelf.First as it doesn't work with dynamics 2014-06-09 08:41:29 +01:00
Jeavon Leopold 40868d7cd2 Fixing typo in Descendants for template query controller 2014-06-09 07:08:06 +01:00
Jeavon Leopold 0fde3f7b5d Fixing up the test method for the query builder 2014-06-08 23:26:46 +01:00
Jeavon Leopold 76f0eac5f8 Template Query WIP 2014-06-08 22:39:01 +01:00
Jeavon Leopold 2352d258b9 Fix mock API method and some Stylecop 2014-06-08 19:06:37 +01:00
Rusty Swayne 2dc38a29cf Added QueryModel 2014-06-08 10:20:34 -07:00
leekelleher 91ddbff990 U4-5066 Display message on empty list-view. 2014-06-08 18:18:50 +01:00
Niels Hartvig 5fd1d7c9e5 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-08 19:18:43 +02:00
Niels Hartvig 32cfdbe968 Fixes: U4-4892 Inconsistent (lack of) instructions regarding file extensions in the UI 2014-06-08 19:18:37 +02:00
Shannon a754cecaf7 Allows any Controller to use PreRenderViewActionFilterAttribute 2014-06-08 19:12:40 +02:00
Jeavon Leopold 1aa162e255 Add Site() method to DynamicPublishedContent for Template Query Builder 2014-06-08 18:09:29 +01:00
leekelleher 8ccb06c91d Tidied up the "Recycle Bin" headers for both content/media 2014-06-08 18:09:07 +01:00
Shannon d8e35ffc08 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-08 19:05:54 +02:00
Shannon 34dcde645c Half completes: U4-2462 Does the app_plugins manager monitor file changes? 2014-06-08 19:05:48 +02:00
Rusty Swayne 342999a678 TemplateQueryController 2014-06-08 09:51:06 -07:00
Jan Skovgaard 0474605d36 Fix of U4-4416
http://issues.umbraco.org/issue/U4-4416
2014-06-08 18:47:07 +02:00
Sebastiaan Janssen 4dd3f2f8ac Merge pull request #399 from leekelleher/U4-3575
U4-3575 Get Started Dashboard does not changes when changing sections using Left Menu icons
2014-06-08 18:38:43 +02:00
Jan Skovgaard d7a0447e2e Fix of U4-5040 2014-06-08 18:31:50 +02:00
Sebastiaan Janssen cbe23663e3 Merge pull request #400 from BatJan/7.1.5-installer-fix-4874
7.1.5 installer fix 4874
2014-06-08 18:23:21 +02:00
Niels Hartvig bff415a4c6 Fixes: U4-4893 Inconsistent display of file extensions in the UI 2014-06-08 17:55:05 +02:00
leekelleher caa59f2c80 Updated recycle-bin dashboard controller to handle both content and media items. 2014-06-08 16:46:04 +01:00
leekelleher 2ff1c973e0 Set the listview row item to 'inactive' if the item isTrashed.
(As media items do not have a published state.)
2014-06-08 16:45:22 +01:00
leekelleher f056d3fae7 Modified MediaTypeController.GetAllowedChildren to return an empty collection if the "node ID" is the content/media recycle-bin.
Removed the media recycle-bin node ID from the `ContentTypeController.GetAllowedChildren `.
2014-06-08 16:43:55 +01:00
leekelleher 41a455c9ac Added treeHeaders_mediaRecycleBin to the localization mocks 2014-06-08 16:28:13 +01:00
Shannon f834155763 updated version to 7.1.5 2014-06-08 17:26:23 +02:00
leekelleher 15cc3d19c1 Modified ContentTypeController.GetAllowedChildren to return an empty collection if the "node ID" is the content/media recycle-bin. 2014-06-08 16:18:33 +01:00
leekelleher 3bb563ec55 Modified the 'listview' view + controller - added isTrashed property/state 2014-06-08 16:17:16 +01:00
Shannon b5282244f0 Umbraco MVC style routes now implemented. 2014-06-08 17:16:28 +02:00
Shannon aa5b5708b2 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-08 17:15:58 +02:00
Shannon ec0d6959a9 mini profiler in back office now enabled with query string 2014-06-08 17:15:52 +02:00
leekelleher 320df6706e Modified content tree controller to point the recycle bin node to the dashboard. 2014-06-08 16:15:28 +01:00
leekelleher 519dd8b476 Modified the existing 'recyclebin' dashboard view.
Added view for media 'recyclebin'
2014-06-08 16:14:35 +01:00
leekelleher 0434b3e5bd #U4-3575 Get Started Dashboard does not changes when changing sections using Left Menu icons
Switching sections updates the route/location; thus displays the corresponding dashboard.
2014-06-08 16:02:18 +01:00
BatJan ff42a1b79c Fix of http://issues.umbraco.org/issue/U4-5025 2014-06-08 16:32:03 +02:00
BatJan 4e433becd6 Fix of http://issues.umbraco.org/issue/U4-5025 2014-06-08 16:29:10 +02:00
Niels Hartvig 8aafc583de New styling for content / media titles 2014-06-08 16:29:04 +02:00
Jan Skovgaard d6b0ed2d40 Fix for U4-4874
Added id's to the input fields, so labels are connected properly.
2014-06-08 16:09:06 +02:00
Shannon ebbbd80bb3 Fixes: U4-5065 Add event to modify the model on front-end for IRenderMvcControllers 2014-06-08 14:14:12 +02:00
Morten Christensen 02eff33d29 Fixes U4-2640 LocalizationService throws exception when getting dictionary items and adds tests for the LocalizationService 2014-06-08 13:16:32 +02:00
Shannon 7b33eca014 disables dist call 2014-06-08 13:14:27 +02:00
Shannon f8e06e54de Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-08 13:09:37 +02:00
Shannon 23d9ef624b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5
Conflicts:
	build/Build.bat
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
2014-06-08 13:09:31 +02:00
Morten Christensen cdb5b0470d Implementing tests for all methods in the LocalizationService. 2014-06-08 12:59:30 +02:00
Shannon b43f39a0cb disables dist call 2014-06-08 12:50:45 +02:00
Shannon d0cb27d1c1 Completes: U4-2633 Bundle all cache refresher transmissions into a single call per request for much better performance 2014-06-08 12:49:20 +02:00
Shannon e8990eb6b2 Merge commit 'beb1979b4655a529b703ceec094a50f6a3dd8602' into 7.1.5
Conflicts:
	src/Umbraco.Web.UI/config/umbracoSettings.config
2014-06-08 12:24:29 +02:00
Shannon 05524c643e Merge branch '7.1.5-backoffice-miniprofiler' into 7.1.5 2014-06-08 12:08:34 +02:00
Shannon ed989079b4 positions mini profiler to the bottom right 2014-06-08 12:08:05 +02:00
antoine 5cb210c7b6 slider input updated real time 2014-06-08 11:08:56 +02:00
Morten Christensen feed5c5e51 Fixes #U4-4593 EntityService.GetObjectType with passed in integer id or guid unique id 2014-06-08 09:46:43 +02:00
antoine b80ab20cb4 device preview background color 2014-06-08 09:42:39 +02:00
Lesley 754a6e327e Correct capitals for English days of the week (part 2). 2014-06-07 15:56:17 +01:00
Lesley 650fb94057 Correct capitals for English days of the week. 2014-06-07 14:12:01 +01:00
Stephan 0af19fa442 U4-5057 - fix UmbracoHelper.TypedSearch 2014-06-05 17:30:58 +02:00
antoine bac6e71e7f color picker in real time, general clear code 2014-06-05 14:02:38 +02:00
Matthew Sheeley a4b25c3f84 Close user dialog on logout 2014-06-04 15:44:22 -05:00
antoine 9a36d74418 tuning issue 2014-06-04 16:24:02 +02:00
Shandem 5b17bc6d5f Merge pull request #393 from henrikrossen/7.1.5
Migrated obsolete method calls and cleaned ContentTypeServiceTests.cs
2014-06-04 10:46:36 +10:00
Henrik Rossen Jakobsen 06a1f790dd Migrated obsolete method calls and cleaned ContentTypeServiceTests.cs 2014-06-03 21:47:18 +02:00
antoine 39eaa4a15e Element select improved, default style more clean 2014-06-03 19:33:31 +02:00
antoine 2fdf040f73 Palette improvement 2014-06-02 10:55:53 +02:00
antoine aec956dd2e grunt js task issue 2014-06-02 10:55:17 +02:00
Shannon e7994d077e minor logic change for checking if sort exists 2014-06-02 15:40:24 +10:00
Shannon f55f9edb71 Ensures each property type has a real sort order when adding to the property type collection 2014-06-02 14:04:40 +10:00
antoine 65bb1e1e20 gridRow default less 2014-05-30 20:03:34 +02:00
antoine 3dabd73ec2 Merge branch '7.1.2-Usky' into 7.1.2-Usky-Grid
Conflicts:
	src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
	src/Umbraco.Web.UI.Client/src/tuning/tuning.global.js
	src/Umbraco.Web.UI/Umbraco/js/tuning.panel.js
	src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
2014-05-30 19:56:51 +02:00
Shannon df3bc873df Upgrades mini profiler and enables it in the back offfice. 2014-05-30 15:26:22 +10:00
Sebastiaan Janssen d1c5ddc03d Merge branch 'AndrewSwerlick-7.1.1' into 7.1.5 2014-05-29 18:19:52 +02:00
Sebastiaan Janssen f11d209177 Merge branch '7.1.1' of https://github.com/AndrewSwerlick/Umbraco-CMS into AndrewSwerlick-7.1.1 2014-05-29 18:19:22 +02:00
Stephan 16a1720bf7 Merge remote-tracking branch 'origin/6.2.1' into 6.2.1 2014-05-28 17:11:56 +02:00
Sebastiaan Janssen ea32776174 Bump version 2014-05-28 17:07:51 +02:00
Sebastiaan Janssen 92ef071883 Don't do a ToString() in a IsNullOrEmpty.. 2014-05-28 16:37:16 +02:00
Sebastiaan Janssen b42d0bc17e Bump version and fix dashboard 2014-05-28 16:04:11 +02:00
antoine 90e5440518 bootstrap3 ; issue + hx style issue 2014-05-28 15:33:36 +02:00
antoine 7cfd2d6593 schema's selector improved 2014-05-28 15:06:16 +02:00
Sebastiaan Janssen 020a416dc5 en_us lang also updated like en 2014-05-28 13:15:20 +02:00
Sebastiaan Janssen d491c133a7 Merge pull request #391 from danlister/patch-1
Updated en.xml to fix some minor spelling mistakes
2014-05-28 13:13:01 +02:00
Sebastiaan Janssen b68dd6b35c U4-5006 Typo: "struture" in the Copy and Move dialogs 2014-05-28 13:12:10 +02:00
Sebastiaan Janssen ba9d023cc0 Additional fix for U4-4950 U7.1.3 multiple media picker 2014-05-28 13:10:17 +02:00
Sebastiaan Janssen eb6fe1e4d3 Fix unit test that was failing after moving from yepnope to LazyLoad.js 2014-05-28 13:06:23 +02:00
Stephan c972ae566e Merge remote-tracking branch 'origin/6.2.1' into 7.1.4
Conflicts:
	src/Umbraco.Core/Dynamics/PropertyResult.cs
	src/Umbraco.Core/Models/IPublishedProperty.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
2014-05-28 11:45:45 +02:00
Stephan 320b53ae3c U4-4773 - bring back IPublishedContentProperty Alias and Version (compat) 2014-05-28 11:36:31 +02:00
antoine 6382515258 Device preview always enable 2014-05-28 11:29:08 +02:00
Sebastiaan Janssen 84f94d6471 U4-4752 No "change password" dialog available in 7.x backoffice 2014-05-28 11:17:33 +02:00
Morten Christensen f758eb6a62 Extra open namespace for hackers 2014-05-28 10:54:52 +02:00
Shannon 7ec4d3f26d Fixes: U4-4950 U7.1.3 multiple media picker 2014-05-28 13:33:03 +10:00
Shannon 2a0d2bdb86 Fixes: U4-4945 Slider type stops working on ajax load in 7.1.3 2014-05-28 13:25:47 +10:00
Shannon 24d3e465ea Merge remote-tracking branch 'origin/6.2.1' into 7.1.4 2014-05-28 12:42:43 +10:00
Shannon d987dfb5a2 Fixes: U4-4141 7.0.2 "Save and send for approval" fails for a writer user on a newly created unsaved content page 2014-05-28 12:40:43 +10:00
Shannon 2ede32fe70 minor change, using non obsolete user id 2014-05-28 12:39:12 +10:00
Shannon fce8c9d3ec Fixes: U4-4141 7.0.2 "Save and send for approval" fails for a writer user on a newly created unsaved content page 2014-05-28 12:38:11 +10:00
Shannon f5194efb6e Fixes: U4-4999 Image cropper - Image file duplicated each time the page (content) is saved/published 2014-05-28 12:29:41 +10:00
Dan Lister 1b360226d6 Updated en.xml to fix some minor spelling mistakes 2014-05-27 12:01:41 +01:00
antoine fd2b9ce67d /umbraco/dialogs/tuning.aspx removed 2014-05-27 12:37:43 +02:00
antoine 1284417a58 /umbraco/dialogs/tuning.aspx removed 2014-05-27 12:36:49 +02:00
Stephan 74806984b3 U4-4931 - fixing & refactoring 2014-05-27 12:17:48 +02:00
Stephan c8c278c7bc Merge remote-tracking branch 'origin/6.2.1' into 6.2.1 2014-05-27 12:17:43 +02:00
Sebastiaan Janssen 524d6fb76a U4-4914 Add icon for 'Import Document Type' action menu 2014-05-27 12:12:34 +02:00
Sebastiaan Janssen 7185a6dba5 Merge pull request #383 from imulus/colorpicker-toggle
Allow colors to be toggled on/off in Color Picker - U4-4935
2014-05-27 11:53:55 +02:00
Sebastiaan Janssen 2496a8e77e Merge branch '6.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.4
Conflicts:
	src/Umbraco.Web/Models/PublishedContentBase.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
2014-05-27 11:49:31 +02:00
Sebastiaan Janssen 13e8e972eb U4-4956 UserService.SavePassword method always throws a not supported exception 2014-05-27 11:43:50 +02:00
Stephan a8e4c3eb9a Merge remote-tracking branch 'origin/6.2.1' into 6.2.1 2014-05-26 18:07:45 +02:00
Stephan d631039c0d U4-4928 - issue with missing media content properties 2014-05-26 18:07:20 +02:00
Stephan b1e879bf68 U4-4928 - issue with missing media content properties 2014-05-26 15:59:28 +02:00
Stephan 113b866485 U4-4931 - fixing & refactoring 2014-05-26 15:56:29 +02:00
Stephan 6c6ef8d144 Merge remote-tracking branch 'origin/6.2.1' into 6.2.1 2014-05-26 15:03:38 +02:00
Stephan 95b9a46b88 U4-4928 - issue with missing media content properties 2014-05-26 15:02:05 +02:00
antoine b57642003c Grid row unique id 2014-05-25 20:52:23 +02:00
antoine 9ee59e8e38 Merge branch '7.1.2-Usky' into 7.1.2-Usky-Grid
Conflicts:
	src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
2014-05-25 18:35:18 +02:00
antoine a5f81ae6c2 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky
Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
2014-05-23 16:39:39 +02:00
per ploug 08cc608dc8 One last change, enable setting max number of items in a cell 2014-05-23 14:57:16 +02:00
per ploug 71839d53a6 Last round of polish to the grid
adds image captions, textstring markup support in rendering, better
styling and icon previews
2014-05-23 14:37:00 +02:00
Stephan 99250cefbb U4-4931 - fixing & refactoring 2014-05-23 10:46:41 +02:00
Stephan dc651a1c42 Merge remote-tracking branch 'origin/6.2.1' into 6.2.1 2014-05-23 10:46:13 +02:00
Shannon 766ca78725 Merge remote-tracking branch 'origin/6.2.1' into 7.1.4 2014-05-23 10:00:34 +10:00
Shannon 3ca4fb76b2 Merge branch 'darrenferguson-7.1.2' into 7.1.4 2014-05-23 09:52:11 +10:00
Shannon 0a76757cea Merge branch '7.1.2' of https://github.com/darrenferguson/Umbraco-CMS into darrenferguson-7.1.2 2014-05-23 09:51:48 +10:00
antoine 7508613d13 First approach 2014-05-22 22:20:13 +02:00
Sebastiaan Janssen 8fb446960c U4-4927 Image Cropper Crop URL is wrong in 6.2.0
Reverts part of 067268a96e which was refactored wrong
2014-05-22 19:39:25 +02:00
Stephan 1cf40aca07 U4-4922 - add details to error message 2014-05-22 18:32:20 +02:00
Stephan 4e9fd5a223 U4-4931 - fixing & refactoring 2014-05-22 13:43:55 +02:00
Stephan e2c36d7212 Merge remote-tracking branch 'origin/6.2.1' into HEAD 2014-05-22 13:40:58 +02:00
Shannon aadcdc9c15 ensures session id is set on user data on login. 2014-05-22 13:17:15 +10:00
Shannon e04eed41e7 Merge remote-tracking branch 'origin/6.2.1' into 7.1.4
Conflicts:
	src/Umbraco.Core/Models/DeepCloneHelper.cs
	src/Umbraco.Core/Models/PreValue.cs
	src/Umbraco.Core/Models/PreValueCollection.cs
	src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
2014-05-22 13:01:23 +10:00
Shannon 62887607ff fixes csrf with mediauploader.ashx 2014-05-22 12:44:04 +10:00
Shandem 54a639ffcd Merge pull request #387 from lars-erik/Fix-U4-4264
Fixes U4-4264 (dictionary tree collapses) while we wait for angularification.
2014-05-22 10:47:47 +10:00
antoine 9626e91c83 dependency with bootstrap.3.0.1.min.js 2014-05-21 19:51:13 +02:00
per ploug 83b6375f04 Migrated the Editors out of the grid
Added configuration for individual editors, added allowed editors, new
styling refactored css
2014-05-21 15:40:17 +02:00
antoine 52cd44a700 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-21 15:37:58 +02:00
antoine 0c8ff187aa grunt update to copy default files 2014-05-21 15:37:20 +02:00
John 3af74bd4fd Load google fonts independently in the content iframe.
Enables live preview on the page's content for google fonts.
2014-05-21 14:57:20 +02:00
John c9e2e1e116 Apply preview of font to page's content. 2014-05-21 14:57:18 +02:00
John c27f73e54a Fix glitch when selecting new font in dropdown.
In the font family picker, selecting a not-yet-loaded font caused the font sample to render as Arial until the font had been downloaded.
2014-05-21 14:57:17 +02:00
John cede13d180 Merge name and description changes from uSky. 2014-05-21 14:57:15 +02:00
antoine 3ffb2772b6 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-21 13:54:25 +02:00
antoine e6f0d4e056 @Umbraco.EnableTuning() and Recursive less file 2014-05-21 13:53:00 +02:00
Shannon 9f16bee040 Fixes: U4-4952 RTE: macro editing - parameter dialog blank 2014-05-21 15:27:10 +10:00
Stephan 976d1b1ff6 Merge pull request #385 from zpqrtbnk/7.1.4
U4-4618 - public PublishedContentModel & Factory
2014-05-20 15:41:41 +02:00
Lars-Erik Aabech 8a4e39a999 Fixes U4-4264 while we wait for angularification. 2014-05-20 15:05:45 +02:00
per ploug 23c7eafaf5 merge from upstream 7.1.4 2014-05-20 12:32:47 +02:00
per ploug 90892ce818 adds rootscope access to umb.clientmgr 2014-05-20 12:14:10 +02:00
John e62d1559b1 Fix grunt not copying tuning's index.html to Umbraco/preview.
Also fixes same issue when using grunt --dev.
2014-05-20 10:36:48 +02:00
Stephan 695cc07912 Merge remote-tracking branch 'origin/6.2.1' into 6.2.1 2014-05-20 09:32:54 +02:00
Stephan f325794523 U4-4949 - fix issue with domains 2014-05-20 09:32:26 +02:00
Stephan 0b3733f992 Merge remote-tracking branch 'origin/7.1.4' into 7.1.4 2014-05-20 09:28:03 +02:00
Stephan 2926a79c3f U4-4949 - fix issue with domains 2014-05-20 09:24:40 +02:00
Stephan ef7a6f19ba Fix the build 2014-05-20 08:57:27 +02:00
antoine 81934c47d2 laptop width 2014-05-19 16:06:45 +02:00
antoine 80379e116d umbraco media support 2014-05-19 14:34:09 +02:00
Stephan 95a4bb9ba6 refactor PublishedContentModelFactory 2014-05-19 13:15:47 +02:00
Stephan 32b7871eaf Rename PublishedContentModelFactoryImpl 2014-05-19 13:01:49 +02:00
Sebastiaan Janssen 3ec6d2b82f U4-4861 6.2.0 Nuget package copies wrong files 2014-05-19 10:08:26 +02:00
Stephan cd03e80410 Optimize PublishedContentModelFactoryImpl 2014-05-18 21:57:59 +02:00
Stephan 9ed3561b56 Fix the build 2014-05-18 21:41:34 +02:00
Stephan 28da44f0de Refactor PublishedContentModelFactory 2014-05-18 21:31:53 +02:00
Stephan f8d7aeec80 Merge branch '7.1.4' into HEAD 2014-05-18 21:29:37 +02:00
Stephan dacec47cd9 Fix the build 2014-05-18 21:27:41 +02:00
Stephan 57f06ba447 U4-4618 - public PublishedContentModel & Factory 2014-05-18 19:57:39 +02:00
Stephan 46f57a3115 U4-4931 - lock contention & potential application lockdown 2014-05-18 19:13:22 +02:00
Stephan 82c1c95e35 Detached PublishedProperty - refactor 2014-05-18 19:06:28 +02:00
Tom Fulton fa6c215849 Merge branch '7.1.4' into colorpicker-toggle 2014-05-17 15:06:15 -06:00
Shannon 420746397d fixes macro property saving issue in editor (to ensure the alias/key can be changed) 2014-05-17 15:35:56 +10:00
Shannon 142a9963af Fixes macro property saving issue in repo 2014-05-17 15:35:30 +10:00
Tom Fulton b656db3af3 Allow colors to be toggled on/off in Color Picker - U4-4935 2014-05-16 21:59:34 -06:00
Sebastiaan Janssen d697c590e7 U4-4930 NuGet update fails to copy new Umbraco binaries 2014-05-16 18:54:49 +02:00
Sebastiaan Janssen 1dd103caa3 U4-4930 NuGet update fails to copy new Umbraco binaries 2014-05-16 18:53:23 +02:00
antoine 89081b86af preview grunt issue 2014-05-16 14:42:47 +02:00
Sebastiaan Janssen a55cd67fd6 U4-4650 Pluralization of document type aliases doesn't always work 2014-05-16 14:33:25 +02:00
Sebastiaan Janssen 43bfd6e472 U4-4650 Pluralization of document type aliases doesn't always work 2014-05-16 14:33:03 +02:00
Sebastiaan Janssen afa81be102 Fixes U4-4650 Pluralization of document type aliases doesn't always work 2014-05-16 14:23:40 +02:00
Sebastiaan Janssen b07665f4d4 Fixes U4-4650 Pluralization of document type aliases doesn't always work 2014-05-16 14:22:13 +02:00
antoine 216e2255f2 Save message more friendly 2014-05-16 13:33:41 +02:00
Sebastiaan Janssen 0ebd66d926 Merge branch 'dampee-oembed_slideshare' into 7.1.3 2014-05-16 12:51:26 +02:00
Sebastiaan Janssen 8d45898274 UmbracoVersion property no longer needed. Added data folder to the targets. 2014-05-16 12:44:02 +02:00
Sebastiaan Janssen a99a33477a Centralized the current Umbraco version number in UmbracoVersion.txt that will be read by
buildbelle.bat, build.bat and the umbraco.web.ui.csproj so it works in VS, command line and
also in TeamCity.
2014-05-16 12:27:54 +02:00
antoine 9db3dbd730 Style improvement
focus schema in front when roll-over in panel
2014-05-16 11:40:39 +02:00
Sebastiaan Janssen b42d3b226d Bump version 2014-05-16 11:29:35 +02:00
Sebastiaan Janssen b6925f9f07 Merge branch 'gambrose-7.1.2' into 7.1.3 2014-05-16 11:28:02 +02:00
Stephan ddd0e8abb5 Bugfix media cache property alias case sensitivity 2014-05-16 10:10:55 +02:00
Stephan e07f573683 Fix the build 2014-05-16 09:57:21 +02:00
Shannon ffbb1a85ab Fixes: U4-4312 Spelling error on "Retreive" should be Retrieve -U7.0.0.4 2014-05-16 12:43:23 +10:00
Shannon ac9c938e92 Fixes: U4-4923 Failed to retrieve data for application tree media after upgrade to 7.1.2 2014-05-16 12:42:21 +10:00
Shannon 1f88960b3f Fixes: U4-4926 Pre-values need to be cloned in/out of the cache
Conflicts:
	src/Umbraco.Core/Models/PreValue.cs
	src/Umbraco.Core/Models/PreValueCollection.cs
2014-05-16 12:09:47 +10:00
Shannon d8edf67b82 Fixes: U4-4842 Unable to edit "name" and "alias" to MediaType property 2014-05-16 12:09:08 +10:00
Shannon 762656e964 Fixes: U4-4926 Pre-values need to be cloned in/out of the cache 2014-05-16 12:08:17 +10:00
Shannon 46a4f9242c fixes test 2014-05-16 11:43:20 +10:00
Shannon 8cae2526d5 Fixes: U4-4842 Unable to edit "name" and "alias" to MediaType property 2014-05-16 11:34:10 +10:00
Graham Ambrose 6b313aba48 CopyUmbracoFilesToWebRoot assumes packages loacation
CopyUmbracoFilesToWebRoot assumes packages folder is always one dir up from
project file which is not always the case.

I have changed to use MSBuildThisFileDirectory which makes the path
relative the the UmbracoCms.targets file.
MSBuildThisFileDirectory is supported from MSBuild 4 but as ToolsVersion is
already set to 4.0 that should not be a problem.

UmbracoVersion property is no longer required but removing it may break
external target files depending on it. Have moved it to props file as this
makes it more reliable for external targets files.
2014-05-15 22:43:24 +01:00
Shannon 365a8e85e9 Fixes: U4-2356 2014-05-15 16:13:54 +10:00
Shannon 7b4c58538d wrote test to confirm: U4-2356 2014-05-15 16:11:59 +10:00
Shannon e41c99d5bc Merge branch 'ma1f-7.1.2' into 7.1.3 2014-05-15 15:44:56 +10:00
Shannon a49dd36461 Merge branch '7.1.2' of https://github.com/ma1f/Umbraco-CMS into ma1f-7.1.2 2014-05-15 15:43:53 +10:00
Mark van Schaik 82a1e85431 solves issue U4-2356 when deleting templates 2014-05-15 16:37:32 +12:00
Shannon 5f9dddafd8 fixed an upgrade script when upgrading from old 4.x versions 2014-05-15 14:11:43 +10:00
Shannon 836297df58 Fixes error message on publishing when it fails due to any of these statuses: FailedHasExpired, FailedAwaitingRelease, FailedIsTrashed 2014-05-15 13:35:52 +10:00
Shannon 1c7d83f589 Undoes the comma encoding for tags and istead adds support to store the tags as json or csv (U4-4741) 2014-05-15 12:49:03 +10:00
antoine 8a1dd96294 some styles fixed 2014-05-14 19:15:43 +02:00
antoine 67bebd0d2d index.html missing 2014-05-14 18:39:25 +02:00
antoine 4f34fbd2c8 devices preview better look
tested in chrome/firefox/IE
2014-05-14 18:37:44 +02:00
antoine 8cda6e4062 Tuning panel include in preview mode 2014-05-14 14:51:58 +02:00
Shannon 157428dbc8 ensures multiple commas in tags still work. 2014-05-14 20:54:01 +10:00
Darren Ferguson a2a81222e6 Adding extension methods to PartialViewMacroModel to allow: Model.GetParameterValue<DateTime>("datey")
Model.GetParameterValue<int>("booly", 8) //optional default value if parsing can't happen
Model.GetParameterValue("booly",8) // can be used like this as type is implied by default value argument
2014-05-14 11:33:40 +01:00
Darren Ferguson 5abbca0f5d Adding extension methods to PartialViewMacroModel to allow: Model.GetParameterValue<DateTime>("datey")
Model.GetParameterValue<int>("booly", 8) //optional default value if parsing can't happen
Model.GetParameterValue("booly",8) // can be used like this as type is implied by default value argument
2014-05-14 11:32:39 +01:00
Shannon 0bcaa0da7f ensures that when querying for a tag with a comma that we encode it so that it finds it. 2014-05-14 20:31:32 +10:00
Shannon 922942197f Fixes: U4-4741 Tags Property Editor Mishandles Tags with Commas 2014-05-14 19:57:40 +10:00
Shannon b8975de04d Fixes: U4-4666 SQL Error when saving content with Tags property with @ value 2014-05-14 18:55:08 +10:00
Shannon f00950bfe4 adds unit test for image helper 2014-05-14 18:38:05 +10:00
Shannon 80d012f3ad Fixes: U4-4771 u7.1.1 Media section can't view images RangeError: Maximum call stack size exceeded 2014-05-14 18:25:50 +10:00
Shannon 654efd1128 Fixes: U4-3492 Recent history list persist between logged in users 2014-05-14 15:26:52 +10:00
Shannon aa2375b8ba Fixes client side mem leak for dialogs and not correctly removing their scopes. 2014-05-14 15:18:28 +10:00
Shannon f6532d2743 un-does the distinct check, in the past it was never like this, duplicate values were always allowed so by doing this it is a breaking change 2014-05-14 13:09:02 +10:00
Shannon 8c334a8c95 Fixes: U4-4880 SEO Checker fails after upgrading from 7.1.1 to 7.1.2 2014-05-14 12:29:38 +10:00
Shannon 42cd71ef6c Fixes: U4-4865 Umbraco 7.1.2 Date Picker not rendering icon or calendar control 2014-05-14 12:01:38 +10:00
Shannon 5956394bf1 Fixes: U4-4877 Editing macro parameters fails because of new item validation 2014-05-14 10:52:08 +10:00
Shannon d1e9fb6d9f re-fixes Core proj since it would not build 2014-05-14 09:42:34 +10:00
Damiaan 48dcc373dc Oembed for slideshare not working anymore 2014-05-13 22:29:59 +02:00
antoine d8209efefa Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-13 16:20:20 +02:00
antoine 00180d2120 Web.config with less mime 2014-05-13 16:19:45 +02:00
Stephan c9961b5192 Fix Umbraco.Core project (missing files, would not build) 2014-05-13 15:24:36 +02:00
per ploug 66e768afee Missing bootstrap3 grid view
Missing as gitignore wont allow it, had to manually add it
2014-05-13 13:31:51 +02:00
antoine bba109cb28 tuning.aspx deleted 2014-05-13 13:10:28 +02:00
antoine 39ede8c47a Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2014-05-13 13:07:38 +02:00
antoine fec84b8ce3 iframe 100% in firefox 2014-05-13 13:04:39 +02:00
antoine a00e5d54aa rename tuning project without usky 2014-05-13 12:50:48 +02:00
Stephan 03d3503531 Don't throw when validating doctype/property aliases with dangerous chars 2014-05-13 12:39:35 +02:00
per ploug 331813e370 Adds serverside grid api
Replaces the partial view macro, also enables the grid to be rendered
with different frameworks, should be fairly easy to support a couple
2014-05-13 12:36:38 +02:00
per ploug 6c36f43276 Adds support for loading custom RTE settings into the grid 2014-05-13 12:35:08 +02:00
Stephan 9acba1d6d7 U4-4857 - issue with document type new property alias 2014-05-13 09:53:22 +02:00
per ploug e8f4e7663f More visual tweaks to the grid to handle deletes
also rolls back a couple of bower "tweaks" that ended up being horrible
2014-05-13 09:45:09 +02:00
Shannon 659f47c038 Merge remote-tracking branch 'origin/6.2.1' into 7.1.3 2014-05-13 15:47:38 +10:00
Shannon 78613823ae Fixes: U4-4853 Richtext Editor doesn't render macros after upgrade to Umbraco 6.2.0 2014-05-13 15:22:16 +10:00
Shannon cb7f26c998 Fixes: U4-4197 Error 400 on admin area login 2014-05-13 13:39:18 +10:00
Shannon 16b5c86192 Fixes: U4-4869 Cannot save tags - was due to adding the loading... message and the ng-if creating a new scope and not targeting the $parent in the view, also fixes up clearing the value with typeahead is used 2014-05-13 12:55:31 +10:00
Shannon c83ab00827 Merge remote-tracking branch 'origin/6.2.1' into 7.1.3 2014-05-13 10:46:14 +10:00
Shannon 937e840104 Fixes: U4-4873 RuntimeCacheRefresher does not remove items when media or content requires cache refreshing & U4-4871 Synced media indexes between load balanced servers do not sync all properties 2014-05-13 10:40:56 +10:00
Shannon 8d49c730d5 Merge branch 'meixger-hotfix/imagecropper' into 7.1.3 2014-05-13 09:33:34 +10:00
Shannon fadb503b97 Merge branch 'hotfix/imagecropper' of https://github.com/meixger/Umbraco-CMS into meixger-hotfix/imagecropper 2014-05-13 09:33:22 +10:00
antoine 9f116c00d5 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-12 20:00:57 +02:00
antoine 7e61b25746 uskytuning with style suggest and preview device 2014-05-12 19:57:06 +02:00
Martin Meixger 289bed8fd2 change negative coordinates to zero 2014-05-12 15:34:50 +02:00
per ploug 482750ab6a Missing file 2014-05-12 13:22:58 +02:00
per ploug 40d1099fbd grid modifications 2014-05-12 13:22:57 +02:00
Shannon eec1048631 Merge branch '6.2.1' into 7.1.3 2014-05-12 17:50:33 +10:00
Shannon 313d77eb91 Fixes: U4-4789 PluginCache doesn't update with code defined PropertyEditors in package and publicizes a couple things 2014-05-12 17:19:17 +10:00
Shannon b048341da0 Fixes: U4-4789 PluginCache doesn't update with code defined PropertyEditors in package and publicizes a couple things 2014-05-12 17:07:29 +10:00
Shannon 03cb54e931 fixed merge issue 2014-05-12 14:37:54 +10:00
Shannon 150b67d10f Merge remote-tracking branch 'origin/6.2.1' into 7.1.3
Conflicts:
	src/Umbraco.Tests/Models/ContentTests.cs
	src/Umbraco.Tests/Models/ContentTypeTests.cs
2014-05-12 14:37:19 +10:00
Shannon ac88da4188 Fixes: U4-4856 ApplicationContext.Current.Services.ContentService.Save throw exception 2014-05-12 14:32:34 +10:00
Shannon cca27e064a Fixes: U4-4855 Can't use macro parameters at all 2014-05-12 13:48:56 +10:00
Stephan 4e5019d5af U4-4851 - Umbraco.Field legacy names 2014-05-11 21:33:56 +02:00
Stephan f1a312b14a U4-4851 - Umbraco.Field legacy names 2014-05-11 21:06:33 +02:00
antoine 2d050a0c88 original sln 2014-05-10 15:57:59 +02:00
antoine 103f4f33bd Only one less style file 2014-05-10 15:56:36 +02:00
antoine 727f9355a0 dotless dependency 2014-05-10 14:53:59 +02:00
antoine e269a0b9bb Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-09 18:22:37 +02:00
antoine 861b1cefe5 uSkyTuning.loader.js deleted 2014-05-09 18:22:02 +02:00
antoine 23301817bf uSkyTuning into Umbraco core, first approach 2014-05-09 18:18:08 +02:00
antoine f5842c82a6 dotless dependency 2014-05-09 18:15:31 +02:00
Sebastiaan Janssen e12f24af94 Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-05-09 13:31:41 +02:00
Sebastiaan Janssen cbad216387 Update the install ps to do logging of copies and to actually copy the /umbraco folder properly 2014-05-09 13:07:41 +02:00
Sebastiaan Janssen 00880fcbfa I was confused, these files exist just fine :) 2014-05-09 13:07:03 +02:00
per ploug 4baf3ed99a Initial commit of the grid 2014-05-09 12:23:59 +02:00
Stephan 080ed612e8 U4-4837 - bugfix Umbraco.Core.EnumerableExtensions.InGroupsOf 2014-05-09 10:22:23 +02:00
Stephan 5661a34e00 Bugfix media cache property alias case sensitivity 2014-05-09 10:21:31 +02:00
Sebastiaan Janssen 85012ee82a Renaming files that don't exist led to the NuGet package not being created correctly somehow 2014-05-09 09:16:51 +02:00
Shannon 53a9cdb7a0 fixes a couple tests 2014-05-09 17:10:56 +10:00
Shannon 6b6ca615ba Updates build to ignore bower and commits typeahead. 2014-05-09 17:02:14 +10:00
Shannon da0b935604 Fixes merge 2014-05-09 16:08:05 +10:00
Shannon b91a06ab98 Fixes: U4-4849 Cannot change a users language/sections in the back office 2014-05-09 16:00:30 +10:00
Shannon d61fb5d94d Fixes user cloning issues with allowed sections 2014-05-09 15:59:30 +10:00
Shannon 2eef061c42 attempting to add the default git path to the path variable - hopefully the server has the same one 2014-05-09 15:58:09 +10:00
Shannon 3b424274ee ensure properties reset on deep clone of ContentType (this is just a fail safe check) 2014-05-09 15:57:17 +10:00
Shannon b763c2ab2f Fixes deep clone of User object 2014-05-09 15:56:45 +10:00
Shannon 70f65583d7 Fixes: U4-4546 Error: Failed to retreive data for media ids 2014-05-09 15:50:07 +10:00
Shannon 0d37a1f6e8 Fixes: U4-4849 Cannot change a users language/sections in the back office 2014-05-09 15:19:00 +10:00
Shannon 389724cba5 Re-fixes: U4-4211 User without media section permission will be logged out immediately when accessing a document type using a media picker datatype (u7.0.3) 2014-05-09 14:06:15 +10:00
Shannon 0382902984 Fixes user cloning issues with allowed sections 2014-05-09 14:01:20 +10:00
Shannon e0a0216b2d Fixes build in unit tests with ctor for service context 2014-05-09 13:28:03 +10:00
Shannon b02f7e0d3a ensure properties reset on deep clone of ContentType (this is just a fail safe check) 2014-05-09 13:26:50 +10:00
Shannon 9d96a4411f Fixes deep clone of macro object 2014-05-09 13:26:16 +10:00
Shannon 8e9a9dc996 Fixes deep clone of User object 2014-05-09 13:25:18 +10:00
Shannon b1603a21a2 Fixes up strange culture issue with thread switching with the update to the AngularJsonMediaTypeFormatter. 2014-05-09 10:46:15 +10:00
Sebastiaan Janssen 59cb1ad31e Revert "Fixes: U4-4211 User without media section permission will be logged out immediately when accessing a document type using a media picker datatype (u7.0.3) - this is done by using the entityResource in the mediaPicker but to do this we need to return a cut down version of the media properties in the additionalData which is tricky because the cropper stores json which is ntext and the existing sql didn't cater for this. This also cleans up the entity service and we no longer have this internal collection of properties, everything is just added to additionalData, then had to add mediaHelper method to deal with getting urls from a media 'entity' not just a media object."
This reverts commit c38c2ede11.
2014-05-08 16:08:16 +02:00
Sebastiaan Janssen 215ebb78ca Oops, this really needs to be Release mode 2014-05-08 13:56:19 +02:00
Sebastiaan Janssen c1796dd5ac Update ImageProcessor dependency to latest version 2014-05-08 13:28:46 +02:00
Sebastiaan Janssen 28550e3bb7 Require a recent version of NuGet in order to install Umbraco. 2014-05-08 13:28:32 +02:00
Sebastiaan Janssen bc59ff2e8c Clarified /base obsoletion to point out UmbracoApiController 2014-05-08 11:14:00 +02:00
Shannon 614327a273 Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-05-08 19:03:58 +10:00
Shannon ed292d34db oops fixed build 2014-05-08 19:03:40 +10:00
Shandem 5ac3eb7fef Merge pull request #364 from tomfulton/patch-1
Fix U4-4779: Media Picker not working as single picker
2014-05-08 18:49:36 +10:00
Shannon 94732cff00 Renames GetCurrent to GetCurrentMember to be inline with GetCurrentMemberId 2014-05-08 18:13:59 +10:00
Shandem 7947682cf0 Merge pull request #373 from sniffdk/patch-1
Fix for issue U4-4826
2014-05-08 18:13:23 +10:00
Shannon 6506768f10 Adds GetCurrentMemberId as a method to MembershipHelper 2014-05-08 18:12:28 +10:00
Shannon 9e0d10d0a3 Adds Logout as a wrapper to formsauth in membershiphelper 2014-05-08 18:10:01 +10:00
Shannon 392b18f4dd Adds GetCurrent() to MembershipHelper 2014-05-08 18:08:06 +10:00
Shannon c3ecc9e942 Fixes: U4-4505 Add obsolete messages to /base restextentions methods ( i think i got them all ) 2014-05-08 17:25:06 +10:00
Shannon c47f9ae26d Fixes: U4-4835 If you've changed data on a content item and then attempt to logout, the 'discard changes' dialog pops up however the logout continues but the URL and view remains 2014-05-08 16:57:29 +10:00
Shannon 22b506e2fb Fixes: U4-4827 The new speechbubble container is placed over the save and publish buttons 2014-05-08 12:26:59 +10:00
Shannon 516723d31d Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-05-08 11:38:38 +10:00
Shannon 7c30f26505 Fixes: U4-4845 Publicize INotificationService 2014-05-08 11:38:05 +10:00
Shandem 6b84a6adec Merge pull request #374 from sniffdk/patch-2
Fix for issue U4-4827
2014-05-08 11:31:22 +10:00
Shannon 6e2493854a makes Reset protected internal on ResolverBase 2014-05-08 11:22:44 +10:00
Shandem 1e13746cd0 Merge pull request #375 from rustyswayne/7.1.2
Makes HasCurrent property protected on ResolverBase.  #U4-4829
2014-05-08 11:11:12 +10:00
Shannon 8c7adf80b2 Fixes: U4-4573 7.0.4 Save and Send For Approval button not sending notification email 2014-05-08 00:45:54 +10:00
Shannon c38c2ede11 Fixes: U4-4211 User without media section permission will be logged out immediately when accessing a document type using a media picker datatype (u7.0.3) - this is done by using the entityResource in the mediaPicker but to do this we need to return a cut down version of the media properties in the additionalData which is tricky because the cropper stores json which is ntext and the existing sql didn't cater for this. This also cleans up the entity service and we no longer have this internal collection of properties, everything is just added to additionalData, then had to add mediaHelper method to deal with getting urls from a media 'entity' not just a media object. 2014-05-07 23:55:20 +10:00
per ploug 3c09cd7674 Initial commit to set upstream
Includes a minor change to force it to commit...
2014-05-07 15:10:14 +02:00
Shannon a6cd2b9e18 Fixes: U4-4420 TagQuery / TagService missing method to get content with tag. 2014-05-07 14:27:10 +10:00
Rusty Swayne 5fa128697b Makes HasCurrent property protected on ResolverBase. #U4-4829 2014-05-06 10:04:14 -07:00
Mads Krohn 62c3bf6afe Fix for issue U4-4827
I simply placed the container a little higher up, just above the Save and Publish buttons.
2014-05-06 13:39:11 +02:00
Mads Krohn aec862a9de Fix for issue U4-4826
When editing an existing link in tinymce the following error is thrown:
Could not find the tree content, activeTree has not been set 

This is caused by passing a wrong value as parameter to the doLoad method in the loadActiveTree function.
2014-05-06 13:02:47 +02:00
Shannon cfd21bc924 Got this working: U4-4420 TagQuery / TagService missing method to get content with tag - just need to add some unit tests. 2014-05-06 19:04:49 +10:00
Shannon d264792e18 Fixes: U4-4819 Publicize AuthenticationExtensions 2014-05-06 18:15:38 +10:00
Shannon af732955fb Fixes up a bit more with tags look ahead, fixes up rte to show a loading... text so the UI is handled much better 2014-05-06 18:06:41 +10:00
Shannon a846ba64eb Fixes: U4-4799 Ensure image logic found in the ContentService is duplicated for the new cropper 2014-05-06 15:27:53 +10:00
Shannon d3e925add9 Fixes: U4-4803 Need to expose CurrentUser on WebSecurity as public since IUser is now public 2014-05-06 14:49:43 +10:00
Shannon 683f0c5725 Fixes: U4-4503 Tags datatype does not autocomplete 2014-05-06 14:44:24 +10:00
Shannon 6827def8ba Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-05-06 10:41:10 +10:00
per ploug dbbe3fe5fb Removes remaining yepnop dependencies 2014-05-05 12:59:34 +02:00
Shannon d2a20b10aa nearly got tag typeahead working 2014-05-05 19:07:57 +10:00
Shannon 27e6b8c80c Adds bower to node dependencies, uses bower to get the typeahead dependency, gets bower dependencies on npm install 2014-05-05 15:55:48 +10:00
Shannon 956a92f5b4 removes unused moment.js from core/release 2014-05-05 13:35:20 +10:00
Shannon 36c7fd53cb Fixes merge issues with left over IPublishedContentProperty 2014-05-05 13:21:18 +10:00
Shannon 3df2d03fc8 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Models/IPublishedContentProperty.cs
	src/Umbraco.Core/Models/PublishedContent/IPublishedContentExtended.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedFragment.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
	src/Umbraco.Web/PublishedContentPropertyExtension.cs
	src/Umbraco.Web/Search/ExamineEvents.cs
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/umbraco.cms/businesslogic/template/Template.cs
2014-05-05 12:49:06 +10:00
Sebastiaan Janssen 16c360de88 Merge pull request #363 from aweber1/patch-1
Update ImageCropMode.cs
2014-05-02 10:43:59 +02:00
Sebastiaan Janssen c661fc6537 Merge pull request #370 from BatJan/patch-5
Fix of spelling mistake in "minumum".
2014-05-01 16:44:44 +02:00
BatJan c2c5098045 Fix of spelling mistake in "minumum".
Corrected "minumum" to "minimum" according to http://issues.umbraco.org/issue/U4-4804
2014-05-01 16:35:22 +02:00
Sebastiaan Janssen 16d98488e4 Losen up the requirement for json.net dependency 2014-05-01 14:06:28 +02:00
Morten Christensen 5a862f5c64 Fixes import of nested dictionary items #U4-4663 2014-05-01 13:51:33 +02:00
Sebastiaan Janssen caf41b74b8 Add failing test - dictionary items don't get properly nested 2014-05-01 12:26:18 +02:00
Sebastiaan Janssen e858f4ff1e U4-4775 creating new member group shows error message in dialog... 2014-05-01 11:45:14 +02:00
Sebastiaan Janssen 851961ef2b U4-4775 creating new member group shows error message in dialog... 2014-05-01 10:48:27 +02:00
Sebastiaan Janssen c139c5d93e U4-3925 Cancel Document_BeforePublish event gives YSOD 2014-05-01 09:55:14 +02:00
Shannon c4603ee5cd Fixes: U4-4798 When new property types are added, the internal Examine index isn't notified and will ignore them 2014-05-01 12:43:40 +10:00
Shannon 1e9d1007b6 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-05-01 11:36:33 +10:00
Shannon f23af85253 Fixes: U4-4624 Media cache hits the DB on every empty property, U4-4338 Umbraco fails to enumerate TypedMedia 2014-05-01 11:36:17 +10:00
Sebastiaan Janssen b0c5d16ba7 U4-4127 Turkish culture prevents Macros embedded 2014-04-30 19:29:32 +02:00
Stephan cd5581bef6 Back to IPublishedContentProperty (for 6 only) 2014-04-30 16:53:14 +02:00
Stephan 7d8da56dcb Revert "Reintroduce IPublishedContentProperty"
This reverts commit d33cc29f98.
2014-04-30 16:39:51 +02:00
Stephan 0501b181ce Refactor template aliases to strict aliases 2014-04-30 15:46:26 +02:00
Stephan 6d076a09e4 Refactor template aliases to strict aliases (cont) 2014-04-30 15:44:29 +02:00
Stephan 3cd3230b55 Refactor template aliases to strict aliases 2014-04-30 15:38:47 +02:00
Sebastiaan Janssen 3134668cec Bump version number 2014-04-30 12:00:19 +02:00
Shannon a8cc8fa688 Fixes case sensitivity with MySQL 2014-04-30 19:58:59 +10:00
Shannon cf2217cfe1 Fixes MySQL upgrades from < 6.0 2014-04-30 19:41:40 +10:00
Shannon e88e809e29 Use new YouTube oembed https end-point (old http one redirects) and make sure videos are embedded over https to allow for https Umbraco sites. 2014-04-30 17:39:13 +10:00
Shandem b404f3b56b Merge pull request #368 from uber-rob/u4-4785
Use new YouTube oembed https end-point (old http one redirects) and make...
2014-04-30 17:31:43 +10:00
Shannon c5559d7721 Specifying assembly for membership/user provider
Addresses http://issues.umbraco.org/issue/U4-4781
2014-04-30 11:27:47 +10:00
Shandem e9da4121bd Merge pull request #365 from aaronpowell/patch-2
Specifying assembly for membership/user provider
2014-04-30 11:24:08 +10:00
Shannon 771e216813 U4-2635 Skip past replaced word when checking
Avoids infinite loop if search and replacement are equal
2014-04-30 11:21:12 +10:00
Shannon 877ae6e026 Merge remote-tracking branch 'origin/7.1.1' into 7.1.2 2014-04-30 11:16:33 +10:00
Shandem e1d99855f6 Merge pull request #367 from lctjohn/7.1.1-U4-2635
fix for: U4-2635 Replace [...] method only replaces first ocurrence of oldString
2014-04-30 11:10:28 +10:00
Rob Church 9d9db577b4 Use new YouTube oembed https end-point (old http one redirects) and make sure videos are embedded over https to allow for https Umbraco sites. 2014-04-29 19:09:45 +01:00
John b4127294e5 U4-2635 Skip past replaced word when checking
Avoids infinite loop if search and replacement are equal
2014-04-29 14:06:05 +02:00
Aaron Powell d369af5fe0 Specifying assembly for membership/user provider
Addresses http://issues.umbraco.org/issue/U4-4781
2014-04-29 21:49:56 +10:00
John 74dd1f9181 U4-2635 Skip already-checked part of source input 2014-04-29 13:33:48 +02:00
John 86f7d79e7a Fixes: U4-2635 Umbraco.Core.Strings string Rep...
...lace(this string source, string oldString, string newString,
StringComparison stringComparison) method only replaces first ocurrence
of oldString
2014-04-29 13:24:54 +02:00
John c1781c2f4b U4-2635 add failing test
Only first occurrence of oldString is replaced.
2014-04-29 12:54:51 +02:00
per ploug d0dae43dd1 Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-04-29 11:38:29 +02:00
per ploug 90bf600378 Replaces yepnope.js with lazyload.js
Solves the caching and multi-load of the same file problems - adds a bit
of promise-based loading logic ontop of ll.js to ensure order and count
2014-04-29 11:38:13 +02:00
Stephan d33cc29f98 Reintroduce IPublishedContentProperty 2014-04-29 09:47:30 +02:00
Tom Fulton 472c9d3a88 Fix U4-4779: Media Picker not working as single picker 2014-04-29 01:00:36 -06:00
Shannon e23d7d1af3 Fixes: U4-3404 Pressing preview should save the changes and then open preview window 2014-04-29 15:09:01 +10:00
Shandem 4b97eb2a9a Merge pull request #354 from JackieNagel/link-picker-issue
fix for issue U4-4707 - When a mediaitem is selected in the linkpicker, the id is not returned
2014-04-29 14:03:48 +10:00
Shannon dadf063ad5 Fixes: U4-4777 Preview with related links property editor doesn't work - this is just a temp fix, ensures that the YSOD is not created but doesn't fix the way preview pages are created. 2014-04-29 13:46:32 +10:00
Shannon 86e18ef89d Fixes merge issues 2014-04-29 13:36:21 +10:00
Shannon e0c3eda675 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Models/DataValueSetterTests.cs
	src/Umbraco.Web.UI/web.Template.config
	src/umbraco.cms/businesslogic/media/Media.cs
	src/umbraco.cms/businesslogic/member/Member.cs
2014-04-29 13:06:10 +10:00
Shannon b98fbbc75d Fixes: U4-4770 Preview XML is not generated for many operations in the ContentService, also moves some more CRUD logic in the content service to the content repo. 2014-04-29 11:11:48 +10:00
Shannon aba1862811 Fixes: U4-4754 Member and Media repositories need to generate preview xml when EnableGlobalPreviewStorage is true 2014-04-29 09:58:38 +10:00
Adam Weber 470913f796 Update ImageCropMode.cs
Fixed spelling error in ImageCropMode.Stretch
2014-04-28 10:17:41 -05:00
Shannon 2f53698bc5 Fixes: U4-4766 UmbracoMembershipProvider.ChangePassword() is seal, what might be a breaking change? 2014-04-28 19:19:48 +10:00
Shannon e0e12d5773 Moves content xml crud logic for member service to member repo 2014-04-28 19:04:53 +10:00
Shannon 2e96de5449 Moves the CRUD logic from the media service to the media repo for dealing with content xml items and ensures it's done in the same transaction, streamlines how this process is done between the content, media, member services, adds test for it. 2014-04-28 18:53:21 +10:00
Shannon c5bce3b8cc completes: U4-4769 Remove the circular references from services for calls like ToXml which then calls into the PackagingService 2014-04-28 17:46:05 +10:00
Shannon b4286a7d4e works on U4-4769 - removing circular refs from media service 2014-04-28 17:38:24 +10:00
Shannon 31e018c045 Moves XML serialization for content/media/members to a resusable class: EntityXmlSerializer to remove the circular references we have by using the ToXml extension methods from directly in the services. This has been completed for the ContentService, next is Media and Member services. Updates the ContentService to not perform CUD operations for preview or published xml, this is now done at the repository level and now done in a single transaction for the saving and publishing events. Still need to do that for the member and media services too and the remaining methods in the content service 2014-04-28 17:28:40 +10:00
Shannon e964d52548 Merge branch 'U4-898' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-898 2014-04-28 12:49:28 +10:00
Shannon 50b71faff9 Adds .woff mime type 2014-04-28 12:45:12 +10:00
Shannon d7bd38386e Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-04-28 12:40:01 +10:00
Shannon 1f581c1fcb Merge branch 'patch-1' of https://github.com/aaronpowell/Umbraco-CMS into aaronpowell-patch-1 2014-04-28 12:39:20 +10:00
Shandem 475e6970f9 Merge pull request #356 from mattbrailsford/7.1.2-rtetinymcecheck
Added check to rte controller so as not to reload tinymce script
2014-04-28 12:32:15 +10:00
Shandem 32c8a83449 Merge pull request #360 from Jwheuvel/7.1.2
Update web.config with .woff mime support
2014-04-28 12:28:31 +10:00
Shandem 33ee2a4e48 Merge pull request #362 from Jeavon/U4-4767
Fixes U4 4767 and adds 2 Tests
2014-04-28 12:26:36 +10:00
Shannon b420941ff4 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
2014-04-28 12:26:21 +10:00
Shannon 033fd1b7ff Fixes: U4-4765 backoffice user section does not save password changes in v6.2 2014-04-28 12:24:39 +10:00
Jeavon Leopold 5f0b09544a Added Test for getting a crop on a Upload property type instead of a Cropper 2014-04-27 22:17:24 +01:00
Jeavon Leopold 7aa618cbfb Fixes U4-4767 and adds a Test for it 2014-04-27 22:06:48 +01:00
Jwheuvel 44fbc29541 Update web.config with .woff mime support
Bootstrap icons aren't visible on Windows Phone because it uses the .woff variant but the mimetype isn't available. Updated the web.config and added .woff to the staticContent section of system.webServer.
2014-04-24 20:34:57 +02:00
Sebastiaan Janssen e3162d223d Tiny update 2014-04-24 17:37:15 +02:00
Sebastiaan Janssen 6e53e19e60 Adding an Allbinaries NuSpec for use on UaaS 2014-04-24 14:03:28 +02:00
Shannon d9ac529e7e Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
	src/Umbraco.Core/Models/PropertyType.cs
	src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js
	src/Umbraco.Web/WebServices/CoreStringsController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-04-24 16:33:04 +10:00
Shannon 2621b25fd3 Ensures that member saving events don't get raised for normal member operations like validating and getting a user and flagging them as online. This fixes: U4-3451 Cache on Partial View refreshed, after member execute login 2014-04-24 16:28:37 +10:00
Shannon 61055380c5 Ensures that member saving events don't get raised for normal member operations like validating and getting a user and flagging them as online. This fixes: U4-3451 Cache on Partial View refreshed, after member execute login 2014-04-24 16:26:21 +10:00
Shannon adf09d925f adds a comment 2014-04-24 14:51:41 +10:00
Shannon 12170fd787 fixes ysod overlay for ajax errors 2014-04-24 14:23:17 +10:00
Shannon c32cae16db Fixes: U4-4696 Macro personalized cache with custom membership provider not working - for any membership provider regardless of provider user key type 2014-04-24 12:14:06 +10:00
Shannon 437d1b759b fix for: U4-4696. Macro personalized cache with custom membership provider not working 2014-04-24 12:13:50 +10:00
Shannon e10e04aabf Fixes: U4-4696 Macro personalized cache with custom membership provider not working - for any membership provider regardless of provider user key type 2014-04-24 12:12:06 +10:00
Shannon 2c1807bb37 Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-04-24 11:58:31 +10:00
Shannon c6e3340be1 Updates an error msg for media resource, performs a null check 2014-04-24 11:58:18 +10:00
Shandem 3bac4877eb Merge pull request #353 from eerrecart/fix-U4-4696
fix for: U4-4696. Macro personalized cache with custom membership provider not working
2014-04-24 11:54:54 +10:00
Stephan f46811ff67 U4-3027 - fix content & property types alias casing 2014-04-24 00:18:24 +02:00
Stephan ee210ae5d8 U4-3027 - fix content & property types alias casing 2014-04-24 00:17:21 +02:00
Stephan 6d50b46bd8 U4-4747,3027... - bugfix content type editor / aliases 2014-04-23 19:28:04 +02:00
Stephan 0810e90478 U4-4747,3027... - bugfix content type editor / aliases 2014-04-23 19:26:48 +02:00
Shannon e8989de82e Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 2014-04-23 22:29:54 +10:00
Shannon a51bf232ec Fixes issue with data type pre-values and using PreValueAsArray when they are dictionary formatted. 2014-04-23 22:24:16 +10:00
Shannon cefc319bfb Fixes issue with data type pre-values and using PreValueAsArray when they are dictionary formatted. 2014-04-23 22:15:33 +10:00
Shannon b60ee9944d fix merge issues 2014-04-23 20:54:31 +10:00
Shannon 0d8ffc0e67 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Tests/MockTests.cs
	src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
2014-04-23 20:45:02 +10:00
Shannon fd19411e65 Fixes: U4-4743 Add IMemberService and IUserService to ServiceContext ctor 2014-04-23 20:41:03 +10:00
Shannon 7ac7bb9714 Fixes: U4-4746 Examine does not index updated paths/levels for moved/trashed media, U4-4744 Examine events do not listen for recycle bin emptying 2014-04-23 20:28:09 +10:00
Shandem 95cd32ad8c Merge pull request #359 from Jeavon/7.1.2-ImageCropper
Adding support for Image Crop Ratio Dimension Support & UpScale to GetCropUrl & More Tests
2014-04-23 20:20:09 +10:00
Shannon 021cac9ca5 Fixes: U4-4746 Examine does not index updated paths/levels for moved/trashed media, U4-4744 Examine events do not listen for recycle bin emptying 2014-04-23 20:19:36 +10:00
Stephan aaa56002a9 Merge remote-tracking branch 'origin/7.1.2' into 7.1.2 2014-04-23 11:23:39 +02:00
Stephan c00c59af1d U4-4676 - fix property alias corruption issue 2014-04-23 11:22:47 +02:00
Sebastiaan Janssen 56d949ab9d Correcting some more paths, come on, work! 2014-04-23 11:22:45 +02:00
Sebastiaan Janssen 65ecff4248 D'oh, automated builds make obj folders, not bin folders 2014-04-23 10:57:21 +02:00
Sebastiaan Janssen 9c82e8bc8c Build needs to be in debug mode to get all the pdb files 2014-04-23 10:42:38 +02:00
Sebastiaan Janssen 421162d809 Bump version + Attempt at U4-4742 Publish debugging symbols for NuGet package 2014-04-23 10:11:36 +02:00
Shannon 360c324511 updates examine events for media to update media if it is moved to recycle bin 2014-04-23 16:11:12 +10:00
Shannon 949447c25f Fixes examine lookup for children to ignore recycled media 2014-04-23 13:40:11 +10:00
Shannon 99d7bf91b7 Fixes null check in recycle bin repo
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
2014-04-23 13:39:34 +10:00
Shannon cc3a6f8c7a Fixes examine lookup for children to ignore recycled media 2014-04-23 13:34:57 +10:00
Shannon 9bbe8e7a93 Fixes null check in recycle bin repo 2014-04-23 13:34:25 +10:00
Shannon 508a40cd50 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
	src/Umbraco.Web/Models/RegisterModel.cs
2014-04-23 12:00:32 +10:00
Shannon a92c232178 Fixes: U4-4653 MembershipHelper RegisterMember does not set password and ignores logMemberIn, adds a new flag to the model as to whether or not to have the cookie set as a persistent cookie (default is true) 2014-04-22 19:03:43 +10:00
Shannon 30901446e1 Fixes: U4-1853 Tinymce with the format dropdown added as soon as you interact with it the content tree stops working [Uncaught TypeError: Cannot set property 'href' of undefined (anonymous function) DependencyHandler.axd:57] Chrome Only.. 2014-04-22 18:17:28 +10:00
Stephan e42149e8d9 Detached PublishedProperty remains internal for now 2014-04-22 10:13:39 +02:00
Shannon a4949a1132 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 2014-04-22 17:49:01 +10:00
Shannon 0725d95941 fixes merge 2014-04-22 17:48:36 +10:00
Shannon d772336c0f Fixes: U4-4695 Copy document type to new parent seems to lose some data, U4-4535 Create Copy method on the content type Service 2014-04-22 17:48:08 +10:00
Shannon 4f8485e7d9 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 2014-04-22 14:00:28 +10:00
Shannon f673cb024a Adds unit test for ensuring reset identities on cloning a content type 2014-04-22 14:00:03 +10:00
Shannon c4046ecb32 Fixes 'Clone' methods to ensure a Deep clone is used 2014-04-22 13:48:51 +10:00
Shannon b978582675 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
	src/Umbraco.Web/Mvc/RenderViewEngine.cs
2014-04-22 13:05:30 +10:00
Shannon 7823609500 Fixes: U4-4682 Get EditorTemplates and DisplayTemplates working with RenderViewEngine 2014-04-22 13:03:47 +10:00
Shannon 069ae9930a Fixes: U4-3425 App_Code XSLT Extensions aren't recognized 2014-04-22 12:20:35 +10:00
Shannon 509d3f2647 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
2014-04-22 12:01:59 +10:00
Shannon a88cb3f724 Fixes: U4-3425 App_Code XSLT Extensions aren't recognized 2014-04-22 11:59:21 +10:00
Sebastiaan Janssen 2881118a02 Fixes U4-4026 Inline styling on container affect header text - properly 2014-04-21 16:37:20 +02:00
Sebastiaan Janssen 464cfb34f2 Merge pull request #358 from nabbed/patch-1
Update README.md
2014-04-21 13:25:03 +02:00
Sebastiaan Janssen 7a04881428 Fixes U4-4728 Public Access Error Page Choose link not selectable 2014-04-21 11:42:53 +02:00
Ben Norman 8556cf5702 Update README.md 2014-04-21 19:32:36 +10:00
Sebastiaan Janssen 1c0038ead3 Fixes U4-4726 Image Cropper Listed Dimensions Inversed From Settings 2014-04-21 10:58:15 +02:00
Jeavon Leopold ef787fc769 Adding upScale parameter to GetCropUrl 2014-04-21 09:45:05 +01:00
Jeavon Leopold ec04469b16 If only one dimension specified with Ratio mode then assume a square 2014-04-21 09:27:53 +01:00
Jeavon Leopold 80db81a7c5 Adding GetCropUrl ratio mode tests 2014-04-21 08:53:40 +01:00
Jeavon Leopold 7787c51156 Creating the internal GetBaseCropUrl method and moving the logic from the Model GetCropUrl method to ImageCropperBaseExtensions so that it can be used by both the Model method and the template extensions
Also added some new tests
2014-04-21 08:38:53 +01:00
Stephan 1a02e6be97 Detached PublishedProperty 2014-04-19 18:39:11 +02:00
Stephan 536b8ee921 U4-3425 - TypeHelper referenced assemblies issue 2014-04-19 17:44:52 +02:00
Stephan 12acdd8122 U4-3425 - TypeHelper referenced assemblies issue 2014-04-19 16:48:08 +02:00
Stephan 3bf1041041 U4-3787 - Ensure we republish published descendants when republishing 2014-04-19 14:31:36 +02:00
Stephan cd459e8b7d Merge remote-tracking branch 'origin/7.1.2' into 7.1.2 2014-04-19 14:21:24 +02:00
Stephan 7ae522b511 U4-3787 - Ensure we republish published descendants when republishing 2014-04-19 14:20:26 +02:00
Jeavon Leopold 1cf20597a4 Getting Ratio mode to work with Crop dimensions and also moving cache buster to always being the last variable 2014-04-19 11:04:32 +01:00
Jeavon Leopold e8d41a1b5e Adding Ratio Mode parameter to GetCropUrl helper 2014-04-18 22:04:23 +01:00
Jeavon Leopold 9a14a29a53 Updating ImageProcessor to v1.8.8 and ImageProcessor.Web to v3.2.2 2014-04-18 20:39:38 +01:00
mattbrailsford d66998a3e3 A better test (checks to see if it's even defined) 2014-04-18 15:52:26 +01:00
mattbrailsford fe4da60b15 Added check to rte controller so as not to reload tinymce script if it's already loaded (we don't check the CSS, but I figure this is ok) [This is temp bandaid for #U4-4724] 2014-04-18 15:43:36 +01:00
Shannon 52186f5cb2 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
	src/Umbraco.Core/Models/Member.cs
2014-04-17 20:08:07 +10:00
Shannon b13251778e Fixes: U4-4713 Provider Name not set when using Custom Connection String from the Installer 2014-04-17 20:05:55 +10:00
Shannon 51309e62ec Fixes: U4-4714 Sql Azure no longer a database option in 7.1 2014-04-17 19:55:17 +10:00
Shannon fee23fac0a updates deep clone to have the false flag for resetting properties (we don't want to remember them when cloning)
Conflicts:
	src/Umbraco.Core/Models/Member.cs
2014-04-17 18:54:55 +10:00
Shannon 15f4de4ed0 fixes build issues 2014-04-17 18:52:07 +10:00
Shannon 8c303893d2 updates deep clone to have the false flag for resetting properties (we don't want to remember them when cloning) 2014-04-17 18:46:37 +10:00
Shannon 7d556a0318 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderExtensions.cs
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/ICacheProvider.cs
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/PreValue.cs
	src/Umbraco.Core/Models/PropertyType.cs
	src/Umbraco.Core/Services/DataTypeService.cs
	src/Umbraco.Tests/Models/Collections/PropertyCollectionTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Models/PublishedProperty.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs
2014-04-17 18:10:42 +10:00
Shannon cf6775ec31 moves an internal class 2014-04-17 18:05:12 +10:00
Shannon 1a13366cc9 Working on U4-4701 Fixup DataTypeService and repository with cache - the deletion logic all now happens in the transaction before it was done quite poorly for updating content types :( 2014-04-17 18:03:34 +10:00
Shannon 595b039ebe Working on U4-4701 Fixup DataTypeService and repository with cache, pre-values are now persisted properly using units of work with it's own mini internal repo. 2014-04-17 17:41:08 +10:00
Shannon e6406e9757 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-04-17 14:23:52 +10:00
Shannon bf65bf5bab Got pre-values caching properly and data types using the runtime cache provider correctly + unit tests. 2014-04-17 14:23:37 +10:00
Stephan a39a659858 Bugfix published content extension .Next() 2014-04-16 19:10:50 +02:00
Stephan 306d83cbd6 Bugfix published content extension .Next() 2014-04-16 19:04:49 +02:00
Stephan a4eedb9f8b U4-4575 - refactor 2014-04-16 18:51:12 +02:00
Stephan 1da901be96 U4-4575 - refactor prop. conversion logic 2014-04-16 18:25:41 +02:00
Shannon d953966248 Completes: U4-4670 Add .ContainsAny string extension to Umbraco.Core.StringExtensions 2014-04-16 17:01:26 +10:00
Shannon 2f679a52f4 fix build 2014-04-16 16:52:45 +10:00
Shannon ad8ab9f46e Fixes media uploader issue to ensure non-approved file types are not saved 2014-04-16 16:48:52 +10:00
Shannon 9b344a5a69 Added tests for member groups and member cloning. Added tests to verify that all entities can be serialized without issue. 2014-04-16 16:44:08 +10:00
Shannon 0a28bdafc2 Merge remote-tracking branch 'origin/6.2.0' into 6.2-cachefixing 2014-04-16 15:54:37 +10:00
Shannon a3a0f1a0bf adds some logging 2014-04-16 15:38:16 +10:00
Shannon f69527eac1 Fixes media uploader issue to ensure non-approved file types are not saved 2014-04-16 15:38:01 +10:00
Shannon 7aa1f480c9 Fixes up some cloning with value types and collections 2014-04-16 15:33:21 +10:00
Shannon 998f031877 Merge branch '6.2.0' into 6.2-cachefixing 2014-04-16 14:01:38 +10:00
Shannon ac7cb8febe Fixes cache providers to ensure it stores and resolves clones 2014-04-16 14:01:26 +10:00
Shannon 6e166bdba7 publicizes DeepCloneHelper 2014-04-16 13:40:20 +10:00
Shannon 1f2e46a195 Simplifies much of the deep cloning with the DeepCloneHelper and adds tests 2014-04-16 13:39:42 +10:00
Shannon bb22f5a283 More code and tests written for deep cloning. 2014-04-16 11:23:00 +10:00
Jackie Nagel 4890e97168 Added removal of isMedia whenever a contentnode is selected 2014-04-15 19:59:31 +02:00
Jackie Nagel e4f63c0576 Now inserting mediaId in the link picker and setting the isMedia flag so that you can get mediaId's from the linkPicker dialogservice 2014-04-15 18:07:40 +02:00
Shannon dcac5d4709 More code and tests written for deep cloning. 2014-04-15 20:31:32 +10:00
Shannon 0e4e12d0ba More code and tests written for deep cloning. 2014-04-15 19:12:42 +10:00
Shannon 9118701669 More test written for deep cloning. 2014-04-15 14:53:19 +10:00
Shannon 58758e7a41 More work on deep cloning, have test passing for IContent 2014-04-15 13:52:49 +10:00
curiosoelbicho 1eaf02b221 fix for: U4-4696. Macro personalized cache with custom membership provider not working 2014-04-14 21:39:31 -03:00
Shannon 5697809ce9 Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-04-14 18:33:04 +10:00
Shannon 4f5cae55c2 Fixes: U4-4654 7.1.1 InsertMacroController unescapes objects to string 2014-04-14 18:32:28 +10:00
Sebastiaan Janssen e5b4769109 Remove test code 2014-04-14 09:27:25 +02:00
Shannon 5990a95d13 Fixes: U4-4610 Unmapped members in Automapper 2014-04-14 15:20:02 +10:00
AndyButland 309e460f07 Merge from 7.1.1 2014-04-13 22:52:41 +02:00
per ploug e3c4ed5bf7 Changes grunt to accept a buildversion param
use grunt build --buildversion=7.1.2 to set it in all client files
2014-04-10 14:25:26 +02:00
Sebastiaan Janssen 02a4c2f4fc Update for WebPI 2014-04-09 09:35:02 +02:00
Sebastiaan Janssen b60aa3031c Post.cshtml shouldn't be there 2014-04-08 12:03:55 +02:00
Sebastiaan Janssen 2a0e3d803f Merge branch '7.1.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-08 11:37:50 +02:00
Sebastiaan Janssen 670a67225a Upgrade to Json.Net 6.0.2 2014-04-08 11:37:40 +02:00
perploug 0bedf09f48 Fixes: U4-4609 v7.1 Media Picker datatype only allows selection of images not PDFs 2014-04-08 11:34:42 +02:00
perploug 41ad18deef Removes autocomplete from installer password field 2014-04-08 11:07:23 +02:00
perploug 4745be4765 Fixes missing listview icons 2014-04-08 11:07:02 +02:00
Andrew Swerlick 6fae57c5e9 Fix for U4-4636. Changed to pass in the defined fileAddition names for preset sizes and pass in an empty string for additional file sizes 2014-04-08 01:10:06 -04:00
perploug 13891bb033 Merge branch '7.1.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-07 16:08:45 +02:00
perploug a2efd7ab53 Fixes: U4-4619 Make sure installer pings stats 2014-04-07 16:08:34 +02:00
Sebastiaan Janssen 3c204da150 Spelling error 2014-04-07 16:05:21 +02:00
Sebastiaan Janssen ab7371e146 Bump version number 2014-04-07 14:29:59 +02:00
Sebastiaan Janssen 0f5c79afbc Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-07 13:02:56 +02:00
Sebastiaan Janssen 4a516f7da9 Manually applying PR #347 2014-04-07 13:01:43 +02:00
Sebastiaan Janssen fcb080658d Reverting 221bfa5f3d so that views are found in partials again
Tested creating/editing members with custom properties in combination with our snippets and
that seems to work fine now, so not sure what this was supposed to fix.
Fixes U4-4604 Surface Controller functionality changed in 7.1 breaking site
2014-04-07 12:16:45 +02:00
Aaron Powell f45edbe2fe U4-4629 - Detecting existing macros
By setting the ID of the macro the repository layer will update the existing instance rather than trying to create a new one, which would result in a duplicate alias and that violates a table index.
2014-04-07 18:10:09 +10:00
Alexander Bryukhov 051f9b4744 Updated ru.xml - new ver7 keys were added 2014-04-04 10:21:01 +07:00
perploug 08d74e3320 Tiny tweak more 2014-04-03 14:01:25 +02:00
perploug 98fd75b55d Updating user screen on the installer 2014-04-03 13:52:18 +02:00
perploug e7da70e076 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-03 11:52:01 +02:00
perploug 200cec0e23 Hardcodes starterkit guid into the installer
This way we can change it remotely to another package instead of relying
on just getting the first guid in the collection of kits
2014-04-03 11:51:51 +02:00
perploug 807778a737 Fixes: U4-4592 U7.1 - You can trigger a lot "Unsaved changes" bars 2014-04-03 11:50:50 +02:00
Sebastiaan Janssen 66d61c9d20 One more ImageProcessor update 2014-04-03 11:29:13 +02:00
Sebastiaan Janssen ecae5a856a Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0
Conflicts:
	src/Umbraco.Core/Services/IRelationService.cs
	src/Umbraco.Web/Models/PublishedProperty.cs
	src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
2014-04-03 11:13:13 +02:00
Sebastiaan Janssen bf8add4f8d Manually picked up PR #343 2014-04-03 11:10:43 +02:00
perploug 256fa3385a Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-03 09:31:47 +02:00
perploug ebaa46b2fc Fixes: U4-4212 Insert Image in RTE not resizing image 2014-04-03 09:31:32 +02:00
Sebastiaan Janssen e207185d51 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-03 09:30:12 +02:00
Sebastiaan Janssen 5efc45a7dd Bump version number 2014-04-03 09:29:52 +02:00
Sebastiaan Janssen c3fc27565d Update version of ImageProcessor and refer to NuGet in the csproj instead of the bin (!) 2014-04-03 09:26:51 +02:00
Sebastiaan Janssen 0af3f9dce0 Fixes U4-4278 Multiple RadioButtonList on one Document
Manually applying pull request as it's a bit faster to copy&paste instead of resolve merge conflicts
2014-04-03 08:55:19 +02:00
perploug 426b02b08a Sets zoom throttle to 100 instead of 300
To limit the number of re-calculations, but still keep it somewhat
fluent
2014-04-03 00:41:27 +02:00
perploug a4e23ef82b Missing files in last commit 2014-04-03 00:40:36 +02:00
perploug d0c6c4aafa Fixes: U4-4332 MediaPicker - Typealias is hardcode several places 2014-04-03 00:37:59 +02:00
perploug 3ea7e6fb8a Partially fixes: U4-4479 Cropper preview in backoffice is a bit off from the actual crop
Makes the cropper card UI reset on save, ensuring changes populate
2014-04-02 23:04:37 +02:00
Stephan 9940b78a57 U4-4575 - fix 8371105 2014-04-02 17:00:24 +02:00
Stephan 8371105c10 U4-4575 - property converters use wrong source value 2014-04-02 16:00:46 +02:00
perploug d4b0f3c570 Resizing safeguards to ensure we only return positive 2014-04-02 14:21:40 +02:00
perploug 29416320d2 Fixes failing macrospec tests
doooh, it referenced marcoParamsDictionary - instead of
macroParamsDictionary - whats up with that Marco guy?
2014-04-02 13:43:03 +02:00
perploug d11eb485e1 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-02 13:19:41 +02:00
perploug 300bd3bed4 Fixes: U4-4558 U7 Macro Parameter Editors needs some love!
Adds some config to the media picker and fixes thumbnail issues
2014-04-02 13:19:26 +02:00
Sebastiaan Janssen 3ca5443350 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-02 12:02:29 +02:00
Sebastiaan Janssen f6d56f51d4 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0
Conflicts:
	src/Umbraco.Core/Services/IRelationService.cs
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
2014-04-02 12:01:55 +02:00
Sebastiaan Janssen 53c0bd6938 Fixes: Password is not saved when using the Register snippet 2014-04-02 11:59:16 +02:00
perploug 174aa9f4ad Fixes: U4-4581 Hotkey - Click on disabled element 2014-04-02 11:51:56 +02:00
Sebastiaan Janssen a768fe5bb3 Ports behaviour from membershiphelper from v7 to 6 to make them the same 2014-04-02 11:42:48 +02:00
Sebastiaan Janssen d9c66cd4b3 Adds AddRelation and missing events in RelationService from v7 into v6 2014-04-02 11:41:59 +02:00
Stephan 6d3e8e1f6d U4-4559 - tests 2014-04-02 11:40:05 +02:00
Stephan b6185b847f U4-4575 - property converters use wrong source value 2014-04-02 11:39:53 +02:00
perploug c8877d0a2c Fixes failing dropdown prop editor tests 2014-04-02 11:35:23 +02:00
perploug 891810b045 Adds newsletter to installer
With the good ol' V6 installer code, ahhh the smell of code patina
2014-04-02 11:20:35 +02:00
Sebastiaan Janssen 77d910b6b6 We don't really need to scream greetings to people who try to use the member picker 2014-04-01 19:14:42 +02:00
Sebastiaan Janssen 47044b3a77 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-01 16:46:43 +02:00
Sebastiaan Janssen 5b693f9310 Adds ability to add/remove a single role to/from a single member, which is much nicer than having to instantiate arrays 2014-04-01 16:43:11 +02:00
Sebastiaan Janssen 40ebc1295c Fixes error thrown when saving password and actually using the Umbraco membership provider 2014-04-01 15:30:42 +02:00
Sebastiaan Janssen b769b224c2 Fixes error thrown when saving password and actually using the Umbraco membership provider 2014-04-01 15:29:16 +02:00
Sebastiaan Janssen 89efe40f41 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-04-01 14:27:47 +02:00
Sebastiaan Janssen 51660d918c Assembly redirect seems to help a lot installing NuGet pkg, should finally be able to close U4-4510 nuget targets file creates an invalid path in the property group 2014-04-01 14:22:13 +02:00
Sebastiaan Janssen ea7b053106 Merge pull request #340 from leekelleher/U4-4550
Fixes: U4-4550 Media Picker preview with transparent images
2014-04-01 13:06:58 +02:00
Sebastiaan Janssen 3e17201ce7 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-04-01 11:59:26 +02:00
Sebastiaan Janssen 1f03983628 Clean up belle/build folder when building with build.bat to make sure it's pristine 2014-04-01 11:54:25 +02:00
Sebastiaan Janssen 15aa6fc4b8 Fixed U4-4576 7.0.4 : InternalMemberSearcher config incorrectly uses 'enableLeadingWildcards', should be 'enableLeadingWildcard' 2014-04-01 11:53:56 +02:00
Sebastiaan Janssen 41e8a9ef2d Fixed U4-4576 7.0.4 : InternalMemberSearcher config incorrectly uses 'enableLeadingWildcards', should be 'enableLeadingWildcard' 2014-04-01 11:51:51 +02:00
perploug a492976a32 Fixes: U4-4557 Color Picker - default is black, but it can't be added without choosing another color first
Sets color to be black by default, so will be added if you click add
without setting anything, so its consistent with the default swatch
2014-04-01 10:08:50 +02:00
perploug 88e09f9077 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-01 10:02:23 +02:00
perploug 65a1709bd3 Fixes: U4-4537 Macro Textbox parameter in RTE Encoding issue 2014-04-01 10:02:10 +02:00
Sebastiaan Janssen 6478a8424a Fixes test, additional Tag mapper requires count to be updated 2014-04-01 09:11:07 +02:00
leekelleher 55ade4e491 Replaced solid/semi-transparent background, with a checkered background image. 2014-03-31 22:45:35 +01:00
Stephan a767aa9f3a Merge pull request #342 from kipusoep/7.1.0
Changed $('#form1') usage to $('form')
2014-03-31 18:19:29 +02:00
Sebastiaan Janssen 50321e5936 Merge pull request #336 from bjarnef/7.1.0_-_U4-4026
Fix for U4-4026 Inline styling affect header text
2014-03-31 17:32:50 +02:00
perploug 1321702d19 Fixes: U4-3649 Bottom button bar gradient overlaps last field
Temp fix, as we will likely refactor or editor directives before
building more core editors
2014-03-31 13:24:30 +02:00
perploug 005ff2f830 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-31 13:17:27 +02:00
perploug dff3fde840 Fixes: U4-4553 7.1 Template drop down has values but is blank
patches the it on the clientside for now, longerterm solution is to have
templates being returned as prevalues, but will leave that to shannon as
there could be other things accidentally being poked doing that.
2014-03-31 13:17:15 +02:00
Sebastiaan Janssen 44504ff6af Fixes summary for the TagMapper 2014-03-31 12:59:28 +02:00
Sebastiaan Janssen 25d3389759 Merge pull request #341 from robertjf/7.1.0
Fixes #U4-4544 Issue: TagService.GetAllTags(group) throws Exception in MappingResolver
2014-03-31 12:57:51 +02:00
Robert Foster 3f97c74712 removed commented out code 2014-03-31 22:00:54 +11:00
perploug 1152b61fb0 7.1 login greetings update 2014-03-31 12:43:05 +02:00
perploug b1842de045 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-31 12:37:26 +02:00
perploug 750a2862ee Fixes: U4-4562 Images and markdown editor 2014-03-31 12:37:08 +02:00
perploug 7632075df4 Fixes: U4-4536 Tree points to wrong views after install 2014-03-31 12:29:44 +02:00
perploug aa75cd4ea8 Fixes: U4-4549 Related Links "New Window" checkbox has css "display: none" 2014-03-31 12:28:56 +02:00
Sebastiaan Janssen 06827bd7a5 Merge pull request #338 from vnbaaij/7.1.0
Solution for  U4-4548
2014-03-31 11:57:13 +02:00
Stefan Kip 9a82ab7d4a Changed $('#form1') usage to $('form')
I'm having an issue with v6.1.6 where the form's id is 'aspnetForm' instead of 'form1', I don't know why.
Using $('form') is much safer than using $('#form1').
2014-03-31 09:56:16 +02:00
Robert Foster b1037d1936 Added a TagMapper class to resolve ITag back to TagDto. 2014-03-30 19:07:35 +11:00
leekelleher ccdc3a1eab Fixes: U4-4550 Media Picker preview with transparent images 2014-03-28 16:59:34 +00:00
leekelleher 655d629621 Rebased web.Template.config - reapplied the whitespace fixes. 2014-03-28 16:31:03 +00:00
leekelleher c8e0fedce4 Made the whitespace consistent in config files.
This may ease the frustration of web-developers doing upgrades.
2014-03-28 16:25:01 +00:00
Vincent Baaij a47387fec0 Solution for U4-4548 2014-03-28 16:03:51 +01:00
perploug c29d08c915 Fixes: U4-4489 7.1 RC, warn about changes partially overlays breadcrumb 2014-03-28 11:00:29 +01:00
perploug b8f796eb2c Fixes: U4-4532 Unable to insert Image in TinyMCE when Image property 'umbracoFile' is changed from type 'Upload' to the new 'Image Cropper' 2014-03-28 10:39:24 +01:00
Shannon b9088c9ac0 fixes build 2014-03-28 08:51:25 +11:00
Shannon 7a8f8ac0fe Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-28 08:31:52 +11:00
Shannon 49cf0f98ce U4-1752 - Add GetPreValueAsString(id) method to the @Umbraco helper 2014-03-28 08:31:21 +11:00
Shandem 22ffa86e18 Merge pull request #301 from Jeavon/U4-1752
U4-1752 - Add GetPreValueAsString(id) method to the @Umbraco helper
2014-03-28 08:21:32 +11:00
perploug c4e2d98138 U4-4532 Unable to insert Image in TinyMCE when Image property 'umbracoFile' is changed from type 'Upload' to the new 'Image Cropper'
Replaces the old media api with the resolveFile helper methods
2014-03-27 02:46:32 -07:00
Shannon c01211c62d Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
2014-03-27 17:28:46 +11:00
Shannon d8a3e00440 Fixes: U4-2843 Copying Document Type when Selecting Master Doesn't Work (Master ignored), U4-3552 Copy nested document type is failing 2014-03-27 17:26:55 +11:00
Shannon 264c537b50 Fixes: U4-4530 Edit Profile Snippet: Check for null before loop 2014-03-27 16:52:43 +11:00
Shannon f26c61d736 renames file 2014-03-27 16:43:34 +11:00
Shannon 43f647fd94 Fixes U4-4531 dialogService.macroPicker callback wrong property name 2014-03-27 16:43:20 +11:00
Shannon cc0bcc2d59 Fixes unit tests 2014-03-27 16:27:57 +11:00
Shannon 1b23540b87 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web/Cache/DistributedCache.cs
2014-03-27 16:12:37 +11:00
Shannon c309e18f13 Fixes: U4-459 Public Access permissions not set on distributed servers 2014-03-27 16:11:34 +11:00
Shannon dec60885b4 Fixes more thread safety issues with Access.cs 2014-03-27 15:50:56 +11:00
Shannon eee09ec45b Completes: U4-459 Public Access permissions not set on distributed servers 2014-03-27 14:43:07 +11:00
Shannon b4daab2856 started fixing: U4-459 Public Access permissions not set on distributed servers but have commented that code out for now because it will cause problem in some LB scenarios. 2014-03-27 14:28:45 +11:00
Shannon fdfbad254d Fixes some very badly handled threading issues with the Access (public access) class 2014-03-27 14:28:12 +11:00
bjarnef 0c6e766030 Fix for U4-4026 Inline styling affect header text
Inline styling on container affect header text and dropdown with
text-align:center on language in settings section.
2014-03-27 02:42:21 +01:00
Shannon 7444363cef adds another null check to the other TranslateItem method 2014-03-27 08:13:05 +11:00
Shandem a82097b92b Merge pull request #334 from Jeavon/U4-4527
Fix for U4-4527 U7 - Creating initial Folder in media section causes exc...
2014-03-27 08:05:56 +11:00
Jeavon Leopold 07934161a4 Fix for U4-4527 U7 - Creating initial Folder in media section causes exception 2014-03-26 10:07:20 +00:00
Shandem 9194030a9a Merge pull request #333 from Nicholas-Westby/7.1.0
Replaced "retreive" with "retrieve".
2014-03-26 17:45:03 +11:00
Shannon 1cbaace777 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	build/Build.proj
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	build/NuSpecs/tools/install.ps1
	src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js
2014-03-26 15:06:03 +11:00
Nicholas-Westby ef5052324b Replaced "retreive" with "retrieve". 2014-03-25 20:49:52 -07:00
Nicholas-Westby 204a8d813c Replaced "retreive" with "retrieve". 2014-03-25 20:48:05 -07:00
Nicholas-Westby 8009cb3892 Replaced "retreive" with "retrieve". 2014-03-25 20:46:23 -07:00
Nicholas-Westby 284d168cd7 Replaced "retreive" with "retrieve". 2014-03-25 20:45:28 -07:00
Nicholas-Westby fdd025aefd Replaced "retreive" with "retrieve". 2014-03-25 20:44:47 -07:00
Nicholas-Westby e36d4768e1 Replaced "retreive" with "retrieve". 2014-03-25 20:44:08 -07:00
Nicholas-Westby df2047e8f8 Replaced "retreive" with "retrieve". 2014-03-25 20:43:32 -07:00
Nicholas-Westby d9280d5238 Replaced "retreive" with "retrieve". 2014-03-25 20:42:29 -07:00
Nicholas-Westby 388249f500 Replaced "retreive" with "retrieve". 2014-03-25 20:41:32 -07:00
Nicholas-Westby a08b75592e Replaced "retreive" with "retrieve". 2014-03-25 20:40:44 -07:00
Nicholas-Westby 38ea6dfbfe Replaced "retreive" with "retrieve". 2014-03-25 20:39:45 -07:00
Nicholas-Westby 39ccde221a Replaced "retreive" with "retrieve". 2014-03-25 20:38:58 -07:00
Nicholas-Westby 17b6366ea3 Replaced "retreive" with "retrieve". 2014-03-25 20:37:20 -07:00
Nicholas-Westby 3d6a608b12 Replaced "retreive" with "retrieve". 2014-03-25 20:36:46 -07:00
Nicholas-Westby 851f58df9c Replaced "retreive" with "retrieve". 2014-03-25 20:35:36 -07:00
Nicholas-Westby 0ff0cc6366 Replaced "retreive" with "retrieve". 2014-03-25 20:34:44 -07:00
Nicholas-Westby 08004ecc68 Replaced "retreive" with "retrieve". 2014-03-25 20:33:59 -07:00
Nicholas-Westby 4a2544d0e6 Replaced "retreive" with "retrieve". 2014-03-25 20:32:39 -07:00
Nicholas-Westby bace1cce74 Replaced "retreive" with "retrieve". 2014-03-25 20:31:31 -07:00
Nicholas-Westby acc88e25d8 Replaced "retreive" with "retrieve". 2014-03-25 20:30:17 -07:00
Nicholas-Westby 2a1a16d478 Replaced "retreive" with "retrieve". 2014-03-25 20:28:47 -07:00
Nicholas-Westby a5afb8ed19 Replaced "retreive" with "retrieve". 2014-03-25 20:27:57 -07:00
Nicholas-Westby d02678e05c Replaced "retreive" with "retrieve". 2014-03-25 20:26:58 -07:00
Nicholas-Westby 9e0bbd3c99 Replaced "retreive" with "retrieve". 2014-03-25 20:26:06 -07:00
Nicholas-Westby 539efcc669 Replaced "retreive" with "retrieve". 2014-03-25 20:25:24 -07:00
Nicholas-Westby d0d9d85151 Replaced "retreive" with "retrieve". 2014-03-25 20:24:27 -07:00
Nicholas-Westby ffa307613c Replaced "retreive" with "retrieve". 2014-03-25 20:23:36 -07:00
Nicholas-Westby 19ea6d6005 Replaced "retreive" with "retrieve". 2014-03-25 20:22:34 -07:00
Nicholas-Westby 155b1737d3 Replaced "retreive" with "retrieve". 2014-03-25 20:20:51 -07:00
Nicholas-Westby b66253f33e Replaced "retreive" with "retrieve". 2014-03-25 20:19:50 -07:00
Nicholas-Westby bcbadfe648 Replaced "retreive" with "retrieve". 2014-03-25 20:19:12 -07:00
Nicholas-Westby 3325b06873 Replaced "retreive" with "retrieve". 2014-03-25 20:18:30 -07:00
Nicholas-Westby 852914bf6b Replaced "retreive" with "retrieve". 2014-03-25 20:17:55 -07:00
Nicholas-Westby 3e14807370 Replaced "retreive" with "retrieve". 2014-03-25 20:17:18 -07:00
Nicholas-Westby e44cb6708d Replaced "retreive" with "retrieve". 2014-03-25 20:16:31 -07:00
Nicholas-Westby fd43b27d00 Replaced "retreive" with "retrieve". 2014-03-25 20:15:34 -07:00
Nicholas-Westby 524f113611 Replaced "retreive" with "retrieve". 2014-03-25 20:14:54 -07:00
Nicholas-Westby 04dcf50218 Replaced "retreive" with "retrieve". 2014-03-25 20:14:23 -07:00
Nicholas-Westby 2b497deaa3 Replaced "retreive" with "retrieve". 2014-03-25 20:13:30 -07:00
Nicholas-Westby dbe2f8ea37 Replaced "retreive" with "retrieve". 2014-03-25 20:12:50 -07:00
Nicholas-Westby 7dc0239ad1 Replaced "retreive" with "retrieve". 2014-03-25 20:11:46 -07:00
Nicholas-Westby 72fdc5f472 Replaced "retreive" with "retrieve". 2014-03-25 20:10:34 -07:00
Shannon cde3c42cec Fixes: U4-4455 Javascript error with single quotes in literals
Conflicts:
	src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js
2014-03-26 13:34:26 +11:00
Shannon 10b544abb9 Fixes: U4-4455 Javascript error with single quotes in literals 2014-03-26 13:31:15 +11:00
Shannon 88aecdf672 fixes U4-4517 Color picker not showing colors 2014-03-26 13:07:07 +11:00
Shannon ad95736eaa Fixes issues relating to adding ability to sort pre-values, had to update all property editors that use the shared sortable pre-values, ensure the list items are an array and then sorted. 2014-03-26 13:01:53 +11:00
Shannon 34a21a78a0 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-26 11:23:58 +11:00
Shannon 1e01c2669f fixes missing semi-colon 2014-03-26 11:23:48 +11:00
Shandem d3a7389b89 Fixes file name casing 2014-03-26 11:21:31 +11:00
Shandem bc8b6c4bea Fixes file name casing 2014-03-26 11:21:08 +11:00
Shandem 3953a48a3b Merge pull request #332 from arknu/7.1_U4-3744
U4-3744: Make it possible to make individual selections while still selecting the entire text on first click
2014-03-26 11:08:50 +11:00
Shannon 2f44e94bd0 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-26 11:00:46 +11:00
Shannon 5eeb8d7df6 Fixes: U4-4520 Issue: MultipleTextStringValueConverter returns an empty string array due to mismatched XML value format 2014-03-26 11:00:32 +11:00
arknu 231f23cc6e Cleaned up the code a bit 2014-03-25 22:26:05 +01:00
Sebastiaan Janssen 3235678d29 U4-4510 nuget targets file creates an invalid path in the property group
That should fix this one properly now
2014-03-25 20:40:44 +01:00
Sebastiaan Janssen f13ddddc16 U4-4510 nuget targets file creates an invalid path in the property group
That should fix this one properly now
2014-03-25 20:39:46 +01:00
arknu 490c346fcf U4-3744: Make it possible to make individual selections while still selecting the entire text on first click 2014-03-25 19:34:19 +01:00
Shannon 8f1d8419a0 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	build/NuSpecs/build/net40/UmbracoCms.targets
	build/NuSpecs/build/net45/UmbracoCms.targets
	build/NuSpecs/build/net451/UmbracoCms.targets
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
2014-03-25 15:47:57 +11:00
Shannon be8320bb4b fixes some compatibility issues with PR for sortable pre-vals 2014-03-25 14:14:09 +11:00
Shannon 1d4b6178e5 Merge branch 'wip-u4-3951' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3951
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
2014-03-25 13:31:21 +11:00
Shannon 3427f596e3 fixes up a few notes. 2014-03-25 13:07:16 +11:00
Shannon c31ea7409f Merge branch 'fix-u4-3839' of https://github.com/lars-erik/Umbraco-CMS into lars-erik-fix-u4-3839 2014-03-25 12:47:26 +11:00
Shannon f88e60bcb5 Fixes: U4-3481 Adding Scripting Files and Partial View Macro File with the same name and 'create macro' selected fails. 2014-03-25 12:16:27 +11:00
Shannon c81919e269 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-25 11:45:57 +11:00
Shannon c936aaa517 Fixes: U4-3845 v7.0.0 keepUserLoggedIn issue 2014-03-25 11:45:38 +11:00
Shandem b8f88e0459 Merge pull request #330 from Jeavon/7.1.0-ImageCropper-JeavonWIP
7.1.0 image cropper - removal of lots of duplicated code, fixes for various param options and some further unit tests
2014-03-25 10:47:09 +11:00
Shannon 1628ac917c Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-25 10:45:14 +11:00
Shannon ab586a49ce Fixes: U4-4508 Save causes content to vanish in IE 2014-03-25 10:44:55 +11:00
Jeavon Leopold ff2ee540e2 Fixing the CacheBusting on GetCropUrl as it was totally random which meant the server cache was creating a new cache file for every request. Now changed it to use item updateDate.ToFileTimeUtc as the cache busting value so it will change only when the item is updated in Umbraco. 2014-03-24 19:27:00 +00:00
Jeavon Leopold b450299d45 GetCropUrl - moved propertyAlias and cropAlias to after width and height so that GetCropUrl(100,100,"myProperty") is possible and renamed useFocalPoint to preferFocalPoint 2014-03-24 18:37:15 +00:00
Jeavon Leopold 0ebe535922 ImageCropDataSet - a little bit of Stylecop 2014-03-24 17:58:12 +00:00
Jeavon Leopold f5f8fe7b42 GetCropUrl - Stylecop and an additional test 2014-03-24 17:51:52 +00:00
Jeavon Leopold f51a66b728 GetCropUrl - further code duplication removal and 2 new unit tests 2014-03-24 16:32:50 +00:00
Sebastiaan Janssen f8a7b453c7 Sync the en and en_us translations 2014-03-24 17:26:04 +01:00
Sebastiaan Janssen 89235f707c Sync the en and en_us translations 2014-03-24 17:25:31 +01:00
Jeavon Leopold 550166c41b Removing HasPropertyAndValueAndCrop method as it's no longer needed 2014-03-24 15:49:04 +00:00
Jeavon Leopold 40be3957f6 GetCropUrl - ensuring that GetCropUrl(width,height) works and also adding the useFocalPoint parameter 2014-03-24 15:44:04 +00:00
Sebastiaan Janssen 6ccce4d914 U4-4515 GenericProperty.ascx.cs references non-existent lblAlias control, causing YSOD of death when editing certain document types
Whoops, missed some references
2014-03-24 16:01:47 +01:00
Sebastiaan Janssen 14ea374b24 Also removing stray semicolons here for U4-4510 nuget targets file creates an invalid path in the property group 2014-03-24 15:44:09 +01:00
Sebastiaan Janssen 4d49268c47 U4-4515 GenericProperty.ascx.cs references non-existent lblAlias control, causing YSOD of death when editing certain document types
Codebehind file somehow got out of sync
2014-03-24 15:16:57 +01:00
Sebastiaan Janssen a569796adb Removes stray semicolons from the nuget targets files 2014-03-24 14:00:12 +01:00
Jeavon Leopold 59de0613f5 GetCropUrl - Removing duplicate code 2014-03-24 11:43:55 +00:00
Sebastiaan Janssen 8391c32886 Fix whitespace 2014-03-24 09:34:48 +01:00
Sebastiaan Janssen bf2efd30e9 U4-4073 Audit Trail is missing from action menu
Removed the icons for now as they are missing and should be new style icons anyway
2014-03-24 09:34:47 +01:00
Shannon 187373132f Completes: U4-4154 convert existing property data from XML to JSON during upgrade v6 - 7 2014-03-24 18:44:18 +11:00
Shannon 79584a9cf9 Fixes thread safety issue with RichTextPreValueController 2014-03-24 16:32:42 +11:00
Shannon 96fa8c7dc9 Publicizes a few things, including the fix for U4-3981 Make Umbraco.Web.WebApi.Filters.UmbracoApplicationAuthorizeAttribute public 2014-03-24 15:41:46 +11:00
Shannon 5e43ddc13c Fixes: U4-4502 Umbraco7.0.4 media picker shows uploaded images minus 1 2014-03-24 13:43:20 +11:00
Shannon 98f76a989f Adds better error handling for the media picker - we were not detecting image types before and were getting loads of server errors. Fixes up some method return calls 2014-03-24 12:38:49 +11:00
Shannon 2e8993adb8 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	build/NuSpecs/build/net40/UmbracoCms.targets
	build/NuSpecs/build/net45/UmbracoCms.targets
	build/NuSpecs/build/net451/UmbracoCms.targets
	build/NuSpecs/tools/Readme.txt
	build/NuSpecs/tools/install.ps1
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2014-03-24 11:31:52 +11:00
Shannon 81600f0f3c Merge branch 'patch-2' of https://github.com/designagencytom/Umbraco-CMS into designagencytom-patch-2
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2014-03-24 11:18:11 +11:00
Shannon 74ccd79408 Merge branch 'patch-1' of https://github.com/designagencytom/Umbraco-CMS into designagencytom-patch-1 2014-03-24 11:13:07 +11:00
Shandem 3e0a754dc0 Merge pull request #328 from arjanpot/7.1.0
CropUrl should be formatted with InvariantCulture.
2014-03-24 11:04:59 +11:00
Sebastiaan Janssen 006a89e136 U4-4498 Doc & Media Type, Server Error when upgrade, 7.0.4 to 7.1.0 RC via Nuget
Have to copy in the Umbraco and Umbraco_Client folder during NuGet updates as well.
2014-03-23 16:10:58 +01:00
Sebastiaan Janssen 29dbbee173 Imageprocessor config files are no longer required and shouldn't ship with Umbraco 2014-03-23 15:02:54 +01:00
arjanpot cd31637371 CropUrl should be formatted with InvariantCulture. 2014-03-22 11:22:01 +01:00
Shannon beb1979b46 Fixes small bug when distributed cache is called with invalid params. 2014-03-21 17:04:30 +11:00
Shannon 672672d0aa Completes: U4-2633 Bundle all cache refresher transmissions into a single call per request for much better performance 2014-03-21 14:50:24 +11:00
perploug ab70c98d4c Ensures the config is cleared properly every time 2014-03-20 09:41:30 -07:00
Sebastiaan Janssen 424ff02734 Forgot a few includes, fixed! 2014-03-20 17:29:16 +01:00
Sebastiaan Janssen 80bd8d962b Make sure the App_Plugins folder is there 2014-03-20 16:58:35 +01:00
Sebastiaan Janssen 4b4efde490 Make sure the App_Plugins folder is there 2014-03-20 16:57:53 +01:00
Sebastiaan Janssen 956364decd v7 NuGet changes also apply to v6 2014-03-20 16:02:24 +01:00
Sebastiaan Janssen 7bc2bdae75 Merge pull request #327 from Jeavon/7.1.0-ImageCropper-JeavonWIP
7.1.0 image cropper - GetCropUrl not using .Url anymore
2014-03-20 15:45:24 +01:00
Sebastiaan Janssen c43ab7942a Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-20 15:38:52 +01:00
Morten Christensen 166f9b939c Moving the sqlce dlls to UmbracoFile in the nuspec 2014-03-20 15:37:41 +01:00
Morten Christensen ede9e00a7f Updating the targets to include a few more folders 2014-03-20 15:37:21 +01:00
Sebastiaan Janssen 0bfbacfd66 No need to back up the config files, they don't get overwritten if you answer "No"
Updated the readme.
2014-03-20 15:33:41 +01:00
Jeavon Leopold 5c5827e319 If cropper property editor not in use on umbracoFile then we can use mediaItem.Url 2014-03-20 14:31:21 +00:00
Sebastiaan Janssen 05ca98219d Also copy the new config files over 2014-03-20 14:57:07 +01:00
Sebastiaan Janssen a83a0f1e25 Fix merge conflict 2014-03-20 14:27:39 +01:00
Sebastiaan Janssen ea7d476559 Backup config files properly 2014-03-20 14:26:11 +01:00
Jeavon Leopold 2d2f57a71b GetCropUrl - needed to get the url from within the json within the check for a crop otherwise a exception can occur 2014-03-20 13:22:45 +00:00
designagencytom 6133e8f8c2 Update loadMemberGroups.cs
Sort the roles alphabetically to make it easier to manage the list when it becomes very large.
2014-03-20 13:02:25 +00:00
Morten Christensen bfaace373c Updating the install ps1 to only copy over the web.config on initial install to ensure that the web.config is correct. 2014-03-20 14:00:43 +01:00
Morten Christensen a6d24fce93 Updating the targets files to copy in umbraco backoffice client dependencies AfterBuild with condition !Exists. 2014-03-20 14:00:42 +01:00
Jeavon Leopold 7e8aaebfce Merge remote-tracking branch 'origin/HEAD' into 7.1.0-ImageCropper-JeavonWIP 2014-03-20 12:42:14 +00:00
Jeavon Leopold 6a3fb87499 GetCropUrl to not use .Url property but get directly from cropper JSON 2014-03-20 12:42:05 +00:00
Sebastiaan Janssen 74cad56a6b Merge pull request #324 from Jeavon/7.1.0-ImageCropper-JeavonWIP
7.1.0 image cropper - fix and basic unit test and new overload GetCropUrl(cropAlias)
2014-03-20 13:30:09 +01:00
Jeavon Leopold 9b02457f7a Adding a basic unit test for GetCropUrl - more to come 2014-03-20 12:22:50 +00:00
Jeavon Leopold 6077e24685 Add GetCropUrl(string cropAlias) overload and fix mediaItem.Url 2014-03-20 11:23:17 +00:00
Sebastiaan Janssen 39a3a9dc56 Reference the correct ImageProcessor version to get it included in the build 2014-03-20 09:42:06 +01:00
Shannon 801a3731a2 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-20 17:55:03 +11:00
Shannon bcb7561e74 fixes unit test 2014-03-20 17:44:13 +11:00
Shannon f077520781 Fixes: U4-4154 convert existing property data from XML to JSON during upgrade v6 - 7 to ensure that other data types that have this property editor are upgraded as well. Fixes some of the installer bits so that the steps are not marked as completed if they have problems. 2014-03-20 17:35:51 +11:00
Shannon 61ec1e4c35 Fixes the Url property to work with the image cropper to be consistent with the upload field. 2014-03-20 14:58:18 +11:00
Shannon 3710c0916c Fixes up the Image cropper extensions, ensures that we don't recursively call Url (this is a special property). 2014-03-20 14:57:48 +11:00
Shannon 863667f5bd Moves the image crop enums to their correct location and renames them to be more descriptive (less generic). 2014-03-20 14:27:58 +11:00
Shannon 7475851bb5 Ensures that we log exceptions instead of completely ignoring them 2014-03-20 14:17:00 +11:00
Shannon a721ed5e0f Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web/Cache/UserPermissionsCacheRefresher.cs
2014-03-20 13:19:50 +11:00
Shannon 0bc621c40f Merge branch 'Jeavon-7.1.0-ImageCropper-JeavonWIP' into 7.1.0 2014-03-20 13:19:26 +11:00
Shannon 620fbde1db Merge branch '7.1.0-ImageCropper-JeavonWIP' of https://github.com/Jeavon/Umbraco-CMS into Jeavon-7.1.0-ImageCropper-JeavonWIP
Conflicts:
	src/Umbraco.Web/ImageCropperBaseExtensions.cs
2014-03-20 13:18:57 +11:00
Shannon 39e7947435 fixes merge issues 2014-03-20 13:15:53 +11:00
Shannon 2792937b17 Merge branch '7.1_U4-4447' of https://github.com/arknu/Umbraco-CMS into arknu-7.1_U4-4447
Conflicts:
	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
2014-03-20 13:10:39 +11:00
Shannon af9a9a9a7a Fixes: U4-4481 Image cropper pre value editor doesn't validate properly 2014-03-20 13:03:30 +11:00
Shannon 83f4c0262e Fixes: U4-4475 Creating new member doesn't put it in examine. Fixes up some cache refreshers to ensure they are calling the base method so that events fire consistently.
Conflicts:
	src/Umbraco.Web/Cache/UserPermissionsCacheRefresher.cs
2014-03-20 12:38:19 +11:00
Shannon 08d4ce7667 Fixes: U4-4475 Creating new member doesn't put it in examine. Fixes up some cache refreshers to ensure they are calling the base method so that events fire consistently. 2014-03-20 12:36:13 +11:00
Shannon 2340adbe94 Fixes: U4-4425 Umbraco Macros break on quote, U4-4290 RTE changes Macro parameter values containing right angle brackets, U4-4442 Line break in macro text area breaks the Macro 2014-03-20 12:21:40 +11:00
Shannon fb6b234491 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-20 10:38:40 +11:00
Shannon 15222e176e Fixes: U4-4474 YSOD when expanding Members tree 2014-03-20 10:37:54 +11:00
Shannon 63b92eaee5 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Models/MemberType.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
2014-03-20 09:54:13 +11:00
Shannon 84dd7dc61a Fixes: U4-4466 6.2-beta - Creating Member Type without Alias results in no viewable Member Types in back office 2014-03-20 09:52:31 +11:00
Sebastiaan Janssen 5a4b09f9d1 Make sure we use the latest ImageProcessor version in VS as well, not just in the nuget package. 2014-03-19 19:56:48 +01:00
perploug bbbd03f001 Final tweak to the U4-4477 - media items could not be retreived on refreshing the editor 2014-03-19 19:14:39 +01:00
perploug 4a721ddf34 Fixes: U4-4477 Single Media picker doesn't show thumbnail any more 2014-03-19 18:44:46 +01:00
Jeavon Leopold d88745bf49 Adding ToLowerInvariant to compares and also removing a redundant method copied in from my cropper package but not needed 2014-03-19 16:53:13 +00:00
perploug 3543204794 Revert "Merge"
This reverts commit 1573eb2f74.
2014-03-19 09:51:07 -07:00
arknu c565744a9b Fix drag-and-drop upload 2014-03-19 17:46:04 +01:00
perploug 2470ec3ded Minor addition to the U4-4477 fix 2014-03-19 09:38:27 -07:00
perploug 7b4f7abbcd Fixes: U4-4477 Media picker doesn't show thumbnail any more 2014-03-19 09:38:24 -07:00
perploug 1573eb2f74 Merge 2014-03-19 09:38:22 -07:00
Jeavon Leopold e8e8b536f1 Fix for GetCropUrl method when mediaItem.Url has JSON data 2014-03-19 16:12:30 +00:00
Sebastiaan Janssen 704c3df597 No more need for imageprocessor configs in web.config, yay! 2014-03-19 16:59:06 +01:00
Sebastiaan Janssen 36c107c0ef Quick fix for U4-4206 - not the absolute correct fix, but it'll get rid of that horrible null reference error 2014-03-19 14:30:53 +01:00
Sebastiaan Janssen 70f5641b83 Change to overflow:auto so there's no horizontal scroll bar when not necessary 2014-03-19 13:28:28 +01:00
Sebastiaan Janssen bbb5fe728a Better styling of ChangeDocType dialog 2014-03-19 13:25:16 +01:00
Sebastiaan Janssen 307ea6bd74 Fixes last error in U4-3470 Errors in console window are failed to load resource at
/umbraco/%7B%7Bcmd.icon%7D%7D
2014-03-19 11:48:46 +01:00
Sebastiaan Janssen 76eb06784d Don't try to access model.value when model.value might be empty. Fixes broken prevalue editor for RTE. 2014-03-19 11:19:34 +01:00
Jeavon Leopold c6e1235ac4 Fixing GetCropUrl overload 2014-03-19 09:52:53 +00:00
Sebastiaan Janssen 6ac2cc9f8b Not sure how the logout button ended up in the help dialog, sorry! :) 2014-03-19 10:38:43 +01:00
Shannon 9d5c8e5aed Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-19 19:45:39 +11:00
Shannon 56001a8ccb Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
2014-03-19 18:55:20 +11:00
Shannon ff5dadde53 Fixes unit test and another potential migration problem using an old alias for foreign key 2014-03-19 18:43:10 +11:00
Shannon 6d92393f08 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-19 17:56:45 +11:00
Shannon 6169d13eb5 fixes the config issue with unit tests 2014-03-19 17:56:30 +11:00
perploug 361c382a2e Makes cropper components size-able
So all UI components can be given a max-size so they can scale image and
ui up accordingly
2014-03-18 23:49:09 -07:00
perploug 375b3948e0 Fixes: U4-4177 U7 - Add Startnode Picker to Multiple Media Picker 2014-03-18 23:49:05 -07:00
perploug 6453a82717 Allow cropper thumbnails to downscale 2014-03-18 23:49:02 -07:00
perploug a4c9fae05c Fixes: U4-4461: Case sensitive crop alias's 2014-03-18 23:49:01 -07:00
perploug 29edbb90a6 Fixes: Image grid using fullsize images instead of thumbs 2014-03-18 23:49:00 -07:00
Shannon 71201970e9 Gets the new color spectrum pre-value editor working. 2014-03-19 17:45:21 +11:00
Shannon 992727821b Merge branch 'robertjf-7.0.2' into 7.1.0 2014-03-19 15:43:46 +11:00
Shannon 67fd3cc234 Merge branch 'moppa-7.0.2' into 7.1.0 2014-03-19 15:41:06 +11:00
Shannon f70717985c Cleans up a little bit of code and adds some null checks. 2014-03-19 15:32:31 +11:00
Shannon ded82611a7 Finalizes: U4-4472 Image cropper should use IFileSystem - currently uses standard IO 2014-03-19 15:09:50 +11:00
Shandem 6a8cb5e123 Merge pull request #270 from stefana99/6.2.0-imagecropper
Changes to imageCropper, supports new mediafilesystem
2014-03-19 14:48:38 +11:00
Shandem 09428d703c Merge pull request #298 from KevinJump/6.2.0--PackageServiceFixes
6.2.0  package service fixes
2014-03-19 14:43:19 +11:00
Shannon 2b6b8e9e8c Fixes: U4-4470 New Installer doesn't deal with 500 errors, also fixes a tree init problem causing this particular ysod 2014-03-19 13:28:23 +11:00
Shannon a46c088d0c Ensures correct exceptions are thrown when configurations cannot be loaded, before was just null ref exception which was not good. 2014-03-19 11:00:32 +11:00
Shannon 65e591501c Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Tests/Migrations/Stubs/AlterUserTableMigrationStub.cs
2014-03-19 10:35:46 +11:00
Shannon a0541b000e Fixes: U4-4463 Upgrade 6.2.0 > 7.1.0 fails - due to incorrect formatting of foreign keys for sql servers
Conflicts:
	src/Umbraco.Tests/Migrations/AlterMigrationTests.cs
	src/Umbraco.Tests/Migrations/Stubs/AlterUserTableMigrationStub.cs
2014-03-19 10:33:37 +11:00
Shannon 1f6b139cde Fixes: U4-4463 Upgrade 6.2.0 > 7.1.0 fails - due to incorrect formatting of foreign keys for sql servers 2014-03-19 10:31:19 +11:00
Shannon 17893715fc Fixes the CDF nuget reference since we need the latest version and it is marked as visible now (this just undoes our old workaround) 2014-03-19 09:38:41 +11:00
Shannon a25e6e0d2c Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/build/net40/UmbracoCms.targets
	build/NuSpecs/build/net45/UmbracoCms.targets
	build/NuSpecs/build/net451/UmbracoCms.targets
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
2014-03-19 09:34:37 +11:00
Shannon 668935548d Fixes: U4-4394 7.0.4: Inconsistency in member tree listings
Conflicts:
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Web/Trees/MemberTreeController.cs
2014-03-19 09:28:13 +11:00
Shannon 14141fcaa5 Fixes the dictionary query syntax properly for all db's 2014-03-19 09:24:57 +11:00
arknu 1948fe12b3 U4-4447: Make image properties populate when uploading from ImageCropper 2014-03-18 22:31:05 +01:00
Sebastiaan Janssen 4bcf3983c5 Update readme and remove non-functioning backups from install.ps1 2014-03-18 18:41:05 +01:00
Sebastiaan Janssen 7c5942b05f Updating minimum required versions of dependencies to be the same as v7. 2014-03-18 18:40:20 +01:00
Sebastiaan Janssen 8b4d4e3189 Update readme and remove non-functioning backups from install.ps1 2014-03-18 18:38:16 +01:00
Sebastiaan Janssen 4f008f5848 Bump version to RC 2014-03-18 18:37:42 +01:00
Sebastiaan Janssen 1a40ccc838 Updating nuget targets files, like on v7. Also updates nuget author name. 2014-03-18 17:51:33 +01:00
Sebastiaan Janssen 0bf43da825 Time to finally update the author name as well 2014-03-18 17:49:53 +01:00
Sebastiaan Janssen c83db52bd7 Update database type wording and dropdown width 2014-03-18 17:45:26 +01:00
Sebastiaan Janssen 00e1556504 Update to the correct minimum requirements for ImageProcessor 2014-03-18 17:26:09 +01:00
Jeavon Leopold 5c8440a7d6 ImageCropper helpers WIP 2014-03-18 15:20:48 +00:00
Sebastiaan Janssen 3e86fb6298 ImageProcessor.Web only has a v3 for some reason 2014-03-18 15:54:10 +01:00
Sebastiaan Janssen 9b0895c5b0 People tend to forget to deploy global.asax A LOT, doesn't hurt to have it as content and
included in the VS project, this should help a bit as it's no longer a hidden file
2014-03-18 15:48:41 +01:00
Sebastiaan Janssen 4ad9ea1537 Bump the version to RC 2014-03-18 15:40:09 +01:00
Sebastiaan Janssen 0b08f19f53 U4-4174 Umbraco Nuget Install by Visual Studio 2013 failed
Should be fixed by referencing this version of WebApi. ImageProcessor is also required
2014-03-18 15:39:54 +01:00
Sebastiaan Janssen 527402a6d8 The Overflow starter kit adds App_Code and needs this reference to be able
to use HttpResponseMessage
2014-03-18 15:35:07 +01:00
Sebastiaan Janssen 9eea8c85e0 Include global.asax and Config\splashes folder while publishing with msdeploy 2014-03-18 15:32:39 +01:00
Stephan e80963093d Fix MySql dictionary issue
Conflicts:
	src/umbraco.cms/businesslogic/language/Item.cs
2014-03-18 12:44:32 +01:00
Shannon 6f586c7eeb Ensures we are not directly referencing Membership.Provider and instead targetting our provider by alias. 2014-03-18 20:36:02 +11:00
Shannon ff3b5baf06 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
2014-03-18 20:12:03 +11:00
Shannon 0749124f45 fixes bug with col name 2014-03-18 20:11:22 +11:00
Shannon 549aeecf31 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Models/Member.cs
2014-03-18 19:40:41 +11:00
Shannon bef970437a doh, fix for new ctor 2014-03-18 19:39:17 +11:00
Shannon 0898b13072 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Models/Member.cs
2014-03-18 19:31:26 +11:00
Shannon dda36f0147 added additional ctor for member to create an empty one 2014-03-18 19:30:54 +11:00
Shannon 9d3f362029 fixes minor issue with the backing up of the install folder 2014-03-18 19:27:58 +11:00
Shannon 4d13925e3b Fixes merge issues 2014-03-18 19:05:07 +11:00
Shannon 02481dcfba Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
2014-03-18 18:53:04 +11:00
Shannon caad775399 Removes the User membership provider name constant - it is not a constant, this value is configurable! 2014-03-18 18:52:17 +11:00
Shannon fd14065f14 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs
	src/Umbraco.Core/Persistence/Factories/MemberFactory.cs
	src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Mappers/MemberMapper.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/IMembershipUserService.cs
	src/Umbraco.Core/Services/UserService.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs
	src/Umbraco.Web.UI/install/steps/DefaultUser.ascx.cs
	src/Umbraco.Web/Controllers/UmbProfileController.cs
	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs
2014-03-18 18:47:49 +11:00
Shannon 7a7720c460 Gets #U4-4454 Can't log in a new member created through memberservice completed 2014-03-18 18:41:18 +11:00
Shannon b2aeb835d5 Implements the SavePassword method of the MemberService 2014-03-18 17:45:11 +11:00
Shannon 8dd950bd52 Ensures all access to the users membership provider is done with our extension method 2014-03-18 17:22:25 +11:00
Shannon e2881e07d1 Ensures that all calls to the members membership provider are done so explicitly with the membership provider alias - this decouples the need to have the umbraco membership provider declared as the default, we were doing both before. 2014-03-18 17:08:21 +11:00
Shannon e0e0076a7a allows for client side validation on the text box and date picker controls and updates the models to allow support for this for any prop editor. 2014-03-18 15:29:14 +11:00
Shannon 00a96a4888 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-18 14:51:43 +11:00
Shandem b16cf375b9 Merge pull request #320 from imulus/u4-4432
U4-4432 - Expose Mandatory setting in ContentProperty
2014-03-18 14:48:53 +11:00
Shannon a3b433c73c Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-18 14:39:58 +11:00
Shandem 855a4961dd Merge pull request #321 from robbaman/7.1.0
Added datepicker support for IsRequired
2014-03-18 14:37:56 +11:00
Shannon 71de4dc7de Fixes: U4-3675 [NonAction] attribute should be ignored by Umbraco RenderActionInvoker 2014-03-18 14:28:05 +11:00
Shannon 19d3c06470 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
2014-03-18 14:20:45 +11:00
Shannon e22476f54a fixes some test logic 2014-03-18 14:19:26 +11:00
Shannon 20ae16b2d7 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-03-18 14:18:50 +11:00
Shannon 9e466971af fixes some test logic 2014-03-18 14:18:34 +11:00
Shannon 7017d8094d Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-18 13:08:39 +11:00
Shannon 0e40971178 Fixes remaining tests 2014-03-18 13:08:24 +11:00
perploug 1ae9816c28 Updates grunt file to work with latest jshint cfg format 2014-03-18 02:24:38 +01:00
Shannon e40cf3b8fc fixes js unit tests 2014-03-18 12:23:10 +11:00
Shannon 09ea82b37f fixes last unit tests 2014-03-18 11:57:53 +11:00
Shannon c44918f830 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-18 11:40:32 +11:00
Shannon 760dd42c43 Optimizes integration test performance and fixes failing unit tests. 2014-03-18 11:40:20 +11:00
perploug 0409192892 Fixes: U4-4449 Issue: Discard Changes popup inconsistency 2014-03-18 01:09:50 +01:00
Shannon d575eaa9c1 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/TypeFinder.cs
	src/Umbraco.Tests/Services/PackagingServiceTests.cs
	src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs
	src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
2014-03-18 09:46:43 +11:00
Shannon 373e9755ed Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-18 09:22:08 +11:00
perploug d6f00d9367 Fixes: U4-4405 List view icons are broken in firefox 2014-03-17 20:53:19 +01:00
perploug 3cabec84d4 Fixes broken IE11 slider in ImageCropper 2014-03-17 20:01:39 +01:00
perploug c9d12f7dc5 WIP on seperating logic from the content editor into smaller units 2014-03-17 19:40:52 +01:00
perploug 9e97b84fb8 Fixes issues with crop sizes prevalues 2014-03-17 19:40:52 +01:00
perploug f4fa090857 Removes dog with glasses + fixes unit tests 2014-03-17 19:40:51 +01:00
perploug 0e22a2bb5a Fixes installer progress bar 2014-03-17 19:40:50 +01:00
Stephan 36b10e71d7 U4-4373, U4-4374 - finalize fixes
Conflicts:
	src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
2014-03-17 15:44:16 +01:00
Stephan 3c6029c969 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2014-03-17 15:27:25 +01:00
Stephan a4a0de3503 U4-4373, U4-4374 - finalize fixes 2014-03-17 15:25:25 +01:00
Shannon 217267bf94 Supercharges integration tests - now running at a great speed. 2014-03-17 22:22:44 +11:00
Shannon 4748366766 Fixes up some more test attributes 2014-03-17 20:59:31 +11:00
Shannon de15dc36e7 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs
2014-03-17 20:54:48 +11:00
Shannon ab00782d84 Fixes potential issue with why test were failing 2014-03-17 20:33:30 +11:00
Shannon 2d6d95a63e Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Tests/Persistence/Auditing/AuditTests.cs
	src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
	src/Umbraco.Tests/PublishedContent/DynamicDocumentTestsBase.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
	src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs
	src/Umbraco.Tests/Services/LocalizationServiceTests.cs
	src/Umbraco.Tests/Services/PackagingServiceTests.cs
	src/Umbraco.Tests/Services/PerformanceTests.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
2014-03-17 19:44:34 +11:00
Shannon d19d1b3a18 Changes database behavior in integration tests to be opt-in, removes the db behavior to have a new schema per fixture, now we only deal in new files + schema per fixture/tests as it was taking longer to uninstall the db tables than just delete the file. 2014-03-17 19:38:29 +11:00
Shannon 5a779c24d0 Fixes: U4-4428 Upload field on members fails on resizing 2014-03-17 18:39:53 +11:00
Shannon c669a2702b Fixes: U4-4210 MNTP not working with Member and ensures the content picker has real validation built into it. Fixes up the EntityController switching out the global action selector. 2014-03-17 18:34:41 +11:00
Shannon f777f1b3d6 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-03-17 16:23:49 +11:00
Shannon 3e8ada24e4 reverts sebastian's commit as this will cause unwanted other side affects 2014-03-17 16:08:06 +11:00
Shannon fe884b2070 Fixes: U4-4426 Upload field on Member Type doesn't work 2014-03-17 16:01:09 +11:00
Shannon 30cfa4c0ae moves MemberCountType to correct namespace 2014-03-17 14:18:38 +11:00
Shannon 66aa3084f9 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/packages.config
	src/umbraco.cms/packages.config
	src/umbraco.cms/umbraco.cms.csproj
	src/umbraco.controls/packages.config
	src/umbraco.editorControls/packages.config
	src/umbraco.macroRenderings/packages.config
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
2014-03-17 14:15:14 +11:00
Shannon d028ee2c3e Completes: U4-4457 Upgrade to latest CDF 2014-03-17 14:08:07 +11:00
Shannon 2bd5e908db Fixes merge issues 2014-03-17 14:01:42 +11:00
Shannon 154652c896 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AddChangeDocumentTypePermission.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AssignMissingPrimaryForMySqlKeys.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/UpdateToNewMemberPropertyAliases.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/umbraco.controls/TreePicker/SimpleContentPicker.cs
2014-03-17 13:39:49 +11:00
Shannon a60e2318ad Fix Null Prevalue Values on Export of DataTypes
Exporting a DataType that has a Numeric pre-value that has no value
causes an Exception - added null checking to pre value.value
2014-03-17 13:23:26 +11:00
Shannon f642a7fd63 Fixes: U4-4368 Cannot insert the value NULL into column 'name' when creating new relation type from API 2014-03-17 13:21:17 +11:00
Shandem b4cce4860f Merge pull request #313 from KevinJump/7.1.0---Null-DataType-PropertyValue-Fix
Fix Null Prevalue Values on Export of DataTypes
2014-03-17 13:20:24 +11:00
Shannon d1d54d8e84 Fixes: U4-4427 Exception with selecting content start node in Multi-node tree picker 6.2.0 2014-03-17 13:12:08 +11:00
Shannon bbeedb6c1b Fixes: U4-4373 @Library.NodeById(-1).Id returns "0" instead of "-1"(6.2.0 beta) & U4-4374 @Model.NodeById(-1).DescendantsOrSelf().First().Id results in Excecption (6.2.0 beta) 2014-03-17 12:27:37 +11:00
Shannon 4745995f92 Fixes: U4-4373 @Library.NodeById(-1).Id returns "0" instead of "-1"(6.2.0 beta) 2014-03-17 11:45:42 +11:00
Shannon c66aca2d41 Adds migration to rename the index umbracoUserLogins_Index to IX_umbracoUserLogins_Index so that it follows standards, fixes unit test 2014-03-17 11:24:01 +11:00
Shannon af148a4544 reverts the notion of shema migration - we will run migrations normally as we've been doing, this fixes a couple of unit tests too. 2014-03-17 10:48:56 +11:00
Shannon d7ea8e02d6 fixes unit test 2014-03-17 09:40:28 +11:00
Shannon 3acec1dd65 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-17 09:38:46 +11:00
Sebastiaan Janssen e52f8dcbc9 Update wording on upgrades 2014-03-16 19:37:08 +01:00
Sebastiaan Janssen 60edf7d3b9 Pointing to the typical error log folder 2014-03-16 12:00:36 +01:00
Sebastiaan Janssen f626738174 DoResize(-1,-1) - I don't know why you'd ever want to attempt to resize to -1,-1.
Also removed the else clause as it hides the error until later, now size will be null at the appropriate time.
2014-03-16 11:46:49 +01:00
Shannon ad3c004d95 Added another property to a migration to specify a minimum current version - needed for specifically targeting a migration 'from' a version. Finally got mysql upgrading from 6.1 to 7.1 without issue, had to re-order a few things and ensure some migrations don't execute based on the 'from' version. 2014-03-15 20:15:01 +11:00
Shannon 58814d4ac2 updates the migration order 2014-03-15 20:11:42 +11:00
Shannon c29dbf444a Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
2014-03-15 19:02:59 +11:00
Shannon bd06729619 oops, fixes some logic with a closing bracket in the wrong place 2014-03-15 18:54:08 +11:00
Shannon bd1dc4f88d Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-03-15 18:53:25 +11:00
Shannon 67c1cc44c5 oops, fixes some logic with a closing bracket in the wrong place 2014-03-15 18:53:03 +11:00
Morten Christensen b680f87c12 Adding a note about the usage of the PackageInstallation class in the PackagingService 2014-03-14 12:14:43 +01:00
Morten Christensen 8db6633c91 Initial implementation of a new package installation approach based on PR-297. Everything is left internal as we don't know when something like this can be introduced.
Idea is to be able to install a complete package using the PackagingService, so that we eventually can obsolete the old Packager/Installer-code.
2014-03-14 12:11:38 +01:00
Robert Mulder 8843f6c02c Added datepicker support for IsRequired
Added support for the model.config.IsRequired flag to the datepicker property editor.
2014-03-14 10:15:48 +01:00
Shannon 6561a79b5c Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Tests/Migrations/AlterMigrationTests.cs
2014-03-14 19:35:11 +11:00
Shannon 3e5128147c fixes typo 2014-03-14 19:34:09 +11:00
Shannon 64c126ea61 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Configuration/GlobalSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-03-14 19:33:53 +11:00
Shannon 3dcbcba9cf Updates the required migrations to be Schema migrations, ensures the foreign key deletion occurs with the correct supported syntax across db types. Ensures we don't try to drop a pk in mysql when it never existed. 2014-03-14 19:24:45 +11:00
Shannon b5329ace3b Backports fixes for legacy encoding checks and to not do any db lookups for the new membership providers and also ensures the legacy membership provider doesn't do any db lookups on init. 2014-03-14 18:38:57 +11:00
Shannon e1a134f587 Fixes: U4-4430 MySql primary key issues 2014-03-14 17:11:21 +11:00
Tom Fulton 1ec2901762 Expose Mandatory setting in ContentProperty
This allows a PropertyEditor to be aware of whether it's required or not, via: `$scope.model.mandatory` (along with `$scope.model.alias`, etc)
2014-03-13 23:32:12 -06:00
Robert Foster 58bfb6999d Merge remote-tracking branch 'upstream/7.0.2' into 7.0.2 2014-03-14 13:45:40 +11:00
Shannon e8056de589 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
	src/Umbraco.Web.UI/install/Default.aspx.cs
2014-03-14 13:06:45 +11:00
Shannon bbe6194b06 Exception is thrown if trying to run mysql in med trust. Migrations arranged to execute schema migrations first and then data migrations. If a schema migration fails it will attempt to run the downgrade scripts of the migrations if running mysql since schema changes aren't supported in transactions. Updated all sql syntax providers to try to return only the column indexes, not key indexes. Updates the db version checker to include errors for all missing columns, indexes and constraints in the db and vice versa in the schema. 2014-03-14 13:04:20 +11:00
Shandem 06a08be6de Merge pull request #317 from BatJan/patch-1
Fix of U4-4414 UX: Replace Change placeholder text in new installer
2014-03-14 11:35:10 +11:00
Shandem f1e8e845a2 Merge pull request #319 from BatJan/7.1.0_-_U4-4378
Fix of U4-4378 Label needed under button graphics for videos
2014-03-14 11:33:57 +11:00
Jan Skovgaard 20c5be0a8e Fix of U4-4378 Label needed under button graphics for videos 2014-03-13 13:32:35 +01:00
Shannon 6990c46262 Fixes installer when it fails on the db install or upgrades, fixes some upgrade queries with mysql, fixes ignoring case check for checking version 2014-03-13 21:47:08 +11:00
Shannon 099c558797 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-13 20:46:06 +11:00
Shannon d76fd7d25e updates schema result to have case ignored. 2014-03-13 20:45:07 +11:00
Shannon e020989577 Give some love to mysql with regards to schema validation and the syntax provider - need ignore case comparisons. 2014-03-13 20:42:57 +11:00
Shannon f2541cae86 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web.UI/web.Template.Debug.config
2014-03-13 20:16:08 +11:00
Shannon a907b5bdcd Fixes up the dbconnection checker to work with all supported db types. 2014-03-13 20:14:56 +11:00
Shannon 7258964bb7 Ensures version specific db providers are not referenced in the web.config 2014-03-13 20:14:11 +11:00
Shannon d290ffa306 Fixes: U4-4392 Umbraco 7 delete member from others 2014-03-13 18:47:36 +11:00
Shannon 75bc3e09c6 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-13 18:43:40 +11:00
Shannon bcc2424577 fixes issue with getting 'other' 'members 2014-03-13 18:43:16 +11:00
Shannon 67f8b8f88b Fixes: U4-3606 Handle caching issues from server requests correctly 2014-03-13 18:24:37 +11:00
BatJan 2d44650139 Fix of U4-4414 UX: Replace Change placeholder text in new installer
Changed "First Last" in the name placeholder to "Full name".
2014-03-13 07:27:08 +01:00
Shannon 8eaea3fb54 fixes: U4-4285 Expose/Publicize (3rd party) PropertyEditors 2014-03-13 16:34:54 +11:00
Shannon 2166a4a5ac Fixes: U4-4394 7.0.4: Inconsistency in member tree listings 2014-03-13 15:25:30 +11:00
Shannon 3ba6391dda Ensures that 6.2 migrations are run for 7.1 as well. 2014-03-13 14:23:32 +11:00
Shannon 8574c6b7d0 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
2014-03-13 14:12:45 +11:00
Shannon b533a9f690 Merge commit '85a74e4fa700c83bab4bf3436f69f045029932cd' into 7.1.0
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Controllers/UmbLoginController.cs
	src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
	src/Umbraco.Web/Controllers/UmbProfileController.cs
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
2014-03-13 14:12:02 +11:00
Shannon 221bfa5f3d Fixes up issues with editing the member profile and registering a member with our snippets including specifying a custom member type. 2014-03-13 14:10:05 +11:00
Shannon 85a74e4fa7 Fixes: U4-4419 TempData is not being cleared on RedirectToCurrentUmbracoPage - it actually shouldn't be cleared but we need to handle how we add it properly as tempdata only clears when it is read 2014-03-13 12:21:31 +11:00
Shannon 62d4bff8aa Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
2014-03-13 11:11:51 +11:00
Shannon 095be823c6 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-13 11:11:10 +11:00
Shannon a8858ecfdd fixes unit tests 2014-03-13 11:10:29 +11:00
Shandem 9c48330aae Merge pull request #314 from esn303/7.1.0
fix typos, thousands separator and casing of installer facts
2014-03-13 11:03:59 +11:00
Marc 22792a2f8e fix typos, thousands separator and casing of installer facts 2014-03-12 11:05:50 +01:00
Shannon 0dc00a62e2 Adds ability to have proxy migrations so there is no duplication of declaring migrations and no duplication of executing already executed migrations. Would have been a bit nicer to have 2014-03-12 20:36:40 +11:00
Shannon 0c4e442578 Checks for index existence before trying to add 2014-03-12 18:52:05 +11:00
Shannon 9d7d866467 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
	src/Umbraco.Core/Umbraco.Core.csproj
2014-03-12 18:44:54 +11:00
Shannon 3b26834484 updates migration to make it a little faster 2014-03-12 18:40:39 +11:00
Shannon aee10348e5 Ensures not to add new indexes if they already exist 2014-03-12 18:37:22 +11:00
Shannon d0fc3ddba5 ensures applicationeventsresolver is disposed of in the correct place. 2014-03-12 18:11:05 +11:00
Shannon 3aadca167f oops, updated the reset to resetcollections for clearing collections for resolvers. 2014-03-12 18:00:00 +11:00
Shannon 3a92c26a7f Adds ability to extract index details from databases using sql syntax provider. 2014-03-12 17:17:52 +11:00
Shannon 6a4ea56dc5 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
2014-03-12 17:17:05 +11:00
Shannon cdd6768966 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-12 15:09:48 +11:00
Shannon d89205abaf Fixes: U4-4395 YSOD when creating membergroup 2014-03-12 15:08:55 +11:00
Shannon ff21379547 Makes ApplicationEventsResolver IDisposable so we can clear resources after startup. 2014-03-12 14:16:52 +11:00
Sebastiaan Janssen 74f00a9f89 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-12 00:33:03 +01:00
Sebastiaan Janssen 3912300f83 Really... nobody noticed "MEH"? 2014-03-12 00:30:25 +01:00
Shannon c8ff708a43 adds null check to MemberGroupCacheRefresher 2014-03-12 10:04:33 +11:00
Sebastiaan Janssen 693899935b For absolute clarity added the fact that this is the current Umbraco version. 2014-03-11 19:09:17 +01:00
Sebastiaan Janssen 1a87d96f77 Temporary fix to at least have a scrollbar when protecting a page (only added inline style, and
removed an unopened </div>, the rest is just formatting)
2014-03-11 18:47:50 +01:00
Sebastiaan Janssen 0a959b5b84 Thought I'd moved the version up a already but looks like I forgot to commit. Also made it
have a bit more contrast with it's background.
2014-03-11 17:39:11 +01:00
Sebastiaan Janssen f2202eb337 Removing 503 header as Azure Websites would just stop doing anything after seeing this, so
the rewrite to noNodes.aspx would never happen and you'd get a blank screen with:
Service Unavailable HTTP Error 503. The service is unavailable.
2014-03-11 17:28:55 +01:00
Shannon 19b7a9dfff Completes: U4-4369 Remove the need for an Areas folder for the installer 2014-03-11 18:09:54 +11:00
Shannon f432e23a47 Removes files that should never have been committed 2014-03-11 18:07:07 +11:00
Kevin Jump 20d92432b2 Fix Null Prevalue Values on Export of DataTypes
Exporting a DataType that has a Numeric pre-value that has no value
causes an Exception - added null checking to pre value.value
2014-03-11 06:55:59 +00:00
Shannon 59cdb8a6fe Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-11 17:27:30 +11:00
Shannon aed4c1faed minor code cleanup and a null check. 2014-03-11 17:26:14 +11:00
Shannon 2ecab70772 Fixes: U4-4182 Exception during plugins loading 2014-03-11 17:00:35 +11:00
Shannon 894a649574 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-11 15:02:48 +11:00
Shannon 48bbf1ecb2 Fixes unit tests 2014-03-11 15:02:23 +11:00
Shannon 5dc44ca612 fixes some merge issues 2014-03-11 15:02:14 +11:00
Shannon 3c771648e3 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
	src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/Security/MembershipHelper.cs
	src/Umbraco.Web/UmbracoHelper.cs
2014-03-11 14:47:00 +11:00
Shannon c500d29029 adds some exceptions 2014-03-11 14:44:18 +11:00
Shannon 2c8fe5a130 fixes a few issues 2014-03-11 14:35:49 +11:00
Shannon d737afa327 Working on 2014-03-11 14:23:51 +11:00
Shannon 2db1c1bb40 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-11 10:39:55 +11:00
Shannon d95ca7bc6f updates naming from CreateProfileModel to GetCurrentMemberProfile 2014-03-11 10:39:19 +11:00
Sebastiaan Janssen 6b491ac6cd Merge pull request #312 from vnbaaij/patch-1
Update en_us.xml
2014-03-10 10:13:58 +01:00
vnbaaij 278b681501 Update en_us.xml
header was incorrect:
<language alias="en" intName="English (GB)" localName="English (GB)" lcid="" culture="en-GB">
2014-03-10 10:07:30 +01:00
Shannon abd72e7676 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-10 18:09:20 +11:00
Shannon ec6cb4520c Fixes: U4-3835 U7(nightly214) - Umbraco.Field not working 2014-03-10 17:44:40 +11:00
Shannon 2dfa85c9b4 Fixes merge issues 2014-03-10 17:35:28 +11:00
Shannon 921a5963e2 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web.UI/umbraco/create/simple.ascx
	src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
	src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
2014-03-10 17:30:46 +11:00
Shannon 3626d5b79d fixes unit tests 2014-03-10 17:27:22 +11:00
Shannon 980e8e84a6 Fixes: U4-4353 You are able to create duplicate content/media/member type's with the same alias 2014-03-10 17:26:04 +11:00
Shannon 4070669e7d Completes: U4-4335 It's Possible to Create Duplicate Data Types 2014-03-10 16:00:53 +11:00
Shannon b20e61d316 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	build/Build.bat
	src/Umbraco.Web.UI/umbraco/create/simple.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.designer.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs
	src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
2014-03-10 15:27:09 +11:00
Shannon fb764641c5 Fixes: U4-4335 It's Possible to Create Duplicate Data Types 2014-03-10 15:16:17 +11:00
Shannon 405727f1ac Completes: U4-3919 Get google spellchecker working in new RTE editor in a much better way that requires no server side implementations - it enables spell checking by the browser in the RTE which is heaps better and less code for us 2014-03-10 14:36:20 +11:00
Shannon 6446f63dcb Fixes: U4-4366 Lots of js errors in RteController when editing the rte data type 2014-03-10 14:16:24 +11:00
Shannon f1963fb404 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-10 12:56:01 +11:00
Shannon c26b72bd10 fixes a locking issue and exception logging 2014-03-10 12:55:45 +11:00
Shannon b94cee68e7 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-03-10 11:23:06 +11:00
Shannon b67fbbcbd8 Fixes: U4-4015 Usercontrol Browse Properties error 2014-03-10 11:22:49 +11:00
perploug 71fcc77e9b merge 2014-03-09 22:24:04 +01:00
perploug 38509f9d5a Adds details view to media picker to edit alt text 2014-03-09 22:21:55 +01:00
perploug 3ff04f585c Fixes issue with late-loaded file resolvers 2014-03-09 22:21:36 +01:00
Sebastiaan Janssen 3de8f9bd18 Merge pull request #311 from arknu/71-issue3691
U4-3691: Use empty alt text instead of 'Some description'
2014-03-08 14:05:52 +01:00
arknu c95e7c245e U4-3691: Use empty alt text instead of 'Some description' 2014-03-07 22:24:28 +01:00
perploug fce31a2e02 7.1 beta 2014-03-07 15:26:28 +01:00
Sebastiaan Janssen 4d3eef1124 Update version 2014-03-07 15:25:10 +01:00
perploug b816e7f4db Fixes: sites cannot run the new installer if they have /install directory 2014-03-07 12:10:04 +01:00
perploug 45f6d4f911 ensures the installer clears angular cache 2014-03-07 12:10:00 +01:00
Shannon 6a9a1d1547 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-07 20:26:57 +11:00
perploug 391eb99e10 Installer facts typo 2014-03-07 10:18:36 +01:00
perploug 3b4487c836 Fixes: Weird merge issue with dashboard.config 2014-03-07 10:18:30 +01:00
perploug 46461c7c5d Fixes installer breaks with missing app_data/temp/installer folder 2014-03-07 10:18:08 +01:00
perploug 7104629ffd Fixes installer database dropdown default value 2014-03-07 10:17:46 +01:00
Shannon b46abecde5 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Navigation.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml
	src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Navigation.cshtml
	src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/SiteMap.cshtml
2014-03-07 20:10:33 +11:00
Shannon e82795f798 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-07 20:09:32 +11:00
Shannon a6faf5b757 fixes build issue 2014-03-07 20:09:22 +11:00
Shannon 3e6e6faf03 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-03-07 20:08:22 +11:00
Shannon b3f18bc677 fixed an issue with setting password with legacy api 2014-03-07 20:08:10 +11:00
Sebastiaan Janssen a48fe40675 Also clean up v6 snippets 2014-03-07 09:46:45 +01:00
Shannon 74c777b1ae Ensures the built-in member controllers have the correct logic - somehow got reverted and then not merged. 2014-03-07 19:39:31 +11:00
perploug 1e955fa813 Tweaks startkits usercontrol style 2014-03-07 09:34:25 +01:00
Shannon bc371e69a3 Completes: U4-4227 Rename default member property aliases 2014-03-07 19:30:54 +11:00
Shannon 9a97b636eb Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-07 19:15:38 +11:00
Shannon 878156e21e putting back what the UmbLoginController should be ... where in the hell has this been overwritten from??! 2014-03-07 19:13:25 +11:00
Sebastiaan Janssen af376d2837 Fix failing nuget build (now that \install is removed) 2014-03-07 09:06:06 +01:00
Shannon 9dd5f250c7 Fixes up the GetUrlWithTimeStamp to be called GetUrlWithCacheBust and another extension method to actually generate the hash which will be umb version + cdf version hashed or datetime.ticks if in debug mode. Updates the main view to use CDF to render the CSS which ensures compression/minification/combination + cache busting. 2014-03-07 11:03:13 +11:00
Shannon bb527996b9 Moves the JsNoCache to a real readable file instead of an embedded string (now an embedded file resource), updates it's logic to not append the hash to any dependencyhandler.axd request, fixes case sensitivity checking on the URLs, changes the cdf + umb version to be a nice shorter hash of the two. 2014-03-07 10:40:27 +11:00
Shannon 1a171161cd Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-07 10:11:36 +11:00
perploug d410663a68 Updates ImageProcessor 2014-03-06 22:54:51 +01:00
perploug 9e332ca0a4 Fixes: media unit test merge issue 2014-03-06 22:54:23 +01:00
perploug 02388a33ba Tweaks fileupload view 2014-03-06 22:54:05 +01:00
perploug 3f52364308 Fixes: FixNumber directive always dirtied the model 2014-03-06 22:53:51 +01:00
perploug e157837e0e Fixes merge issue in valformmanager 2014-03-06 22:53:13 +01:00
perploug c2318349e5 merge 2014-03-06 20:11:37 +01:00
perploug c540c74a04 merge 2014-03-06 20:10:17 +01:00
perploug e5b1271ce1 Fixes: U4-4205 Add item to multi node tree picker - Min/Max Items Issue 2014-03-06 14:38:03 +01:00
perploug dfaa15c6e7 Directive cleanup + button event js errors fix 2014-03-06 12:28:36 +01:00
perploug 4aa3e1368a Fixes scrollbar and database val msg 2014-03-06 12:27:46 +01:00
Shannon 25f10011fc Fixes merge issues 2014-03-06 20:38:23 +11:00
perploug d08f08ffaf Umbraco facts 2014-03-06 10:30:41 +01:00
Shannon 9a9237e78e Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/IMembershipUserService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web.UI/config/umbracoSettings.config
	src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
	src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
	src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx
	src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
	src/Umbraco.Web/Search/ExamineEvents.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/cache/LegacyClasses.cs
2014-03-06 20:22:32 +11:00
Shannon 1511ad58b2 oops, put back the defaults for umbracoSettings 2014-03-06 20:16:55 +11:00
Shannon 2e9b751174 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-03-06 20:12:21 +11:00
Shannon d61ab97be3 Fixes: U4-4217 Ensure that the cmsTask data is cleared for any entity that uses umbracoNode table 2014-03-06 20:12:05 +11:00
Stephan dd40d73b71 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2014-03-06 10:06:50 +01:00
Shannon 068bca84b7 Fixes: U4-156 Drag / drop support 2014-03-06 20:05:13 +11:00
Shannon 0fda528b94 Fixes: U4-1550 Publish notifications on a load balanced environment 2014-03-06 19:47:23 +11:00
Shannon 3552f63d87 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-03-06 19:29:35 +11:00
Shannon 01d04fde37 Fixes: U4-4060 Rollback feature does not show differences 2014-03-06 19:29:09 +11:00
Stephan 7f8c526136 Fix TryConvertTo handling of number decimal separator 2014-03-06 09:14:05 +01:00
Stephan ea4be14f0c Fix 026d040 - keep Standalone stuff internal 2014-03-06 09:10:14 +01:00
Stephan 20df48e2f0 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2014-03-06 08:49:38 +01:00
Stephan 2c0f6f975c Bugfix UmbracoEntity ctor test 2014-03-06 08:42:41 +01:00
Shannon fa7f91b39d Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-03-06 18:26:10 +11:00
Shannon 72c5853fb1 Completes: U4-3937 Ensure media is indexed across all servers in LB environment with Distributed Cache calls
for members
2014-03-06 18:25:38 +11:00
Stephan f03b1a22f9 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2014-03-06 08:12:51 +01:00
Shannon e7fb6e5beb Streamlines member and user services CreateMemberWithIdentity to be similar to media/content and not have a raise events flag. Also implements the CreateWithIdentity explicitly 2014-03-06 18:07:02 +11:00
Shannon d0cc93d6a2 Fixes: U4-3937 Ensure media is indexed across all servers in LB environment with Distributed Cache calls
This fix is for media indexes to be distributed properly and for unpublished content to be distributed properly, now to get members to do the same.
2014-03-06 17:50:08 +11:00
Shannon 4adc2562b1 Fixes issue with ugolive dashboard trying to load in knockout from a bundle which causes the examine mgr to fail 2014-03-06 17:49:09 +11:00
Shannon ba6878666c Fixes pretty ugly issue of the Saving/Saved events not being raised when using CreateWithIdentity 2014-03-06 17:35:47 +11:00
Shannon 30da7fb801 Merge branch '7.1.0-installer' into 7.1.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
	src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
2014-03-06 12:28:50 +11:00
Shannon 7086a5153a Fixes js errors with apply since a digest is already in operation. 2014-03-06 12:25:45 +11:00
Shannon 37937e2c8e Fixes the user password validation to ensure it obeys what the membership provider's are configured for. 2014-03-06 12:11:14 +11:00
Shannon 7676099f2e small styling fix on db err msg 2014-03-06 11:14:41 +11:00
perploug 0d1bb355b5 merge 2014-03-05 20:12:45 +01:00
perploug 3276b8a4d8 Latest visual changes to installer + db validator 2014-03-05 20:03:45 +01:00
Stephan 792ab8d088 Introduce support for content fragments 2014-03-05 15:46:37 +01:00
Stephan 3d4409e52a Refactor CacheRefreshersResolver.CacheResolvers into .CacheRefreshers 2014-03-05 15:46:35 +01:00
Stephan acd377956f Improve how DomainHelper determines domain 2014-03-05 15:46:34 +01:00
Stephan 3b6dcc3421 Factor Dictionary.ReplaceKey method 2014-03-05 15:46:33 +01:00
Stephan cec4d41df7 Add comments to UmbracoViewPageOfTModel 2014-03-05 15:46:32 +01:00
Stephan ff0bcffefa Implement DefaultShortStringHelper.PostFilter to cut url segments at 240 chars 2014-03-05 15:46:31 +01:00
Stephan 5dbc72897a Add method to reset PublishedContentRequest template 2014-03-05 15:46:30 +01:00
Stephan 83736bec01 U4-4190 - enable retrieval of wildcard domains 2014-03-05 15:46:29 +01:00
Stephan 2f953c3819 Fix a38e0dc - use UInt64 instead of int 2014-03-05 15:46:28 +01:00
Stephan 026d040a62 Enable StandaloneApplication to work with Powershell 2014-03-05 15:39:16 +01:00
Stephan 7747b8f64f U4-3579 - support chars such as <, > or & in prevalues 2014-03-05 15:33:15 +01:00
Shannon feab2de260 Fixes up the starter kit installer in the back office with it's legacy implementation. Adds some handy methods for webapi routing for areas. 2014-03-05 22:42:51 +11:00
Shannon 24cc417395 Removed all the legacy files that we don't need - need to test the starter kit installation process in the back office though as some old files are still used there. 2014-03-05 19:47:00 +11:00
Shannon 56e1fc07e4 adds some notes on testing db connectivity. 2014-03-05 19:42:24 +11:00
Shannon fbd2b3a1e1 Gets the v7 upgrade report working on the new installer. 2014-03-05 18:23:50 +11:00
Shannon 8f7f761bb3 implements the file permissions report correctly and tests it. 2014-03-05 17:44:13 +11:00
Shannon a40ba2f27e Updates the RequiresExecution logic so we can skip steps based on some user input (i.e. skip the starter kit installation). Fixes the start kit js stuff to update the model correctly and continue. Fixes the error view to restart - it cannot just go back because there might not be a view there. 2014-03-05 14:30:17 +11:00
Shannon 893f86d34c Fixes installer service so that when forward is called and there are no more views to show the installer will automatically start. This will occur in cases where we are customizing the install but we don't want a starter kit installed since the server has detected that one has already been installed. This also prevents some JS errors and will improve the installer in the future if there might be more views. 2014-03-05 12:57:44 +11:00
Shannon ddd2ab463e Ensures that the starter kit view is not returned if there is one already installed 2014-03-05 12:44:38 +11:00
Shannon cbced2caed fixes db upgrade step to check for correct previous step 2014-03-05 12:21:49 +11:00
Shannon ce068a60d5 Removes default instructions from the installer service, passing in empty instructions is ok now and the server will assign defaults if they are empty. 2014-03-05 12:08:35 +11:00
Shannon 7f7f3202d2 fixes issue with checking starter kit steps, fixes issue with installer service code with the method param name being the same as the variable name and fixes the _find lookups to ensure a value is returned from the iteration. 2014-03-05 11:49:07 +11:00
Shannon 0227b800a0 Gets the installer steps working nicely and returning the next step to execute which now displays the current step details correctly and dequeues steps that are not required after the previous one has executed. 2014-03-05 11:34:42 +11:00
Shannon 8e89aa233c Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer
Conflicts:
	src/Umbraco.Web.UI.Client/src/installer/installer.service.js
	src/Umbraco.Web/Install/Controllers/InstallApiController.cs
2014-03-05 10:34:27 +11:00
Shannon 24ceb5ce2d Updates to include returning the next step in sequence 2014-03-05 10:32:59 +11:00
perploug 923eb300e5 Updates grunt file to run vs file copy 2014-03-04 19:11:27 +01:00
Shannon 0d93db5f1f Fixes the order that descriptions are listed during install 2014-03-04 19:28:57 +11:00
Shannon d2aecd12eb Updates more installer logic, getting into the nitty gritty details with upgrades, etc... 2014-03-04 19:20:36 +11:00
Shannon 1e99c466ee Updates some tests and fixes a couple things 2014-03-04 16:40:23 +11:00
Shannon 71a9fb4f68 Updated more installer logic 2014-03-04 16:21:45 +11:00
Shannon 0497771750 fixed merge issues 2014-03-04 11:42:11 +11:00
Shannon 000b2b639f Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer
Conflicts:
	src/Umbraco.Web/Install/Controllers/InstallApiController.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseInstallStep.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs
	src/Umbraco.Web/Install/InstallSteps/FilePermissionsStep.cs
	src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
	src/Umbraco.Web/Install/InstallSteps/UserStep.cs
	src/Umbraco.Web/Install/Models/InstallSetupStep.cs
	src/Umbraco.Web/Install/Models/InstallSetupStepAttribute.cs
2014-03-04 11:20:52 +11:00
Shannon 885f691c0e Updated install steps, classes and logic 2014-03-04 11:16:42 +11:00
perploug 92f6b5564d Fixes failing js unit tests 2014-03-03 13:21:30 +01:00
perploug ce65ae8742 Updates to the installer UI
Adds database and packages step
2014-03-03 08:57:57 +01:00
Shannon 57c9d9ca7b Merge remote-tracking branch 'origin/6.2.0' into 7.1.0-installer
Conflicts:
	src/Umbraco.Tests/MockTests.cs
	src/Umbraco.Web/UmbracoContext.cs
2014-03-03 04:17:40 +01:00
Shannon feb9f40237 updates some ctors on umbraco context and routing context to have lazy overloads which allows us to more easily create/mock the umbraco context. 2014-03-03 04:16:09 +01:00
AndyButland c9d1123f0a Removed related links sorting up/down buttons and updated to use drag-drop 2014-02-28 14:42:45 +01:00
Shannon 3fc96a45a6 Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer 2014-02-27 10:16:45 +01:00
Shannon 3b71a6c3a5 asfsafd 2014-02-27 10:16:30 +01:00
perploug 9c4212703b umbraco base url 2014-02-27 10:00:38 +01:00
Sebastiaan Janssen a20c11d438 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-02-26 22:52:38 +01:00
Sebastiaan Janssen 89b8d056a2 Fixes #U4-4310 Missing Curly Brace in Boolean Property Editor 2014-02-26 22:52:13 +01:00
Sebastiaan Janssen 8707348215 Merge pull request #307 from BatJan/7.1.0
U4-4295 typo on front of admin
2014-02-26 22:42:00 +01:00
Jan Skovgaard 70ba0cd592 U4-4295 typo on front of admin 2014-02-26 19:51:56 +01:00
Shannon 429b5f7c01 Updates the completion stage of the installer 2014-02-26 16:49:35 +01:00
Shannon db4a547801 Fixes build issues 2014-02-26 16:39:40 +01:00
Shannon a9916fc415 Installer logic working for a new installer on sqlce 2014-02-26 16:30:25 +01:00
Shannon 64a37209b8 Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer 2014-02-26 16:01:48 +01:00
Shannon f9304d7f04 Gets lots of the new installer logic working 2014-02-26 16:01:31 +01:00
perploug 24ae424207 Fixed: U4-3851 More specific error when saving a user with no Section checkbox selected 2014-02-26 15:53:16 +01:00
Per Ploug Krogslund b86ef0d7ac Adds WIP installer files 2014-02-26 15:51:09 +01:00
Per Ploug Krogslund de97d8849a Fixes broken unit tests 2014-02-26 15:51:09 +01:00
Per Ploug Krogslund a3576d8564 Moves app controllers into seperate folder 2014-02-26 15:51:08 +01:00
Sebastiaan Janssen ffdf4e7256 Merge pull request #306 from coolmikkel/7.1.0
Name of Media items easyer to read
2014-02-26 09:46:19 +01:00
Shannon f9475305bb more install bits 2014-02-26 18:25:59 +11:00
coolmikkel 0a6208f3ef Name of Media items easyer to read
The contrast between the text color and background was to low. The text
color has to be darker - black would be the right one.
2014-02-25 22:11:38 +01:00
Shannon 00f2afe454 Creates Install MVC Area, creates new installer api controllers, moves old installer files to the new Area folder so that the /install path can route properly. 2014-02-26 04:15:14 +11:00
Shannon 3800ffc11c Fixes new membership providers to ensure no sql is run on init. Fixes the installer useLegacyEncoding setup to not attempt to set this when the legacy provider is enabled. 2014-02-26 02:57:05 +11:00
Shannon 2a9b1cb246 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
2014-02-25 03:30:32 +11:00
Shannon 651182f5de Fixes sql statement - to be like we have in v7 that supports all sql servers 2014-02-25 02:37:48 +11:00
Shannon 784f873777 updated to use constant 2014-02-25 02:36:25 +11:00
Shannon a938605461 fixes merge issue 2014-02-25 02:33:48 +11:00
Shannon bb9c968d3a fixes merge issues 2014-02-25 02:30:05 +11:00
Shannon b8fe5df3c9 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Configuration/GlobalSettings.cs
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web.UI/config/feedProxy.config
	src/Umbraco.Web.UI/config/tinyMceConfig.config
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
	src/Umbraco.Web.UI/config/umbracoSettings.config
	src/Umbraco.Web.UI/config/xsltExtensions.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-02-25 02:24:45 +11:00
Shannon 22b15a06f6 Fixes how member is approved is set by defaut and adds unit test for it. Also ensures that it returns true if the property value is invalid for whatever odd reason. 2014-02-25 02:10:25 +11:00
Shannon cb09795280 Removes new member service Creating event, as only Created makes sense. Deprecates the other 'Creating' events with a note to just use the Created event. 2014-02-25 01:45:41 +11:00
perploug 81dfd0c6bc #U4-3649 Fixed 2014-02-24 15:35:25 +01:00
perploug 9f028e6d61 Replace Crop() with GetCropUrl() 2014-02-24 15:35:24 +01:00
Sebastiaan Janssen ac57ec2211 Fixed U4-3648 v7, User without access to "Users" section can't change password
Added change password dashboard back
2014-02-24 13:15:45 +01:00
Sebastiaan Janssen 218bb28440 #U4-4245 Umbraco version number is really hard to see
Moved the version to the top when clicking "help", moved the css into main.less and made the text a little bit darker for contrast
2014-02-24 12:49:07 +01:00
Sebastiaan Janssen d02b230f71 Fixes #U4-4195 7.0.X PropertyValueEditor.GetDatabaseType FormatException on different regional settings 2014-02-24 12:08:33 +01:00
Sebastiaan Janssen 289361c02f Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-02-24 11:59:05 +01:00
Sebastiaan Janssen fc3020ffa4 #U4-4153 Fixed Macro snippets refer to 'MediaCurrent' and 'Show', also polishes other snippets a bit 2014-02-24 11:58:25 +01:00
perploug 7c4c44cf7e Enables the breadcrumb nav on media edit 2014-02-24 11:55:54 +01:00
perploug 458c51a955 Implements IHtmlString on imagecropdataset 2014-02-24 10:42:29 +01:00
perploug f3d64bb85d Fixes broken file resolver due to wrong alias 2014-02-24 10:30:35 +01:00
perploug 8261a2b69b Fixes U4-4271 U7.1 Nightly build 16 YSOD when editing doc type 2014-02-24 09:36:10 +01:00
Sebastiaan Janssen a5637af2d8 Adding missing CreateMember method that also as a convenience allows you to pass in the member type alias instead of a whole membertype 2014-02-22 18:32:26 +01:00
Sebastiaan Janssen ac59c5deb0 Fixing some potential upgrade issues and two issues found with the legacy member API
- For legacy API we never had and "approved" checkbox, so the assumption is that members are always approved
- The RequiresUniqueEmail check was wrong, previously the assumption was: if there's no e-mail then don't check for uniqueness
2014-02-22 16:44:02 +01:00
Sebastiaan Janssen 683ddf6d34 Apparently we rely on <error404>1</error404> to be in umbracoSettings.config 2014-02-22 16:03:59 +01:00
Sebastiaan Janssen eda33b1ac4 Update incorrect summary 2014-02-22 14:47:59 +01:00
Sebastiaan Janssen ed0f884348 Been a while: properly syncing /config/*.config with /config/*.Release.config 2014-02-21 17:50:58 +01:00
Sebastiaan Janssen b561351340 Update UI.Release.xml with the correct Partial View references 2014-02-21 17:33:19 +01:00
Sebastiaan Janssen 690ab29863 Use the database "agnostic" query for this (see U4-3876) 2014-02-21 17:01:59 +01:00
Jeavon Leopold b048ae4d36 U4-1752 - Add GetPreValueAsString(id) method to the @Umbraco helper 2014-02-21 10:17:29 +00:00
Shannon a1b3345671 fixes last unit test 2014-02-21 18:09:46 +11:00
Shannon e1022bd5a1 fixes another test 2014-02-21 18:04:15 +11:00
Shannon 1f2c00e3be fixes another test 2014-02-21 18:03:26 +11:00
Shannon bf4c58a6f4 fixed some config unit tests 2014-02-21 18:01:23 +11:00
Shannon 9de0a62cff Fixes merge issues 2014-02-21 16:43:49 +11:00
Shannon 3c3f2d7c8d Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Constants-Conventions.cs
	src/Umbraco.Core/DateTimeExtensions.cs
	src/Umbraco.Core/Models/PropertyType.cs
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
	src/Umbraco.Tests/App.config
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
	src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
	src/umbraco.MacroEngines/App.Config
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-02-21 16:32:53 +11:00
Shannon 27cb1d5223 completes: U4-4275 Hide built-in member type properties from the insert umbraco field list 2014-02-21 16:20:07 +11:00
Shannon c677f36f08 Changes some of the naming conventions for the underlying membership provider services bits. 2014-02-21 16:03:32 +11:00
Shannon 750f7a6b33 Updates some method names to be less confusing regarding permissions 2014-02-21 15:55:56 +11:00
Shannon dea804b402 fixes some permission logic and a unit test 2014-02-21 15:46:39 +11:00
Shannon 3803d1d7da fixes reflected property on dynamicnode and unit test 2014-02-21 15:22:02 +11:00
Shannon 3e67b3034d Added the ability to specify explicit db type's for a property type using an overloaded ctor argument. This allows us to specify explicit db types for properties without having them get overwritten during the repository saving logic which will always reset it to be the db type of the underlying property editor. In the case of our built-in membership properties we do not want this to happen. Fixes some unit tests. Removes built-in props from being included in the property types on the profile model on the front-end. 2014-02-21 12:56:00 +11:00
Shannon 1ada5210ad updated to latest examine 2014-02-21 09:54:53 +11:00
Shannon 92e1db1667 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-20 23:14:45 +11:00
Shannon f0258b2bce fixes merge issue 2014-02-20 23:14:39 +11:00
Shannon 9a608674eb fixes another test 2014-02-20 23:11:27 +11:00
Shannon 0fc5af5e17 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
2014-02-20 23:06:13 +11:00
Shannon 7dae412a29 fixes most of the newly failing unit tests and adds better null checking 2014-02-20 23:00:04 +11:00
perploug c3471ffbc3 Cropsizes config and upload compatible
Refactors imagecropper and fileupload to use the samen metadata setting
extensions
2014-02-20 12:59:15 +01:00
perploug f8baf343bf Fixing totally broken merge 2014-02-20 12:59:11 +01:00
Shannon b7f7775b89 adds initial commit of entity cloning 2014-02-20 22:34:54 +11:00
Shannon a1067e676f publicizes some repository factory methods and interfaces 2014-02-20 21:56:58 +11:00
Shannon ce649f54d7 Upgraded to latest examine, completes: U4-4240 Update with new examine version 0.1.53 2014-02-20 15:01:47 +11:00
Shannon 09b9056fb0 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-20 14:39:23 +11:00
Shannon 8da2c22a4e removes special default password check, this is no longer necessary. 2014-02-20 14:38:56 +11:00
Shannon d159792256 Updates last step of installer logic, we don't care about other providers as that would never have worked anyways 2014-02-20 14:38:00 +11:00
Shannon d08712306c updates logic for v7 new cols 2014-02-20 14:03:51 +11:00
Shannon 5e30fd4ced Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-20 13:56:37 +11:00
Shannon 314abde9ac fixes merge 2014-02-20 13:56:18 +11:00
Shannon 606b5aa60a fixes logic in membershiphelper updatemember 2014-02-20 13:55:56 +11:00
Shannon 5441c30780 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
	src/Umbraco.Web.UI/install/Default.aspx.cs
	src/Umbraco.Web/UmbracoModule.cs
2014-02-20 13:42:02 +11:00
Shannon 2c563168e7 Merge remote-tracking branch 'origin/7.1.0' into 7.1.0 2014-02-20 13:40:56 +11:00
Shannon 59f8508332 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Attempt{T}.cs
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2014-02-20 13:40:17 +11:00
Shannon a206652a0d updates login redirect logic to be more inline with v7, less greedy which is better. 2014-02-20 13:37:12 +11:00
Shannon 545040fdf0 Fixes installer upgrade 2014-02-20 13:09:54 +11:00
Sebastiaan Janssen 2954b31435 Enables change content type action for v7 as well (see issue 1468) 2014-02-19 21:48:17 +01:00
Shannon 40d1a09609 Updates the membership helper in how it updates the membership provider data, updates the editMember page to update the membership provider properties all via the membership provider 2014-02-19 23:49:53 +11:00
Shannon 2e25bc8fdb Moves all FindCOntrolRecursive calls to an extension method 2014-02-19 23:49:08 +11:00
Shannon 1618ac86b8 Adds implicit bool operator for Attempt, makes things nicer to check for success :) 2014-02-19 22:45:22 +11:00
Shannon a4adbca12c Removes the ability to edit the data type for a built-in membership property. Ensures that even if a data type is attempted to be changed with the API that the built-in properties are always persisted with the data type that we have defined by convention. 2014-02-19 21:56:33 +11:00
Shannon 8728e2f918 Fixes: U4-4260 When changing sort order on member type and saving, this doesn't get reflected on the member 2014-02-19 20:17:21 +11:00
Shannon d6b55c54e6 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-19 17:54:07 +11:00
Shannon cd53682ddb removes ability to configure custom fields for the new membership provider 2014-02-19 17:52:45 +11:00
Shannon d000b67703 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-19 17:27:42 +11:00
Shannon e2d5fbf545 Fixes issue with ensuring properties on entities when a new property type has been created - but if the property type doesn't have an id, we should ignore it. 2014-02-19 17:27:08 +11:00
Shannon a6c4ce3a31 fixes some merge issues 2014-02-19 17:26:19 +11:00
Shannon 64246b4eef fixes build 2014-02-19 17:08:55 +11:00
Shannon fe8098adac Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs
2014-02-19 17:02:25 +11:00
Shannon d339e7c814 updates the property type editability for built in member types 2014-02-19 16:57:33 +11:00
Shannon 9860ffc3bf Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Constants-Conventions.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/MemberType.cs
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2014-02-19 16:55:56 +11:00
Shannon 7db829b2a3 updates convention data types 2014-02-19 16:50:45 +11:00
Shannon 10759773ca Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-02-19 16:36:28 +11:00
Shannon 078deb704b Completes: U4-4255 Add readonly membership provider properties to the profile model 2014-02-19 16:27:14 +11:00
Shannon 6858eb3330 Fixes: U4-4257 Fix member type editor to not have to re-call 'Save' so many times,
streamlines how the show property and editable property on member type's are dealt with (removes tuples)
2014-02-19 16:14:34 +11:00
Shandem 16e16f9578 Merge pull request #299 from kgiszewski/feature-slider-fix
Fix broken path
2014-02-19 15:35:30 +11:00
Shannon e267b7700a Ensures that member properties are created when member type property type's are added (same as U4-1407), streamlines how this occurs on the base class. Streamlines how empty aliases are validated at the repo level for members, media, content. Makes built-in member property type's non-editable 2014-02-19 14:23:48 +11:00
perploug f780c21ef0 Removed crops from umbracoSettings.cfg 2014-02-19 00:19:18 +01:00
perploug 84e7396729 Ensure that umbracoFile doesnt try to process json as a filepath 2014-02-19 00:19:17 +01:00
perploug 7ed11c04c5 Updates yepnope cache in jsinit.cs to append correct rnd value 2014-02-19 00:19:16 +01:00
perploug 81305173ca Changes imagecropper to store config in its property data 2014-02-19 00:19:15 +01:00
perploug 6637ceaf41 Add support for looking up 3rd party editor file paths
Adds a file resolver on the mediaHelper, property editors can then
register a resolver to return file paths from whatever format
2014-02-19 00:19:13 +01:00
perploug 82d5f7b72b Adjusted assetsService to deal with weird yepnope behaivior 2014-02-19 00:19:12 +01:00
perploug e69dea26a5 Adds extra null checking when looking up active tree 2014-02-19 00:19:11 +01:00
Kevin Giszewski 85d6f1d54a Fix broken path 2014-02-18 11:07:14 -05:00
Kevin Jump 366697f4eb PackageService: Fixes Single import for DataTypes
Importing a file with a single data type failed, because the DataType
element is at the root when exported.
2014-02-18 15:10:11 +00:00
Kevin Jump 987644379e Fix U4-4119 - Export Fails for Generic Properties
Adds null checking for PropertyGroupID on export so that properties with
no group (tab) don't throw an exception.
2014-02-18 15:07:47 +00:00
Shannon f168093b92 Merge commit 'f06c9e823545d8e86309bb751e63b99a2a3b1a18' into 7.1.0
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/packages.config
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs
2014-02-18 18:03:29 +11:00
Shannon 1e45abe71e oops, changes the failedpassattempts back to noedit 2014-02-18 17:58:57 +11:00
Shannon a556b4ed21 Logs warnings if accessing built-in properties on the member model but the underlying property type is missing. 2014-02-18 17:53:02 +11:00
Shannon 953c711ca4 Updates the default member type property types to use "Labels", then needed to update the member type repo and membertypereadonlyfactory to ensure that even though the underlying data type for the property exposes a different Db Type that we 'reset' that Db Type to what it always should be. This means that no matter what underlying data type a developer changes a property to, if it is a built-in membership property, the Db Type will always stay consistent and save in the correct column. Of course if someone enters some invalid data, then the data will not be saved. 2014-02-18 17:19:38 +11:00
Shannon f06c9e8235 Ensures the default member type properties are put on a custom tab 2014-02-18 15:39:00 +11:00
Shannon f1a439e851 removes version specific references to mysql in the proj files and web.config
ensures that escaping in the sql expression classes is done correctly without any double escaping. Also ensures that escaping is happening using the equals operator, not just the Equals() method and adds unit tests for them.
Fixes: U4-4232 Umbraco.Core.Persistence.Querying issue with backslashes
2014-02-18 14:57:03 +11:00
Shannon 20c2574f94 Merge remote-tracking branch 'origin/7.0.4' into 7.1.0
Conflicts:
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
	src/umbraco.providers/UsersMembershipProvider.cs
2014-02-18 11:11:57 +11:00
Shannon ab4c58b3a3 restores BuildBelle 2014-02-18 11:11:06 +11:00
Shannon cb63642ce9 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-02-18 10:48:51 +11:00
perploug 3fb756939e ImageProcessor config files 2014-02-17 16:17:18 +01:00
perploug ec14a16aec ImageCropper Razor models + helpers 2014-02-17 16:17:17 +01:00
perploug 6944f25c9f Fixes Assets.Service callback not firering 2014-02-17 16:17:16 +01:00
perploug 45c7699a33 Footer breadcrumb navigation 2014-02-17 16:17:09 +01:00
perploug 2bd2f12831 ImageCropper Upload enabled
The cropper can now fully replace the upload datatype
2014-02-17 16:17:02 +01:00
Shannon a0e496e589 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-02-17 21:38:38 +11:00
Shannon e0dcc3afbc Streamlines how strings are escaped with the sql expression helpers and syntax providers. Fixes: U4-4232 Umbraco.Core.Persistence.Querying issue with backslashes 2014-02-17 21:38:13 +11:00
Stephan a4b1b31a24 U4-4241 - UrlAbsolute() returns relative urls 2014-02-17 10:49:26 +01:00
Stephan 3634a77d61 U4-4241 - UrlAbsolute() returns relative urls 2014-02-17 10:47:51 +01:00
Shannon 13f76f7922 Updates version
Signed-off-by: Shannon <sdeminick@gmail.com>
2014-02-17 20:41:53 +11:00
Shannon d12a9e046f Fixes: U4-4172 Change password in users section not working (u7.0.3)
Signed-off-by: Shannon <sdeminick@gmail.com>
2014-02-17 20:41:30 +11:00
Shannon 846f4b5b6c Removes the various old hacks for the legacy user's membership provider, now that we have the AllowManuallyChangingPassword flag, these hacks are not required. 2014-02-17 19:32:04 +11:00
Shannon 2869f17eff ensures the default property aliases are set during ctor 2014-02-17 18:02:29 +11:00
Shannon b73c39b4e9 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
	src/Umbraco.Core/Services/UserService.cs
	src/Umbraco.Tests/Services/PerformanceTests.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
2014-02-17 17:48:16 +11:00
Shannon feefb052fd Updates the BulkInsertRecords method to optionally close the trans - shouldn't by default. Updates how permissions are handled in the new services and exposes another method, ensures it's all wrapped in trans and ensures that cache is cleared properly. Fixes: U4-4213 "Replace child node permissions" does not work if all permissions cleared 2014-02-17 17:45:59 +11:00
Shannon 87f93be6ba updates version 2014-02-17 16:06:46 +11:00
Shannon 7e7c4b52b6 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/PluginManager.cs
2014-02-17 15:59:43 +11:00
Shannon 4d2d9156ba updates more plugin manager defs 2014-02-17 15:58:57 +11:00
Shannon a1603c3cbd Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Models/Membership/EntityPermission.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
	src/Umbraco.Core/PluginManager.cs
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web/Search/ExamineEvents.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
2014-02-17 15:56:48 +11:00
Shannon 82ba1a24a3 Ensures we perform null checks in both GetAll and GetByQuery as we never want to include a null item in the resultant collection - which could happen depending on what the sub class repository is doing.
Fixes: U4-3145 Cache file periodically becomes corrupted: "Oops: this document is published but is not in the cache (internal error)"
2014-02-17 15:45:36 +11:00
Shannon 357db9d0b6 completes: U4-3282 Expose permission assignment methods at the service layer 2014-02-17 15:33:17 +11:00
Shannon 61766287bc Cleans up some more of the old 'object' User Id references. 2014-02-17 15:26:38 +11:00
Shannon ffbf8b2fd6 completes: U4-4103 Publicize PluginManager for devs to use to create their own plugins 2014-02-17 15:08:27 +11:00
Shannon e8c25283b0 Fixes: U4-2876 Ensure runtime cache is cleared with ICacheRefreshers when macro's change since they use the RuntimeCacheProvider 2014-02-17 15:03:49 +11:00
Shannon f7a703195c Fixes: U4-4215 Tree.config registeres tree inconsistently 2014-02-17 14:56:12 +11:00
Shannon 848e8b5722 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-17 14:15:54 +11:00
Shannon 4d316c9671 fixing some casting 2014-02-17 14:15:40 +11:00
Shannon 509be9b431 Updates the underlying UmbracoServiceMembershipProvider to deal with 'object' for provider key, this then lets us deal with either guid or int for the new membership provider, just like the old one does. 2014-02-17 14:14:17 +11:00
Shannon 8154382fb1 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-02-17 13:17:19 +11:00
Shannon 10ef5eb7bc adds new interface for members' membership providers to implement so we know what aliases to store data against. 2014-02-17 13:16:28 +11:00
Shannon f4c1c4578f adds some null checking 2014-02-17 12:56:37 +11:00
Shannon 6f15949af7 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-17 12:24:37 +11:00
Shannon 2849ecadb7 fix legacy member wrapping new api and mixing email/login name 2014-02-17 12:24:11 +11:00
Shannon 778c698ef7 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-17 12:10:12 +11:00
Shannon 697f93c3ce removes null check for LoginName, since it gets set to the name passed in if it is empty 2014-02-17 12:09:27 +11:00
Shannon e6c2f0ad70 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-17 11:50:39 +11:00
Shannon 13976559a8 Created a EntityNotFoundException to use when we are expecting an umbraco entity found. Updates some code to use this exception. 2014-02-17 11:50:13 +11:00
Shannon 18121e8726 Enxures user start node's are -1 by default when creating the model. 2014-02-17 11:48:32 +11:00
Shannon 8b6583b554 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-02-17 11:23:24 +11:00
Shannon 234d4cf427 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0
Conflicts:
	src/Umbraco.Core/Models/Template.cs
2014-02-17 11:23:02 +11:00
Shannon 81cdc71145 Ensures new user objects are approved by default. 2014-02-17 11:17:15 +11:00
Sebastiaan Janssen f822400036 Fix broken build 2014-02-15 14:24:40 +01:00
Shannon 2aae108cb4 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Web/Security/WebSecurity.cs
2014-02-13 17:21:30 +11:00
Shannon 4069fc8d1f fixes issue with legacy user.Password property and fixes comparison of sections 2014-02-13 17:19:28 +11:00
Shannon 643f05d949 fixes some more merge issues 2014-02-13 16:56:23 +11:00
Shannon d36cd035e9 Fixes merge issues 2014-02-13 16:46:52 +11:00
Shannon c4acbf0dbc Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs
	src/Umbraco.Core/Constants-Conventions.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/IMemberTypeService.cs
	src/Umbraco.Core/Services/IMembershipUserService.cs
	src/Umbraco.Core/Services/IUserService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Core/Services/MemberTypeService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Core/Services/UserService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/MockTests.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Breadcrumb.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListAncestorsFromCurrentPage.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesFromCurrentPage.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesOrderedByDate.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesOrderedByName.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesWithDoctype.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListDescendantsFromCurrentPage.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/MultinodeTree-picker.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Navigation.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/SiteMap.cshtml
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.cs
	src/Umbraco.Web.UI/config/umbracoSettings.config
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Controllers/UmbLoginController.cs
	src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
	src/Umbraco.Web/Controllers/UmbProfileController.cs
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
	src/Umbraco.Web/Models/LoginModel.cs
	src/Umbraco.Web/Models/LoginStatusModel.cs
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/UmbracoApiController.cs
	src/Umbraco.Web/umbraco.presentation/library.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewMacrosTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbracobase/baseLibrary.cs
	src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs
	src/umbraco.businesslogic/User.cs
	src/umbraco.providers/UsersMembershipProvider.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-02-13 16:22:51 +11:00
Shannon 0a80c39962 Fixes merge 2014-02-13 15:25:57 +11:00
Florian Verdonck edee8134c2 Updated request after feedback 2014-02-13 15:21:40 +11:00
Shannon 2f66303b38 Merge branch 'KevinJump-7.0.2' into 7.1.0 2014-02-13 15:12:02 +11:00
Shannon 7102ed49ec Merge branch '7.0.3' of https://github.com/stevetemple/Umbraco-CMS into stevetemple-7.0.3
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
2014-02-13 15:00:42 +11:00
Shandem f5d94c3a05 Merge pull request #294 from nojaf/patch-1
Changing MasterTemplateId to public
2014-02-13 14:48:24 +11:00
Shannon 92502f946b Merge branch '7.0.3' into 7.1.0 2014-02-13 14:49:00 +11:00
Shannon 30a73c0886 updated web.config template to use new role provider. 2014-02-13 14:45:24 +11:00
Shannon f5ee02a3e9 Updates the membership partial view templates to redirect to current page by default but allows this to be overridden. Creates a new RedirectToCurrentUmbracoUrl method which is slightly diff from RedirectToCurrentUmbracoPage since it doesn't care about the actual page item rendering, just the currently rendered URL which is useful if coming from a rewritten URL (which is what happens with public access rewrites) 2014-02-13 13:30:32 +11:00
Shannon 9827b40bea Fixes: U4-4223 MVC based forms with SurfaceControllers don't work when rendered in Webforms mode.
This slightly changes how the routing works in the module, now we always send the request to the RenderRouteHandler, this will first process the logic for route hijacking, then it will determine if the request was found to be a WebForms template, if so then we'll return the webforms handler. This also now allows us to have POSTed values to SurfaceController's from forms that have been rendered in Webforms whilst maintaining all viewdata, tempdata and model state on postback even when rendering in webforms!
2014-02-13 13:19:51 +11:00
Shannon 2de6f09634 Adds configuration section classes for the image cropping + unit tests. 2014-02-13 11:01:37 +11:00
Sebastiaan Janssen df16a69582 Merge pull request #295 from loedeman/patch-1
Update nl.xml
2014-02-12 13:37:09 +01:00
Stephan f9323c85e4 Fix issue with 9d7b3b96 in .designer.cs file 2014-02-12 13:22:35 +01:00
Stephan 2677672e50 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2014-02-12 13:22:30 +01:00
Morten Christensen a38e0dcf86 Adding integer overload for UmbracoEntity so it can be used with a dynamic object containing either a boolean or integer retrieved from the database to initialize the UmbracoEntity object. 2014-02-12 12:47:47 +01:00
Stephan fdd7227494 Fix DynamicPublishedContent to use CleanStringType.ConvertCase 2014-02-12 10:46:57 +01:00
Stephan 6b74e14cdd Backport DefaultShortStringHelper from 7.1 2014-02-12 10:40:00 +01:00
Stephan db528d8d7a U4-4199 - undef debug code in release 2014-02-12 10:23:59 +01:00
Shannon 9d7b3b965a fixes some issues with new bundles. 2014-02-12 18:19:20 +11:00
Shannon 806008a7e9 Fixes issue with @ symbols in login name and a member group query 2014-02-12 18:02:00 +11:00
Shannon 45fa192c95 Fixes some unit tests 2014-02-12 17:25:45 +11:00
Shannon 92235128f1 Got new MemberGroupService done, completed the MemberService for role based stuff, created a member group cache refresher since we are caching member groups by name (probably should cache others too). Public access stuff changes if a name of a member group is changed which is now done with an event instead of coded into the biz logic. 2014-02-12 17:14:16 +11:00
loedeman 06cb7a529e Update nl.xml
I've updated the Dutch translation based on the current 7.0.2 English translation (en.xml) since I would rather not start liking the placeholders ;) ...
2014-02-11 19:56:08 +01:00
perploug fa4e9d0cd1 Merge remote-tracking branch 'origin/7.1.0-ImageCropper-WIP' into 7.1.0 2014-02-11 14:56:41 +01:00
perploug 764644fc5d Merge 2014-02-11 14:55:22 +01:00
perploug 0bf27f4371 Make sure the formcontroller reset dirty state on save 2014-02-11 14:48:06 +01:00
Shannon 7622937cfd implemented remaining methods for member groups/roles + unit tests 2014-02-11 20:38:48 +11:00
Shannon bf41694572 Fixed up some more of the member group + member stuff with more unit tests 2014-02-11 19:21:36 +11:00
Shannon 7b897ce64c Member group repo updated along with the member service to support roles, etc... got first of many unit tests passing. 2014-02-11 12:43:55 +11:00
perploug 36a8599e62 Adds cache bursting to production mode
Package installer bumps CDF version, we make sure to purge the angular
cache
initial js loader gets a cache burst as well
2014-02-10 13:02:16 +01:00
Shannon 1ca950f721 Starts creating the IMemberGroupService and supporting classes. 2014-02-10 19:48:16 +11:00
Shannon ffba271fd0 Creates the MemberGroupRepository and supporting models. 2014-02-10 19:35:32 +11:00
Shannon ec08d3e910 Updates MembershipHelper to not change the email/name if the value has not changed. Updates the templates to show only validation summaries for their own values/prefixes. Fixes some underlying MVC methods that merge view state to ensure the prefixes work with validation summaries properly when not showing property level errors. Updates the Umb controllers to add model level validation msgs when failed. 2014-02-10 18:34:12 +11:00
Shannon 0bfd032fad Obsoletes the RedirectOnSucces on the RegisterModel as it is not needed. Adds RedirectUrl to the ProfileModel and updates the controller to redirect properly (ensures it doesn't just redirect to home!) 2014-02-10 16:46:45 +11:00
Shannon 2bb58b6fca Updates MembershipHelper to ensure that the membership provider is used when updating a profile, specifically to deal with unique emails. Updates the profile edit template to have correct validation procedures. 2014-02-10 16:22:15 +11:00
Shannon 4d2d656b3d Moved ChangePassword method to MembershipHelper and makes it public, adds an overload. 2014-02-10 14:29:29 +11:00
Shannon fa625d72f9 updates some comments 2014-02-10 14:12:44 +11:00
Shannon 1991380e02 Changes CDF version to be the hash code of UTC now 2014-02-10 13:53:12 +11:00
Shannon 3b8d6dc2c7 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2014-02-10 13:50:43 +11:00
Shannon 1faeb76c27 Removes the need for duplicate templates for partial views. Of course we can have partial view only templates if necessary but currently we just borrow them from the partial view macros and update the header 2014-02-10 13:50:31 +11:00
Florian Verdonck a064903e90 Updated request after feedback 2014-02-08 00:28:52 +01:00
perploug 2850c3c3de Improved caching in debug mode by adding global yepnope filter 2014-02-07 15:45:52 +01:00
Florian Verdonck 1fa7cd234d Changing MasterTemplateId to public
When you create a Template in code, I think there is no way to define a masterTemplate. If MasterTempateId were to be public it could be done.
2014-02-07 09:39:10 +01:00
perploug cec8001c38 Fixes issue with MediaHelper and complex property values 2014-02-07 09:16:05 +01:00
perploug 7dbd21a854 ImageCropper Added as a real property editor + polish
Polishing the UI, it can now edit actual image data and store crop
points / center point as json, next add configuration service
2014-02-07 09:15:44 +01:00
Sebastiaan Janssen 3a513668fd U4-4185 Log fails to show unicode (cyrillic) characters 2014-02-05 15:52:20 +01:00
perploug 9ff82f3a00 Removes unneeded loging in umbpanel.directive 2014-02-04 13:58:13 +01:00
perploug 25999be0c9 Improves sticky footer button detection
Refactored the event hooks, added a watch on the buttons position
2014-02-04 12:53:09 +01:00
perploug 853baf9462 Final tweaks to the unsaved changes dialog 2014-02-04 11:40:16 +01:00
Per Ploug Krogslund 6f36384a35 Merge branch '7.1.0-LocationChangeNotificatiion' into 7.1.0 2014-02-04 09:46:54 +01:00
Per Ploug Krogslund d55e492d17 Route change confirm notification dialog 2014-02-04 09:46:14 +01:00
Per Ploug Krogslund fcbdf6c635 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-02-03 21:50:30 +01:00
Per Ploug Krogslund 1fda22a4e0 Merge branch '7.1.0-LocationChangeNotificatiion' into 7.1.0 2014-02-03 21:48:23 +01:00
Per Ploug Krogslund deeaf724bd Fixes missing dependencies 2014-02-03 21:04:11 +01:00
Per Ploug Krogslund 34824ffbb0 Confirm navigating away from unsaved content 2014-02-03 21:03:43 +01:00
Per Ploug Krogslund 6f28a0a686 Updates NotificationService to support custom views
This allows us to inject small UI components as overlays ontop of
editors
2014-02-03 21:03:24 +01:00
Sebastiaan Janssen b3f6a8c71b Merge branch '7.0.3' into 7.1.0
Conflicts:
	.gitignore
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
2014-02-03 11:52:36 +01:00
Sebastiaan Janssen 98684e6292 Add 100 to the ClientDependency.config version to avoid conflicts with older caches 2014-02-03 10:23:13 +01:00
Steve Temple aad0e73fea Add customConfig back into rte 2014-01-31 23:18:49 +00:00
perploug 9687b2abee Special rule for installer password change 2014-01-31 13:03:46 +01:00
perploug 4ea589e954 Missing changes on ContentPickerControler re-added 2014-01-31 11:38:24 +01:00
perploug 621a19d4bd Final tweaks to TreeSource picker
Better help text, polish icons and margins, made sure it toggles UI
correctly for each type of tree

(cherry picked from commit 9ce79e98a3)

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
2014-01-31 11:38:23 +01:00
perploug 5821444678 Fixes inconsistently named private method
Replaces delegates with lambdas

(cherry picked from commit 2a81162756)
2014-01-31 11:38:22 +01:00
perploug 7533baf368 fixes mntp filtering
(cherry picked from commit 3e22598f4a)
2014-01-31 11:38:21 +01:00
perploug d691e525b3 Adds support for xpath root node selection on mntp
(cherry picked from commit d842f0f5b7)

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
2014-01-31 11:38:20 +01:00
perploug 02d9d42ae2 adds getByQuery to entityService
(cherry picked from commit 8258619055)

Conflicts:
	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
	src/Umbraco.Web/Editors/EntityController.cs
2014-01-31 11:38:19 +01:00
perploug 17838e044c Addss template clearing when in debugmode
(cherry picked from commit 7d2f6c13c3)
2014-01-31 11:38:18 +01:00
Stephan 73173f92d6 U4-4144 - fix 2014-01-31 10:33:23 +01:00
Per Ploug Krogslund 7d7fcd2093 Wip on dropper and gravity editor directives 2014-01-30 22:28:50 +01:00
Stephan 2ab1cf59a6 U4-2317 - issue with domains & languages management 2014-01-30 16:19:09 +01:00
Stephan 3ef51d7357 U4-2317 - issue with domains & languages management 2014-01-30 16:18:06 +01:00
Stephan 56cd1cee81 U4-4160 - make sure string properties are returned as strings 2014-01-30 15:08:13 +01:00
Stephan 002988ce86 U4-4144 - Media Cache dies due to new 'key' property in XML 2014-01-30 08:48:35 +01:00
perploug 81c32716fe Removes pre-checkpassword check 2014-01-29 22:04:37 +01:00
Stephan 8b553dd067 U4-4144 - work around media cache exceptions on invalid properties 2014-01-29 19:30:17 +01:00
perploug c52123e878 adds mock cropper data for WIP prototype 2014-01-29 14:30:51 +01:00
perploug 4e6ca57f7a Chore: seperate media + image helpers into 2 files 2014-01-29 14:30:35 +01:00
perploug ce9cfbf071 Chore: update media+mediahelper mocks 2014-01-29 14:30:17 +01:00
perploug 8024bde429 Imaging directives (crop, gravity and preview) 2014-01-29 13:44:34 +01:00
perploug 9ce79e98a3 Final tweaks to TreeSource picker
Better help text, polish icons and margins, made sure it toggles UI
correctly for each type of tree
2014-01-29 11:21:54 +01:00
perploug 3e5553d9b0 Fixes weird issue with user language dropdown 2014-01-29 09:50:37 +01:00
Shannon c2f34cefb5 Merge branch '7.0.2' of https://github.com/rsoeteman/Umbraco-CMS into rsoeteman-7.0.2 2014-01-29 11:26:05 +11:00
Shannon ccaf82d797 Fixes object extensions for dates with a 'kind' specified. 2014-01-29 11:21:35 +11:00
Shannon 2f7727af68 Fixes: U4-3894 Date picker with time resets to "måndag januari 1, 0001" on Republish entire site 2014-01-29 11:20:25 +11:00
Shannon 5a9874bfad Fixes U4-3894 Date picker with time resets to "måndag januari 1, 0001" on Republish entire site 2014-01-29 11:19:59 +11:00
perploug 5047c7bbe7 Fixes: U4-4155 Backend CSS Rich Text Editor Path Issue 2014-01-29 00:28:56 +01:00
perploug 0c45fb1b97 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-01-28 23:50:58 +01:00
perploug 7bd745a870 WIP: Tree icon colors 2014-01-28 23:50:25 +01:00
Shannon 68b4a493c6 updates versions and port 2014-01-29 09:46:25 +11:00
Shannon 6338d57959 Cherry picked - Removes hard coded api url from rte embed 2014-01-29 09:34:07 +11:00
Shannon 7de1b2d09d Fixes ServerVariablesParser to have a proper event declared! :P 2014-01-29 09:33:14 +11:00
Tim Geyssens 93a4e8f426 Removes hard coded api url from rte embed 2014-01-28 16:18:30 +01:00
Tim Geyssens fcc115004e Updates server vars with embedApiBaseUrl 2014-01-28 16:11:57 +01:00
perploug 24062c0061 Rolls back listview items in dialog trees 2014-01-28 15:49:04 +01:00
perploug 06cbdc37b4 Fixes: U4-4143 In rich text editor, non ASCII characters in source code window are encoded
Also at the same time fixes missing config import from serverside config
2014-01-28 15:45:14 +01:00
Shannon f28ae52ae3 moved logic to update a profile to MembershipHelper. 2014-01-28 21:57:00 +11:00
Shannon cfd0973f00 Moves the registration logic to the MembershipHelper, fixes up the views to keep the indexes so props save. 2014-01-28 21:42:30 +11:00
Shannon 1bfdd83ba7 Cleans up more of the membership controllers and snippets to be using the membership helper and fixes up a few issues 2014-01-28 19:41:21 +11:00
Shannon 6fefcacc61 Adds more methods to the MembershipHelper, updates the RegisterModel and obsoletes the standard ctor so biz logic is not happening in the model, updates the snippets to use the correct way. Fixes an issue in the membership repo for persisting new members when the member type doesn't contain all the built-in props. 2014-01-28 18:59:27 +11:00
Shannon 3b639e61b2 Exposes MembershipHelper onthe UmbracoViewPage so people can use it directly in views. 2014-01-28 17:02:20 +11:00
Shannon 9959ff667e publicizes MembershipHelper and exposes it on the various base classes: SurfaceController, UmbracoApiController and UmbracoUserControl as the property "Members", will add more helper methods. 2014-01-28 16:58:55 +11:00
Shannon de1f86c7a1 adds logic to the membership helper to create a new LoginStatusModel with the values filled in, obsoletes the empty ctor on LoginStatusModel since that does some biz logic lookups, instead replaces it with a static method to create an empty one. 2014-01-28 16:30:58 +11:00
Shannon 28d8fd0531 Changes LoginStatusModel to use the correct api and updates the new membership provider stuff to ensure that the provideruserkey is the int id of the model for backwards compatibility. 2014-01-28 16:13:05 +11:00
Shannon e4e76eb0bf Backports commit: Prefixed built in controllers to better avoid conflicts with people's custom code
Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web/Controllers/UmbLoginController.cs
	src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
	src/Umbraco.Web/Controllers/UmbProfileController.cs
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
	src/Umbraco.Web/Umbraco.Web.csproj
2014-01-28 13:47:16 +11:00
Shannon 677cc8c8fd Fixes ProfileController to use normal .Net APIs and the new members service - also removes the Response.Redirect that was in there, why was it like that? 2014-01-28 13:35:43 +11:00
Shannon 3fa5c4e0b2 Updates RegisterController with the standard ASP.Net APIs to create and login a member. 2014-01-28 13:21:30 +11:00
Shannon 360393c464 Fixes LoginStatusController to use the standard ASP.Net APIs 2014-01-28 13:07:25 +11:00
Shannon d3daf88a8d Fixes the LoginController to use the correct APIs 2014-01-28 12:58:22 +11:00
Shannon 7a99ebd6d9 Starts the implementation of the new role provider. 2014-01-28 12:48:41 +11:00
Shannon a7298e2e5a Completes: U4-4148 Anytime RuntimeCacheProvider or InMemoryCacheProvider is used, a cache refresher will need to handle it's distribution! 2014-01-28 12:20:10 +11:00
Shannon 15d7443c61 Streamlines the content type cache refreshing, leaving some of the legacy cache clearing but that shouldn't really have an effect, with these new changes it should be guaranteed that the distributed cache is executed always for Doc, media and member types. 2014-01-28 12:13:27 +11:00
Shannon f2b7e27b34 Fixes: U4-2721 RuntimeCacheProvider is not cleared when data type changes and updates the repo factory to not use the InMemory cache provider since we should only ever use that for very very specific reasons since the memory can never auto-clear with that provider. 2014-01-28 11:30:02 +11:00
Shannon 690d08aa8c Completes wrapping the new IUserService from the legacy User object. Ensures User cache is handled correctly and distributed cache is updated for Users. 2014-01-28 10:46:59 +11:00
Shannon 6719d70cc0 Updates UserTypeCacheRefresher to clear the runtime cache accordingly. 2014-01-28 09:22:01 +11:00
Shannon 3cdcf513ec removes ancient test project 2014-01-28 09:00:17 +11:00
Shannon 23d9944a61 Merge branch '7.0.2' of https://github.com/kalletoxic/Umbraco-CMS into kalletoxic-7.0.2 2014-01-28 08:47:09 +11:00
perploug 31429ad9c8 Fixes treenodes with very long names breaking the tree 2014-01-27 22:09:16 +01:00
perploug 05a8d80284 Fixes broken refresh action
Refresh action referenced the tree, not its root node
2014-01-27 22:08:40 +01:00
perploug c2d978a0db Enables listview children in dialog trees
By default trees doesnt show children of listview nodes, this enables
them in dialog trees, otherwise content pickers cannot select childrens
of a listview node
2014-01-27 22:03:52 +01:00
perploug e17b32c6e5 Removes option to query media with Xpath on mntp
Only content can be queried with Xpath in a reasonable performant manner
as its the only type of data that is cached as xml
2014-01-27 13:49:09 +01:00
perploug de79512dd4 Adds overloads to relationService.AreRelated
Allows to lookup relations based on type and alias of type when doing
"AreReleated()" checks
2014-01-27 13:45:54 +01:00
Mårten Palm 4a095184bb Prevent NullReferenceException
The variable val was not referenced later in the function and caused a
NullReferenceException.
2014-01-27 10:54:41 +01:00
Richard Soeteman 06ae6ad15e Fix media.save throws an error in Umbraco 7.0.x
See http://issues.umbraco.org/issue/U4-3928 width and Height properties
are assigned on the file media types.  This was because of always
assigning a value to
content.getProperty(uploadFieldConfigNode.WidthFieldAlias).Value

Added an if statement to make sure the media item is an image when
assigning those values.
2014-01-27 10:15:14 +01:00
perploug 2a81162756 Fixes inconsistently named private method
Replaces delegates with lambdas
2014-01-27 08:27:31 +01:00
perploug 0a7526601c Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-01-24 18:41:46 +01:00
perploug 3e22598f4a fixes mntp filtering 2014-01-24 18:38:47 +01:00
perploug d842f0f5b7 Adds support for xpath root node selection on mntp 2014-01-24 18:38:39 +01:00
perploug 8258619055 adds getByQuery to entityService 2014-01-24 18:38:08 +01:00
perploug 7d2f6c13c3 Addss template clearing when in debugmode 2014-01-24 17:20:34 +01:00
Shannon b314bff127 Creates powershell file to do the build, this detects if you have sandcastle installed first, also overwrites the default TOC.css file with a custom slightly nicer version for the output. 2014-01-24 18:23:37 +11:00
Shannon d66e2e52e9 adds additional bat files to the sln files for editing, adds the sandcastle help file config file that can be used to build the docs when sandcastle is installed. 2014-01-24 16:31:49 +11:00
Shannon 43c426b46c Update booting.aspx
Throw the exception immediately if the parameter is not there or empty.

If the parameter is not there it's defaulted to the current url, and this will redirect to itself and create an endless loop here.
2014-01-24 12:36:02 +11:00
Shannon 0714aaa457 Merge remote-tracking branch 'origin/7.0.2' into 7.1.0 2014-01-24 12:34:40 +11:00
Shandem 81dac97917 Merge pull request #284 from markvantilburg/patch-1
Update booting.aspx
2014-01-23 17:33:22 -08:00
Shannon de6e0dc8d7 Merge branch '7.0.2' into 7.1.0 2014-01-24 12:32:07 +11:00
Kevin Jump 57c68daf38 Fix Template Import when template has no master
Importing a template with no master template (i.e when it's at the root)
caused an error. Added check for MasterTemplateId != null - (tried
.IsValueCreated but that generated a object not set exception)
2014-01-23 16:07:07 +00:00
Kevin Jump a705561a51 Fix Importing Macro when macro already exists
ParseMacroElement called by ImportMacro was no checking for to see if
the macro or properties already exists - caused SQL errors on import of
macro. Added check to look for existing macro, and only add new
properties on import (in line with other import methods)
2014-01-23 16:05:08 +00:00
Kevin Jump a7107f01e8 Single DataType import Fix
Importing a file with a single data type failed, because the DataType
element is at the root when exported.
2014-01-23 15:57:50 +00:00
Shannon e2ac82abca Gets most of the User and UserType legacy objects wrapping the new services, yay! Now just need to sort out all the caching stuff which I have tasks for. 2014-01-23 18:44:41 +11:00
Shannon 64d1a484bd Fixes User Id issues with HasIdentity, wraps legacy UserType to the new service, fixes the uninstalling db schema to not throw exceptions and clog up the unit test log. 2014-01-23 17:11:58 +11:00
Shannon 585b42af48 More Save()'s missing and removes the extra calls to XmlGenerate - should save some processing time. 2014-01-23 16:13:29 +11:00
Shannon 7c4412fc4b Ensures that Save() is called wherever member data is saved 2014-01-23 16:09:59 +11:00
Shannon 0be8039c8f Changes how IProfile works which is now just exposed by the IUser instead of implemented, this cleans up the Id situation. 2014-01-23 15:31:49 +11:00
Shannon 668265f1ac Allows forcing pass change with new provider, updates conventions to not allow editing of question/answer - unfortunately cannot make the other ones readonly because noEdit data type is the wrong clr type. 2014-01-23 15:11:54 +11:00
Shannon 4735f27a66 Fixes more naming conventions with CreateMemberWithIdentity, fixes memberTasks to ensure the name is set, fixes new membership providers which had the name/email call reversed. Updates the cache refresher event handler to listen to MemberService events instead of the old legacy API events. 2014-01-23 14:55:41 +11:00
Shannon 6377b9aa50 Fixes some underlying type conversions, fixes more of the member type wrapping, updates contenttypecontrolnew to work with member types properly, ensures the property type cache is cleared when member types change. 2014-01-23 13:33:58 +11:00
Shannon 011be60205 Finishes wrapping the member service and fixes a few bugs - ensures the RepositoryBase doesn't keep enumerating when getting all 2014-01-23 12:30:28 +11:00
Shannon a272675ed8 Wraps the MemberService from the legacy Member object 2014-01-23 11:41:01 +11:00
Shannon 80697cf9ca MemberType fully wraps new MemberTypeService 2014-01-23 10:57:24 +11:00
Shannon f4534aa94c adds unit tests for member type can view/can edit properties 2014-01-23 10:55:22 +11:00
Shannon 56dec485a5 Starts wrapping MemberTypeService from the legacy MemberType object. Changes the User.Id to an int - no more casting. Changes CreateMember to CreateMemberWithIdentity for consistency. Adds raiseEvent params to the create/save methods. Updates the MemberTypeService to have consistent naming conventions. Starts wrapping more of the MemberService from the legacy Member object. 2014-01-23 10:41:57 +11:00
Shannon ffde0f48cf Starts wrapping MemberTypeService from the legacy MemberType object. Changes the User.Id to an int - no more casting. Changes CreateMember to CreateMemberWithIdentity for consistency. Adds raiseEvent params to the create/save methods. Updates the MemberTypeService to have consistent naming conventions. Starts wrapping more of the MemberService from the legacy Member object. 2014-01-23 10:35:30 +11:00
Kevin Jump 5663b6890f Revert "Export Template fails when template has no master value"
This reverts commit a2905c13f6.
2014-01-22 21:35:16 +00:00
Kevin Jump a2905c13f6 Export Template fails when template has no master value 2014-01-22 21:29:49 +00:00
Kevin Jump e8f7a83f68 Fixed: U4-4119 - Export ContentType fails for Generic Properties
Adds Null checking for PropertyGroupID so that an exception is avoided
when the propertyType is in the Generic Properties group (and has no ID
assigned)
2014-01-22 19:50:21 +00:00
Shannon 2956aee4e3 Fixes: U4-4108 The backoffice should not be accessible when the app is not configured, it should redirect to the installer and U4-4106 Set the new membership providers to be shipped as default. 2014-01-22 15:26:45 +11:00
Shannon 9bd8d729fa publicizes user stuff, changes the IUser.Id to an int - no need for it to be an object and casted everywhere. Updates the login logic to perform the mapping logic for custom membership providers with an extension method. 2014-01-22 14:07:18 +11:00
Shannon fb9569d914 Fixes user membership providers to throw exceptions on duplicate emails when the provider is configured to not allow duplicates. 2014-01-22 13:20:00 +11:00
Shannon 47974d49fe obsoletes old providers, creates new membership role provider stub 2014-01-22 12:16:47 +11:00
Shannon 3f8b3031c2 completes: U4-3996 Fix EditUser to use the membership provider properly, U4-3997 Fix EditMember to use the membership provider properly 2014-01-22 11:57:33 +11:00
Shannon 7da41594fd re-publicizes member services, fixes: U4-4102 Un-obsolete ContentService.Publish 2014-01-22 11:27:44 +11:00
Shannon 9796b30bbb Fixes: U4-4104 Using strongly typed Html.Action<T> with a PluginController causes exception 2014-01-22 11:02:24 +11:00
Sebastiaan Janssen ead837f654 U4-4095 Missing Keys in English US Language File 2014-01-20 19:15:50 +01:00
Sebastiaan Janssen 10a4eb3ddc Fix Duplicate attribute YSOD (key was already added in the base class) 2014-01-20 12:02:52 +01:00
Morten Christensen 51f46cf871 Not raising export events for content/media ToXml extension for the time being 2014-01-20 10:37:46 +01:00
Shannon 88182edf8f Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-01-20 18:34:11 +11:00
Shannon e456dd3886 Merge branch '7.0.2' into 7.1.0 2014-01-20 18:33:54 +11:00
Shannon 697548d1c7 Fixes: U4-3897 Copy contents relations not created 2014-01-20 18:01:19 +11:00
Shannon f717628322 Ensures username is escaped in user service 2014-01-20 16:13:41 +11:00
Shannon c2c4763faa Ensures username is escaped in user service 2014-01-20 16:11:38 +11:00
Shannon e91b297cc2 updates user task creation for release 2014-01-20 16:04:49 +11:00
Shannon c062d3b71b Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-01-20 16:01:53 +11:00
Shannon ed83fb8216 updates user task creation for release 2014-01-20 16:00:19 +11:00
Shannon c92441e544 Ensures user name is escaped in member service query. 2014-01-20 14:37:26 +11:00
Shannon f0573fc68c Fixes: U4-4084 Macro's with non alphanumeric chars in their aliases cannot render in the rich text editor 2014-01-20 13:59:25 +11:00
Shannon eb44480fdf fixes package installer path redirect when installing from the repo 2014-01-20 11:58:52 +11:00
Shannon 1ad05fbfc9 Clears the auth cookie after install if there is one which forces the login screen to display so that the csrf tokens are created - this is required if you are upgrading from a previous version and are logged in but don't have a version with csrf tokens. 2014-01-20 10:53:14 +11:00
Shannon 673e24a2ea Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-20 10:37:36 +11:00
Shannon 4842be01cd Ensures app domain restarted after db upgrade to clear PetaPoco's mapping cache. 2014-01-20 10:36:37 +11:00
Morten Christensen dddb38d4ee Adding comment to private method for clarity 2014-01-19 15:23:05 +01:00
Morten Christensen 727ce0f795 Additional tests for Macro import and export 2014-01-19 15:23:04 +01:00
Morten Christensen ba27acead9 Adding unique key to xml for contentbase exports 2014-01-19 15:23:04 +01:00
Morten Christensen a026a81a8a Adding test for import of Macros from uBlogsy package xml 2014-01-19 15:23:03 +01:00
Morten Christensen 5e7ee0c236 Adding ImportMacros to PackagingService interface 2014-01-19 15:23:03 +01:00
Morten Christensen bb30d5ebd2 Refactoring Macro import method in PackagingService 2014-01-19 15:23:02 +01:00
Morten Christensen 2ae3b09b8c Updating PackagingService to use the newly added event args 2014-01-19 15:23:02 +01:00
Morten Christensen 473d76f1b7 Adding Event Args for import and export 2014-01-19 15:23:01 +01:00
Sebastiaan Janssen 918e454c42 Make sure the build does a complete rebuild so that the Belle build gets triggered 2014-01-19 15:21:47 +01:00
Shannon 7e32fdb682 changed buildbelle to do a grunt build instead of running the default grunt build. 2014-01-19 13:11:23 +11:00
Sebastiaan Janssen 171a472966 Split out the Belle build and integrate it in the build of the Web.UI project 2014-01-17 18:56:04 +01:00
Sebastiaan Janssen 8194655ad1 Update the readme file with a pointer to the build.bat file to get started quickly 2014-01-17 16:07:29 +01:00
Sebastiaan Janssen 80c1812bc8 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-17 15:51:01 +01:00
Morten Christensen 6c37b33509 Adding export method for macros in the PackagingService and changing the ctor to accept the MacroService, so we can also add an import method. 2014-01-17 15:29:51 +01:00
Morten Christensen 509bcee540 Changing the name of the private field to be more inline with the Property 2014-01-17 15:28:53 +01:00
Morten Christensen 3dec881848 Removing extra line spaces 2014-01-17 15:28:12 +01:00
Sebastiaan Janssen 65b522a0a0 Automatically build Belle from build.bat without having to install Node.js on local machine 2014-01-17 14:52:42 +01:00
Morten Christensen 9164567abe Adding export of templates to PackagingService 2014-01-17 13:55:34 +01:00
Stephan 12314f16a2 U4-4056 - fixing 2014-01-17 10:27:09 +01:00
Shannon 1621d01992 fixes some unit tests 2014-01-17 13:18:49 +11:00
Shannon ae05bfd350 Fixes: U4-4055 List View document types still display children in content tree 2014-01-17 13:00:11 +11:00
Shannon 79567d4e8f Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-17 12:26:02 +11:00
Shannon 334a56ce5c Fixes: U4-3765 v7 MultiNode Treepicker Sort not working 2014-01-17 12:25:34 +11:00
Sebastiaan Janssen c2ee3303a5 U4-4059 Update MNTP snippets for string of id's rather than old xml fragment 2014-01-16 19:49:57 +01:00
Stephan bfc89a7247 merge branch 'origin/6.2.0' into 7.0.2 + fix 2014-01-16 19:40:29 +01:00
Stephan 326309e61e U4-4056 - better unicode/ascii support for urls 2014-01-16 17:09:21 +01:00
Shannon 8926e8c7d9 ensures preview cookie is gone on logout. 2014-01-16 20:56:34 +11:00
Shannon ee7ee81098 fixes merge issue 2014-01-16 20:51:23 +11:00
Shannon f4b707e928 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/umbraco.businesslogic/StateHelper.cs
2014-01-16 20:49:19 +11:00
Shannon c38030def2 Fixes: U4-3855 Preview cookie should be a session cookie not persisted 2014-01-16 20:47:13 +11:00
Shannon 43a61d8a06 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-01-16 20:15:35 +11:00
Shannon 4fd3725c51 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.cs
	src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx
	src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx.cs
2014-01-16 20:09:18 +11:00
Shannon 949861a890 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-01-16 20:03:52 +11:00
Shannon 122069752a fixes legacy validate member logic 2014-01-16 20:03:29 +11:00
Shannon c288734877 Fixes: U4-4054 Multinode Treepicker datatype - selecting a start node sends to content section 2014-01-16 19:47:27 +11:00
Shannon 4b22ff3a75 Completes: U4-4011 Package installation will require either a full app refresh or we will need to re-lazy load in all of the assets 2014-01-16 19:11:03 +11:00
Shannon 2b1a43b40a Finally got somewhere with U4-4011 Package installation will require either a full app refresh or we will need to re-lazy load in all of the assets - took ages to get this going, now to get it working when packages have custom screens. 2014-01-16 18:33:31 +11:00
Shannon 076d90ddc4 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-16 12:31:54 +11:00
Shannon 1e2e26d898 publicizes server vars parser and event 2014-01-16 12:31:29 +11:00
Sebastiaan Janssen f56cb2c3ac Hardcoded empty snippets need to be updated as well.. 2014-01-15 21:11:35 +01:00
Sebastiaan Janssen ae83b0fbaf Hardcoded empty snippets need to be updated as well.. 2014-01-15 21:07:24 +01:00
Sebastiaan Janssen fb7b65cf3b Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-15 20:57:42 +01:00
Sebastiaan Janssen 168abddacf U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2014-01-15 20:57:27 +01:00
Sebastiaan Janssen 99e91a1053 U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2014-01-15 20:55:17 +01:00
Sebastiaan Janssen bad118ac6b U4-4046 Rename "empty template" to "empty" 2014-01-15 10:17:46 +01:00
Shannon f334c3d74a playing a bit more with re-initializing the app, but think we're def gonna have to do a full browser refresh. To do that we'll have to figure out how to gen a deep link url to the installer complete screen which could include a custom screen from a package. 2014-01-15 17:47:46 +11:00
Shannon 0e6c199a7e working on U4-4011 Package installation will require either a full app refresh or we will need to re-lazy load in all of the assets but unfortunately we cannot lazy load in things like directives as angular doesn't like that, we have to re-load the browser. 2014-01-15 17:18:23 +11:00
Shannon 0bc39afdab fixes language drop down styles - was too big to fit 2014-01-15 15:39:35 +11:00
Shannon cf3de52249 removes the old language.ascx webforms files 2014-01-15 15:36:28 +11:00
Shandem 3f0569af41 Merge pull request #285 from mrdrbob/U4-3831
Fix for U4-3831.
2014-01-14 20:17:32 -08:00
Shannon 9f078357a7 Fixes: U4-4030 RelatedLinksEditorValueConvertor can't be overruled and internal links are wrong 2014-01-15 15:17:03 +11:00
Shannon bb837232ba Allows DefaultPropertyValueConverters to shadow other default converters, this allows us to have a hierarchy of default converters. This also fixes part of this issue: U4-4030 RelatedLinksEditorValueConvertor can't be overruled and internal links are wrong 2014-01-15 14:45:33 +11:00
Shannon 6d57afc71a ensures auth controller has IsBackOffice specified 2014-01-15 13:49:37 +11:00
Shannon fd682efdb1 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2014-01-15 13:37:46 +11:00
Shannon 5c614a88a2 ensures webapi plugincontrollers are routed to /backoffice if [IsBackOffice] is specified 2014-01-15 13:29:17 +11:00
Shannon f27a0c0461 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EmptyTemplate.cshtml
	src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
2014-01-15 13:28:41 +11:00
Shannon 3ef9635406 Fixes: U4-4010 Member and user session gets mixed - fixes how we detect a back office request + unit tests and added new IsBackOffice attribute 2014-01-15 13:17:38 +11:00
Shandem 80601abb27 Rename umbImageGravity.directive.js to umbimagegravity.directive.js
Changed file name to be consistent with the rest of our file names
2014-01-15 11:11:31 +11:00
Shandem 79384d8a0a Rename umbImageCrop.directive.js to umbimagecrop.directive.js
changed file name to be consistent with the rest of our file names
2014-01-15 11:11:02 +11:00
Shannon 793a1a9aa8 Adds comments to EntityController code to use UmbracoHelper 2014-01-15 11:08:02 +11:00
Shannon e3da493345 Re-adds all updates for the WIP for xpath/css filtering and the cropper. 2014-01-15 11:06:20 +11:00
Shannon c527833081 Revert "adds editing function to media picker controller"
This reverts commit 7d051dffbb.
This will only be contained in 7.1
2014-01-15 10:59:05 +11:00
Shannon 5caf091406 Revert "WIP: adds cropper directive"
This reverts commit c5a7eab1d5.
new cropper is only contained in 7.1 branch
2014-01-15 10:55:22 +11:00
Shannon 5a29441640 Reverts GetByQuery and MNTP Xpath query WIP - is contained only in 7.1 2014-01-15 10:53:14 +11:00
Shannon 75a42fd0d6 fixes the protect page logic 2014-01-15 10:42:01 +11:00
Shannon 84da5f43a2 U4-4045 The "Empty" partial view snippet should have @inherits 2014-01-15 10:41:37 +11:00
Bob Davidson 0da7ed8d93 Fix for U4-3831. Removes form, adds ng-click with $event.preventDefault() to prevent premature saving. 2014-01-14 15:40:22 -06:00
Sebastiaan Janssen 0aa72e5026 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-14 15:21:38 +01:00
Sebastiaan Janssen 14cfd2a8df D'oh .. now properly renamed, in the csproj as well - U4-4046 Rename "empty template" to "empty" 2014-01-14 15:21:20 +01:00
Morten Christensen d6b3d115b0 Correcting the naming of events in the PackagingService 2014-01-14 15:09:21 +01:00
Morten Christensen 7b1fd5378f Correcting the naming of events in the RelationService 2014-01-14 15:09:20 +01:00
Morten Christensen 9e9b94b1d5 Correcting raiseEvents parameter for dictionary items 2014-01-14 15:09:20 +01:00
perploug cf837d783d Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-14 15:00:05 +01:00
perploug 3df44e2990 treesource editor changes to remove the search field 2014-01-14 14:59:55 +01:00
perploug 0c5ebb2674 Fixes umbPhotoGrid Filtering 2014-01-14 14:40:00 +01:00
perploug ba2fa2bff4 Legacy dialogs missing conversion, language + partial view 2014-01-14 14:33:11 +01:00
Sebastiaan Janssen 03090e85fd U4-4046 Rename "empty template" to "empty" 2014-01-14 13:51:08 +01:00
Sebastiaan Janssen 5c55d6a6e3 U4-4045 The "Empty" partial view snippet should have @inherits 2014-01-14 13:49:20 +01:00
Shannon 0632d73e32 fixes view state and err styling for protect page 2014-01-14 16:56:38 +11:00
Shannon 000c2637d6 fixes view state and err msg 2014-01-14 16:54:32 +11:00
Shannon bf24e101d3 fixes some logic with the protect page if it's already protected 2014-01-14 16:53:32 +11:00
Shannon 08c837602f Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Models/MemberType.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2014-01-14 16:28:48 +11:00
Shannon 563867cd8b Temp fix for: U4-3968 Umbraco 7.01 - Membership - Public Access - Add Single User protection - crash, fixes protectPage so that it uses the membership provider to make changes, updates the UI logic so that if you choose an existing user it will you about it, fixes it so you cannot arbitrarily change a member's password. 2014-01-14 16:21:00 +11:00
Shannon 86c66511dd changes all calls from Member.InUmbracoMemberMode() to Membership.Provider.IsUmbracoMembershipProvider() and obsoletes the InUmbracoMemberMode 2014-01-14 14:17:28 +11:00
Shannon eedd109332 Temp fix for: U4-3968 Umbraco 7.01 - Membership - Public Access - Add Single User protection - crash 2014-01-14 12:38:48 +11:00
Shannon 7d57521ad8 Fixes some thread safety issues with old membership API 2014-01-14 11:53:41 +11:00
Shannon d5fc18dc95 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-14 11:44:11 +11:00
Shannon e36b3d46e8 Fixes: U4-4039 @Umbraco.Field("writerName") etc. don't work any more 2014-01-14 11:43:56 +11:00
Sebastiaan Janssen d8aa98e60c Temporary workaround for the ClientDependency dependency 2014-01-13 11:50:13 +01:00
markvantilburg 4a8a09c78a Update booting.aspx
Throw the exception immediately if the parameter is not there or empty.

If the parameter is not there it's defaulted to the current url, and this will redirect to itself and create an endless loop here.
2014-01-13 11:33:24 +01:00
perploug 8a8899397e Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-13 10:17:27 +01:00
perploug dc69b5a825 WIP: cropper and gravity editors 2014-01-13 10:17:16 +01:00
perploug df7691ada3 Adds missing mocks 2014-01-13 10:14:30 +01:00
perploug 1048df7e63 Fixes broken assembly browser for usercontrols 2014-01-13 10:14:09 +01:00
Shannon 457560920d Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
2014-01-13 19:15:16 +11:00
Shannon e79c0ae2b5 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Services/NotificationService.cs
2014-01-13 19:11:39 +11:00
Shannon e74e8f9d73 Fixes: U4-4005 Member custom properties not saving from code, only from backend, wraps more of the getter functions in legacy member class with new member service methods, fixes paged result method when there are no results. 2014-01-13 18:36:08 +11:00
Shannon 23b0c89848 ensures the mail usage is disposed. 2014-01-13 17:28:49 +11:00
Shannon 285989e737 updated notification email links to only have edit since we currently don't support deep linking to dialogs. 2014-01-13 16:34:42 +11:00
Shannon 2c580d0b20 updates email notification link address 2014-01-13 16:21:46 +11:00
Shannon 3c1f6abd0d Fixes: U4-3830 Unable to get email notifications working in version 7 2014-01-13 16:13:53 +11:00
Shannon 4eb1ef3444 fixed up merge issues 2014-01-13 14:54:15 +11:00
Shannon 0f503fc320 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
	src/Umbraco.Tests/Services/Importing/ImportResources.resx
	src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
	src/Umbraco.Tests/Services/PackagingServiceTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.cms/businesslogic/workflow/Notification.cs
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
2014-01-13 14:08:23 +11:00
Shannon aebc30c7a3 Removes the version specific info from the CDF and Examine references in all proj files. 2014-01-13 14:02:50 +11:00
Shannon 44bc365fdd Moves all notification sending logic to the notification service, improves performance during any action when notifications are to be sent, ensures emails are sent out async to not block up the current request. 2014-01-13 13:50:30 +11:00
Shannon 06defee410 Completed new NotificationService, moved Diff to Core 2014-01-13 13:05:25 +11:00
Robert Foster f674fdf014 Implemented spectrum for picking colors for the color picker pre-value editor and added broader bgColor directive 2014-01-13 03:26:55 +11:00
Morten Christensen d5d4dc9561 Adding event handlers to new import and export methods in the PackagingService 2014-01-10 16:24:20 +01:00
Morten Christensen be2c72f8b4 Adding new methods to the IPackagingService interface 2014-01-10 16:05:19 +01:00
Morten Christensen 62f46d531f Fixing merge issue 2014-01-10 16:04:50 +01:00
Morten Christensen 6bfdbe3e8a Updating the legacy Installer class to use the new methods in the PackagingService
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/umbraco.cms/businesslogic/Packager/Installer.cs
2014-01-10 15:42:43 +01:00
Morten Christensen 7095b21eb4 Removing some internal experimental stuff that isnt used 2014-01-10 15:40:41 +01:00
Morten Christensen efce912332 Adds import and export of languages along with tests
Conflicts:
	src/Umbraco.Tests/Services/PackagingServiceTests.cs
2014-01-10 15:40:28 +01:00
Morten Christensen b33a265ea4 Moving events out of the repository scope.
Adding Get Language by Iso Code method
2014-01-10 15:39:15 +01:00
Morten Christensen db849c1e36 Adding languages xml to existing xml file for testing purposes 2014-01-10 15:38:57 +01:00
Morten Christensen b01721c2a9 Adding Export of DictionaryItems including test
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Services/PackagingServiceTests.cs
2014-01-10 15:38:43 +01:00
Morten Christensen 4f2a807327 Updates from PR#127 from Lars-Erik. Had to manually copy in the changes because the PR was closed.
Adds Import of Dictionary Items to the PackagingService along with tests and a fix for the DictionaryRepository.

Conflicts:
	src/Umbraco.Tests/Services/Importing/ImportResources.resx
	src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
	src/umbraco.cms/businesslogic/Packager/Installer.cs
2014-01-10 15:37:44 +01:00
Morten Christensen 955573256d Updating the legacy Installer class to use the new methods in the PackagingService 2014-01-10 15:11:07 +01:00
Morten Christensen d963f5cd7d Updating a few methods that are made public in 7.0.2 2014-01-10 14:57:27 +01:00
Morten Christensen 2467b5ee3b Removing some internal experimental stuff that isnt used 2014-01-10 14:53:27 +01:00
Morten Christensen f86eb4b741 Adds import and export of languages along with tests 2014-01-10 14:48:55 +01:00
Morten Christensen 33b99073f0 Moving events out of the repository scope.
Adding Get Language by Iso Code method
2014-01-10 14:48:31 +01:00
Morten Christensen 880636c5a6 Adding languages xml to existing xml file for testing purposes 2014-01-10 14:47:31 +01:00
Morten Christensen 6e344f335e Adding Export of DictionaryItems including test 2014-01-10 13:08:33 +01:00
Morten Christensen 6b205bd725 Updates from PR#127 from Lars-Erik. Had to manually copy in the changes because the PR was closed.
Adds Import of Dictionary Items to the PackagingService along with tests and a fix for the DictionaryRepository.
2014-01-10 11:45:41 +01:00
perploug d97a0f5b6c Adds missing PluginController Attribute to updatecheckercontroller 2014-01-10 11:21:55 +01:00
Shannon a510396a57 fix merge issue 2014-01-10 17:07:28 +11:00
Shannon 297d54ec98 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/umbraco.cms/businesslogic/CMSNode.cs
2014-01-10 17:05:23 +11:00
Shannon 531306a091 Created notifications repository and service with unit tests, then need to start integrating that so notifications are properly sent. 2014-01-10 17:03:00 +11:00
Shannon 4346f73159 Fixes naming conventions from old Notification class 2014-01-10 15:13:25 +11:00
Shannon 3cb5754ff2 Fixed some null checks 2014-01-10 12:20:49 +11:00
Shannon bf5bb8bc70 obsoletes imageHelper in favor of the new mediaHelper, updates the link picker to fix: U4-3882 Can't Link to Non-Image Media in 7.0.1 2014-01-10 12:11:52 +11:00
Shannon 7b7ad4d350 completes: U4-3991 Ensure macroservice events are public 2014-01-10 11:20:37 +11:00
Shannon 544a0756f3 Fixes: U4-3995 Remove Contour language keys from deployed language files 2014-01-10 00:43:53 +11:00
Shannon 934215307d Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-10 00:22:09 +11:00
Shannon 349825b4f8 Fixes merge issues 2014-01-10 00:21:58 +11:00
Morten Christensen f3f1a161e4 Adding AreRelated method to the RelationService 2014-01-09 14:12:58 +01:00
Shannon c088187a13 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxContext.cs
	src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderExtensions.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
	src/umbraco.cms/packages.config
	src/umbraco.controls/packages.config
	src/umbraco.editorControls/packages.config
	src/umbraco.macroRenderings/packages.config
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
2014-01-10 00:09:38 +11:00
Shannon 4db6ce4b22 Fixes various issues relating to File Repositories and Services: U4-4014 FileRepositories offer no way to create folders, U4-4013 The models that the FileService produces causes security exceptions, U4-3993 Replace system.io calls in umbraco.scriptTasks legacy task
updates to latest CDF
2014-01-09 18:08:13 +11:00
Shannon 72a366d0dc Fixes: U4-4012 When loading in a lot of separate assets in a manifest CDF is throwing exceptions with a 'too long query string' - updates to latest CDF 2014-01-09 15:58:06 +11:00
Shannon fc18189fc8 fixes a null check on membership provider, completes: U4-3962 publicize IMapperConfiguration 2014-01-09 13:32:39 +11:00
Shannon 49cfeee5b0 Fixes: U4-3880 Custom parameter editor with JSON valueType 2014-01-09 12:49:33 +11:00
Shannon 01d09548aa fixed merge issues 2014-01-09 10:54:02 +11:00
Shannon 1ff049a063 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
2014-01-09 10:38:31 +11:00
Shannon 7c720460f5 Fixes: U4-3876 MySQL cmsContentXml Migration Error on 7.0.1 Upgrade 2014-01-09 10:33:35 +11:00
Morten Christensen d0c0ec56a4 Adding event handlers to the PackagingService 2014-01-08 14:13:16 +01:00
Morten Christensen 3c965e8c32 Updating relation event handlers 2014-01-08 14:13:15 +01:00
Morten Christensen 5bcd6a9982 Adding interface to PackagingService 2014-01-08 14:13:15 +01:00
perploug 525477f84f Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-08 13:27:42 +01:00
perploug 7d051dffbb adds editing function to media picker controller 2014-01-08 13:27:34 +01:00
perploug c5a7eab1d5 WIP: adds cropper directive 2014-01-08 13:27:04 +01:00
perploug 115c8b15fd updates jquery ui to 1.10.3 2014-01-08 13:26:34 +01:00
Morten Christensen 29c8f065f7 Implementing Saving/Saved and Deleting/Deleted events for Relations and RelationTypes.
Fixes U4-3992 RelationService doesnt have any events.
2014-01-08 12:52:55 +01:00
Shannon 961755336a adds another test for #U4-3876 2014-01-08 20:34:20 +11:00
Shannon e0aff8a1e4 adds a unit test 2014-01-08 20:25:35 +11:00
Shannon 6fa0c627a5 working on #U4-3876 2014-01-08 20:19:08 +11:00
Shannon b3c2574aac working on #U4-3876 2014-01-08 20:04:26 +11:00
Shannon 98b2320421 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Tests/TreesAndSections/SectionTests.cs
2014-01-08 18:41:01 +11:00
Shannon 66a63b3cbb ignores these tests for now, they are successful when running isolated but as a whole they don't pass because of something with the legacy data layer. 2014-01-08 18:39:37 +11:00
Shannon 077f3468b9 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2014-01-08 18:20:49 +11:00
Shannon 21c5b6fe02 fixes user lookup on legacy provider 2014-01-08 18:20:18 +11:00
Shannon 3274d873a9 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
2014-01-08 18:13:35 +11:00
Shannon ffed85640d fixes provider user key issue 2014-01-08 18:12:07 +11:00
Shannon 250f082346 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Tests/TreesAndSections/SectionTests.cs
2014-01-08 17:12:06 +11:00
Shannon cdbf89ee57 Fixes up the unit tests 2014-01-08 17:08:13 +11:00
Shannon 056b13eb98 fixes up the double member creation in the createuser method 2014-01-08 16:29:09 +11:00
Shannon e2a395e245 Fixes merge issues 2014-01-08 16:09:35 +11:00
Shannon 6b760dcfe8 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Models/Membership/EntityPermission.cs
	src/Umbraco.Core/Persistence/Factories/UserFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Services/UserServiceTests.cs
2014-01-08 15:47:53 +11:00
Shannon 5ded732188 fixing some merge issues 2014-01-08 15:43:58 +11:00
Shannon 9467a67661 Backports the permissions repo updates, permissions on user/content repo updates and default permissions for users 2014-01-08 15:42:49 +11:00
Shannon d6a83d9887 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Models/IMember.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Core/Models/Membership/MembershipExtensions.cs
	src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
	src/Umbraco.Core/Models/Membership/User.cs
	src/Umbraco.Core/Models/Membership/UserProfile.cs
	src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Factories/UserFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
	src/Umbraco.Core/Services/IMembershipUserService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Core/Services/UserService.cs
	src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
	src/Umbraco.Tests/Services/UserServiceTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedUserType.cs
	src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.cs
	src/Umbraco.Web.UI/umbraco/dashboard/ChangePassword.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
	src/umbraco.businesslogic/User.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-01-08 14:32:38 +11:00
Shannon 96e00bc1eb moves classes to sep files 2014-01-08 14:04:30 +11:00
Shannon 0f9f11bbcf re-internalizes some classes for now 2014-01-08 14:03:10 +11:00
Shannon 5b6cc51516 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-01-08 13:04:01 +11:00
Shannon 80b83ab64b Fixes up password changer on postback, fixes up more of the edit user and edit member pages. 2014-01-08 13:03:33 +11:00
Shandem 326d81286a Merge pull request #281 from Jeavon/U4-3987
Fixes U4-3987- Related Links
2014-01-07 15:47:16 -08:00
Lars-Erik Aabech 6eeb9d6af4 Forgot document type on general properties tab 2014-01-07 18:53:47 +01:00
Lars-Erik Aabech cbefabb724 Changed TabsAndPropertyResolver's translation mechanism to use CultureDictionaryFactory. Also added translation to ContentTypeController.GetAllowedChildren. Localization "complete" and working for content editing. 2014-01-07 17:44:01 +01:00
Lars-Erik Aabech f7f6cc64ce More or less fixes content localization. Must do more tests and fix create dialog. Only tested manually on my box. 2014-01-07 16:43:03 +01:00
Lars-Erik Aabech 1408e4f64e DictionaryRepository now excludes translations with missing language. Should've committed a test to prove that TabsAndPropertiesResolver.TranslateTab uncommented fails, but can't find a nice existing fixture, so just debugging to see if it works now. 2014-01-07 16:15:59 +01:00
Lars-Erik Aabech 0a68d2f4ee Language repo now returns null for non-existing ids, making Get_WhenIdDoesntExist_ReturnsNull pass. 2014-01-07 16:03:26 +01:00
Lars-Erik Aabech 11a4a0436d Proves LanguageRepository lines 37-38 to be useless, but probably intended 2014-01-07 15:55:49 +01:00
Lars-Erik Aabech 2583800b2c Proves dictionary repository fails to get when weird 0 languageid dictionary item exists. 2014-01-07 15:53:17 +01:00
Jeavon Leopold 13641473d0 Fixes U4-3987- Related Links 2014-01-07 14:40:45 +00:00
Morten Christensen c6751f0374 Correcting the legacy template MakeNew private method so the OnNew event is fired after the design is added and file is created. 2014-01-07 13:24:05 +01:00
Morten Christensen d71c686aea Typo or missing update in legacy User class 2014-01-07 13:23:03 +01:00
Morten Christensen 4c5dfb42d5 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-01-07 13:13:38 +01:00
Shannon 0245efe3cb Fixes the change password dashboard to work properly. Fixes the EditUser to property save the member and the user. Adds new (probably temporary) MembershipHelper which is used to update a MembershipUser. Updates the User model to ignore the membership properties that we currently cannot persist. Ensures the legacy User membership provider still looks for a typed membership user (which should never have happened). Fixes small issue with underlying membership provider trying to encrypt an empty string. 2014-01-07 17:01:22 +11:00
Shandem b3151ca788 Merge pull request #280 from AndyButland/wip-u4-3980
Fix to SQL on inserting tags to handle tag with apostrophe (U4-3980)
2014-01-06 15:59:09 -08:00
AndyButland aa1edb6e69 Fix to SQL on inserting tags to handle tag with apostrophe 2014-01-06 21:56:10 +01:00
Shannon 0b4ddf82aa Adds more user service tests 2014-01-06 17:43:29 +11:00
Shannon 3ff173732b implements the remaining incomplete parts of the UserService, adds more unit tests 2014-01-06 17:30:08 +11:00
Shannon f3f7aa70d1 Ensures a default member/user type is assigned on membership provider initialize, adds more unit tests 2014-01-06 16:18:25 +11:00
Shannon cd82bc6d21 streamlined the new membership provider classes so now they all share the same logic and use IMembershipMemberService<T> which is used by both IMember and IUser services 2014-01-06 15:38:34 +11:00
Shannon c3a6c7c473 fixes up more of the legacy user membership provider 2014-01-06 14:02:09 +11:00
Shannon 5538a2e793 fixed up the failing unit tests for member service counts, added more unit tests for UserService and implemented more of the required methods. 2014-01-06 12:25:14 +11:00
Shannon 1b7dc76df2 Updated much more of the UserService + some unit tests 2014-01-06 11:56:53 +11:00
Shannon 85c85cd1eb Simplifies and streamlines the models used between IMember and IUser along with the services used for both of these entities.
Updates the model used to store and retreive permissions, instead of a single string it is an Enumerable<string> which gives us some flexibility in the future and since this was not public (yet) it's the perfect time to do this.
Removes the base Profile classes from User since these are not required, since we cannot share base classes between Member and User, these weren't necessary.
2014-01-06 11:04:26 +11:00
AndyButland 07229c4bd2 Up/down buttons for changing the order of related links 2014-01-03 17:08:33 +01:00
Shannon ba5f2bc69d Ensure the old membership provider's count online members is implemented 2014-01-02 15:57:27 +11:00
Shannon 3fcdbe85b5 Fixes merge and build issues 2014-01-02 15:41:00 +11:00
Shannon 78336181ea Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Models/Membership/MembershipExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Tests/App.config
	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
	src/Umbraco.Web.UI/config/tinyMceConfig.config
	src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
	src/umbraco.controls/TabView.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-01-02 15:28:42 +11:00
Shannon 17883358b6 Fixes some issues with the User membership provider, updates user create dialog to also have an email address (which is required by membership), adds validation to the member and user create dialogs to ensure that the email address is validated to be a correcty formatted address. 2014-01-02 14:13:43 +11:00
Shannon fc0c6a1cd8 fixes stored password check with legacy encoding. 2013-12-31 13:27:47 +11:00
Sebastiaan Janssen 934d4020b2 Merge pull request #224 from Attackmonkey/Hackathon-2760
Fixes issue U4-2760, sorting installed packages
2013-12-29 06:30:09 -08:00
Sebastiaan Janssen 8b03ba4f42 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-12-29 15:26:44 +01:00
Sebastiaan Janssen 3caf84c63c Merge branch 'Hackathon-U4-3063' of https://github.com/Attackmonkey/Umbraco-CMS into Attackmonkey-Hackathon-U4-3063 2013-12-29 15:24:47 +01:00
Sebastiaan Janssen aae16f227e Merge pull request #227 from mattbrailsford/6.2.0-3454
Maintains tab sort order for doc type imports/exports.
2013-12-29 06:20:09 -08:00
Sebastiaan Janssen 443002cdde Merge pull request #273 from esunxray/patch-2
Update zh.xml
2013-12-29 06:19:30 -08:00
Sebastiaan Janssen 75150f0bfa Merge pull request #223 from Attackmonkey/Hackathon-2757
Fixes issue U4-2757 where generic properties are not ordered correctly.
2013-12-29 06:18:19 -08:00
Sebastiaan Janssen af73fd8b68 Merge pull request #218 from dipunm/U4-2551
Missing languages in RTE insert link dialog.
2013-12-29 06:11:53 -08:00
Sebastiaan Janssen 139df63ddf Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-12-29 15:08:10 +01:00
Sebastiaan Janssen a49058fe00 Fixes U4-510 Copy node makes multiple copies 2013-12-29 15:07:28 +01:00
Sebastiaan Janssen dcde00cec1 Merge pull request #213 from leekelleher/U4-3452
Fixes: U4-3452 Update the MIT License URL (Packager)
2013-12-29 05:58:02 -08:00
Sebastiaan Janssen bcc70f7a1e Merge pull request #197 from mkariti/u4-415
U4-415
2013-12-29 05:39:30 -08:00
Sebastiaan Janssen 32bc2f1d69 merge ismailmayat-UK-Festival 2013-12-29 14:34:54 +01:00
Sebastiaan Janssen 4d3f67885a Fixes U4-1076 Apostrophes in document type description are shown preceded/escaped by a slash in the Create Node dialog 2013-12-29 14:12:23 +01:00
Sebastiaan Janssen a269e9d426 Merge branch 'BatJan-master' into 6.2.0 2013-12-29 13:51:54 +01:00
Sebastiaan Janssen af5a382f93 Merge branch 'master' of https://github.com/BatJan/Umbraco-CMS into BatJan-master 2013-12-29 13:51:18 +01:00
Sebastiaan Janssen 90174a39e3 Merge branch 'enkelmedia-patch-2' into 7.0.2 2013-12-29 12:41:12 +01:00
Sebastiaan Janssen 4d9f9c890d Merge branch 'patch-2' of https://github.com/enkelmedia/Umbraco-CMS into enkelmedia-patch-2 2013-12-29 12:40:46 +01:00
Sebastiaan Janssen dad910b8ab Merge pull request #212 from mattbrailsford/6.2.0-1004
Added ValidateRequest="false" on package installer page to allow user co...
2013-12-28 03:50:10 -08:00
Shannon 8a70c440f2 Added many more unit tests for the membership provider base class and fixed some logic inconsistencies. 2013-12-28 18:55:43 +11:00
Shannon 07f3de8b67 updates port number 2013-12-28 14:42:34 +11:00
Shannon 0955b0c474 fixes proj ref 2013-12-28 14:37:53 +11:00
Shannon 57d1ff20fd Improves test suite performance - this should shed a few minutes off of the test runs. 2013-12-28 14:35:43 +11:00
Shannon fbdb1d5d6c Fixes: U4-3942 Cannot configure the request if there is not content assigned - exception
Conflicts:
	src/Umbraco.Tests/Umbraco.Tests.csproj
2013-12-28 14:01:08 +11:00
Shannon b924b06062 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-28 13:57:53 +11:00
Shannon fb029861cf Fixes: U4-3942 Cannot configure the request if there is not content assigned - exception 2013-12-28 13:57:20 +11:00
perploug 4eb19bd26c Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-27 22:03:30 +01:00
perploug 71a07060a9 removes debugging output from treesource preval editor 2013-12-27 21:55:59 +01:00
Shannon edaa5ebd43 Lots more unit tests for the membership providers and some other fixups - have a new failing test as i need to sort out salting issue with encrypted passwords. 2013-12-24 14:03:18 +11:00
Shandem c12b270511 Merge pull request #268 from james-melville/6.2.0
Fixes: U4-3814 - 6.1.6 XSS vulnerability in backoffice
2013-12-23 16:14:52 -08:00
Shannon c8fa2b3880 Merge branch 'abjerner-patch-1' into 6.2.0
Conflicts:
	src/Umbraco.Web/PublishedContentExtensions.cs
2013-12-24 11:08:48 +11:00
Shannon d474481cba publicizes MemberService so that devs can use the events on nightly builds for now. 2013-12-24 11:03:20 +11:00
Shannon 62e3ab27fe Adds comments to EntityController code to use UmbracoHelper 2013-12-24 10:58:11 +11:00
Shannon 86c008fc8c Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-24 10:49:01 +11:00
Shannon 154ee39755 Fixes: U4-3907 Token cookie issues in 7.0.1 2013-12-24 10:48:32 +11:00
Shannon 63ca9f210b updates version # 2013-12-24 10:48:14 +11:00
Shannon 1c139b685a updates legacy membership provider to use efficient paging. 2013-12-20 18:12:54 +11:00
Shannon 7a8b3dc9bc Updated the member service/repo to have paged queries and results which use db paging for maximum efficiency (of course only works for things like email, username but those are 2 specific things that are needed by the membership provider) 2013-12-20 18:11:12 +11:00
Shannon a4dde1948f Implements the member count methods on the member service and adds unit tests. 2013-12-20 16:20:32 +11:00
Shannon 0f68818a19 Updated member service with the newer property value queries and added unit tests for all of them 2013-12-20 15:44:53 +11:00
Shannon 414b65b269 More WIP on the membership providers - both new and old. They are now both working with the same up-to-date logic and base classes. Updated the interface definitions on the member services to support the membership provider queries - now to implement the logic. 2013-12-20 14:01:10 +11:00
perploug 28c2aa1195 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-19 11:32:17 +01:00
perploug 391c778b80 Minor refactor of treesource internal model 2013-12-19 11:32:09 +01:00
perploug f2c2b7590b Get Entity by Query WIP 2013-12-19 11:31:55 +01:00
perploug 22d6981ab0 Fixes small issue with language loading 2013-12-19 11:06:10 +01:00
Stephan 4dbe317c03 Merge pull request #274 from esn303/U4-3908
Fix for U4-3908 YSOD on frontend after being logged out
2013-12-19 01:54:24 -08:00
Marc dc727ba0de Fix for U4-3908 YSOD on frontend after being logged out 2013-12-19 10:41:44 +01:00
Shannon 2dd04799b2 WIP membership provider updates 2013-12-19 18:33:25 +11:00
esunxray 1c901e00cc Update zh.xml
add line <key alias="resetPassword">重设密码</key>
2013-12-19 14:53:50 +08:00
Shannon d7207f7c2a Fixes some merge issues 2013-12-19 16:09:33 +11:00
Shannon a5828a2c3e Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
2013-12-19 15:59:50 +11:00
Shandem c589c741e8 Merge pull request #220 from leekelleher/U4-2006
Fixes: U4-2006 Domain.GetDomain(string DomainName) is case-sensitive
2013-12-18 20:56:03 -08:00
Shandem c8923cbc27 Merge pull request #221 from AnthonyCogworks/U4-2272
Replaced HttpContext.Current.Cache with HttpRuntime.Cache
2013-12-18 20:54:57 -08:00
Shandem 063f405a06 Merge pull request #230 from Yawka/U4-2772
U4 2772
2013-12-18 20:51:17 -08:00
Shannon 68a25bb5b1 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-19 15:50:03 +11:00
Shandem addfbcf2a7 Merge pull request #232 from Yawka/U4-2034
U4 2034
2013-12-18 20:48:52 -08:00
Shandem 8ee133bb75 Merge pull request #239 from OptimisticCoder/U4-451
U4-451 Inconsistent line endings in template files created by Umbraco
2013-12-18 20:46:46 -08:00
Shandem fa1185cbd8 Merge pull request #241 from OptimisticCoder/U4-3039
U4-3039 Import Document Type leaves files in App_Data
2013-12-18 20:43:15 -08:00
Shandem 68e0a414a0 Merge pull request #245 from esn303/patch-1
Fixed minor typos
2013-12-18 20:39:43 -08:00
Shannon 6ddef7df27 Merge branch 'esn303-patch-2' into 7.0.2 2013-12-19 15:36:59 +11:00
Shannon 66f572b642 Merge branch 'patch-2' of https://github.com/esn303/Umbraco-CMS into esn303-patch-2 2013-12-19 15:36:44 +11:00
Shannon a7a1730898 Merge branch 'kalletoxic-7.0.0' into 7.0.2 2013-12-19 15:31:26 +11:00
Shannon 155e7338cf Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
	src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/autolink/editor_plugin_src.js
	src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/table/editor_plugin_src.js
	src/Umbraco.Web.UI/umbraco_client/tinymce3/tiny_mce_popup.js
2013-12-19 15:30:17 +11:00
Shandem 89860bd786 Merge pull request #261 from esunxray/patch-1
Update zh.xml
2013-12-18 20:26:48 -08:00
Shandem b5cfefa052 Merge pull request #265 from Jeavon/U4-3247
Fixes U4-3247 - TinyMce v3 doesn't work with IE11
2013-12-18 20:22:19 -08:00
Shannon b2c0f3c35a some file formatting 2013-12-19 15:21:02 +11:00
Shannon d5e0c6ff68 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	.gitignore
	src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.designer.cs
	src/Umbraco.Web.UI/umbraco/editContent.aspx
	src/Umbraco.Web.UI/umbraco/login.aspx
	src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
	src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
2013-12-19 15:08:19 +11:00
Shannon a43f4b7b7f Completes: U4-1521 Updated back office to use ClientDependency bundles for common files 2013-12-19 15:05:05 +11:00
Shandem 7ce3949852 Merge pull request #209 from ProNotion/U4-1521
U4 1521
2013-12-18 18:37:02 -08:00
Shandem 4862419744 Merge pull request #198 from craigacronin/U4-1891
Fixed as per issue comments, but also implemented for another 3 overload...
2013-12-18 18:33:57 -08:00
Shannon 6b810c89f6 un-ignores PublishedContentExtensionTests 2013-12-19 13:28:17 +11:00
Shandem 89b0a2fd89 Merge pull request #170 from lars-erik/6.2.0_fix_publishedcontentextensiontests_sidebysidefriendly
Should make the PublishedContentExtensionTests green when ran together w...
2013-12-18 18:25:38 -08:00
Shannon 73c479c843 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-19 13:23:22 +11:00
Shannon 8aceae9880 re-formats some code, simplifies calls using InvariantEquals extension method 2013-12-19 13:22:33 +11:00
Shandem 384d4d60f1 Merge pull request #168 from stevetemple/6.1.6-multiple-action-route-issue
Fix error when multiple routes have the same controller
2013-12-18 18:18:44 -08:00
Shannon 67caf81a74 adds a couple of null checks. 2013-12-19 13:14:38 +11:00
Shannon 763ab26446 Updates packaging service to not export empty properties. 2013-12-19 13:13:13 +11:00
Shannon 67a8fa5f07 Merge branch 'wtct-U4-3091' into 6.2.0 2013-12-19 13:05:27 +11:00
Shannon f7b61d09e2 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Profiling/ProfilingViewEngine.cs
2013-12-19 12:53:32 +11:00
Shannon 5c59317bf8 changes casing of col names 2013-12-19 12:52:37 +11:00
Shannon a2ec53dd4f Merge branch 'wtct-U4-3071' into 6.2.0 2013-12-19 12:50:42 +11:00
Shannon db78c78df2 fixes some merge issues with view engine wrapping PR. 2013-12-19 12:45:46 +11:00
Shannon 4558549d5a Fixes appendformat issue 2013-12-19 12:40:41 +11:00
Shannon d98801d5d1 Merge branch '6.2.0' of https://github.com/mortenbock/Umbraco-CMS into mortenbock-6.2.0
Conflicts:
	src/Umbraco.Web/WebBootManager.cs
2013-12-19 12:35:33 +11:00
Shandem de9ecf6afc Merge pull request #143 from IDisposable/patch-1
Added contextualKeyBuilder optional argument to allow the key used for cachin...
2013-12-18 17:32:26 -08:00
Shandem 702790bf77 Merge pull request #144 from IDisposable/patch-2
Make CacheHelperExtensions public so we can call CachedPartialView and C...
2013-12-18 17:30:01 -08:00
Shannon 3a1dbc778b Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2013-12-19 12:29:02 +11:00
Shannon c912e80134 modified media service tests to not have to create data in teh base tests 2013-12-19 12:27:21 +11:00
Shannon 098c856138 Merge branch '6.2.0' of https://github.com/sniffdk/Umbraco-CMS into sniffdk-6.2.0
Conflicts:
	src/Umbraco.Tests/Umbraco.Tests.csproj
2013-12-19 12:11:33 +11:00
Shannon b45306e1ff Merge branch '6.2.0' of https://github.com/dprothero/Umbraco-CMS into dprothero-6.2.0
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2013-12-19 11:59:22 +11:00
Shannon 3499f39970 Merge branch 'kipusoep-patch-1' into 6.2.0 2013-12-19 11:49:30 +11:00
Shannon 4fb61be092 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-19 11:46:59 +11:00
Shannon 9115aa1a6d merge issue with proj file 2013-12-19 11:46:31 +11:00
Shannon f98b81116c Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2013-12-19 11:45:24 +11:00
Shannon 904cbbb906 missing proj file update 2013-12-19 11:41:26 +11:00
Shannon c0380e491b Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs
	src/umbraco.controls/TreePicker/SimpleContentPicker.cs
2013-12-19 11:41:03 +11:00
Shannon 8656d3e4b9 adds some null checks, removes old unused webforms files for tree control 2013-12-19 11:35:53 +11:00
Shannon 40988b4655 Merge branch 'select-parent-on-movecopy' of https://github.com/pynej/Umbraco-CMS into pynej-select-parent-on-movecopy
Completes: U4-3920 Move/Copy/Content-Picker time saver - pre-selects current node
2013-12-19 11:25:54 +11:00
Shannon 8a8b69a442 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GoogleSpellChecker.cs
2013-12-19 11:14:06 +11:00
Shannon 06dbea84d8 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-12-19 11:06:11 +11:00
Shannon f54cf32057 Converted spell checker deserialization to json.net and changed the deserialized object to internal with correct naming conventions. 2013-12-19 11:06:00 +11:00
Shannon 64dbf0207b Merge branch 'DougMac-6.1.4' into 6.2.0 2013-12-19 10:38:56 +11:00
Shannon f743830167 Fixes: U4-3911 Datatypes changes their uniqueID on first save 2013-12-19 10:27:18 +11:00
Stephan 206c88105e Left some Console.WriteLine statements uncommented 2013-12-18 17:50:47 +01:00
Morten Christensen 3177b979d3 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-12-18 10:00:47 +01:00
Shannon 0addd719d3 fixed merge issues 2013-12-18 18:14:37 +11:00
Shannon 662dfb37d3 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
2013-12-18 18:11:56 +11:00
Shannon 4ab32dd270 moves classes into sep files 2013-12-18 18:09:54 +11:00
Shannon fec55e9d1c Updates IMemberService with methods to search on string properties with an option to define how to match the string property, adds all supporting unit tests. 2013-12-18 17:37:46 +11:00
Shannon a21aa079ff Adds ability to use the query builder with string matches based on an NText column 2013-12-18 17:22:00 +11:00
Shannon ef4246478d Fixes: U4-2294 6.1.0: umbracoServer table can't be created on MySQL <5.6.5 2013-12-18 15:30:40 +11:00
Shannon dda538d1fc Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-17 16:14:33 +11:00
Shannon 137d859532 backports missing logic and tests from 7 that I overlooked. 2013-12-17 16:13:38 +11:00
Shannon d6d80ae037 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Constants-Conventions.cs
	src/Umbraco.Core/Models/ContentExtensions.cs
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Relators/PropertyDataRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Core/Services/IMemberTypeService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Core/Services/MemberTypeService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
2013-12-17 16:03:27 +11:00
Shannon 82b2821e27 Gets the members services ensuring members xml is being handled correctly, fixes issue with the static variable holding the default member type properties (this was then persisted in mem and then reused across all member types). Added more unit tests to verify all. 2013-12-17 15:40:47 +11:00
Shannon b270cefacc Upgrading member repositories and services with tests 2013-12-17 14:53:21 +11:00
Shannon 8b064fc2ec Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
2013-12-17 12:39:45 +11:00
Shannon b4e984fe6a adds/updates unit tests for member and member type repository 2013-12-17 12:38:11 +11:00
Shannon 1a3339d485 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
2013-12-17 11:42:50 +11:00
Shannon f62e4fa973 adds/updates member type repo tests 2013-12-17 11:42:03 +11:00
Shannon ee8050f38f Fixes ContentTypeBase event assignment issue - an event handler was added for every property type added - that was not correct. 2013-12-17 11:35:56 +11:00
Stephan 8cb0f5762c Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 17:11:15 +01:00
Stephan 287596220a Merge remote-tracking branch 'origin/7.0.2' into 7.0.2 2013-12-16 17:10:42 +01:00
Stephan f870ee18d4 U4-3710 - fix merge 2013-12-16 17:10:30 +01:00
Stephan b506b5c8e9 U4-3710 - bugfix 2013-12-16 17:01:35 +01:00
stefana99 067268a96e Changes to imageCropper, supports new mediafilesystem 2013-12-16 13:35:18 +00:00
Morten Christensen d9e843f0ba Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-12-16 09:48:18 +01:00
Shannon 805c1dfb5b Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 19:05:44 +11:00
Shannon 66dd0d073c backports the member type service updates 2013-12-16 19:05:03 +11:00
Shannon f269b1931d Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 19:03:29 +11:00
Shannon 29c22cc4b5 exposes repository service 2013-12-16 19:02:53 +11:00
Shannon 76695fc7b2 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 18:44:52 +11:00
Shannon e29031a2c4 Back ported relationship repo/service updates 2013-12-16 18:44:11 +11:00
Shannon 9b2b8e8166 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 18:24:12 +11:00
Shannon 3ff0cca033 back ports entity service updates 2013-12-16 18:23:40 +11:00
Shannon aa398b4f36 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 18:18:23 +11:00
Shannon fe16cc91fa back ports packaging service updates 2013-12-16 18:17:30 +11:00
Shannon 7e6fdcb05e back ported template repo and file service updates 2013-12-16 18:10:44 +11:00
Shannon ae54f34bcf Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 17:48:01 +11:00
Shannon d1e071b9cb adds additional unit tests for the data type service to include pre-value handling. 2013-12-16 17:47:40 +11:00
Shannon 3e253f9c19 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 17:18:15 +11:00
Shannon 2ce952bdbb backports data type service updates and fixes unit tests with correct seeding value. 2013-12-16 17:17:23 +11:00
Shannon b8f5d1c42c Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs
2013-12-16 16:29:28 +11:00
Shannon 6a9b8d5540 Fixes a unit test issue with the mntp editor initialization. 2013-12-16 16:27:59 +11:00
Shannon fdc9261399 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-16 16:21:47 +11:00
Shannon 64b247157c Merge commit '0f25029ff6531095782a567bf054d6bc209e2a56' into 7.0.2
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
2013-12-16 16:21:38 +11:00
Shannon fcacc1bd71 Merge commit '060e584503039ac020f79602ae9565d7ee0531bb' into 7.0.2 2013-12-16 16:21:06 +11:00
Shannon 68d581ac82 fixes build (merge issue) 2013-12-16 16:18:44 +11:00
Shannon af86a5d7b1 backporting imediaservice changes 2013-12-16 16:04:37 +11:00
Shannon 0f25029ff6 Fixed typo 2013-12-16 16:02:34 +11:00
Shannon 060e584503 backported IContentService updates 2013-12-16 15:57:59 +11:00
Shannon 743c0bb31c Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-12-16 14:19:10 +11:00
Shannon 4bac3e19fe Fixes up webbootmanager with new cachehelper updates. 2013-12-16 14:18:58 +11:00
Shannon b86cddda94 fixes up unit tests 2013-12-16 13:55:46 +11:00
Shannon 11103c0bc5 proj file 2013-12-16 13:23:07 +11:00
Shannon 8210702474 removes the xquery tests - we don't need these and r# keeps wanting to run them 2013-12-16 13:22:52 +11:00
Shannon a42b660648 Backporting the cachehelper and associated cache classes. 2013-12-16 13:19:10 +11:00
Shannon f11d4fbedd Worked on the application cache, added request cache, changed some stuff over to be interfaces, added unit tests suite (need mroe) to test all caching providers.
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/NullCacheProvider.cs
	src/Umbraco.Core/Cache/StaticCacheProvider.cs
2013-12-16 12:51:02 +11:00
Shannon 9105c08a4c getting membership provider to the same state as v7 2013-12-16 12:20:38 +11:00
Shannon 71b3ea2e56 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-16 11:19:57 +11:00
perploug 33b3032b30 Merge pull request #269 from hartvig/7.0.1
Fixes links in help
2013-12-14 03:02:28 -08:00
Niels Hartvig 31e5ed7b1b Fixes links in help 2013-12-14 11:48:08 +01:00
Stephan 98c8d637f4 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Core/DatabaseContext.cs
	src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/install/utills/LegacyClasses.cs
2013-12-13 13:05:10 +01:00
Stephan 8a3eae9ea6 Merge remote-tracking branch 'origin/7.0.1' into 7.0.2 2013-12-13 12:55:46 +01:00
Stephan 5aec753859 U4-3710, -3732 - Fix default ShortStringHelper 2013-12-13 12:20:57 +01:00
james-melville eeaa9166ac Fixes: U4-3814 - 6.1.6 XSS vulnerability in backoffice 2013-12-13 10:25:32 +00:00
Shannon 751ace1168 Merge branch '6.2.0-membershipprovider' into 6.2.0
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2013-12-13 17:17:24 +11:00
Shannon 51da5343ea Fixes installation issue with rebuilding media cache
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web/Umbraco.Web.csproj
2013-12-13 17:07:29 +11:00
Shannon 34df5009e0 Upgraded installer to do a two part install - first install then if an upgrade is required do the upgrade in a second call - this way we can have the progress bar update since the media xml installer can take some time. 2013-12-13 16:58:21 +11:00
Shannon d4db7d9523 Merge branch '7.0.1' into 7.0.2 2013-12-13 16:54:39 +11:00
Shannon 6a5a320a22 doh, didn't mean to commit this config change 2013-12-13 16:54:16 +11:00
Shannon 62cf1cd87d Fixes: U4-3844 U7 - System.OutOfMemoryException: Out of memory - uploading 11Mb image 2013-12-13 16:50:11 +11:00
Shannon ebf22d155e Updated the migration to just remove the data it needs instead of rebuilding as that would take a very long time for some installs. 2013-12-13 12:53:02 +11:00
Shannon 01644e8f6c Upgraded installer to do a two part install - first install then if an upgrade is required do the upgrade in a second call - this way we can have the progress bar update since the media xml installer can take some time. 2013-12-13 12:34:57 +11:00
Shannon f2be1669bf Fixes installation issue with rebuilding media cache 2013-12-13 12:02:32 +11:00
Anders Bjerner e17b5e6a7b Update PublishedContentExtensions.cs
Added overloaded extension methods for Next() and Previous() to take a delegate (eg. lambda expression) as a second parameter. The methods are based on this thread by Jeavon Leopold: http://our.umbraco.org/forum/developers/razor/46832-Filtered-Next()-and-Previous()-v7-UmbracoHelperMVC

The code is tested in 7.0.0, but since it only relies on the existing Next() and Previous() methods, it should work in 6.1.x and 7.1.1 as well.
2013-12-12 15:32:52 +01:00
perploug 24911bffe2 adds version number to help dialog 2013-12-12 12:28:43 +01:00
perploug d343340f56 Adds missing language keys 2013-12-12 12:28:25 +01:00
perploug 0c82f78c43 Upgrades tinymce lib to support IE11 2013-12-12 12:27:49 +01:00
perploug 5cf3a619f7 Fixes: U4-3841 sorting picked media items with the multiple media picker clears the selection 2013-12-12 09:16:02 +01:00
Shannon 49550b410a Ensures Integer and Email validators are added on startup as manifest validators. 2013-12-12 18:28:45 +11:00
Shannon b9df55ef98 fixing more tests 2013-12-12 18:09:48 +11:00
Shannon e456c44b46 Fixing some unit tests 2013-12-12 17:57:50 +11:00
Shannon 61315a8d83 Merge remote-tracking branch 'origin/6.2.0' into 7.0.1
Conflicts:
	src/Umbraco.Tests/ObjectExtensionsTests.cs
2013-12-12 17:53:27 +11:00
Shannon a1c65f0518 Gets that naggy unit test passing 2013-12-12 17:52:03 +11:00
Shannon 49c8313c9e Fixes: U4-3638 - U7 - Preview mode seems permanent and shows incorrect content on front of website, when using same browser as admin login 2013-12-12 17:30:27 +11:00
Shannon 141f9b6ea1 ensures the cssclass is set for selecting media items (oops, had removed that before) 2013-12-12 16:23:33 +11:00
Shannon d223ee97cd Fixes: U4-3840 MediaPicker doesn't show images when there are also folders inside of the folder being viewed
and moves some of the util classes into their own files, adjusted media picker's icon sizes too to make it more readable.
2013-12-12 16:16:59 +11:00
Shannon a098e49840 Fixes: U4-3835 U7(nightly214) - Umbraco.Field not working 2013-12-12 14:41:01 +11:00
Shannon 8785239964 Finalizes the implementation of getting the menu items rendering for child of listview items for both content and media. 2013-12-12 14:10:03 +11:00
Shannon 74a691ac3a Removes all the console.log calls 2013-12-12 14:09:03 +11:00
Shannon 38c1669e57 Gets content items that are children of listviews to query for their affiliated tree-node and display the action menu. 2013-12-12 13:27:33 +11:00
Shannon 58f0d1a464 fixes null check on HttpQueryStringFilterAttribute and adds ability to specify parameters in the GetUmbracoApiService urlhelper extensions. 2013-12-12 13:26:53 +11:00
Shannon f30740bd49 grid is working nicely now with a couple tests 2013-12-12 11:38:34 +11:00
perploug 3de3ccad00 Fixes related links word-breaking 2013-12-11 13:32:17 +01:00
perploug 75502ca18c Compact form less adjustments 2013-12-11 13:09:45 +01:00
perploug c531c36cab adds target to RTE link picker 2013-12-11 13:09:25 +01:00
perploug 387e64acac Fixes wrong app_plugin dialog path
Changes /app_plugin/folder/umbraco to /app_plugins/folder/backoffice
which the way we documented it
2013-12-11 09:47:56 +01:00
perploug 91a5d55183 Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-11 09:44:37 +01:00
Shannon 9819318060 Fixes up the auth http post 2013-12-11 18:53:00 +11:00
Shannon 2e990a7869 All working now, Fixes: U4-3722 Images in Media folder are huge 2013-12-11 18:05:04 +11:00
Shannon ed7175192b images that are smaller than the min display size will now just be centered in the square and are no longer scaled up. 2013-12-11 17:53:19 +11:00
Shannon 4e63bb38f3 margins are now working nicely. 2013-12-11 16:44:20 +11:00
Shannon d61b9bfdd7 Awesome progress on the photo folder changes to have correctly calculated images sizes - now just need to get margins going and centering of images that are smaller than the min. 2013-12-11 14:34:04 +11:00
Shannon 0de53308f5 Fixes some issues with app startup/authentication and when events fire 2013-12-11 12:01:22 +11:00
Shannon 85bf47df82 Fixes FileUploadPropertyEditor and IFileSystem usage 2013-12-11 09:05:38 +11:00
Shannon 791c3f5208 added missing view file 2013-12-11 08:51:07 +11:00
perploug bc7876681b docs: dialogservice 2013-12-10 15:31:08 +01:00
perploug 68aa3f7b1b broke touch detection, reverting 2013-12-10 12:15:40 +01:00
perploug 976531fe7e Removes missing file from web.ui.csproj 2013-12-10 12:08:13 +01:00
perploug ded7350d74 Docs: util.service.js 2013-12-10 11:23:54 +01:00
perploug e3594bf6fc Fixes: U4-3723 Only possible to link to content (not media) in Richtext editor
Adds file link button to link dialog, that proxies through the standard
media dialog
2013-12-10 11:20:00 +01:00
Shannon 6a6d9ec7b0 Updates the image helper and imagescontroller to never scale images larger than what they are. 2013-12-10 18:24:20 +11:00
Shannon 200a400fc5 put the row style on to the photo folder, without it the image widths are not calculated correctly and span over a row (depending on your current screen size). Since the currently implementation isn't really responsive anyways this at least makes it look better. We can later detect size changes and re-calc how they should be laid out. Updates the JS code to be more readable by humans. 2013-12-10 18:23:45 +11:00
Shannon 76c807a4e7 Fixes latest IFileSystem fix for image uploading 2013-12-10 16:48:57 +11:00
Shannon 985db6d2e3 div tag not closed on umb-photo-folder 2013-12-10 16:20:22 +11:00
Shannon 7894fcfc91 Fixes: U4-3714 Media tree doesn't get refreshed after upload 2013-12-10 15:10:11 +11:00
Shannon f41b0ff4b5 removes some debug logging 2013-12-10 14:15:23 +11:00
Shannon d0a5892f9f Fixes: U4-3796 No media macro parameter in v7 2013-12-10 14:13:56 +11:00
Shannon c0f4950270 Fixes: U4-3826 It is possible in some cases to insert a macro inside a macro inside the rte 2013-12-10 14:11:36 +11:00
Shannon 1d9c3b1a79 Merge remote-tracking branch 'origin/6.2.0' into 7.0.1
Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Web/umbraco.presentation/library.cs
2013-12-10 12:59:29 +11:00
Shannon c5047148b3 Fixes legacy media business logic to return null when calling ToXml if the media item is trashed - this makes it consistent with how content works and also prevents being able to show the media on the front-end when it is trashed. Fixes up how the MediaService rebuilds the XML to make sure it's transactional based. Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled
Conflicts:
	src/Umbraco.Web/umbraco.presentation/library.cs
2013-12-10 12:56:31 +11:00
Shannon a6b3233c10 Fixes legacy media business logic to return null when calling ToXml if the media item is trashed - this makes it consistent with how content works and also prevents being able to show the media on the front-end when it is trashed. Fixes up how the MediaService rebuilds the XML to make sure it's transactional based. Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled 2013-12-10 12:53:33 +11:00
Shannon 9ec1f9b3f9 Merge remote-tracking branch 'origin/6.2.0' into 7.0.1
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/install/Default.aspx.cs
2013-12-10 11:55:32 +11:00
Shannon ed2126eef9 ensures media xml cache is rebuilt on upgrade 2013-12-10 11:54:18 +11:00
Shannon ce4b56895e fixes installer login check 2013-12-10 11:51:41 +11:00
Shannon eaac76cdc1 Fixes: U4-3821 Infinite redirect loop when upgrading from 7.0.0 to 7.0.1 and ensures media cache is rebuilt on upgrade 2013-12-10 11:51:03 +11:00
Shannon bffe52e060 Merge remote-tracking branch 'origin/6.2.0' into 7.0.1
Conflicts:
	src/Umbraco.Tests/PluginManagerTests.cs
2013-12-10 10:00:37 +11:00
Shannon 94db371234 Ensures macro and urls are not parsed in the ItemRenderer when a content item is assigned since that parsing will occur with the value converters 2013-12-10 09:59:13 +11:00
Shandem b12cd81c01 Merge pull request #264 from mvanhelmont/patch-1
fix /{localLink:ID}
2013-12-09 14:53:48 -08:00
Sebastiaan Janssen 103e226b51 Merge pull request #215 from dipeshhirani/U4-752
U4-752 Add culture invariant languages to create language dialog
2013-12-09 13:40:21 -08:00
Sebastiaan Janssen 208cf8a01d Bump version and try to make the buildserver happy 2013-12-09 17:55:37 +01:00
perploug 1f81107485 Fixes: U4-3653 Bottom "Action" links inaccessible 2013-12-09 15:24:38 +01:00
perploug bf5042e3d0 fixes: U4-3718 Sorting a list view by "Updated by" throws an exception
It tries to sort the result on UserBasic, made userbasic implement
ICompareble
2013-12-09 14:32:16 +01:00
perploug 15b55f2b36 Fixes: U4-3631 Disable preview button when there is no template assigned, since there is nothing to preview then... 2013-12-09 14:17:51 +01:00
Shannon 57f2250f13 Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled 2013-12-09 16:56:02 +11:00
Shannon f15682ef60 Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled 2013-12-09 16:35:12 +11:00
Shannon 1b1ec04e7c Ensures macro and urls are not parsed in the ItemRenderer when a content item is assigned since that parsing will occur with the value converters 2013-12-09 15:42:38 +11:00
Shannon 049c65a2c7 Fixes: U4-3799 @Umbraco.Field("bodyText") returns {LocalLink:xxx} 2013-12-09 15:20:11 +11:00
Shannon d50aa38c31 Ooops fixes the rte macro parser to not return empty when no macros are found 2013-12-09 14:01:34 +11:00
Shannon 1531f979a2 fixes: U4-3816 Creating member with @ in login results in SQL parameter error 2013-12-09 13:19:59 +11:00
Shannon 69ffecd686 Fixes: U4-3741 GetMemberFromLoginNameAndPassword Always Return Null 2013-12-09 13:08:06 +11:00
Shannon 6ec297aaaf Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 2013-12-09 12:49:13 +11:00
dipeshhirani bb1edd2051 remove commented line 2013-12-08 16:23:03 +00:00
Sebastiaan Janssen 14790559cb Merge pull request #140 from pynej/search-node-type
Add node type to search results
2013-12-08 07:56:50 -08:00
Sebastiaan Janssen 97457087c7 Merge pull request #266 from greystate/patch-1
Fix a typo/grammar error in da.xml
2013-12-08 06:21:31 -08:00
perploug 8469d18a0e fixes search keyboard support 2013-12-06 15:09:39 +01:00
perploug da3269e970 Fixes: U4-3426 Can't delete any contentnode, media, document type or template from back end, Umbraco 7.0.0-RC
Replaces $http.delete with $http.post enables httppost on the
server-side, its not the best solution, but has way fewer unknowns then
adding extensive VERB and origin support in the web.config
2013-12-06 13:12:18 +01:00
perploug b2b0afde4b Fixes broken copy/move dialog 2013-12-06 12:17:12 +01:00
perploug ff849ab912 Sets umbracoVersion to 7.0.1 2013-12-06 12:17:01 +01:00
perploug 97b8a5000a Fixes broken installer due to moving app-settings back into web.config 2013-12-06 12:16:36 +01:00
perploug f59489a5cb Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-06 10:07:29 +01:00
perploug b03427cabc Fixes: U4-3806 Prevalue validation run all field validators against all fields 2013-12-06 10:07:04 +01:00
Shannon 2eb5c08825 Fixing: U4-3686 Umbraco 7 - Rich Text Editor and Macro Issues + fixed up the per-controller webapi configuration and more fixes to loading propertyeditors/param editors, this saves a assembly scan. 2013-12-06 15:01:58 +11:00
Shannon 37eb66510f Fixes: U4-3505 Sometimes macro parameter types are not resolved during startup 2013-12-06 14:07:29 +11:00
Shannon dc7c7304ad Fixes: U4-3505 Sometimes macro parameter types are not resolved during startup 2013-12-06 14:06:53 +11:00
Shannon 8327b8aa0e Completes: U4-3792 Move appSettings, connectionStrings back to web.config 2013-12-06 11:52:47 +11:00
Shannon 7759249963 Fixes: U4-2967 Inline macros error out when trying to access the Model 2013-12-06 11:22:16 +11:00
Shannon 9d9070c979 fixes user service query to work with mssql and mysql 2013-12-06 10:56:49 +11:00
Shannon feb1a14650 Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 2013-12-06 10:27:40 +11:00
Shannon 4cb4ff0617 Fix MySQL migrations.
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs
2013-12-06 10:26:32 +11:00
Shannon 9e1d6dbf9b Merge branch 'Bitmapped-7.0.0' into 7.0.1 2013-12-06 10:22:07 +11:00
perploug 82ec2d28ef WIP on media upload tree refresh 2013-12-05 15:28:32 +01:00
perploug 66383c6f16 merge 2013-12-05 13:11:17 +01:00
Chriztian Steinmeier dc60eb8383 Fix a typo/grammar error in da.xml 2013-12-05 13:06:24 +01:00
perploug 9733c5c031 Folderbrowser tree sync 2013-12-05 13:04:28 +01:00
Shannon 0c0c08ec98 Changes how we set the csrf header for jquery, changed to global and ensures that it is lazily resolved to always ensure it has the newest value 2013-12-05 22:18:07 +11:00
Shannon d7d800331b Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-05 22:07:19 +11:00
Shannon 4346578160 Ensures csrf token is set for PostFile on the media controller for bulk file uploads 2013-12-05 22:06:57 +11:00
perploug cfe0b2f9e5 fixes failing eventsService tests 2013-12-05 11:30:08 +01:00
Shannon d7d7d88ecc Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-05 21:23:53 +11:00
Shannon fd34a9cd29 fixes demo app loader to load the correct bootstrap 2013-12-05 21:23:31 +11:00
Jeavon Leopold 3f1b057f45 Fixes U4-3247 - v6.1.6 RTE view/edit HTML doesn't work with IE 11 by upgrading TinyMce to v3.5.10 2013-12-05 09:06:01 +00:00
perploug 6da1a5adb3 Fixes: U4-3405 Umbraco 7 RC admin login - remember password 2013-12-05 09:22:32 +01:00
Shannon 23cf5b544a Moved image handling to diff controller since it doesn't support the csrf header, need to test more in an hour (WIP) 2013-12-05 19:06:55 +11:00
Shannon b0cde715da fixes merge issue 2013-12-05 18:51:05 +11:00
Shannon 366ca11490 Merge branch 'lars-erik-7.0.azurestorage' into 7.0.1 2013-12-05 18:45:21 +11:00
Shannon a1a985e4a8 Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-05 18:34:05 +11:00
Shannon 3384634033 Fixes: U4-3795 Cannot create content with a tag editor when the tag property belongs to an inherited doc type & U4-3786 Multi-level document types fail 2013-12-05 18:33:51 +11:00
perploug b6bcdcb351 fixes: U4-3728 Non-Mandatory Numeric property gives error when left blank
also fixes dimming on buttons fails when validation fails
2013-12-05 08:32:53 +01:00
Shannon db5b99dbf1 adds failsafe database lookup to BackwardsCompatibleData even though it shouldn't even get used. 2013-12-05 16:30:14 +11:00
Shannon a64dbb172e undo my custom test change to login controller 2013-12-05 16:20:02 +11:00
Shannon b1913c9a07 puts IDataValueSetter back in so it can be used by backwards compatible data 2013-12-05 16:18:45 +11:00
Shannon 11fc06d75d Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 2013-12-05 16:12:32 +11:00
Shannon f6179ff813 Strange, somehow these updates got overwritten 2013-12-05 16:11:15 +11:00
Shannon 186e664894 Merge remote-tracking branch 'origin/6.2.0' into 7.0.1
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/umbraco.cms/businesslogic/member/Member.cs
2013-12-05 16:09:34 +11:00
Shannon 1735c5adca adds Exists(string username) to member service and wraps IsMember with that call. 2013-12-05 16:04:53 +11:00
Shannon 31e715e146 Updates legacy Member class to setupNode based on the new IMember object (just like we do with media/content) - this will speed up data retrieval and is the start of wrapping the new API from the old one. 2013-12-05 15:51:38 +11:00
Shannon 4a7f7813e7 Updates legacy Member class to setupNode based on the new IMember object (just like we do with media/content) - this will speed up data retrieval and is the start of wrapping the new API from the old one. 2013-12-05 15:30:22 +11:00
Shannon 5f50bae65c Cleaning up a bit of the legacy member class
Conflicts:
	src/umbraco.cms/businesslogic/member/Member.cs
2013-12-05 14:48:30 +11:00
Shannon 996d74b1d3 Cleaning up a bit of the legacy member class 2013-12-05 14:45:28 +11:00
Shannon e6d8a83519 Ensures that the ContentBase item is set on Document/Media and that the property value is set based on the already loaded value in the model if IData implements IDataValueSetter (which DefaultData does). This streamlines how properties get their data and will save on a ton of queries when using the legacy API. 2013-12-05 14:26:18 +11:00
Shannon d3aa1b3d7e Ensures that the ContentBase item is set on Document/Media and that the property value is set based on the already loaded value in the model if IData implements IDataValueSetter (which DefaultData does). This streamlines how properties get their data and will save on a ton of queries when using the legacy API. 2013-12-05 14:24:26 +11:00
Shannon 3effe6b96d updates manifest docs to be correct 2013-12-05 12:38:39 +11:00
mvanhelmont 0b2428e9a3 fix /{localLink:ID}
ensures it set the href to /{localLink:ID} instead of /umbraco/{localLink:ID}
2013-12-04 21:01:10 +01:00
Lars-Erik Aabech 6458c223b8 Cleaned it up a bit. Now just using media file system provider.
It needs a bit of convesion rules though, need getfullpath(getrelativepath(path)) to be compatible with package & physical.
2013-12-04 19:47:54 +01:00
Brian Powell d36fc65baa Fixed MySQL issue. 2013-12-04 10:50:38 -05:00
Lars-Erik Aabech a511c84b4d Messy fix to support images on other domain. (Read: Azure Storage)
Added GetResized to replace usage of third party packages for simple resizing.

This PR should probably not be pulled, but I make a PR to show you what must be done.
Surely this is considered for UAAS?
2013-12-04 16:12:27 +01:00
perploug ff34024f39 fixes: U4-3717 List view doesn't honor the sort order 2013-12-04 13:17:55 +01:00
perploug bdc0ae7e2f fixes: U4-3707 Change password under users is not translated
translated, and added missing danish keys
2013-12-04 12:55:23 +01:00
perploug 60965ecd92 fixes: U4-3738 macro container, editing doesn't seem to work, just adds a new one
adds fallback on the parser object
2013-12-04 10:56:46 +01:00
Sebastiaan Janssen 708b49ca13 Reference the Microsoft.AspNet.WebApi.Client NuGet instead of local MVC4 install 2013-12-04 10:47:59 +01:00
perploug b6baa9af3d removes webdavModule from web.config 2013-12-04 09:24:04 +01:00
Shannon 8c7db9e846 Fixes: U4-3742 Umbraco 7 and umbraco/channels.aspx 2013-12-04 17:45:47 +11:00
Shannon 176ec0edc0 Fixes: U4-3651 What is the "Pick multiple items" prevalue on MNTP for? and removes the remaining uGoLive references. 2013-12-04 17:13:26 +11:00
Shannon 0d1cf872d3 Fixes WebApi issue with creating HttpResponseMessage manually - this shouldn't be done and we'll end up with very strange YSODs 2013-12-04 17:05:05 +11:00
Shannon 13b6318ad2 Fixes: U4-3776 v7 - MNTP value type changes between int and string 2013-12-04 15:57:55 +11:00
Shannon 18352f8a4d Fixes null check with filtered content/media attribute, fixes issue with container types and rendering tree nodes. 2013-12-04 15:54:50 +11:00
Shannon ad52b86336 Fixes scrollbar issue with directory/file browser and xslt visualize 2013-12-04 15:29:51 +11:00
Shannon 38df2017de Fixes issue with deleting content types that have content 2013-12-04 15:01:27 +11:00
Shannon 210f66cc4a Fixes issue with deleting content types that have content 2013-12-04 15:00:49 +11:00
Shannon e7e209280c Fixes issue with replacing webapi formatter 2013-12-04 14:47:19 +11:00
Shannon 5b7e9c712e Merge remote-tracking branch 'origin/6.2.0' into 7.0.1
Conflicts:
	src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs
2013-12-04 13:50:55 +11:00
Shannon 33aa4e2062 Fixes potential xss 2013-12-04 13:33:24 +11:00
Shannon 1efa75c891 Fixes potential xss 2013-12-04 12:42:40 +11:00
Brian Powell f48fb5c499 Fix MySQL migrations. 2013-12-03 15:44:34 -05:00
perploug cb13b4a0e0 Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-03 13:44:53 +01:00
Shannon cb8dbf9da5 fixes up some merge issues 2013-12-03 18:14:04 +11:00
Shannon 2a05687c8b Merge remote-tracking branch 'origin/6.2.0' into 7.0.1
Conflicts:
	src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/PluginManager.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
	src/Umbraco.Web.UI/install/Default.aspx.cs
	src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
	src/Umbraco.Web.UI/umbraco/dashboard.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
	src/Umbraco.Web.UI/umbraco/logout.aspx
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
	src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
2013-12-03 18:10:00 +11:00
Shannon d4514844f8 Fixes a few other potential xss entry points 2013-12-03 17:58:42 +11:00
Shannon 6b7a495d19 Fixes a few other potential xss entry points and cleans up some legacy webforms files 2013-12-03 16:38:58 +11:00
Shannon 601eb0bf38 Fixes a few other potential xss entry points and cleans up some legacy webforms files 2013-12-03 16:28:51 +11:00
Shannon 037e7e0797 Fixes remaining xslt injection U4-3175 2013-12-03 15:56:50 +11:00
Shannon a7e32e97e3 Fixes xss issue 2013-12-03 15:40:12 +11:00
Shannon 9d90506265 Fixes issue with authcookie on renew - need to ensure its http only and persited for a day remains, ensures the csrf cookies are set when getting the user since that is called before logging in. 2013-12-03 11:57:41 +11:00
Shannon 08100793af completed csrf protection 2013-12-03 11:36:17 +11:00
perploug a265424b3f Replaces all rootScope.broadcast with eventsService
Broadcast is inefficient and eventsService gives us extra options for
funneling all app events through one pipeline.

For now it just replicates rootScope on/emit, but longer term we can get
this to handle async UI events
2013-12-02 13:51:03 +01:00
perploug bb87fa7fa8 removes outcommented code 2013-12-02 12:24:36 +01:00
perploug 16cf64866a default tinymce config to have default height and width 2013-12-02 12:21:39 +01:00
perploug 11da6d5be7 Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-02 09:42:53 +01:00
Shannon ea35ea1af5 getting csrf stuff coded up, it's pretty much done just need to write a couple tests and add the filter to the necessary controller/actions 2013-12-02 17:20:50 +11:00
Shannon 33c32579c8 Adds AngularJsonMediaTypeFormatter and ensures our controllers all use this formatter in order to enable angular's JSON Vulnerability protection. 2013-12-02 13:31:44 +11:00
Shannon 1ac6f6db50 publicizes macroproperty 2013-12-02 13:30:08 +11:00
esunxray cacf87be2d Update zh.xml
update Chinese file for 6.2, this can be merged into V7.
2013-11-29 21:26:16 +08:00
perploug 7baa81c2df missing en translation for login dialog 2013-11-29 12:00:03 +01:00
perploug a0e88a297d Blocks search box from loading untill after login 2013-11-29 11:59:44 +01:00
perploug 8d2b52a5b0 fixes: U4-3749 Login page is not translated 2013-11-29 11:58:58 +01:00
perploug 81389ce435 Fixes: U4-3685 Richtext Editor - Custom toolbars and dimensions ignored 2013-11-29 11:56:52 +01:00
Shannon e981776e6d Created new EnsurePublishedContentRequestAttribute for custom routing to still be able to render macros. 2013-11-29 17:41:38 +11:00
Shannon 48b3806129 adds umbraco session id to UserData so we can use for csrf 2013-11-29 12:42:50 +11:00
Shannon 9fc8e18881 Fixes csrf issue
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/umbraco/logout.aspx
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
	src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs
2013-11-29 12:17:58 +11:00
Shannon 250276bbd4 Merge branch '6.1.6-U4-3619' into 6.2.0 2013-11-29 11:26:01 +11:00
Shannon af29f61478 Fixes csrf issue 2013-11-29 11:10:25 +11:00
perploug cdfebe705d Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-11-28 15:35:34 +01:00
perploug e6714ae829 Ensure refresh node action is translated 2013-11-28 15:35:23 +01:00
perploug a0dead872b DA lang file updates 2013-11-28 15:35:06 +01:00
perploug b6ebc34199 ensure create dialogs can reopen the menu 2013-11-28 15:34:56 +01:00
perploug 49e7ace2d9 tree menu should not be selectable 2013-11-28 15:34:39 +01:00
perploug d140eab12d Ensures dialogs doesnt reopen the menu 2013-11-28 15:34:24 +01:00
Kalle Ekstrand 24fcfd9fcb Minor changes 2013-11-28 15:07:33 +01:00
perploug 83e05a4f84 Merge pull request #259 from nilzen/U4-3683
Fixed: U4-3683 Icon selector problem (Chrome)
2013-11-28 05:43:08 -08:00
Kalle Ekstrand 48dd619899 Minor changes 2013-11-28 14:34:22 +01:00
perploug ff52755636 Media and content tree root node translation 2013-11-28 13:26:05 +01:00
perploug a7cd18c3d2 The section mapping was reversed, so werent translated 2013-11-28 13:20:52 +01:00
perploug 98a0208b47 Removes button icon from script editor 2013-11-28 13:08:54 +01:00
perploug b923305527 adds pointer cursor to help 2013-11-28 13:06:28 +01:00
perploug 04ccbdde4d Dims buttons during action to prevent multiple saves 2013-11-28 13:06:19 +01:00
perploug de1e3d150f Missing script translation 2013-11-28 13:05:36 +01:00
perploug 07182529f4 replace $element with $scope.$on($destroy)
We should never access dom element from controllers
2013-11-28 12:32:03 +01:00
perploug e076b687c6 added rte and assets service mocks 2013-11-28 12:32:02 +01:00
Shannon 7f305db637 Fixing: U4-3687 Umbraco 7 Packaging Issues - have fixed the data type package issues, cleaned up some code and fixed a different underlying pre-val issue for empty legacy aliases 2013-11-28 16:57:05 +11:00
Shannon 50e10155e7 Completes: U4-3712 Allow c# property editors to have custom js injected into the js initialization block so they can load in angular controllers 2013-11-28 14:27:58 +11:00
Shannon 478b7cde42 Removes uGoLive from the core (for now until it is rebuilt against v7 ) 2013-11-28 10:51:54 +11:00
Shannon c86f52d5ea Completes: U4-3230 Combine/Minify manifest files to one request with CDF 2013-11-28 10:37:08 +11:00
Shannon 58fc51ae93 Fixes: U4-3736 Unit test Can_Get_File_Dates() now testing correctly, disregarding local (nont-UTC) time. 2013-11-28 09:30:50 +11:00
Shandem 413248a126 Merge pull request #260 from AndersKroghDk/7.0.1
Fixes: U4-3736 Unit test Can_Get_File_Dates() now testing correctly.
2013-11-27 14:25:11 -08:00
Anders f114f94740 Fixes: U4-3736 Unit test Can_Get_File_Dates() now testing correctly, disregarding local (nont-UTC) time. 2013-11-28 00:09:09 +01:00
Shannon ce162e2657 Gets the JS done for: U4-3230 Combine/Minify manifest files to one request with CDF - now loading incredibly fast. 2013-11-27 18:42:35 +11:00
Shannon 00518f8451 improves security and ensures the server vars cannot be loaded without authentication, they will get lazy loaded once authenticated and changed the controllers to listen for the 'ready' event instead. 2013-11-27 17:38:59 +11:00
Shannon ba3c1f9d21 minifies and outputcaches the server vars 2013-11-27 14:52:54 +11:00
Shannon 7535585b63 Fixes: U4-3720 Color picker prevalues isn't saved as an array and therefore "model.config.items.length === 0" doesn't work 2013-11-27 10:22:45 +11:00
nilzen bf288c0502 Fixed: U4-3683 Icon selector problem (Chrome) 2013-11-26 13:25:23 +01:00
Kalle Ekstrand f8375857c2 Updates to the swedish language file for v7 2013-11-26 11:08:55 +01:00
Shannon 2391ee1368 Changes the web.config template to use a linked resources (one file) 2013-11-26 20:03:13 +11:00
Shannon 327d17c90e obsoleted some un-used/legacy code. IMediaFactory it is no longer used and is contained in an old assembly. If we want to re-support this (which i don't think we do), it needs to be manually re-created and implemented, i don't think its been used for quite some time. 2013-11-26 17:52:53 +11:00
Shannon d6b4c47cd9 fixed gen'd mvc web.config template. 2013-11-26 17:14:58 +11:00
Shannon a052fc42b1 Fixes: U4-3682 Can not create new documents (javascript error) 2013-11-26 14:03:00 +11:00
Shannon c89fb0a0be Fixes: U4-3688 Unable to delete a property of type "Tags" from a Document Type 2013-11-26 13:58:49 +11:00
Shannon 03a606432a Fixes: U4-3695 Events does not fire 2013-11-26 13:34:51 +11:00
Shannon 54e826bc96 Fixes: U4-3696 Upload datatype only updates on first save 2013-11-26 13:13:43 +11:00
Shannon 6c57222a2e removes committed file that shouldn't have been there. 2013-11-26 13:12:59 +11:00
Shannon 97e8573dff removes debugging output 2013-11-26 12:46:16 +11:00
Shannon 683862932b Fixes: U4-3679 Using two data types with the Media Picker data editor multiple/not multiple 2013-11-25 19:38:56 +11:00
Shannon 9a856df8bc Fixes: U4-3644 Multiple Textstring DataType not displaying in DocType (vs. 7.0.0 build 183) 2013-11-25 17:36:56 +11:00
Shannon e1ef2e8700 Fixes: U4-3677 Multinode tree picker does not save content when node type is set to Media 2013-11-25 16:58:47 +11:00
Shannon 59599efab6 Fixes: U4-3655 Clicking on recycle bin in media section redirects you back to the content tree 2013-11-25 14:45:14 +11:00
Shannon 20813ef207 Fixes: U4-3673 Creating content with Services API always sets created by to admin
Conflicts:
	src/Umbraco.Tests/Services/ContentServiceTests.cs
2013-11-25 13:25:01 +11:00
Shannon 99e0a1f11b Fixes: U4-3673 Creating content with Services API always sets created by to admin 2013-11-25 13:22:35 +11:00
Shannon 9bf2819ac6 Fixes: U4-3661 Unable to Create Color Picker DataType & U4-3645 Media Picker Umbraco 7 can select multiple 2013-11-25 12:02:25 +11:00
Shannon cafeb6d8c6 Fixes: U4-3661 Unable to Create Color Picker DataType & U4-3645 Media Picker Umbraco 7 can select multiple 2013-11-25 11:58:01 +11:00
perploug f916a6bc18 fixes datepicker css ref issue 2013-11-21 12:15:20 +01:00
perploug 8865f798a6 fixes media dialog sync issues 2013-11-21 12:15:03 +01:00
Tim Geyssens 362bb593f1 Adds value convertor for rel links 2013-11-21 11:48:07 +01:00
Tim Geyssens 4dc7b185aa another update to rel links data migration 2013-11-21 11:27:34 +01:00
Tim Geyssens d0d1b2675d Some changes to related links to make sure peoples front end code will still work 2013-11-21 11:24:46 +01:00
Tim Geyssens b624d87a59 make sure related links datatype value type is set to JSON 2013-11-21 11:17:43 +01:00
perploug aa75a6bf9f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-21 11:14:25 +01:00
perploug 14a0efde01 Minor width adjustment 2013-11-21 11:13:53 +01:00
Tim Geyssens 1c20496974 removes cs from rel links data upgrader, was getting lock issues 2013-11-21 11:13:21 +01:00
perploug 309dd5d4a2 content dashboard 2013-11-21 11:09:20 +01:00
Tim Geyssens 92c28de028 Final touches to rel links data upgrader 2013-11-21 10:41:42 +01:00
Tim Geyssens 16ea928c75 rel links data upgrader, migration is working :) 2013-11-21 10:30:27 +01:00
Tim Geyssens 31f67eac6c uses newtonsoft json serializer on rel link data upgrader 2013-11-21 10:20:18 +01:00
Sebastiaan Janssen a04aef9b98 U4-3623 Text corrections in install wizard 2013-11-21 10:17:52 +01:00
Niels Hartvig 9f046f9945 Updates default dashboards 2013-11-21 09:58:27 +01:00
Tim Geyssens 64cae76dca And yet another small update to rel links data upgrader 2013-11-21 09:57:18 +01:00
Tim Geyssens b6e4a96e3b Another small update to rel links data upgrader 2013-11-21 09:35:20 +01:00
Tim Geyssens 82154ee660 Small update to rel links data upgrader 2013-11-21 09:23:41 +01:00
Sebastiaan Janssen 655075aabe Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-21 08:53:56 +01:00
Sebastiaan Janssen 3773cac232 Limit MVC and WebAPI to version 4 for now until we can test 5. 2013-11-21 08:53:40 +01:00
Tim Geyssens 05cd6500ba Adds some exception handling to the rel links data upgrader, always nice not to blow up the upgrader 2013-11-21 08:53:13 +01:00
Tim Geyssens 345340b957 Adds rel links data upgrader 2013-11-21 08:45:46 +01:00
Shannon 22be517daf publicizes the legacy parameter editor alias map, ensures that a YSOD is not shown when a legacy parameter editor is trying to be rendered, we just render a text box in its place 2013-11-21 18:10:47 +11:00
Shannon d04f2a98b9 Fixes tests 2013-11-21 17:47:57 +11:00
Shannon 8860e77468 Fixes tests 2013-11-21 17:47:23 +11:00
Shannon ffeed58f5d Fixes: U4-3576 When editing file based items and changing the file name - we need to change the route location 2013-11-21 17:23:48 +11:00
Shannon 6fd5eee4f6 Fixes: U4-3591 Creating PropertyValueConverter for a v7 prop editor (created with manifest) ends up with YSOD when outputting value on frontend 2013-11-21 16:39:21 +11:00
Shannon 4354840674 Fixes an issue with member search 2013-11-21 15:57:53 +11:00
Shannon 6d1ba5a823 Fixes: U4-3625 List view filtering is not enabled on media and adds debounce 2013-11-21 15:52:40 +11:00
Shannon eee63e3a48 Fixes: U4-3626 List view filtering needs to be applied using debounce 2013-11-21 15:04:10 +11:00
Shannon f41f82adc5 Changes locker to be static 2013-11-21 14:46:18 +11:00
Shannon e6ae88c016 Fixes hash generation and checking with the trees.config file - since this is changed during startup our plugin cache was never active :( 2013-11-21 14:45:52 +11:00
Shannon abd1c89660 Changes locker to be static 2013-11-21 14:42:35 +11:00
Shannon 9acaa82d4b Fixes hash generation and checking with the trees.config file - since this is changed during startup our plugin cache was never active :( 2013-11-21 14:01:54 +11:00
Shannon d5dc5127ae Ensures the approved check box is checked when creating a new member. 2013-11-21 12:17:07 +11:00
Shannon d8862c85bf Fixes tags property editor to not submit the html form when pressing enter. 2013-11-21 12:16:26 +11:00
Shannon 874c7977c2 updates typefinder assembly ignore list - ensures that we scan the providers dll and ignores some other new ones (should slightly speed up startup) 2013-11-21 12:15:59 +11:00
Shannon fa34652cf1 Fixes: U4-3588 Value cannot be null. Parameter name: child error when using the Login Macro 2013-11-21 11:08:33 +11:00
Shannon 22c615a641 fixes filtering issue 2013-11-21 10:39:10 +11:00
perploug 2ffc64b965 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-21 00:15:31 +01:00
perploug 4c932f013a fixes delete dialog missing spacing 2013-11-21 00:15:08 +01:00
perploug 52b40ac514 fixes tree item style reload 2013-11-21 00:14:51 +01:00
perploug 631710222f fixes media picker single-item mode 2013-11-21 00:14:37 +01:00
perploug 2824a2ca8b fixes simple create tree reload 2013-11-21 00:14:10 +01:00
Shandem c90af1df39 Merge pull request #253 from greystate/7.0.0__U4-3581
Returning root element instead of document node from JsonToXml()
2013-11-20 15:08:51 -08:00
perploug c679e00b81 minor change in iframe offloading 2013-11-20 20:14:58 +01:00
perploug c6caa6aae7 Missing dictionary items 2013-11-20 15:59:25 +01:00
perploug 1b1642ce46 fixes broken script dialog and tree sync 2013-11-20 15:33:24 +01:00
perploug 31d0450d6c fixes broke xslt visualizer 2013-11-20 15:08:04 +01:00
perploug a71d18f352 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-20 14:55:09 +01:00
perploug 12c982f170 ups, forgot an alert() 2013-11-20 14:54:27 +01:00
Sebastiaan Janssen 35af370f70 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-20 14:51:50 +01:00
Sebastiaan Janssen bbee0a81c9 Undo "fix" for starter kit installer, we'll fix properly later 2013-11-20 14:51:35 +01:00
Sebastiaan Janssen 2beb3c5b4c Merge branch 'master' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Conflicts:
	.gitignore
2013-11-20 14:50:57 +01:00
perploug f7d407e9fd various dialogs fixes 2013-11-20 14:37:46 +01:00
perploug d67db8a90a Fixes ctrl+s hotkeys in legacy editors 2013-11-20 14:37:28 +01:00
Chriztian Steinmeier 98e7ee90f4 Minor pedantic casing change 2013-11-20 14:20:22 +01:00
Chriztian Steinmeier 90c4358844 Return the root element instead of document node 2013-11-20 14:19:39 +01:00
perploug 2cb4b207dc fixes broken merge 2013-11-20 13:41:31 +01:00
perploug b80b2475e0 Merge 2013-11-20 13:34:42 +01:00
perploug 94bbcb98a6 adds filter to getChildren 2013-11-20 10:24:45 +01:00
perploug 26f79e1010 Fixed attribute filtering when no items should be filtered 2013-11-20 10:24:35 +01:00
Stephan a626eeff7d U4-3591 - more explicit exception when two IPropertyValueConverter collides 2013-11-20 09:58:28 +01:00
Shannon 474dcd0754 Fixes: U4-3587 Can't delete a member when there is a group assigned
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
2013-11-20 18:24:44 +11:00
Shannon 84353d1e77 Fixes: U4-3587 Can't delete a member when there is a group assigned 2013-11-20 18:23:23 +11:00
Shannon 369f6ac935 fixes merge issue 2013-11-20 18:15:11 +11:00
Shannon 39aa100490 Fixes: U4-3572 CSS class changes are not applied to tree nodes after resync 2013-11-20 18:10:54 +11:00
Shannon 5a928aa459 FIxes installer when duplicate conflicts: U4-3612 Cannot install Txt starter kit in the back office
Conflicts:
	src/umbraco.cms/businesslogic/Packager/Installer.cs
2013-11-20 17:28:33 +11:00
Shannon d1a656b3cd FIxes installer when duplicate conflicts: U4-3612 Cannot install Txt starter kit in the back office 2013-11-20 17:25:25 +11:00
Shannon d87db5b338 Shows an error notification if there is a ysod when not in debug mode so the user at least knows something has gone wrong. 2013-11-20 17:24:45 +11:00
Shannon 416a9ed064 Comments out backported code - need to wait till we merge in the custom membership branch. 2013-11-20 17:10:15 +11:00
Shannon b13c3aa3b9 Fixes: U4-3610 When adding another tab to a member type no members will load and result in a YSOD
Conflicts:
	src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs
2013-11-20 16:59:41 +11:00
Shannon 0a11f31754 Fixes: U4-3610 When adding another tab to a member type no members will load and result in a YSOD 2013-11-20 16:58:25 +11:00
Shannon 99ae94a82f Ensures that members are auto-approved if creating a member via the legacy members API. 2013-11-20 16:40:30 +11:00
Shannon 0c226d1a2c Fixes: U4-3581 Make sure advanced v7 prop editors can also be used from xslt 2013-11-20 15:54:50 +11:00
Shannon 596cf2a9e1 Ensures that members are auto-approved if creating a member via the legacy members API. 2013-11-20 15:11:08 +11:00
Shannon 2f089128d7 Fixes: U4-3608 When logged in as a user with a custom start node the media thumbs do not display on a folder 2013-11-20 14:48:11 +11:00
Shannon b52b649548 Fixes: U4-3209 Ensure user is validated for PostAddFile on MediaController 2013-11-20 14:41:05 +11:00
Shannon 7e4739956a Ensures that tree requests have section security applied, though it's not perfect until we have security by tree and section it ensures that a user cannot list out tree data when they don't have access to a section in which that tree's data is required. Now the root node requests via the application tree controller have their auth filters applied (that took quite a lot of zany work). Gets AD login working nicely too. 2013-11-20 14:18:03 +11:00
Shannon e040fc8819 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-20 08:55:38 +11:00
Shannon c2a858b903 Ensures approval status is checked when validating a member 2013-11-20 08:55:09 +11:00
perploug e1108ce65b Removes extra line on datatype editor 2013-11-19 22:35:41 +01:00
perploug a6e93879c2 Adds overload to file system tree to allow multiple file extensions filter 2013-11-19 21:57:07 +01:00
perploug 56e9d0a602 Adds documentation for missing resource methods 2013-11-19 21:56:35 +01:00
perploug 23d5d117e7 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-19 20:38:00 +01:00
perploug daa4ff28e7 Fixes missing section state indicator 2013-11-19 20:37:39 +01:00
Sebastiaan Janssen 291fcb043c Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-19 20:30:45 +01:00
Sebastiaan Janssen dea1e9e541 Whoops, my last fix was a bit too broad 2013-11-19 20:30:28 +01:00
perploug ca8b6cac7a updated testrunner config 2013-11-19 20:24:29 +01:00
perploug 6cf9312d1a editorState docs 2013-11-19 20:24:19 +01:00
perploug 45868d3fec Fixes repo browser 404 issue 2013-11-19 20:23:56 +01:00
Sebastiaan Janssen 3d90e66d36 Bump version number 2013-11-19 19:20:07 +01:00
Sebastiaan Janssen 836177a90f Fixes issue where media cache is not properly populated with isDoc and image propertyTypes 2013-11-19 19:11:48 +01:00
Sebastiaan Janssen 14bb0ce4d8 At least a temporary fix of the starter kit installer 2013-11-19 18:01:09 +01:00
perploug c6720ff42c Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-19 16:26:54 +01:00
perploug 863c7d11b7 Moves the folder selector on the mediapicker
To the item itself, instead of external button
2013-11-19 16:26:07 +01:00
Sebastiaan Janssen 53c043d22e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-19 16:06:26 +01:00
Sebastiaan Janssen 7e70253e1c U4-3340 Installer: Make SQL CE Default option 2013-11-19 16:06:14 +01:00
perploug b6bca084c5 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-19 15:46:04 +01:00
perploug 0a7e09b3dd revert logo to good ol' orange 2013-11-19 15:45:53 +01:00
Sebastiaan Janssen 313b831559 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-19 15:13:18 +01:00
Sebastiaan Janssen 355137f982 U4-3469 Umbraco 7 + MVC 4 + nuget, web.config error 2013-11-19 15:12:47 +01:00
perploug 6cd09e7b86 minor css tweaks 2013-11-19 14:33:00 +01:00
perploug e80023bcff Adjusts the media picker to display folders properly 2013-11-19 14:21:38 +01:00
perploug d1c7a3764f enables the media picker to select current folder 2013-11-19 14:21:17 +01:00
perploug 806596f04d Disables the tree header when it has a alt start node 2013-11-19 14:20:51 +01:00
perploug 77889f968b turns off imagecropper toxml which has caused issues 2013-11-19 14:19:41 +01:00
perploug 7cb496ee3c WIP on better mediapicker view 2013-11-19 11:10:58 +01:00
perploug fb1d6436b7 wrap rules request in a $q.all() to await response 2013-11-19 11:10:01 +01:00
perploug f749886bf4 disable caching on style rules resource 2013-11-19 11:08:51 +01:00
perploug 11c35977d3 fixes broken legacy pickers 2013-11-19 11:06:09 +01:00
perploug 66119ba3d8 fixes linkpicker broken due to new NiceUrl format 2013-11-19 09:06:43 +01:00
Shannon 31ab56a3c1 Got AD members listed in the tree but we won't be able to edit them till 7.1, now to get login going. 2013-11-19 18:31:15 +11:00
Shannon 640967666f fixes issue with the guid converter 2013-11-19 18:09:23 +11:00
Shannon e2890d4186 reverts the installer to ensure media picker is included along with multiple media picker - people will want both and this fixes a failing test. 2013-11-19 17:52:20 +11:00
Shannon 1e2688b14d fixes some more unit tests 2013-11-19 17:41:48 +11:00
Shannon 5fc82fef18 Fixes: U4-3440 Tempates (MVC Views) tree sync doesn't work correctly 2013-11-19 17:17:39 +11:00
Shannon d3b8ac31c7 Fixes up a bunch of failing tests with hard coded ids. Still need to fix a few more 2013-11-19 15:36:30 +11:00
Shannon a11b326c22 Fixes: U4-3574 right click menu options for trees emit events for all nested nodes involved 2013-11-19 14:12:33 +11:00
Shannon 7f012de43e renames utill to have one "l" (utility) 2013-11-19 14:08:51 +11:00
Shannon 7752aaabfe Updates tree/resource/service so that devs can provider their own custom query string data to load trees/dialogs if required. 2013-11-19 14:05:14 +11:00
Shannon f7e86f6b09 Fixes: U4-3555 Membership tree letters should not contain the 'delete' action 2013-11-19 13:18:33 +11:00
Shannon e502579319 Fixes up security check for start node for mntp 2013-11-19 12:28:50 +11:00
Shannon 2f42fc61bf Changed method signatures of some of the conversion methods on the PropertyValueEditor to make it more flexible for developers to do what they want. 2013-11-19 11:51:01 +11:00
Shannon ac2009e4ae Fixes up CData issues - true/false editor had incorrect value type - changed to INT, drop down had incorrect value type - changed to STRING, changed logic to check for empty/null values, if so never return CData as this just takes up more un-needed space 2013-11-19 10:54:28 +11:00
Shannon 44404b70e1 fixes up protected field - changes to private 2013-11-19 10:40:21 +11:00
Shannon 5bb68f32bf Fixes up editorState - ensures that it is set in all of the correct places (removes appState editingEntity and references), ensures that setting 'current' is not possible, ensures that editorState is reset on all route changes, adds unit tests for getting/setting editorState. 2013-11-19 10:39:18 +11:00
Shannon 89b20a2e77 Updates installer to not install the legacy 'Media Picker' by default and instead install the newer "Multiple Media Picker" which has been given new ids. 2013-11-19 10:11:39 +11:00
Marc Stöcker 997e0e5492 Initial German v7 translation/localization
Should cover all of the already localized strings for v7 (as well as 6.x - no obsolete items removed for now).
2013-11-18 23:39:20 +01:00
Shannon d2a00f5c18 media folders are not containers by default: U4-3566 Don't make Media Folders "Listviews" by default 2013-11-19 09:39:14 +11:00
perploug 91bcb656ec adds basic media controller mocks and tests 2013-11-18 22:29:38 +01:00
perploug 4fea694c6a Loads content and media trees with a custom root 2013-11-18 22:29:19 +01:00
perploug abce483d0e Fixes right-click on li in the tree 2013-11-18 21:07:17 +01:00
perploug 8d0603b11c fixes mntp startnode issue 2013-11-18 20:44:12 +01:00
perploug 6d516212eb Changes the default media picker to a multiple-node one 2013-11-18 20:43:42 +01:00
perploug c3fd4bd685 Adds editorState to media, datatype, content, and member editors 2013-11-18 20:43:21 +01:00
Sebastiaan Janssen e922ca88f2 U4-3553 Settings - Document Type - Tabs do not work 2013-11-18 18:54:55 +01:00
Sebastiaan Janssen 64d5533274 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-18 18:11:46 +01:00
Sebastiaan Janssen 734895c90c U4-3328 404 on zoom-in.png during install 2013-11-18 18:11:26 +01:00
Sebastiaan Janssen a009cad200 Wrong bootstrap file reference, error was hidden by Client Dependency framework 2013-11-18 18:08:38 +01:00
perploug b743ea4fb8 Changes treepicker to tree source on the mntp settings 2013-11-18 16:14:49 +01:00
perploug ed54b55965 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-18 14:59:30 +01:00
perploug 82e9ab1825 Adds multipicking as a setting on media picker 2013-11-18 14:59:02 +01:00
perploug da2f3aefe6 Improves media drag n drop sorting 2013-11-18 14:58:29 +01:00
Sebastiaan Janssen 17db60c34a Fixes U4-3399 - Adds some nuget dependencies and we don't need the dummy in macroscripts
any more nor do we need to preventatively delete json.net any more.
2013-11-18 14:51:12 +01:00
perploug 9ae9a4e52d fixes serverside part of legacy pickers 2013-11-18 11:49:11 +01:00
perploug 4dbd1d3ca7 adds section to page title 2013-11-18 11:48:58 +01:00
perploug f758634a90 lofgin autofocus 2013-11-18 11:01:13 +01:00
perploug c302de6bdf adds link to upload property editor 2013-11-18 11:01:05 +01:00
perploug e3ec0c1019 fixes missing tinymce buttons 2013-11-18 10:48:46 +01:00
perploug a9dd33908c Fixes missing header validation 2013-11-18 10:48:33 +01:00
Shannon 21e3893528 Fixes: U4-3558 members tree syncing is a bit strange and not showing the selected member 2013-11-18 15:58:53 +11:00
Shannon f8e17b711e custom membership providers now working in the back office. 2013-11-18 15:29:53 +11:00
Shannon 4d31512ef0 Custom membership provider's now working in the back office UI - have created intial functionality to allow custom properties with custom membership providers (the creation already performs the link if the Member member type is available). Updating also works too, need to clean up some code though as it's fairly messy. 2013-11-18 14:25:08 +11:00
Shannon 1707e6b18f Added ability for a menu item to simply navigate to a route, adding functoinality for us to create/edit/delete members based on a generic membership provider. 2013-11-17 13:43:04 +11:00
perploug 9212033858 Allows people to click tree to close dialogs 2013-11-16 10:38:14 +01:00
perploug 6effcf82ac Fixes legacy dialog .destroy issues 2013-11-16 10:38:02 +01:00
perploug 71a0c45889 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-15 08:35:53 +01:00
Shannon febe81105b starts fixing custom membership provider problems with the member editor/tree - this now at least loads in the members section. 2013-11-15 18:26:40 +11:00
Shannon 830d6d914f puts the test init code back in that shouldn't need to be there but the server is failing now for some reason. 2013-11-15 18:21:55 +11:00
Shannon 259d8e03db completes: U4-3300 Need to test content service copy API with tags - since there's 'special' code in there to handle it that's not been tested with the new changes - with test 2013-11-15 17:54:01 +11:00
Shannon 2784e2a22d removes ref to missing file 2013-11-15 17:30:26 +11:00
Shannon 94cc49e67e Fixed the model mapping tests 2013-11-15 17:15:59 +11:00
Shannon 2bd91d619d fixes failing unit test due to default value change for keep user logged in 2013-11-15 17:04:45 +11:00
Shannon d446d84cf5 fixes failing unit test due to default package url change 2013-11-15 17:03:29 +11:00
Shannon 5244f75d0d Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-11-15 17:01:13 +11:00
Shandem 96440c9ee5 Merge pull request #248 from lars-erik/6.2.0-fix-sqlsyntaxprovider-indexclustring
6.2.0 fix sqlsyntaxprovider indexclustring
2013-11-14 22:00:31 -08:00
Shannon 4545af0a21 Boom! container nodes work for both media and content, fixes:
U4-3540 When creating a Container type node - the list view shows all children of the item it's being created underneath
U4-3541 media tree is not catering for container types
2013-11-15 16:56:51 +11:00
Shannon 0878de4a8b Fixes tree service from showing that there is children when there isn't, fixes container node issues:
U4-3540 When creating a Container type node - the list view shows all children of the item it's being created underneath
U4-3541 media tree is not catering for container types
Adds container style
2013-11-15 16:19:46 +11:00
Shannon 9774744991 should knock off a few minutes for running tests. 2013-11-15 16:00:48 +11:00
Shannon 4a6103ba94 Fixes some merge issues, tries to speed up unit tests a little. 2013-11-15 15:10:02 +11:00
Shannon 8bbe6675db Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
2013-11-15 15:00:44 +11:00
Shannon b4c005c140 Fixes up the EntityRepository to use dynamics for media as well so that *all* fields in the main table are returned so we can store this information in AdditionalData, now that this is working nicely we should make the entity repo lookup the properties for content too just like we're doing for media since these get put into AdditionalData as well and there's really not much overhead to do that.
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
2013-11-15 14:53:26 +11:00
Shannon 34cebe989f Fixes up the EntityRepository to use dynamics for media as well so that *all* fields in the main table are returned so we can store this information in AdditionalData, now that this is working nicely we should make the entity repo lookup the properties for content too just like we're doing for media since these get put into AdditionalData as well and there's really not much overhead to do that. 2013-11-15 14:29:34 +11:00
Shannon eca823ea90 Fix for U4-3529 Ysod editing Partial View 2013-11-15 13:49:20 +11:00
Shannon 89481405b5 Fixes: U4-3534 Sorting content items 2013-11-15 12:57:28 +11:00
Shannon f1d837dfd1 fixes: U4-3539 Cannot set a scheduled publish at date/time gives a warning message 2013-11-15 12:46:55 +11:00
Shannon c61fd1ec27 Fixes datetimepicker once and for all, fixes user model to return the culture not just the language, adds ability to localize the datetimepicker - will default to english but is easy to add other versions, currently the only custom one in there is brazilian (since it was already made).
fixes: U4-2863 Date picker-textbox jumps between 12 and 24 hours clock
U4-3537 Cannot clear date/time value, still have problems with it's null validation not clearing from the server
2013-11-15 12:26:29 +11:00
Shannon 5314afb51a Changed editorContext to use appState instead for content/media/member editors - the appState saved is the basic entity, this means that if property editors resolve this value they do not have access to actually change the real content model which we don't want to allow (or changing other property's values).
Fixed up some inconsistencies between all of these editors and the content editor helper, fixed up tree syncing with the members editor.
2013-11-15 10:38:36 +11:00
Shannon 1c742db414 Cleans up a bit more code - no longer passing in nav controller scope, removes zany args.scope assignment back to the nav ctrl via the nav service, this is not necessary at all and doesn't make any sense. 2013-11-15 09:43:21 +11:00
Shandem f8b2fcaa2b Merge pull request #249 from rsoeteman/7.0.0
Fix for  U4-3529  Ysod editing Partial View
2013-11-14 14:00:09 -08:00
Marc Stöcker 376fe0bf55 changed wording to correct one in context of content
wording was wrong until today, needed a completely different meaning in the context of the content section; ironically it's just "Alias" now ;)
2013-11-14 22:22:25 +01:00
perploug 684c99b532 removes css that conflicts with firefox selects state 2013-11-14 22:17:18 +01:00
perploug 28ec40e1ae modifies angular-mobile to fix firefox glitch 2013-11-14 22:05:51 +01:00
perploug cadf1fe9bb removes old bootstrap files 2013-11-14 22:03:51 +01:00
Richard Soeteman 393c365b6e Fix for U4-3529 Ysod editing Partial View 2013-11-14 14:48:04 +01:00
perploug a657e10545 Consolidates contextmenu action handling
Moves umbOptionsMenu and umbContext menu exection into navigationService
2013-11-14 14:13:39 +01:00
perploug d6f9d23626 merge 2013-11-14 14:12:49 +01:00
perploug 7e0eefc18a adds editor context value 2013-11-14 13:12:08 +01:00
perploug 9bcd276073 fixes sir trevor manifest 2013-11-14 13:11:58 +01:00
perploug d0fd7523c2 fixes media move to root 2013-11-14 13:11:45 +01:00
perploug 0a6826c62a adds manifest documentation 2013-11-14 13:11:20 +01:00
perploug 132b1f305a moves context action execute to navigationService 2013-11-14 13:11:03 +01:00
Shannon 7dfd684cd8 Fixes: U4-3504 Sorting media doesn't work, always defaults to sorting the root 2013-11-14 22:25:08 +11:00
Shannon 4ce5e67116 Fixes: U4-3517 Package tree doesnt load 2013-11-14 22:01:26 +11:00
Shannon 6d2caaa723 Fixes: U4-3430 Save Properties not working for usercontrol macro 2013-11-14 21:56:01 +11:00
Lars-Erik Aabech e3cd85a6a2 Made CreateIndexBuilder set IndexType in Clustered(), NonClustered() and Unique(). 2013-11-14 10:55:35 +01:00
Lars-Erik Aabech 69f805ecca Proof that CreateIndexBuilder.NonClustered() does not affect index creation statement on SQL Server.
CreateIndexBuilder_SqlServer_NonClustered_CreatesNonClusteredIndex() fails expecting NONCLUSTERED but getting CLUSTERED.
CreateIndexBuilder_SqlServer_Unique_CreatesUniqueNonClusteredIndex() fails expecting UNIQUE NONCLUSTERED but getting CLUSTERED.
2013-11-14 10:53:58 +01:00
Shannon 10e65e8027 Adds new Multiple Media picker property editor 2013-11-14 20:36:06 +11:00
Shannon d79110aee6 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-14 20:32:26 +11:00
Shannon 9eb9b8df92 Fixes: U4-3501 Error when selecting multiple items with the media picker in v7 - ensures the standard media picker cannot multi-select, hides the add button when multi select is disabled and there's a value. 2013-11-14 20:32:11 +11:00
Shandem fc8496dd95 Merge pull request #247 from rsoeteman/7.0.0
Fixed Dashboard Controller is only looking for one section
2013-11-14 01:30:22 -08:00
Richard Soeteman 21334bd282 Fixed Dashboard Controller is only looking for one section 2013-11-14 10:23:21 +01:00
Shannon 367bbd7eff Fixes: U4-3518 'Start Node in content' property of user does not work. 2013-11-14 19:58:55 +11:00
Shannon 2f62c58055 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-14 19:35:13 +11:00
Shannon 47f7d0d8df no more nav.ui. removes exposing the userDialog, moves enter/leave tree to the navigation controller since it doesn't belong on the service, cleans up more of the nav ctrl and we have no more globals :) now to look at changing the object that is passed to dialogs (i.e. not the navigation controller scope) 2013-11-14 19:34:47 +11:00
perploug f4861fb344 fixes broken font on icon picker on windows 2013-11-14 09:16:46 +01:00
perploug 378fc2c655 fixes datatype editor buttons not snapping to buttom 2013-11-14 09:16:35 +01:00
perploug 202ae1eafe removes overflown tabs collection 2013-11-14 09:16:05 +01:00
Shannon 77cb86f74b fixes: U4-3429 After sorting the tree doesn't get refreshed (for content) 2013-11-14 19:14:52 +11:00
Shannon 4281610bc1 fixes tree sync with move media/content 2013-11-14 19:09:13 +11:00
perploug f11aca53e4 added icon picker loader 2013-11-14 09:08:26 +01:00
perploug 87fc9c3ee7 removed filter that didnt work anyway 2013-11-14 09:08:13 +01:00
perploug 4f27fd6d40 better caching of icons for icon picker 2013-11-14 09:07:54 +01:00
perploug 85155175cb fixes broken dialogs in firefox 2013-11-14 09:07:40 +01:00
perploug 6cddd55065 fixes issues with overflown tabs 2013-11-14 09:07:30 +01:00
perploug bf93d773a8 redirects all repo requests to our instead of packages 2013-11-14 09:04:10 +01:00
Shannon 20f1a308a8 fixes tree sync on move 2013-11-14 19:01:41 +11:00
Shannon b6dcbc83e4 Nearly got the whole nav.ui stuff taken care of, have most of the correct objects in appState, fixed up tree syncing with move dialog, fixed up state handling of the currently selected node, removed setting the navigationController's scope from within the navigationService (?), still some more stuff to clean up. 2013-11-14 18:50:31 +11:00
Shannon 6967027e41 remove sort controller's and views - when we put these back we can restore. 2013-11-14 17:05:14 +11:00
Shannon 87309a1ef3 fixes merge 2013-11-14 17:03:53 +11:00
Shannon 9027b41ded made syncTree method on handler return a promise so we can do somethnig with it after (it still raises an event). Updates all editors to assign a currentNode to their scope when syncTree is complete, now that gets assigned to the umboptions which is now decoupled from nav.ui. 2013-11-14 16:59:08 +11:00
Shannon 43f001280e slowly getting the tree node model decoupled from being passed in to menu actions, updated more of the appState and clarified a few things, created a new umboptionsmenu directive to be used for the options drop down on editors 2013-11-14 16:09:53 +11:00
Shannon 8dab2148f1 changes TinyMCEv3Alias to just TinyMCEAlias but unfortunatey we cannot change the actual alias stored in the db because we're already in RC - that means that people will forever see TinyMCEv3 as the property editor alias :( even though it is already v4 2013-11-14 13:39:03 +11:00
Shannon 6474b2b045 Updates eventsService to actually be able to handle async callbacks with promises - though i'm really not sure when this will effectively be used. It no longer returns a promise - since that was a 'false promise' anyways . lol. 2013-11-14 13:27:53 +11:00
Shannon 0b1eb4b42c Created events test and POC 2013-11-14 12:17:20 +11:00
Shannon 86c996efb8 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-11-14 10:51:52 +11:00
Shandem c037e2e09f Merge pull request #246 from lars-erik/6.2.0-fix-U4-3508
Fixes Template.ToXml() (U4-3508) and refactored Template.Import to use P...
2013-11-13 15:51:29 -08:00
lars-erik d8debf6789 Fixes Template.ToXml() (U4-3508) and refactored Template.Import to use PackagingService.ImportTemplates.
Fixed nullreference bug in ImportTemplates when used with XElement("Template"). (Added test for case with one template only)
2013-11-13 14:27:05 +01:00
perploug b02b45c815 datepicker adds current user language 2013-11-13 13:46:04 +01:00
perploug 05cbccec5c adds hotkeys to search, dialogs and help 2013-11-13 13:45:46 +01:00
Marc Stöcker 282da69d61 Fixed minor typos 2013-11-13 13:27:56 +01:00
perploug 238bc58234 Revert to old datepicker 2013-11-13 11:33:39 +01:00
Shannon dd22377b9b Removes the need for activeTree/currentTree on the nav ctrl, fixes the section animation on first load, 2013-11-13 20:35:53 +11:00
Shannon 01589f0a35 Cleans up some more tree code that is not used or required, moves the ui.treeEventHandler to a local var in the nav service since it doesn't need to be exposed, fixes main controller redirecting due to an undefined check. 2013-11-13 20:14:33 +11:00
Shannon b9d22b2577 Fixes: U4-3506 Linkpicker in RTE doesn't expand tree to last selected link - missing GetPath parameter - which lead to lots of other cleanup, removes auth listening on the section and tree directives since that doesn't belong there, now the navigation controller determines what to render depending on authorization. Removes the path parameter on the umbTree and umbTreeItem since this didn't work and syncTree should be used instead. Fixed up some more tree sync logic as well. 2013-11-13 19:57:34 +11:00
Shannon 36c21ca322 refactors out ui.tablet into private variable - only navigationService needs to know about this, otherwise if everything does it needs to go into appState and the listener needs to go elsewhere (a directive) 2013-11-13 18:44:44 +11:00
Shannon 4fe6da9118 refactored out the dialogTitle, currentDialog, actions ui object to use appState, updated the context menu directive to not rely on globals, instead it gets passed the values it needs from the navigation controller. 2013-11-13 18:40:30 +11:00
Shannon b4f8e6c93d refactors out the usage of 'ui.stickyNavigation' to use appState 2013-11-13 16:43:40 +11:00
Shannon 886d146595 refactored out the usage of ui.showTray to use appState 2013-11-13 16:35:23 +11:00
Shannon 2aaf3d06fa missing adding touchDevice to the local scope 2013-11-13 16:25:25 +11:00
Shannon 35315e0331 Removes touchDevice from rootScope and navigationService, now we detect this on app startup and add to the globalState which can be retrieved whenever. 2013-11-13 16:22:47 +11:00
Shannon ba72991929 refactored out the usage of "ui.showContextMenu" with the usage of appState. Added a new init.js instead of having the startup scripts embedded in the routes file (we should make a 'startup' naming convention like we have for 'controllers' to combine into one file) 2013-11-13 16:16:11 +11:00
Shannon ad7edf0d52 refactors out the usage of 'ui.showNavigation' and replaces with using appState. Adds unit tests for appState. 2013-11-13 15:51:59 +11:00
Shannon ac15e84324 refactored out the global 'ui.currentSection' to use the appState service. 2013-11-13 15:20:13 +11:00
Shannon 5d49dfbe28 refactors showSearchResults to be part of appState 2013-11-13 14:25:07 +11:00
Shannon 5889140386 Created the new appState service - this will be used to control all of the tracked back office state and used used explicitly by getting/setting values by key - cannot be mutable without defining properties first, then other controllers/services can listen for changes to state and act accordingly. Theoretically the navigationService 'should' be the only thing setting any of the state. Have started refactoring out the easy wins to move away from the dreaded ui object. 2013-11-13 13:50:36 +11:00
Shannon fd91340e75 Updates DefaultShortStringHelperTests to ensure that umb config is mocked. 2013-11-13 12:41:02 +11:00
Shannon 8dbdd67c98 Reverted CleanStringForSafeFileName to the original name that doesn't strip unnecessary characters. 2013-11-13 12:33:03 +11:00
Shannon d0c5dd208f Reverted to Newtonsoft.Json 4.5.11 2013-11-13 11:28:14 +11:00
Shannon d46486d3db Fixes: U4-3493 Cannot delete a template with children 2013-11-13 11:09:11 +11:00
Shannon c52e0cbb65 Added GetTemplateNode and FindTemplateInTree to the IFileService 2013-11-13 11:05:08 +11:00
Shannon 6224d02989 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-13 11:00:06 +11:00
Shannon 9e8286bda9 Adds ability to query the template tree (hierarchy) with the template repository + unit tests. 2013-11-13 10:59:36 +11:00
Shandem e9ed1bf17a Merge pull request #244 from leekelleher/U4-3051
Fixes: U4-3051 GetAncestorOrSelfDocuments gets stuck in infinite loop
2013-11-12 14:11:05 -08:00
leekelleher cfcfb75dcc Fixes: U4-3051 GetAncestorOrSelfDocuments gets stuck in infinite loop 2013-11-12 21:26:21 +00:00
perploug 9ad869d367 merge 2013-11-12 19:29:15 +01:00
perploug acbde943b0 replaces the datepicker with a native angular picker 2013-11-12 19:01:48 +01:00
perploug c4a0e1e923 changes options to actions 2013-11-12 19:01:24 +01:00
perploug 8465b3465b ensures history is reset on login 2013-11-12 19:00:51 +01:00
perploug 8666ae0540 sections css tweak 2013-11-12 19:00:37 +01:00
perploug 9c8e156768 fixes dublicate help and user dialogs 2013-11-12 19:00:25 +01:00
perploug 9efe68724d Fixes dublicate key bindings for hotkeys 2013-11-12 19:00:08 +01:00
Shannon 2129ac8241 Adds template repository tests, updates template repo business logic to be able to delete the whole template tree, updates some script repo tests too. 2013-11-12 22:28:43 +11:00
Shannon 6bab9500c1 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-11-12 20:54:56 +11:00
Shannon bb4a7ef21f Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-11-12 20:53:06 +11:00
Shannon abb6b6519f Fixes gravatar JS issue if user times out 2013-11-12 20:52:55 +11:00
Shannon e94ca7513b Fixes: U4-3473 Cannot edit Partial views - getting YSOD data reader error - PetaPoco error will backport to 6.2 2013-11-12 20:50:17 +11:00
perploug ad9fa736f4 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-12 10:05:46 +01:00
perploug cad0f8bb2a WIP on photo folderresiizng on IE 2013-11-12 10:05:26 +01:00
perploug 289caa791a moves touch device prop to rootscope 2013-11-12 10:04:40 +01:00
perploug bfa325163d adds fall-back icon to content types 2013-11-12 10:03:59 +01:00
perploug f03e9ecebe adds check to dialog swiping 2013-11-12 10:03:34 +01:00
perploug 0ab2b74004 fixes missing legacy icons in IE 2013-11-12 10:03:19 +01:00
perploug fe40288514 fixes dublicate hotkey in legacy editors 2013-11-12 10:02:59 +01:00
Shannon df867af900 Fixes: U4-3329 Link to "Edit Profile" errors if you don't have access to Users 2013-11-12 18:13:00 +11:00
Shannon 5f5f535f05 Changes UserController to be CurrentUserController - and removes the other methods in there since that was an overlooked security issue. This controller is responsible solely for dealing with the currently logged in user. Changes over to be currentuser.resource as well. 2013-11-12 18:07:10 +11:00
Shannon a532b49485 Fixes: U4-3482 keepUserLoggedIn setting ignored? and streamlines some of the auth methods. 2013-11-12 17:38:32 +11:00
Shannon c28f800fe6 Removes the re-committed app plugins property editor that shouldn't be there 2013-11-12 17:38:09 +11:00
Shannon e7201b6a69 Fixes: U4-3485 Can't use membership provider functions with a membertype that contains a "Belle" property editor 2013-11-12 16:07:53 +11:00
Shannon 1f538d1bd5 Fixes: U4-3489 Member tree items should not have refresh node as an action 2013-11-12 15:24:08 +11:00
Shannon a9ffa3f1b7 his reverts commit c2fca795e6 to use the normal tree cache 2013-11-12 15:06:47 +11:00
Shannon c2fca795e6 This is an attempt to put the tree cache into sessionStorage - I'm creating this revision in case we want to re-visit this but unfortunately it is much more difficult because the cache is serialized/deserialized which means only the first level will be cached automatically since the loadNodeChildren would have to update the cache too but it doesn't know what a cache key is.
I've then done it the other way which is that we cache the tree sections when changing sections, this works great but poses other issues due to the serialized nature of the tree nodes. Spending too much time here, will revisit some other day. will revert after this is committed.
2013-11-12 15:02:02 +11:00
Shannon 72b08f4029 Fixes an issue if the upgrade check server is not responding. 2013-11-12 13:28:13 +11:00
Shannon c4bfeeb321 Changes the CreateTreeNode to ensure that a parentId is always passed in - now all tree node models have a parentId property based on the server side data. Changes the JS tree node model to not have a 'parent' property and instead changes this to a parent() method - this allows us to serialize the tree model because otherwise it has cyclical references. 2013-11-12 13:09:24 +11:00
Shannon acd52d42f4 Refactoring TreeNode to inherit from EntityBasic = makes much more sense and makes our models more consistent. 2013-11-12 12:30:10 +11:00
Shannon 635ccc444d Adds another childrenOf option to clearing tree cache to clear a cached branch, this is used to fix U4-3465 Media tree not updating when creating folders and can be used elsewhere where modifying trees outside of it's context. 2013-11-12 12:01:16 +11:00
Shannon 6dcfbaee7f Adds a new filter arg to remove tree cache - we will use this in order to clear specific items from tree cache (like when we are creating folders for media in the media picker) 2013-11-12 11:09:30 +11:00
Anders Stentebjerg 6fb6aa397f Styling
- Logo size login screen
- H1 in panel
2013-11-11 15:34:49 +01:00
Morten Christensen 181593f5ea Merge pull request #234 from saciervo/fix/petapoco-fetch
SqlHelper Refactoring
2013-11-11 02:59:49 -08:00
Shannon c0037a40c6 Fixes a unit test - before if the packager could not resolve a legacy data type because the ids were not valid, it would just ignore that properly, now it logs warnings and just converts to a label property. 2013-11-11 18:17:49 +11:00
Shannon 57e98fda97 Fixes setting the 'section' on a tree node, fixes the editors syncTree call to not force reload when routing to the editor - this will still load in the data for the tree if it is missing, just won't force reload the individual tree node loading. 2013-11-11 17:54:42 +11:00
Shannon 3111a2d22f Missing file 2013-11-11 17:12:35 +11:00
Shannon f123c58c79 Fixes up some more tree sync, streamlines naming conventions, adds more doc/comments to the code and specifies what is internal (only to be used by legacy code). syncTree method now takes an object to sync and both sets the active tree and the path at the same time and fixes setting the active tree to search the root node and children because content/media trees are single section trees. 2013-11-11 17:12:09 +11:00
Shannon 9f613c04f3 Fixes more tree syncing - setActiveTreeType should *not* perform any tree loading, it should just set the active root tree node. syncTree is always used in conjunction with that call in the legacy API which means we get 2 tree queries loading at once and syncing ends up not working. We'll create a nicer method for our angular views to use to sync the tree, setActiveTreeType will typically only be used by the legacy umbraco wrapper. 2013-11-11 16:15:09 +11:00
Shannon 0be60a5c88 Fixes: U4-3466 Deleting Document Type with children fails 2013-11-11 15:09:26 +11:00
Shannon 8fc82476a6 Fixes some tree syncing with legacy trees - now need to cleanup the delete animation stuff. 2013-11-11 14:36:45 +11:00
Shannon 6fe647146c Fixes: U4-3431 Macro property not passed to ASCX usercontrol 2013-11-11 12:23:46 +11:00
Shannon dd80b41735 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Tests/Macros/MacroTests.cs
2013-11-11 12:23:27 +11:00
Shannon a311a54d3d Hugely simplifies setting properties from macro parameters on user control macros with tests. 2013-11-11 12:22:29 +11:00
Shannon 330732323f Hugely simplifies setting properties from macro parameters on user control macros with tests. 2013-11-11 12:16:30 +11:00
Shannon ad0b7e4259 Changed default (development) macro error handling to throw. 2013-11-11 10:16:25 +11:00
OptimisticCoder c83844468d U4-3039 Import Document Type leaves files in App_Data
Added File.Delete to clean up temp files.
Added try/catch round it and logging if it fails for any reason.
2013-11-09 15:18:43 +00:00
OptimisticCoder 80b5cfbb07 U4-451 Inconsistent line endings in template files created by Umbraco
Changed all "\n"'s to Environment.NewLine
Changed a string that was being appended in that method to a StringBuilder to be more efficient.
Cleaned up old commented out code from the method.
2013-11-09 14:37:22 +00:00
Shannon 0d42f721db fixed more tree sync 2013-11-08 12:35:42 +11:00
Shannon 7664cec0d3 Fixes: U4-3442 tree sync doesn't work for nodes that are not loaded - tree sync is now working properly and loads in any nodes that are missing. Have removed the dependency on navigationService from umbTree directive since it should not have that dependency. navigationService now sets it's global current node after treeSync based on an event. Moved the treeSync logic to the treeService so it can be unit tested (now to write the unit tests). Added another method to treeService to reload a single node - this is now used by treeSync when the current node is being synced - much nicer than reloading all the children. Updates the treeService to always add the current section to each tree node, this will make it much easier to know the treenode section - and in theory should mean we might be able to remove the ui global currentSection var. 2013-11-08 11:48:04 +11:00
Shannon ef40c76363 Re-formats the code structure of nav service and umbtree to be easier to read, adds better error checking to treeservice 2013-11-08 09:07:28 +11:00
Shannon 367cdde35e Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/umbraco.cms/businesslogic/workflow/Notification.cs
2013-11-08 08:55:22 +11:00
Shannon 590b7f2289 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-08 08:49:07 +11:00
Sandro Ciervo 9911f03745 Fixed potential DbReaderException
- Use Fetch<T> instead of Query<T> because we create another DbReader inside the loop with DoesMacroHaveParameters().
2013-11-07 20:09:06 +01:00
Anders Stentebjerg 2d09785753 Search form 1px up 2013-11-07 17:15:41 +00:00
perploug 7a31ba0de7 merge 2013-11-07 18:14:53 +01:00
Anders Stentebjerg 1cfb79788a Align header 2013-11-07 17:11:35 +00:00
yawka aacb86bf92 Add trim to all urls 2013-11-07 19:09:50 +02:00
yawka 59391f58ec Remove previous fix, and move it to IsReservedPathOrUrl 2013-11-07 19:06:25 +02:00
yawka 0debf9c34f Add check is path is whitespace 2013-11-07 19:05:50 +02:00
Morten Christensen 9fa17ef6cb Initial datalayer refactoring work on the legacy User class 2013-11-07 17:56:38 +01:00
Morten Christensen d227aa19b8 Leaving the original internal method intact 2013-11-07 17:56:12 +01:00
Anders Stentebjerg 641d0c737f Styling
- Retina optimized gravatar
- White Umbraco logo
2013-11-07 16:51:25 +00:00
perploug 242b755b1a Tabs overflow 2013-11-07 17:48:54 +01:00
Sebastiaan Janssen d76336cd39 Merge pull request #194 from Attackmonkey/Hackathon-U4-3228
Fixes issue U4-3228, where dictionary item names are not trimmed.
2013-11-07 08:45:21 -08:00
yawka e0a10080b1 Add UI validation for regular expression property 2013-11-07 18:39:27 +02:00
yawka 807df434f6 Add validation for regular expression property 2013-11-07 18:39:02 +02:00
Sebastiaan Janssen 0dc3920309 Merge pull request #191 from dipeshhirani/U4-2756
Fixed the issue below: U4-2756
2013-11-07 08:38:44 -08:00
Sebastiaan Janssen 98d1aafb75 Merge pull request #187 from wpyz/6.2.0
Fixes issue with opening VS solution when only Visual Studio 2013 is installed (fixes U4-3445)
2013-11-07 08:36:40 -08:00
mattbrailsford d963917556 Added SortOrder to XML for document types (used by export)
Added ability for doctype importer to set the sort order if a sort order element is available
2013-11-07 16:30:23 +00:00
Anders Stentebjerg fa0b3ddab9 Set focus on pageName 2013-11-07 16:30:14 +00:00
Per Ploug Krogslund 7440855c72 merge 2013-11-07 17:16:22 +01:00
perploug 937bda9c16 select on focus directive 2013-11-07 17:11:32 +01:00
Tim Payne 347d41c841 Fixes issue U4-2760, and makes the installed packages list by name in alphabetical order to make it easier to see what's installed. 2013-11-07 16:06:16 +00:00
Anders Stentebjerg 2b3a9a0b8f U4-3449 Polish UX so it matches grid 2013-11-07 16:04:07 +00:00
Tim Payne f16aa38fff Fixes issue U4-2757 where generic properties are not ordered correctly. 2013-11-07 15:51:58 +00:00
Sebastiaan Janssen 6a0d7ec8d6 Merge pull request #183 from mkariti/U4-1477
fix U4-1477
2013-11-07 07:49:27 -08:00
adang@thecogworks.co.uk 62a7e0acd0 Replaced HttpContext.Current.Cache with HttpRuntime.Cache 2013-11-07 15:44:55 +00:00
leekelleher 8e89d13142 Fixes: U4-2006 Domain.GetDomain(string DomainName) is case-sensitive 2013-11-07 15:41:34 +00:00
perploug 8b879183ba Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-07 16:05:43 +01:00
perploug 0f424d314f Changes editor header editor to input:text 2013-11-07 16:05:22 +01:00
dipunm a5782a40af Missing languages in RTE insert link dialog.
Also included files in csproj file to ensure proper build.
2013-11-07 14:59:00 +00:00
dipeshhirani c6af319805 commented out the line that checked if the language is neutral. 2013-11-07 14:56:00 +00:00
leekelleher 516beedbbb Fixes: U4-3452 Update the MIT License URL (Packager) 2013-11-07 14:48:20 +00:00
mattbrailsford 7cd01fc50b Added ValidateRequest="false" on package installer page to allow user controls which postback html / code. 2013-11-07 14:35:44 +00:00
Simon Dingley e9d12ae0d8 Revert "Group jQueryTree script files"
This reverts commit baed01518c.
2013-11-07 14:23:53 +00:00
Tim Payne 02e167c1f6 Fixes issue U4-3063 where copying a document type uses the rename for the node alias, but not the title, resulting in two Doctypes with the same name, but different aliases, rather than different names AND aliases. 2013-11-07 14:20:47 +00:00
Simon Dingley baed01518c Group jQueryTree script files 2013-11-07 13:21:01 +00:00
Morten Christensen f9a86385b5 Rearranging the create schema extensions methods to provide a bit more flexibility for external usage. 2013-11-07 14:03:34 +01:00
Craig Cronin a0106ff811 Fixed as per issue comments, but also implemented for another 3 overloads 2013-11-07 12:50:26 +00:00
Simon Dingley e0da5a9cb2 Groups jQuery dependencies using the ClientDependency Group property 2013-11-07 12:45:35 +00:00
mkariti 451d5eb484 U4-415 2013-11-07 14:40:26 +02:00
Morten Christensen b8f7df1a96 Fixing the broken stylesheetrepository test and ignoring the StylesheetRepository in the RepositoryResolverTest for the time being as it takes two different UOWs as opposed to other repositories. 2013-11-07 13:33:49 +01:00
Tim Payne 425fd80e65 Fixes issue U4-3228, where dictionary item names are not trimmed. 2013-11-07 12:28:43 +00:00
Morten Christensen 04bb778dc1 Fix StylesheetRepositoryTest which broke as a result of PR #176 2013-11-07 12:52:25 +01:00
dipeshhirani 3f2be3342a Fixed the issue below:
The "Unpublish" button (under Properties tab) is bad translated to Italian.
The used word is "Non pubblicato". This phrase is mean "It is not published".
A best translation is "Non pubblicare" (unpublish).

Did not do any of the others as they are either already done or the requesters change seems incorrect/irrelevent
2013-11-07 11:42:08 +00:00
Morten Christensen 3ba50e7bae Merge pull request #176 from pynej/add-stylesheet-ids
Fix for missing Id's on FileService.GetStylesheets() call.  This is need...
2013-11-07 03:41:33 -08:00
Morten Christensen 7306ddef14 Merge pull request #182 from stocksr/6.2.0-petapoco-refactor
6.2.0 petapoco refactor - umbraco.cms.businesslogic.language.Item
2013-11-07 03:37:37 -08:00
Morten Christensen 17bb29eb66 Merge pull request #185 from saciervo/6.2.0
Use PetaPoco instead of SqlHelper
2013-11-07 03:35:49 -08:00
Morten Christensen 8bf3de738f Merge pull request #188 from stocksr/6.2.0-petapoco-refactor-umbraco.cms.businesslogic.language.Language
Refactoring umbraco.cms.businesslogic.language.Language class
2013-11-07 03:34:08 -08:00
Robert Stocks 2d37502a44 Refactoring umbraco.cms.businesslogic.language.Language class 2013-11-07 11:28:00 +00:00
Ryan Lewis d5c485205a Whitespace 2013-11-07 11:24:40 +00:00
Ryan Lewis 9533198365 Can open VS solution with only Visual Studio 2013 installed (fixes U4-3445) 2013-11-07 11:23:41 +00:00
Morten Christensen 66f20e3800 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-11-07 12:19:27 +01:00
Sandro Ciervo 9269a98806 Refactored Umbraco.Web.UI.Controls.InsertMacroSplitButton
- CreateChildControls()
- DoesMacroHaveParameters (Int32)
2013-11-07 12:15:03 +01:00
mkariti 7c97fddec5 fix U4-1477 2013-11-07 13:08:56 +02:00
Morten Christensen a567cf2a87 Minor update to the DefaultData so the used PetaPoco db object is consistent 2013-11-07 12:00:45 +01:00
Morten Christensen 1e319d667b Updating the remaining methods in the Notification class so it no longer uses the legacy SqlHelper. 2013-11-07 11:59:59 +01:00
Sebastiaan Janssen cc039e365d Merge pull request #181 from Attackmonkey/Tim-Payne-Hackathon-U4-2708
Fixes issue U4-2708
2013-11-07 02:55:03 -08:00
Morten Christensen f91ff5dc31 Special commit for a special Lars-Erik 2013-11-07 11:48:25 +01:00
Robert Stocks 9347a2edbb Refactoring umbraco.cms.businesslogic.language.Item class - Fix Update and Delete calls 2013-11-07 10:40:23 +00:00
yawka 1923b68594 Fix 2034, add check for whitespaces 2013-11-07 12:36:35 +02:00
Robert Stocks 64a73ef528 Refactoring umbraco.cms.businesslogic.language.Item class 2013-11-07 10:20:55 +00:00
Tim Payne 4ea04f5ffe Fixes issue U4-2708 2013-11-07 10:08:11 +00:00
Morten Christensen 6b006e6fd7 Refactoring GetUserNotifications method in the Notification class 2013-11-07 11:00:19 +01:00
Shannon 30fe174601 working on U4-3442 tree sync doesn't work for nodes that are not loaded 2013-11-07 17:53:46 +11:00
Shannon 31448eb987 Fixes: U4-3427 Tree persistence not working 2013-11-07 17:41:44 +11:00
Shannon 29cf9ae46a Changes all references of navigationService.ui.currentTreeNode to be navigationService.ui.currentNode since that was what has existed previously, now suddenly we have 2 references to current tree node - I'm 99% sure that we only want one reference and currentTreeNode seems to have been added later and isn't declared properly on the nav service. 2013-11-07 17:32:06 +11:00
Shannon 01eb7157bd Adds missing moveNode from the legacy tree api 2013-11-07 17:20:01 +11:00
Shannon bacdcb7abf updates some more logic when saving macro properties to always try to map to the new ones if legacy aliases are used. 2013-11-07 16:07:08 +11:00
Shannon 164b630d5e Fixes: U4-3428 Macro Parameter Types aren't set correctly when a (legacy) package installs them 2013-11-07 16:00:58 +11:00
Shannon d9abbd4232 Fixes: U4-3437 Deleting a macro with parameters causes YSOD 2013-11-07 15:16:18 +11:00
Shannon 3d6eea9470 Fixes: U4-3350 Content Validation: Can't get rid of DateTime error 2013-11-07 14:58:41 +11:00
Shannon 345b96e253 Moves TreeControllerBase to separate file and moves the CreateTreeNode methods to that controller so they can be used in events handlers. 2013-11-07 13:52:06 +11:00
Shannon 546788761f Fixes merge issue 2013-11-07 12:33:06 +11:00
Shannon fad84ac0bb Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI/umbraco/members/EditMember.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2013-11-07 12:30:28 +11:00
Shannon fc0654a80f Fixes: U4-2241 Native Multi-node tree picker in Member Types: Saving clears selected items 2013-11-07 12:02:41 +11:00
Sebastiaan Janssen 4717faaf1b Merge pull request #180 from Jeavon/U4-3432
Fix for U4-3432Rollback Dialog - CreateDate/Creator formatting tweaks
2013-11-06 09:48:08 -08:00
Jeavon Leopold e7d587f776 Fix for U4-3432Rollback Dialog - CreateDate/Creator formatting tweaks required 2013-11-06 17:19:18 +00:00
Anders Stentebjerg ceab957db5 Styling hover state on Page Name 2013-11-05 14:28:57 +01:00
perploug ac21859587 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 14:28:23 +01:00
perploug fc6fb4030b re-adds deleted macro container files 2013-11-05 14:28:07 +01:00
Sebastiaan Janssen 039ec7b958 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-11-05 14:27:09 +01:00
Sebastiaan Janssen 5659ab5fc0 Remove promise of image galleries and blogs in installer screen. :) 2013-11-05 14:26:28 +01:00
perploug f6b2888c26 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 13:56:45 +01:00
perploug e41e017fa3 fixes dialog iframe auto-expanding 2013-11-05 13:56:20 +01:00
Anders Stentebjerg 63eccb4909 Styling: Error on tabs + hover state 2013-11-05 13:48:46 +01:00
Sebastiaan Janssen 4f9ddfeb7a Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 13:19:38 +01:00
Sebastiaan Janssen c19a8fa602 U4-3385 Find a better solution for approving members 2013-11-05 13:19:06 +01:00
Anders Stentebjerg 17529b90b6 Aling checkboxes and text 2013-11-05 13:16:43 +01:00
perploug 2371a40a8a Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 12:38:59 +01:00
perploug d2ae358a3d hide search list on selection 2013-11-05 12:38:45 +01:00
perploug f30416d20f add border to bottom buttons 2013-11-05 12:38:32 +01:00
perploug ef16e6c72f history service skip dublicate entries 2013-11-05 12:38:20 +01:00
perploug 51c459d654 Fixes placeholder label overriding name label 2013-11-05 12:38:01 +01:00
Sebastiaan Janssen 01b21dc9eb Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 12:01:15 +01:00
perploug bcf20f9f3f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 12:01:00 +01:00
Sebastiaan Janssen fed8f51de8 Prefixed built in controllers to better avoid conflicts with people's custom code 2013-11-05 12:00:56 +01:00
perploug d9e18859e9 Media recyclebin 2013-11-05 12:00:53 +01:00
perploug ea73ecd9cb merge 2013-11-05 11:44:34 +01:00
Anders Stentebjerg 1c4129fd64 Disable input[submit] styling 2013-11-05 11:36:43 +01:00
Niels Hartvig 5a690bcf33 Add progress status on starter kit install 2013-11-05 11:24:53 +01:00
perploug 4be6e21257 media editor tree sync 2013-11-05 11:18:23 +01:00
perploug 7e36a6b6e1 translation section icon 2013-11-05 11:18:06 +01:00
perploug aa4bcdd040 color picker feedback 2013-11-05 11:17:58 +01:00
perploug c9f29a443d member tree sync fixes 2013-11-05 11:17:43 +01:00
perploug 725ef52243 version comment in build 2013-11-05 11:17:04 +01:00
Stephan 6bc41f53ee Fix bogus PublishedContent unit tests 2013-11-05 10:50:12 +01:00
Tim Geyssens 11366558c9 Fixes U4-3335 Create dialogs, use placeholder instead of setting the value to Enter a name... 2013-11-05 10:40:17 +01:00
Sebastiaan Janssen 11c02eba49 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 09:05:56 +01:00
Sebastiaan Janssen 2617124ee8 Bump version to RC 2013-11-05 09:05:41 +01:00
Stephan 74df45a056 U3-3314 - refactor 4895b5a 2013-11-05 09:01:11 +01:00
Shannon cf342ece45 Fixes: U4-3322 MNTP doesn't work when choosing media or members 2013-11-05 18:17:16 +11:00
Shannon fbeff81128 Fixes pickers to be backwards compatible - they by default in v6 stored as INT. Fixing MNTP with media/members. 2013-11-05 14:28:25 +11:00
Shannon 787f304de7 Adds GetByKey to entity controller/repository/service, fixes: U4-3263 Member picker isn't working as expected 2013-11-05 13:23:27 +11:00
Shannon 2a52c584f8 Completes: U4-3293 MNTP, Markdown editor, related links should be core property editors in c# - had to hack a bit of the core for the markdown editor JS because we didn't have mapped icons for what they were trying to use. 2013-11-05 12:19:26 +11:00
Shannon e6cc5a5736 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 11:36:49 +11:00
Shannon 1c423245e2 Fixes: U4-3320 When creating a new data type the pre-values are not displayed for a given editor unless you change the editor a couple of times 2013-11-05 11:36:32 +11:00
perploug eb3bd9f89c Fixes broken test loader 2013-11-05 01:11:37 +01:00
perploug 7f964beebf merge 2013-11-05 00:46:16 +01:00
perploug 8b0767b41f Removes hardcoded menu urls 2013-11-05 00:41:55 +01:00
Shannon 68e84c6c59 Removes hard coded url 2013-11-05 10:22:31 +11:00
perploug 38d6244611 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 00:02:00 +01:00
perploug d321721a5e Fixes broken content menu items 2013-11-05 00:01:46 +01:00
Shannon 23e85920ef Adds some error checking for launching a dialog - the tree node must resolve a tree alias - this is why the new 'options' are not working. 2013-11-05 09:59:18 +11:00
Shannon c36197a01c Removes unpublish context menu option since it's not currently implemented, cleans up some code. 2013-11-05 09:38:54 +11:00
perploug 9ab423a280 New installer colors 2013-11-04 21:17:18 +01:00
Tim Geyssens 4895b5a2a8 Fixes U4-3314 Doctype property alias doesn't auto generate camelcase but does pascalcase instead 2013-11-04 15:00:13 +01:00
perploug 102bf79320 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-04 14:58:42 +01:00
perploug 47733b2bbe starterkits html for installer 2013-11-04 14:58:25 +01:00
perploug e9ae2c0836 only show content options on saved content 2013-11-04 14:57:48 +01:00
perploug 82b59c8f8d better panel iframe scaling 2013-11-04 14:57:31 +01:00
perploug 2d53aca29c snap to bottom buttons fix on resize 2013-11-04 14:57:13 +01:00
perploug f342b80e86 Fixes installer issue on CE 2013-11-04 14:56:56 +01:00
perploug be9f0c066e ditto 2013-11-04 14:56:18 +01:00
perploug b84c2007ef new label for unpublish at 2013-11-04 14:56:10 +01:00
Anders Stentebjerg 87ce3806f9 Styling
- Shadow with tree
- hover states
- Added input[type=submit] to .btn
2013-11-04 14:23:02 +01:00
Stephan dca0c85db5 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2013-11-04 12:54:07 +01:00
Shannon eb181b220f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-04 22:12:27 +11:00
Shannon 8d7456dfe7 Fixes: U4-3309 Dashboards cannot have multiple area elements 2013-11-04 22:12:17 +11:00
Tim Geyssens 9c25131958 Fixes U4-3288 Member types still has legacy icon in tree 2013-11-04 11:59:45 +01:00
Anders Stentebjerg 8d72705265 Styling
- Remove shadow on Tree
- Border around "more" button
- Small tweaks
2013-11-04 11:55:01 +01:00
Shannon 2adf2838f6 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-04 21:44:51 +11:00
Shannon b19ed4c039 Trying to fix macro parser tests 2013-11-04 21:44:37 +11:00
Tim Geyssens d3fcdff418 Fixes U4-3280 Logout button isn't actually clickable - except at it's bottom part 2013-11-04 11:17:43 +01:00
Tim Geyssens 8cd7f26431 Fixes U4-3190 Look for all umbraco.aspx references as there's still some buttons redirecting to there
Using Sebs suggestion
2013-11-04 11:01:13 +01:00
Tim Geyssens 89653183dd Fixes U4-3308Related links, removing seems to remove wrong one 2013-11-04 10:53:30 +01:00
Tim Geyssens 5bbb54d6d0 Fixes: U4-3295 When adding a new related link by the picker, nothing is saved/displayed 2013-11-04 10:48:43 +01:00
perploug 1d72800c80 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-04 10:30:19 +01:00
perploug 1c6afe9cea fixes window resizing and bottom buttons 2013-11-04 10:30:02 +01:00
perploug 637ca85ae0 Merge pull request #179 from diachedelic/7.0.0
Added required mocks to run the backoffice in dev mode
2013-11-04 01:29:22 -08:00
Shannon 6cf510a9be More tests fixed 2013-11-04 19:47:09 +11:00
Shannon 485b69743f Another test fixed 2013-11-04 18:53:47 +11:00
Shannon eb0936c3a7 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-04 18:49:32 +11:00
Shannon 2738cd41cd some more unit tests fixed 2013-11-04 18:49:07 +11:00
perploug c8cb724508 merge 2013-11-04 08:45:03 +01:00
perploug 548bdb6f02 js libs 2013-11-04 08:40:57 +01:00
perploug 136ef8f844 Adds context menu to editor and moves primary buttons
Buttons moved to the end of properties, but snap to bottom in case of
overflow, context menu is displayed the top instead, for faster access
to actions
2013-11-04 08:39:11 +01:00
Shannon bc0da04470 Fixes another issue with the installer and detecting macros 2013-11-04 18:27:08 +11:00
Shannon 365eb6497f Fixes an issue with packaging service with property alias changes which fixes part of another test and I think the issue per was having with package installs 2013-11-04 18:12:37 +11:00
Shannon 065aebac5b Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-04 17:25:20 +11:00
Shannon 94de454264 Fixing unit tests 2013-11-04 17:24:25 +11:00
diachedelic 2cd5b63555 Mocked user is regenerated for each call, fixes user lockout on client Belle 2013-11-04 14:37:22 +11:00
diachedelic e1381e4e70 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-04 12:00:26 +11:00
Sebastiaan Janssen 8cda966388 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-03 10:58:04 +01:00
Sebastiaan Janssen 45d339928a Include missing System.Net.Http/System.Net.Http.WebRequest 2013-11-03 10:57:42 +01:00
diachedelic 1d078965b9 Added application info to server variable mocks 2013-11-02 17:12:57 +11:00
diachedelic 2ef48a3355 Added required mocks to run the backoffice in dev mode 2013-11-02 16:34:40 +11:00
Shannon 5006115b2d Fixes object extensions and tests
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
2013-11-02 15:20:04 +11:00
Shannon 37967973a0 Fixes config tests since we've removed this section 2013-11-02 15:18:29 +11:00
Shannon a348177126 Fixes object extensions and tests 2013-11-02 15:18:08 +11:00
diachedelic 1c7609d5e0 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-02 14:14:03 +11:00
Shannon b75a9cc34b Changed the naming to PublishedContentQuery and TagQuery 2013-11-02 13:22:48 +11:00
Shannon 5836c061fa Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
2013-11-02 13:03:46 +11:00
Stephan 058cec7551 Cache AspNet hosting permission level 2013-11-01 16:57:31 +01:00
perploug 998bc73a90 version number change in pakcage.json 2013-11-01 12:29:12 +01:00
perploug b7ff856073 fixed: installer cant install macros 2013-11-01 12:29:00 +01:00
perploug 5363cafd7f installer styling 2013-11-01 12:28:35 +01:00
perploug 1533acc219 placeholder error color 2013-11-01 12:28:06 +01:00
perploug 04e6e43fee tree reload current node 2013-11-01 12:27:52 +01:00
perploug 7e7d93c815 Adds missing clientmngr methods 2013-11-01 12:27:37 +01:00
Stephan 2671709991 U4-2518 - issue with virtual dir named Umbraco 2013-11-01 09:53:50 +01:00
perploug 68f2396ff5 Changes unpublished to lower opacity instead of color
gives better indication of state in tree, when selected
2013-11-01 09:51:55 +01:00
perploug 34f0576a90 Fixes: missign web-service reference in installer 2013-11-01 09:42:24 +01:00
perploug 76e8b4871b Fix: cant move/copy to root 2013-11-01 09:42:10 +01:00
perploug 520ee92b4f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-01 09:28:45 +01:00
perploug e671300dc0 Move and copy dialog treee sync 2013-11-01 09:28:26 +01:00
perploug 31c7af1737 Tree syncing optimized
Tree now syncs new trees, and also takes the delayed tree-load + iframe
loading into account on legacy editors.
2013-11-01 09:28:12 +01:00
Shannon 20c624915f Fixing up more unit tests - still a bunch more to do 2013-11-01 18:12:23 +11:00
Shannon ac2d8633af Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-11-01 18:07:18 +11:00
Shannon 76bc312842 Fixes an issue with empty string conversions to date time - should fail 2013-11-01 18:06:58 +11:00
Shannon b4176ca7df ignores the code first tests that are failing with notes. Need Morten's help with these. 2013-11-01 17:34:14 +11:00
Shannon 9342a7e897 Starts fixing up some tests, un-ignores tests that shouldn't be ignored. 2013-11-01 17:32:03 +11:00
Shannon e4bd459da4 Completes: U4-2666 Change the drop down for selecting an icon/thumbnail for doc/media types to display the new list of icons to choose from 2013-11-01 17:18:57 +11:00
Shannon 083ca23d93 Fixes: U4-3290 PackageBinaryInspector returns error during install 2013-11-01 17:10:01 +11:00
Shannon b2c5d7270e Fixes: U4-3286 Using a custom aspx page that inherits from UmbracoEnsuredPage seems to log you out - moves the authentication/ticket logic to one central place, now for all base page validation requests if the ticket is not already there it will attempt to authentication the request. This only occurs when a page is being loaded that requires back office authentication but is not part of the umbraco back office route (so packages mainly) 2013-11-01 15:37:59 +11:00
Shannon 59a81f4d12 Fixes: U4-2852 Create dialog with legacy implementations. 2013-11-01 14:46:33 +11:00
Shannon 60c4d670da Fixes: U4-3294 When creating new content and there are validation errors we don't redirect to edit the content, instead validation errors are displayed and we create another item 2013-11-01 13:54:42 +11:00
Shannon c1ad4aa560 Starts fixing: U4-3294 When creating new content and there are validation errors we don't redirect to edit the content, instead validation errors are displayed and we create another item 2013-11-01 12:23:37 +11:00
Shannon 7dc4cb7962 Removes 'propertyeditors' package folder from UI.Client project 2013-11-01 12:13:19 +11:00
Shannon 7cbd2f1aad Changed member picker prop-editor to store as INT in the db - to be backwards compat. 2013-11-01 12:03:39 +11:00
Shannon 19a1ca64f6 Fixes tree cache - fixes the unit tests associated with the tree cache so they run properly, tree cache can now be cleared by section, by key, by both or all. There's no longer a default cache key since we don't want to cache things when not needed. ONLY the main trees are now cached, tree pickers and dialog trees should never be cached since tree structures change all of the time (i.e. by other users, changing node names, etc...). The tree-picker directive also had a cache which meant that anyone using that directive would end up with the same cache. 2013-11-01 11:35:48 +11:00
Shannon 35f49962ca Fixes: U4-2461 If umbraco is not installed / uptodate login fails 2013-11-01 09:35:39 +11:00
Shannon 65db15487e Removes UI logic for installation detection, need to move this all to the UmbracoModule - then back port to 6.2 2013-11-01 09:25:19 +11:00
Shannon c722e57914 Moves the our umbraco web reference to where it needs to be. 2013-11-01 09:21:29 +11:00
Shannon c1f35e6991 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-11-01 09:07:04 +11:00
Stephan 767719357e U4-3279 - better exception message when failing to find a content type 2013-10-31 18:28:49 +01:00
Stephan 7b29bd67f3 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2013-10-31 15:29:16 +01:00
perploug e97bb0b354 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-31 12:44:47 +01:00
perploug 72c173dbee Fixes: U4-2690 data type editor, makes 2 requests for the initial load 2013-10-31 12:44:35 +01:00
perploug 7e0e84ae21 fixes: non-configured install doesnt redirect
Adds install info to servervars, adds information to login screen about
going to the installer
2013-10-31 12:44:11 +01:00
Tim Geyssens 453769b1e7 Some styling for related links prop editor 2013-10-31 11:28:38 +01:00
Tim Geyssens 2b9211c56d Work on related links prop editor 2013-10-31 10:10:51 +01:00
Tim Geyssens a79132e922 Member groups picker prop editor is working 2013-10-31 09:29:06 +01:00
Tim Geyssens adcf09c99b Work on member group picker, allows multiple selection 2013-10-31 09:22:06 +01:00
perploug 177eb3d360 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-31 08:47:58 +01:00
perploug 336182d8b7 Absolute image path support, with and without tilde 2013-10-31 08:47:46 +01:00
Shannon acb2e58a5c Completes: U4-3067 Send to publish not implemented 2013-10-31 18:28:02 +11:00
Shannon 523c48d4fd Nearly have send to publish working, it's all wired up in the UI to the controller, just need to implement the logic. 2013-10-31 18:17:30 +11:00
Shannon 90c62bddd9 Fixes security check on content controller for the correct publish letter. Adds cache listeners to the MacroService. Ensures the status message is cleared when a form is reset. 2013-10-31 17:22:10 +11:00
Shannon 719b777188 fixes js tests 2013-10-31 16:57:15 +11:00
Shannon 1ead3f9b6a Updated the content display model to pass in a list of the allowed actions (using the letter of the permission). We then dynamically generate the action buttons on the content editor based on what the user is actually allowed to do and the current state of the content. Fixed up some content saving validation for Create + Publish at the same time, since we never allowed that behavior before we now have to check for both permissions during this one execution. Updated the Unpublish method to check for publish permissions - unpublish is an action but it is not permission assignable, you can only unpublish if you can publish. Fixes the user session timeout display timer. 2013-10-31 16:51:08 +11:00
Shannon ab6a26445e Fixed the horrible mess that was the permissions editor dialog. 2013-10-31 12:57:41 +11:00
Shannon 881dab1612 Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2013-10-31 11:47:50 +11:00
Shannon dc4a0fec80 Merge branch '6.2.0' into 6.2.0-membershipprovider
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2013-10-31 11:36:04 +11:00
Shannon 4c3d700c54 Changes the UserMembershipProvider to validate an already hashed/encrypted password and then validate a non hashed/encrypted attempt, this is to maintain compatibility with how v6 works, it's not ideal but needs to be there. Creates a settable property on the password changer to be able to dynamically hide the old password field if you are going to manually set the old password. Updates the EditUser to hide the old password field and pass in the alraedy encrypted pword to validate against like it used to be. 2013-10-31 11:35:12 +11:00
perploug bfbed0249e moves the label switch a bit up the controller 2013-10-30 23:02:50 +01:00
perploug ea38f7a998 Ensures folder browser doesnt allow upload on creation 2013-10-30 22:33:36 +01:00
perploug b704220133 Enable upload drag/drop message on folder browser 2013-10-30 22:16:51 +01:00
perploug 67903d7590 Publish button changes label depending on publishing access
Needed for the switch between send to pub and save and pub. So the
controller on the server handles the rest, same method called ideally
2013-10-30 22:16:31 +01:00
perploug 06d3f15fa0 We should return all content types, if none are set to allow at root 2013-10-30 22:14:58 +01:00
perploug 00f8472cfc Adds permission checks to contentResource 2013-10-30 22:12:13 +01:00
perploug db1ae58f96 relative image detection, solves tree icon bug 2013-10-30 22:11:29 +01:00
perploug d981058498 Content name directive auto-focus fix 2013-10-30 22:10:46 +01:00
perploug 81d2aac0d2 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-30 19:35:02 +01:00
perploug ce509638e1 Added 7.0 starterkit feed to installer 2013-10-30 19:34:35 +01:00
perploug 00d0d5e046 picker tweaks 2013-10-30 19:34:12 +01:00
perploug b0b785954f Dashboard iframe sizing 2013-10-30 19:33:36 +01:00
Stephan ed80f75c1c Merge pull request #177 from gildebrand/patch-1
Changed spelling of Wonderful to the correct one
2013-10-30 07:17:16 -07:00
gildebrand cf1cbb5f94 Changed spelling of Wonderful to the correct one 2013-10-30 15:15:39 +01:00
Tim Geyssens 7f56c79a8d Member group picker prop editor, almost got it working 2013-10-30 13:56:29 +01:00
Tim Geyssens 69e445239a Updates member group picker dialog 2013-10-30 13:47:54 +01:00
Tim Geyssens 21f0e60061 More member group picker WIP 2013-10-30 13:41:29 +01:00
Tim Geyssens 8b5eefafdb Some more member group picker WIP 2013-10-30 13:33:55 +01:00
Tim Geyssens 54e4866325 More work on member group picker 2013-10-30 13:19:10 +01:00
Tim Geyssens 5ce6ec124a Adds member group picker prop editor to Umbraco.Web 2013-10-30 13:11:59 +01:00
Tim Geyssens 4f79b8bf45 Updates video dashboards to show chapters 2013-10-30 13:03:52 +01:00
perploug 451004d45e Picker fine-tuning 2013-10-30 10:54:47 +01:00
perploug e5879a4c70 Macro container 2013-10-30 10:54:23 +01:00
Shannon bb5dad8c1d Removes user timeout timer to do digests, now just has it's own internal clock and the countdown timer will count for itself and only digest it's own scope, this is heaps better for performance. 2013-10-30 18:57:43 +11:00
Shannon 51aefd2b6b Adds the tab and multi-tab parameter editors 2013-10-30 18:30:04 +11:00
Shannon 5c7f551015 Creates a re-usable dropdown/multilist for any type of Entity that uses the entityResource, so now user picker, property type (+ multiple) param editor, content type (+multiple) param editor all use this. Fixes: U4-3268 UserPicker doesn't actually persist a value 2013-10-30 18:14:16 +11:00
Shannon 35f842f7ba Content type and multiple content type parameter editors completed. 2013-10-30 16:53:53 +11:00
Shannon e4f8f6ebd5 Fixes macro parameter form validation, adds the number parameter editor, updates the parameter editor mapping, adds more fixes to the number fixer and changes the integer property editor to use a type='number' 2013-10-30 15:45:16 +11:00
Shannon 46ba9718ff Changes the explicit paramet editor implementations to simply use the already created property editors, updates the legacy parameter editor mappings and adjusts the resolver to use the mappings if one is not found. 2013-10-30 14:36:07 +11:00
Shannon 68b955e611 Fixes isDialog mode trees, creates content picker parameter editor, ensures the tree dialogs are all isdialog=true, fixes property editor resolution that are parameter editors. 2013-10-30 14:12:06 +11:00
Shannon 5be7ed7d58 Fixes: U4-3277 Macro insert in rte is not pre-populating selected macros 2013-10-30 13:28:41 +11:00
Shannon 201e28513a fixes up some stuff with the slider 2013-10-30 13:05:24 +11:00
Shannon ca8e840195 Completes: U4-3274 Create new Slider editor 2013-10-30 12:54:21 +11:00
Shannon b30a479f86 Fixes the number editor - due to some angular bugs had to make a fixNumber directive. 2013-10-30 11:23:21 +11:00
Shannon 95d98b132a Updates installer to not install some data types that we're not shipping with, fixes up some mappings, changes the simple editor convert to be the markdown editor converter (need to test that) 2013-10-30 08:59:28 +11:00
Shannon ca0db38870 fixing file naming conventions to lower case 2013-10-30 08:37:36 +11:00
Shannon 3272be6a35 fixing file naming conventions to lower case 2013-10-30 08:37:23 +11:00
Shannon 2b4957d4f2 Fixes up mntp pre-value editor with convention naming 2013-10-30 08:35:05 +11:00
Shannon abb28250f8 Updated property editors legacy -> new mappings 2013-10-30 08:31:22 +11:00
Shannon d922846a7e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-30 08:16:30 +11:00
Shannon 70491bb6e6 changed name to readonlykeyvalues 2013-10-30 08:16:12 +11:00
perploug d8a8556598 Fixes an issue with missing _key in member search 2013-10-29 22:10:56 +01:00
perploug a7f5576fee Wires up the help dialog with our and tv feeds 2013-10-29 21:49:40 +01:00
perploug 1860f3f953 Adds mntp filters, aligns picker ui 2013-10-29 21:48:59 +01:00
Jeremy Pyne 6451f6ad68 Fix sql errors in prev change. 2013-10-29 10:00:25 -04:00
Jeremy Pyne 7cd6882f28 Removed dependence in Stylesheet repository on Entity Service. 2013-10-29 09:24:05 -04:00
Shannon 968a94f281 Completes: U4-3261 Ensure label/readonly displays pre-values 2013-10-29 19:14:15 +11:00
Shannon 3d7f7db396 Fixes some value conversions and updates the entity search to be more accurate 2013-10-29 18:46:12 +11:00
Shannon ff7116ac57 couple missing semi colons 2013-10-29 18:21:52 +11:00
Shannon d62aae0205 Fixes property editors that have default pre-values for those prevalues to show up when creating a new data type, fixes: U4-3147 Create tag supported property editors - and adds the tag group to the pre-values for the tag property editor. 2013-10-29 18:17:10 +11:00
Shannon 37464e5f0f Fixes: U4-3269 When a document doesn't have a link and instead just displays a message (because it isn't published), the UI shouldn't render an achor as a link - and makes the preventDefault directive to support conditional logic. 2013-10-29 16:56:22 +11:00
Shannon d96de90cd9 Fixes: U4-3241 New content thinks it has been published
U4-3104 When a document is not published the links list shows there's an internal error
2013-10-29 16:36:56 +11:00
Shannon aca550a9b4 Fixes search algorithm to have more accurate results 2013-10-29 16:00:15 +11:00
Shannon e862ffcb1b Fixes: U4-3266 Xml cache file is not created/persisted 2013-10-29 15:43:10 +11:00
Shannon 0cac739b50 Fixes EntityController search to search fields correctly with the correct case and wildcards 2013-10-29 15:22:52 +11:00
Shannon 3d44c78585 Gets search searching on the member picker - but the member picker doesn't really work, not sure what the UI is supposed to be doing. FIxing some closure issues with the other pickers. 2013-10-29 15:01:46 +11:00
Shannon 8588cbb836 Getting all the search working nicely with the pickers (WIP) 2013-10-29 14:03:46 +11:00
Shannon f5a2f87038 Fixes member issues 2013-10-29 14:03:16 +11:00
Shannon 2075311773 Fixes member data indexing to ensure it includes the unique key, fixes the EntityService search to return IEnumerable<EntityBasic>, not search results so the data returned is limited to non-sensitive data, adds AdditionalData to EntityBasic so we can add additional values like URL to outgoing entities, Fixes up the searchService, searchControllers to use new structure. 2013-10-29 11:39:34 +11:00
Shannon 151e20240a Changes debounce function to use underscore 2013-10-29 09:18:47 +11:00
perploug fc2e605fd8 Improves the property safe alias lookup 2013-10-28 22:57:57 +01:00
perploug 6ee867c01b Fixes: U4-2655 double-click to force reload 2013-10-28 22:12:27 +01:00
perploug 0a677a3b54 #U4-2962 Never hides name editor, better error feedback 2013-10-28 21:49:32 +01:00
perploug 0aab5e435a Adds a way to do hotkys on webforms buttons 2013-10-28 21:32:35 +01:00
perploug c75a7817cf re-adds the jquery-ui sorting
The other libraries werent mature enough so we'll have to stick with
this for now
2013-10-28 20:26:18 +01:00
perploug 7716413015 updates umb.tv feeds on dashboard 2013-10-28 20:25:26 +01:00
perploug e69559238d Fixes tree picker multiple count 2013-10-28 20:25:06 +01:00
perploug 6b5326ccbd hides search correct 2013-10-28 20:24:16 +01:00
perploug eb622504f2 RTE updates for styles and button placement 2013-10-28 20:24:02 +01:00
perploug 228230d46b removes unneeded files 2013-10-28 20:22:40 +01:00
Jeremy Pyne dc336728b5 Fix for missing Id's on FileService.GetStylesheets() call. This is needed as sytlesheets can only be loaded in the editor via their Id so listing stylesheets needs to list there Id as well for custom plugins to render the build in editor. 2013-10-28 14:32:18 -04:00
Shannon 6263b07087 Working on (WIP) U4-3255 Fix search - shouldn't search on every key change, shouldn't show up for non-search sections, shouldn't return ISearchResults 2013-10-28 18:38:20 +11:00
diachedelic 75dfde3bc5 Added test for dictionaryToQueryString method in Belle 2013-10-28 16:35:48 +11:00
Shannon 7c9f742b4d Fixes U4-2702 Ensure the new file uploader has consistent pre-values pre previous versions 2013-10-28 16:01:07 +11:00
Shannon 025e7eba1d Separates some classes 2013-10-28 15:36:08 +11:00
Shannon 2b7a9389b4 Fixes: U4-3254 Property level validation not working when no field level validators are used
U4-2683 Ensure all uploaded files are cleaned up when they change for the FileUploadValueEditor
U4-3252 File uploader needs to adhere to DisallowedUploadFiles config
U4-2774 FileUploadValueEditor needs to remove old files
2013-10-28 15:34:48 +11:00
Shannon 3110b199c6 Completes: U4-3155 Ensure new tree events are fired for legacy trees 2013-10-28 13:45:38 +11:00
Shannon e707506303 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-10-28 12:36:27 +11:00
Shannon 49d5791825 Adds DescendantsOrSelf extensions on ienumerable to published content extensions 2013-10-28 12:35:50 +11:00
Shannon 660e89a46c Fixes merge issues 2013-10-28 11:38:07 +11:00
Shannon fea90482b6 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Web/Standalone/StandaloneBootManager.cs
	src/Umbraco.Web/UmbracoContext.cs
2013-10-28 11:26:01 +11:00
Shannon 6cfb864055 Fixes DataTypeDefinitionRepository to properly delete a data type including it's pre-values 2013-10-28 11:23:09 +11:00
Shannon d0ef627532 Fixes config change from merge 2013-10-28 11:22:36 +11:00
Shannon 7fd823c9e9 Fixes DataTypeDefinitionRepository to properly delete a data type including it's pre-values 2013-10-28 11:22:23 +11:00
Stephan 89c5d5d613 PublishedContent - get published properties to report the CLR type of the value 2013-10-28 01:09:34 +01:00
Stephan 73b7729b82 Standalone - fix so it works again 2013-10-28 01:07:29 +01:00
Stephan c66d49dbfe PublishedContent - remove useles code in model factory 2013-10-28 01:07:17 +01:00
Shannon ecf73a6230 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web/Mvc/UmbracoViewPage.cs
	src/Umbraco.Web/Umbraco.Web.csproj
2013-10-28 11:03:14 +11:00
Shannon a915dff4a8 Fixes packaging service up to export data type's properly, fixes legacy DataTypeDefinition to export data type's properly with the prop ed alias instead of id, obsoletes old content extension methods. 2013-10-28 11:02:04 +11:00
Shannon 9a3b70149c Fixes packaging service to export data type's property with the ID as the property editor ID 2013-10-28 11:00:14 +11:00
Shandem 98cc1c63ce Merge pull request #173 from pynej/trees-config-action
Trees config action
2013-10-27 16:00:00 -07:00
perploug 757086b7bd merged 2013-10-27 15:22:04 +01:00
perploug ab36687c85 Adds contentype alias to media and cotnent tree nodes 2013-10-27 14:12:27 +01:00
perploug d86654fa6b Readds datatype editor killed in merge 2013-10-27 14:12:09 +01:00
Stephan 128a08f169 Web.Mvc - Refactor UmbracoViewPage, UmbracoTemplatePage, support strongly-typed content
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2013-10-25 13:21:29 +02:00
Stephan 4487e686d7 Core.TypeExtensions - add methods 2013-10-25 13:19:20 +02:00
Shannon 7679b36f13 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-25 16:29:02 +11:00
Shannon 716def8d33 Completes: U4-3020 Installning package with legacy data types just gives error 2013-10-25 16:28:46 +11:00
Shannon 4ceb16e20d removes contour committed app config 2013-10-25 16:28:26 +11:00
Shannon 61318df0b4 Removes contour files that were committed by accident 2013-10-25 16:27:09 +11:00
Shandem 822117e453 Merge pull request #175 from diachedelic/7.0.0
Encoded API query string & removed refs to umbraco.aspx
2013-10-24 22:21:42 -07:00
diachedelic d09b34dd03 * Updated references to 'umbraco.aspx' in static content
* URI encode query strings in frontend API calls
2013-10-25 16:07:20 +11:00
Shannon ab8d0c6504 Gets the package inspector all working with type checks and app domains 2013-10-25 14:04:53 +11:00
Shannon c5c1946d1b Got more of the install checker working and inspecting package assemblies for report. 2013-10-25 11:35:09 +11:00
perploug 5b6fd83f21 merge 2013-10-24 15:25:59 +02:00
Shannon 2587b06361 WIP - Fixing up the package installer to detect incompatible legacy data types, dlls, etc... and cleaning up some of the old code in there. 2013-10-24 19:50:46 +11:00
Shannon e507ad4ace Removes IActionHandler - and all it's references : U4-3226 Remove IActionHandler 2013-10-24 17:15:37 +11:00
Shannon 7636f17ba9 Fixes: U4-3225 Media recycle bin malfunction - and removes the default menu for items in the bin since people normally aren't creating children when it's in the bin. 2013-10-24 16:54:17 +11:00
Shannon 36ffd41007 Updates data type service for the way it saves pre-values so we can maintain ids if necessary - updates the pre-value editors to except a different dictionary which includes an id if necessary. This all fixes: U4-2751 Check that when publishing keys for drop down list prop eds that if we change a value that the id remains constistent 2013-10-24 16:38:00 +11:00
perploug b5e06a6552 Cosmetic changes discovered during testing today 2013-10-24 06:39:35 +02:00
Shannon 165caa5aba Ensures data type editor has ctrl+s wired up 2013-10-24 15:14:15 +11:00
Shannon a5d6cfd812 Adds HideLabel pre-val to the RTE, created a new ConfigureForDisplay method which allows property value editors to change any properties like HideLabel based on the pre-values. 2013-10-24 15:06:41 +11:00
Shannon 638a614a24 adds tag controller url to server vars 2013-10-24 13:51:21 +11:00
Shannon a3c3e220a0 Creates public api service for querying tags 2013-10-24 13:42:41 +11:00
Shannon 8d724ff2f7 Completes: U4-3040 Create UmbracoHelper methods for querying real tags on the front-end and creates new TagQueryContext 2013-10-24 13:31:10 +11:00
Shannon f13fd59059 Creates a new PublishedQueryContext which is responsible for all content querying on the front-end templates (now wrapped by the UmbracoHelper). This allows for better separation of logic. 2013-10-24 12:50:43 +11:00
Shannon c03b839bb1 Completes: U4-3052 Create TagsService 2013-10-24 11:49:09 +11:00
perploug 055cf5da3a Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-23 16:07:39 +02:00
perploug d8de1c5b1b Removing boostrap tags lib, updating bootstrap to 2.2.3 2013-10-23 16:07:24 +02:00
perploug 04ab76e5a9 Merge pull request #174 from mvanhelmont/patch-1
Update content.resource.js
2013-10-23 07:06:25 -07:00
mvanhelmont 22da0c85f7 Update content.resource.js
getByIds fails because there is no id property
2013-10-23 16:04:26 +02:00
perploug 440d26d982 Changed sir trevor to json 2013-10-23 15:34:19 +02:00
perploug 2891f96006 Added tablet button for media upload 2013-10-23 15:34:10 +02:00
perploug 7d885e8af0 Visual tweaks for tablet compat 2013-10-23 15:33:35 +02:00
perploug 7d35ad124a basic tag property editor 2013-10-23 15:33:15 +02:00
perploug 45cf5d88cf Changed Url.Link to Url.Route
When running on a different port then port 80, an incorrect path to all
services was returned, as it returned domain and no port number in the
url, this changes it so it only returns the path without domain or port
number
2013-10-23 13:20:25 +02:00
Shannon ee5e0a9b7e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-23 20:28:05 +11:00
Shannon 865d8e633e Created a json converter so we don't have to use DarkMagic - this is based on a new "JSON" value type that is applied to a property editor. 2013-10-23 20:27:48 +11:00
perploug 69a0de20d7 Adds global "esc" hotkey to close all open dialogs 2013-10-23 09:20:03 +02:00
perploug 13f1c80329 Fixes RTE embed sizing hidden 2013-10-23 09:11:34 +02:00
perploug 9a36d40623 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-23 08:42:56 +02:00
perploug db4bcab192 adds suport for ctrl+s in legacy editors 2013-10-23 08:39:17 +02:00
Shannon be3288af44 Fixes tree cache: removes reference to "tree.clearCache" since that doesn't exist, tree's are not cached by tree alias so the logic was never going to work, further more the cache would not have been cleared because the tree cache is *not* an array but an object. Adds unit test for this. 2013-10-23 16:01:25 +11:00
Shannon 322ad6ca26 Completes: U4-3030 Need to remove the starter kit/skin dashboard 2013-10-23 14:30:43 +11:00
Shannon 617d7dcea1 Completes: U4-2656 Put in upgrade checker functionality like we have in v6 2013-10-23 13:02:39 +11:00
Shannon 0510773dc5 Added some docs about tag support. 2013-10-23 12:34:10 +11:00
Shannon 2325052d69 Adds notification for 404 errors, updates password changer to use new provider property for legacy backwards compatibility. Fixes validation logic on post. 2013-10-23 11:31:13 +11:00
Shannon 00486eeaa7 Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/passwordChanger.ascx
	src/Umbraco.Web/Security/WebSecurity.cs
	src/umbraco.providers/UsersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
2013-10-23 10:51:06 +11:00
Shannon ae32968efd Updates the legacy membership providers and WebSecurity/Password changer to stay backwards compatible with their previous settings whilst still keeping all of the provider fixes. 2013-10-23 10:19:43 +11:00
Shannon dc3c517697 Fixes: U4-3123 Umbraco 7 - unable to use email address as user name 2013-10-23 09:20:15 +11:00
perploug 36a472b79a Vertical space improvements 2013-10-22 15:32:49 +02:00
perploug 99766e3f22 removes debuggin value from view 2013-10-22 15:27:23 +02:00
perploug 937e7f9004 Minor tweaks to fix current node indication 2013-10-22 15:23:19 +02:00
perploug d82fd3dd04 member groups tree and editor polish 2013-10-22 14:58:42 +02:00
perploug b94f2aba70 Datatype delete controller 2013-10-22 14:58:30 +02:00
perploug 01c601f87e Responsive tree
Tree collapses on small screens, stays pinned on large ones
2013-10-22 14:58:11 +02:00
perploug 3ba05aca8f Much better tree syncing
Is now pluggable, without those directive watches, and only active when
used from external controllers, so dialog trees become much lighter
2013-10-22 14:57:41 +02:00
perploug d4a069451f Datatype delete dialog 2013-10-22 09:46:22 +02:00
perploug 547361a185 Removes all the views/*.controller.js files from build 2013-10-22 09:46:11 +02:00
Shannon 736339ad1c Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0
Conflicts:
	src/umbraco.providers/members/MembersMembershipProvider.cs
2013-10-22 17:38:09 +11:00
Shannon c1778918b5 Fixes more membership provider woes. 2013-10-22 17:37:03 +11:00
Shannon 3f5fdf840a Completes: U4-3212 Support unlocking a member, also fixes quite a few other issues regarding the membership provider properties of the content type. 2013-10-22 17:36:46 +11:00
Shannon 90c76ae465 Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/install/steps/DefaultUser.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
2013-10-22 13:45:23 +11:00
Shannon 680a4b9570 Fixes a lot -
U4-3208 Ensure all membership provider properties exist on the default Member type shipped with Umbraco
U4-3158 user back office password policies doesn't adhere to membership provider rules
and even more fixes to the membership provider like actually integrating the last locked out date and last pword change date. Fixes member creation to actually use the membership provider - this means that the password is created properly based on the provider config. Fixes the provider to have default fields specified so people don't actually have to specify in config.
2013-10-22 13:41:04 +11:00
Shannon 2243452261 Completes: U4-3089 fix membership provider to be able to change email address 2013-10-22 11:24:56 +11:00
Shannon 4427554752 Completes: U4-3085 member editor should automatically generate a password for new users 2013-10-22 09:45:07 +11:00
perploug 16be7a2971 External editor sample 2013-10-21 22:19:07 +02:00
perploug 35a03a1e58 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-21 14:29:19 +02:00
perploug d258fc5a9f added minification to grunt file 2013-10-21 14:29:00 +02:00
perploug 17e1020724 language file updates 2013-10-21 14:28:43 +02:00
perploug 24858dfdfc tinymce button color 2013-10-21 14:28:32 +02:00
perploug 2a9a7ee9c5 removes legacy js 2013-10-21 14:28:23 +02:00
perploug 00690d011a listview localization serverside 2013-10-21 14:28:05 +02:00
perploug 4b5284fd7b fallback in case on no children on listview 2013-10-21 14:27:46 +02:00
perploug a286f358be create dialog localization 2013-10-21 14:27:16 +02:00
perploug 0b65b3b4a1 used dialog closes when going to profile 2013-10-21 14:27:05 +02:00
perploug 48ef1aab1c adds cancel buttons to all dialogs 2013-10-21 14:26:51 +02:00
perploug 652f1e52ec listview selection css 2013-10-21 14:26:26 +02:00
perploug 5a682c44bc minor localization change for keys 2013-10-21 14:26:14 +02:00
Shannon 70a1704b35 Completes U4-2929 Finish obsoleting the remaining legacy property editors 2013-10-21 18:36:46 +11:00
Shannon d8ff1e97b3 Fixes: U4-3206 MemberService doesn't generate xml for a member 2013-10-21 17:57:36 +11:00
Shannon 39eb0351c0 Completes U4-3086 Remove EditMember.aspx 2013-10-21 17:29:13 +11:00
Shannon 49df332734 Completes: U4-3194 member editor needs group/role support 2013-10-21 17:02:33 +11:00
Shannon 3af8354a93 Fixes: U4-3161 YSOD when clicking on user permissions 2013-10-21 11:57:38 +11:00
perploug a39d41b1b7 adding media move dialog and support for media containers
media containers are disabled currently for UI reasons
2013-10-20 23:36:26 +02:00
perploug d9a1d3438b minor typo in previous commit 2013-10-20 20:00:04 +02:00
perploug 9000ece7d1 Update service notifications 2013-10-20 19:58:44 +02:00
perploug 2b8c566e65 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-19 15:07:20 +02:00
perploug aedb17781b WIP on updates notifications 2013-10-19 15:07:02 +02:00
Jeremy Pyne ba6ba15732 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.1.3-clean 2013-10-18 11:37:28 -04:00
Jeremy Pyne 291f526368 Fix to properly read actions from trees.config. 2013-10-18 11:37:06 -04:00
Shannon 6fd05ab6be Listens to new member events for cache refreshing 2013-10-18 16:23:33 +11:00
Shannon fca605287b Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0
Conflicts:
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/WebBootManager.cs
2013-10-18 16:18:55 +11:00
Shannon 5e63077a32 Adds Xml output for members to packaging service and ToXml extensions, updates examine event handler to listen to new member events as well as old (until we fix that). Adds events to MemberService 2013-10-18 16:16:30 +11:00
Shannon ff61812e65 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-membershipprovider 2013-10-18 16:14:24 +11:00
Shannon d20ea58467 Fixes: U4-3193 Partial view cache needs to invalidate based on cache refreshers 2013-10-18 16:13:41 +11:00
Shannon c6431bde3f Automagically converts json stored data to it's equivalent json.net json structure and works with dynamics. 2013-10-18 14:07:31 +11:00
Shannon c737c43fa2 Completes: U4-3169 Publicize new MacroService 2013-10-18 12:54:18 +11:00
Shandem c4f3dae317 Merge pull request #172 from IDisposable/6.2.0
Reduce Exceptions thrown during type conversions.
2013-10-17 18:07:52 -07:00
Shannon a663cad110 Fixes styling on passwordChanger to be inline with Belle styles 2013-10-18 11:55:53 +11:00
Shannon e0c1b5cd8d Fixes merge issues 2013-10-18 11:39:51 +11:00
Shannon b95575572d Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0
Conflicts:
	src/Umbraco.Core/Models/Rdbms/UserDto.cs
	src/Umbraco.Core/NameValueCollectionExtensions.cs
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Models/PasswordChangedModel.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
	src/umbraco.cms/businesslogic/member/Member.cs
	src/umbraco.providers/Properties/AssemblyInfo.cs
	src/umbraco.providers/UsersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
2013-10-18 11:33:38 +11:00
Shannon 92c7b4446b Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AddChangeDocumentTypePermission.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
2013-10-18 11:27:32 +11:00
Shannon 844f4490fe Completes: U4-3168 Proxy legacy macro APIs to new MacroService 2013-10-18 11:24:53 +11:00
Marc Brooks 4d5b330567 Reduce Exceptions thrown during type conversions.
There are tons of places where null, blank or empty strings are being
converted to primative types (like int,, long, etc) or other ValueTypes
(like Guid, DateTime, etc.). When this is attempted, Exceptions are
thrown (and caught/swallowed) to allow for value defaulting. Since this
happens all the time in normal operation, tons of Exceptions are being
thrown. By switching to the TryParse methods available on all primative
types and the interesting ValueTypes, we can greatly speed the
processing of content data.
2013-10-17 19:12:08 -05:00
Shannon e18b00ef25 Obsoletes legacy relation API 2013-10-18 10:39:00 +11:00
Shannon 3cef9d9186 csproj updates 2013-10-18 10:35:15 +11:00
Shannon 8188f66892 Implements: U4-3171 Create an interface for RelationService 2013-10-18 10:35:04 +11:00
Shannon a87e699f8d Updates the web.config template to allow password reset 2013-10-18 09:54:34 +11:00
Shannon 40287fd427 adds some tests for membership provider base 2013-10-18 09:33:10 +11:00
Shannon 5d5f7a4516 Updated edit member with correct usage of password changer. 2013-10-18 08:52:46 +11:00
Shannon ac6aaedf3e missing csproj commit to fix build 2013-10-18 08:34:37 +11:00
Shannon 61ef83c748 Gets the password changer working - on the edit user page. reset/change password wth validation 2013-10-18 00:37:51 +11:00
Shannon f82329b371 More updates the password changer and edit user 2013-10-17 22:52:37 +11:00
Shannon 0fee434ac2 Working on the password changer control to present the correct inputs based on the membership provider given.... nearly there. 2013-10-17 22:40:38 +11:00
Shannon 3aab41b1e4 Fixes lots of membership provider stuff
U4-3057 MembershipPasswordFormat problem at EncodePassword method in UmbracoMembershipProvider class
U4-3176 UsersMembershipProvider.CreateUser does not encrypt/hash the password
U4-3173 UserMembershipProvider.ChangePassword does not work

- Now we need to update the UI for the member

Signed-off-by: Shannon <sdeminick@gmail.com>
2013-10-17 20:20:43 +11:00
Shannon e0e5aef43e Fixes lots of membership provider stuff
U4-3057 MembershipPasswordFormat problem at EncodePassword method in UmbracoMembershipProvider class
U4-3176 UsersMembershipProvider.CreateUser does not encrypt/hash the password
U4-3173 UserMembershipProvider.ChangePassword does not work
2013-10-17 17:40:29 +11:00
Shannon fd6046ebb6 The user change password dashboard now works and adheres to the membership provider rules. 2013-10-17 14:46:16 +11:00
Shannon 2a7844d031 Fixes more of U4-3174 UsersMembershipProvider.ResetPassword does not work 2013-10-17 13:55:01 +11:00
Shannon dc0f4757a2 Fixes: U4-3174 UsersMembershipProvider.ResetPassword does not work, U4-3173 UserMembershipProvider.ChangePassword does not work 2013-10-17 13:44:21 +11:00
Shannon d6bd3354cf Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-10-17 11:29:04 +11:00
Shannon e94f8da3e8 removes the macro renderings ref 2013-10-17 11:28:39 +11:00
Shannon d28cdf3bdc Updates the formHelper and streamlines the way form submission is handled, updates the member and user controller to use the new change password functionality in the Security object which uses all of the correct logic to update a password based on the membership provider. Gets the user's change password form working correctly with server validation. now just need to get the user membership provider to actually work. 2013-10-17 11:28:21 +11:00
Shannon 1ac2ccb8c2 makes public the ApplicationTreeService on the services context 2013-10-17 11:26:34 +11:00
Shannon 3be2af15ee Removes ObjectExtensions from the config - this was left over from the importing of the new config. 2013-10-17 11:25:21 +11:00
perploug aef7525354 localization and visual tweaking 2013-10-17 01:10:14 +02:00
perploug eef44e97c5 user localization 2013-10-17 01:09:55 +02:00
perploug 1f65f02f49 dashboards localization 2013-10-17 01:09:46 +02:00
perploug 87cacaf92c touch padding 2013-10-17 01:09:32 +02:00
perploug b3830067ca on touch, make the dialog sticky to avoid instant collapse 2013-10-17 01:09:22 +02:00
perploug ff40de7c29 tree menu clicks adjustment 2013-10-17 01:08:58 +02:00
perploug 3f76a130f1 hotkeys osx compat 2013-10-17 01:08:39 +02:00
perploug 205d5f7d71 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-16 20:37:35 +02:00
perploug 100ab5643a Localizing cotnent and media editors main grid 2013-10-16 20:37:12 +02:00
Jan Skovgaard 3abd4df8bd Enabled lists plugin in tinymce by default
Fixes http://issues.umbraco.org/issue/U4-3023
2013-10-16 16:01:17 +02:00
Jan Skovgaard ea239e6122 Missing languages in RTE insert link dialogue
Fixes this issue: http://issues.umbraco.org/issue/U4-2551
2013-10-16 15:53:56 +02:00
Lars-Erik Aabech 3fe99a402e Should make the PublishedContentExtensionTests green when ran together with everything else in TeamCity 2013-10-16 15:45:39 +02:00
Sebastiaan Janssen f9ad06be29 Something odd going on with the new tests being affected by tests that ran before them, no time to fix. Runs fine independently. 2013-10-16 14:19:24 +02:00
Steve Temple e738738e54 Only check actions if more than 1 route matches & ignore case when comparing controller names 2013-10-16 12:02:20 +01:00
Sebastiaan Janssen 699c651daa Merge pull request #169 from stocksr/U4-3033-take2
Really Fix U4-3033 - inserting extra blank line at end of CSS
2013-10-16 04:00:26 -07:00
Robert Stocks 79299175c1 Really Fix U4-3033 - inserting extra blank line at end of CSS 2013-10-16 11:49:02 +01:00
Sebastiaan Janssen 14e3976e88 Merge pull request #142 from lars-erik/6.2.0-recursive_isofdocumenttype
Recursive PublishedContentExtensions IsDocumentType
2013-10-16 02:55:09 -07:00
Sebastiaan Janssen 76c86daf24 Update da.xml 2013-10-16 11:50:12 +02:00
Lars-Erik Aabech a1ef40e4be Split the recursive IsDocumentType into an overload for "real" backwards compatibility.
Changed string comparison to use InvariantEquals. (guessing it doesn't _really_ break backw. compat?)
Added XML docs.
2013-10-16 11:38:58 +02:00
Sebastiaan Janssen e4a0904de6 Merge pull request #167 from lars-erik/change-doctype-defaultnone
Change doctype - default suggestion none when no matching alias.
2013-10-16 01:09:02 -07:00
Shannon 6cca01718d Updated changepassword property editor to be able to be more re-used, now using it for the back office user change password which configures itself based on the membership provider configured for the user provider. now to wire it all up. 2013-10-16 17:51:48 +11:00
Shannon 6b259c8147 removes legacy belle files 2013-10-16 15:38:11 +11:00
Shannon cb727bf6e6 Simplifies user service to launch the dialog and clear user data, updates the login dialog to show that their session has expired when it has expired (not during initial login) 2013-10-16 13:49:50 +11:00
Shannon 6400e7988f adds a logout.aspx for legacy reasons in case an inline page redirects to there 2013-10-16 13:33:08 +11:00
Shannon 93d44df72b After 2 hours of debugging finally figured out the login controller is trying to manually set the iframe url... !? 2013-10-16 13:16:33 +11:00
Shannon 2267ac4534 More work on user timeouts, have the login dialog showing when it needs to and updating the user's ticket and correct new timeout seconds value - now to get it to not re-load routes when they log back in so their data is still editable. 2013-10-16 12:00:42 +11:00
Shannon 7a3e9facd0 Got the user timeout counter all working nicely with minimal server queries, now to show the login dialog when timeout is close or finished. 2013-10-16 11:31:35 +11:00
Shannon 7c881a29ae Fixes path issue and user history issue 2013-10-16 10:37:45 +11:00
Steve Temple f502912225 Updated to use invariant culture 2013-10-15 23:51:39 +01:00
Steve Temple c8a26bf6a3 Merge branch '6.1.6-multiple-action-route-issue' of github.com:stevetemple/Umbraco-CMS into 6.1.6-multiple-action-route-issue 2013-10-15 17:18:46 +01:00
Steve Temple e06e50c4fc Tidied up tabs to match Umbraco standard and nicer string comparison 2013-10-15 17:18:12 +01:00
Steve Temple 4236473b14 Tidied up tabs to match Umbraco standard 2013-10-15 17:15:53 +01:00
Steve Temple 3285e161c0 Fix issue with error http://our.umbraco.org/forum/developers/api-questions/41483-Umbraco-6-MVC-RenderRouteHandlerHandlePostedValues-Sequence-contains-more-than-one-matching-element when multiple routes share the same controller 2013-10-15 17:09:51 +01:00
Lars-Erik Aabech 607a52883a Change doctype - default suggestion none when no matching alias. 2013-10-15 13:21:30 +02:00
Sebastiaan Janssen 4651dfc763 Merge pull request #166 from stocksr/U4-3033
Fix U4-3033 - inserting extra blank line at end of CSS
2013-10-15 01:13:37 -07:00
Robert Stocks da74c0a163 Fix U4-3033 - inserting extra blank line at end of CSS 2013-10-15 09:09:03 +01:00
Shannon 8d9f741a6a Working on user timeouts - now have the user timeout time being nicely tracked in the back office with a bit of injector magic both on the client side and the server side with filters. Now to wire up the call to get remaining seconds if a request hasn't been made for a specified amount of time, then we can add UI notification about timeout period. 2013-10-15 18:46:44 +11:00
Shannon c42170cf6b Fixes: U4-3110 Cant create new relationstype - ensures that the legacy action js path references are included 2013-10-15 16:18:55 +11:00
Shannon 35545019a5 Fixes: U4-3111 Codeeditorsave.asmx always appear to fail - might need to be backported to 6.2 2013-10-15 15:51:30 +11:00
Shannon 0312b947e1 Fixes template editor to re-enable ajax saving - might need back porting to 6.2 2013-10-15 15:38:08 +11:00
Shannon e7162d46ce ignores some properties from being updated after saving otherwise we get duplicate tabs, etc... 2013-10-15 15:12:44 +11:00
Shannon dfec3965ab Completes: U4-3147 Create tag supported property editors 2013-10-15 15:02:52 +11:00
Shannon fbb7f18f23 fixes publish status when publishing child that doesn't have a parent published. 2013-10-15 14:12:10 +11:00
Shannon e2e40a3356 Fixes content service publishing status when parent isn't published, fixes listview to properly have selected checkbox (ng-checked is not supposed to be used), fixes the pre-check if nothing is actually selected before performing bulk operations - U4-3149 2013-10-15 14:11:28 +11:00
Shannon 754ed06d86 Fixes: U4-3103 The content name doesn't rebind from the server if the server changes the name 2013-10-15 12:48:35 +11:00
Shannon 171de064f6 Fixes up the legacy calls to UmbClientMgr.mainTree() and UmbClientMgr.mainTree().getActionNode() 2013-10-15 12:26:16 +11:00
Shannon e7176c40df Fixes legacy action issue where the modal would load as a v7 modal instead of a menu dialog. 2013-10-14 20:11:39 +11:00
Shannon 51cb4ca371 Fixes ParameterEditor - constructs config on ctor, no overrides. 2013-10-14 19:08:04 +11:00
Shannon d9c42e2aca Fixes initial part with legacy trees and legacy actions - now a modal window can launch - but now we need to get the legacy umb client manager js tree stuff hooked in. 2013-10-14 18:47:34 +11:00
Shannon df25edfaf6 Fixes: U4-2928 Packages tree shows context menu for items that shouldn't have one + other issues with legacy trees and menus 2013-10-14 15:36:17 +11:00
Shannon af43b35d17 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-10-14 10:46:06 +11:00
Shannon 72ea43758d Fixes - U4-3119 Non-Admin Users Cannot Create or Edit Users regardless of permission settings - 6.1.6 2013-10-14 10:45:51 +11:00
Sebastiaan Janssen d41188598a Merge pull request #165 from parnar/7.0.0
translated some keys in he.xml language file
2013-10-13 02:57:07 -07:00
parnar 2ed7fc06ea translated some keys in he.xml language file 2013-10-11 19:35:34 +02:00
perploug 5f1c69bc13 Stops tinymce from converting absolute urls 2013-10-11 13:12:21 +02:00
Stephan ee5af4998f Fix bug after merge 2013-10-11 12:30:17 +02:00
Stephan 4740e5f0c7 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-10-11 12:28:56 +02:00
Stephan 4b36dcc13b Fix bug after merge 2013-10-11 12:28:31 +02:00
perploug b92f5c4719 ui.xml file changes 2013-10-11 12:19:39 +02:00
perploug 11441fb1b1 ui.xml release files 2013-10-11 12:16:24 +02:00
perploug 377879d081 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-11 12:13:29 +02:00
perploug 738cc81439 fixes membersearch returning no results 2013-10-11 12:12:29 +02:00
Sebastiaan Janssen 14ba484fc1 Don't include release configs in final package 2013-10-11 12:11:47 +02:00
Stephan 0f894da7a6 Merge remote-tracking branch 'origin/7.0.0-pubcontent' into 7.0.0 2013-10-11 12:07:26 +02:00
Stephan 52640a94ee Fix tests after merge 2013-10-11 12:05:52 +02:00
perploug 133e2fdba7 tree config updates 2013-10-11 11:48:26 +02:00
perploug e6ef1c2506 header error message 2013-10-11 11:43:57 +02:00
Stephan 565a020acf Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-11 11:14:36 +02:00
Stephan 7718adfca1 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
2013-10-11 11:11:18 +02:00
perploug afe3ace32e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-11 10:54:50 +02:00
perploug 9a0679d41c docs update 2013-10-11 10:54:39 +02:00
Sebastiaan Janssen a54b2297c7 Changed version to beta 2013-10-11 10:51:12 +02:00
Stephan 871e390c5e U4-3094 - Fix GetPropertyValue returned type in DynamicPublishedContent 2013-10-11 10:28:16 +02:00
Stephan 34875855db U4-3095 - Fix IPublishedContent navigation axes 2013-10-11 10:27:49 +02:00
Tim Geyssens 6c0fb765f0 Related links prop editor: fixes issue in view 2013-10-11 10:25:11 +02:00
Stephan 69367e0cda Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Properties/AssemblyInfo.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
2013-10-11 10:24:24 +02:00
Stephan 15bbe1b829 PublishedContentModel - keep it internal for now 2013-10-11 10:10:19 +02:00
perploug f95ec4d8f4 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-11 09:47:57 +02:00
perploug 4a6f0a791e Multinode treepicker now supports media,content,members + search 2013-10-11 09:47:36 +02:00
Tim Geyssens 3779ba38cb Related links prop editor: make sure value is saved 2013-10-11 09:47:11 +02:00
Shannon c459a893a5 adds new db indexes 2013-10-11 18:45:37 +11:00
Shannon 2c6eeb7193 changes order of migrations 2013-10-11 18:40:54 +11:00
Shannon 6c5849cca9 adds new db indexes 2013-10-11 18:40:37 +11:00
Stephan 671b94dd06 PublishedContentModel - keep it internal for now 2013-10-11 09:24:26 +02:00
Stephan bc9dc911ed Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-11 09:24:06 +02:00
Stephan cc8298d83c U4-2606 - List registered types in a ManyObject resolver 2013-10-11 09:22:48 +02:00
wtct b5c3fb1728 FFROM to FROM 2013-10-11 09:16:18 +02:00
Shannon 42dd48a3d1 removed editmember.aspx 2013-10-11 17:32:04 +11:00
Shannon d97a98f45d Updates the macro tag parser to not care about the class - if it ever gets stripped again it won't matter on the server side. 2013-10-11 17:28:50 +11:00
Shannon 8d892bd099 Fixes: U4-3093 RTE doesnt pre-render macros 2013-10-11 17:18:14 +11:00
Shannon 886ab32f27 Streamlines both insert macro and change password forms. 2013-10-11 16:20:10 +11:00
Shannon 937b308444 Streamlines form and form validation with new val-form-manager (replaces a couple of other directives). Fixes styling on the umb-content-name, removes the test MyPackage stuff from app-plugins. 2013-10-11 15:44:49 +11:00
Shannon ee4c0cbfc3 Streamlines how forms (editors) work with a new formHelper, this reduces much of the repetitive code and also ensures that the correct events fire, this will be the start of streamlining how all forms work - even simple ones. 2013-10-11 14:11:25 +11:00
Shannon 3ba9f87d93 Simplifies the editors and file manager service so they don't have to manually clear the files, this is now done automatically on route change. 2013-10-11 13:20:37 +11:00
Shannon 626f21aecd changes controller code to use contentId scope var 2013-10-11 13:08:12 +11:00
Shannon 2f6637dcc4 Removes the editorContextService - there is zero reason to have this and it will also mean that the content item that is being stored is never released from memory. Changes form event names to formSubmitting and formSubmitted 2013-10-11 13:05:09 +11:00
Shannon 21de6dfd00 Fixes the DataTypeDefinition - addition data ctor 2013-10-11 12:43:57 +11:00
Shannon a3b0714a9d Fixes the tab error styles - ensures all tab styles are in one place - tab errors should *not* show up until form is submitted. 2013-10-11 12:37:58 +11:00
Shannon b9975ad1f5 Gets password resetting working and displaying the generated one in the UI. 2013-10-11 12:25:10 +11:00
Shannon b63135771e Got more member reset password working based on the provider config. 2013-10-11 11:44:48 +11:00
Shannon bc828176d1 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Properties/AssemblyInfo.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
2013-10-11 11:02:35 +11:00
Shannon 13dcfbbd2b Fixes build - removes .net 4.5 reference of EmailAddressAttribute - we'll leave that in for v7 when targettng 4.5 2013-10-11 10:58:31 +11:00
perploug 3d8138f3ef Added configuration to the multinode picker 2013-10-10 21:15:04 +02:00
perploug e67f85695c fixes U4-3054 icon picker viewstate 2013-10-10 19:47:12 +02:00
perploug 088253ebfd minor content editor tweaks 2013-10-10 19:46:46 +02:00
perploug dc542a4ae7 Moved help section into context-sensitive modal 2013-10-10 19:46:15 +02:00
perploug 219a46f736 mocked conten path 2013-10-10 19:44:18 +02:00
perploug 7599a68c90 tree sync actually works now 2013-10-10 19:44:06 +02:00
perploug a5522188ca contentpicker dialog polish 2013-10-10 19:43:34 +02:00
perploug 36bc2473bf handles parent.right.documet js references 2013-10-10 19:43:15 +02:00
perploug abf8aa7ea3 tinymce valid elements config 2013-10-10 19:42:41 +02:00
perploug e0da6f2dec remove old membersearch 2013-10-10 19:41:41 +02:00
Stephan 8a8b09141f Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
2013-10-10 16:15:23 +02:00
Stephan 18ea5b3768 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent
Conflicts:
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
2013-10-10 15:52:09 +02:00
wtct e1caf3a470 U4-3091 2013-10-10 14:45:18 +02:00
perploug 0e392843dd Adds search field to standard content picker 2013-10-10 14:33:25 +02:00
perploug faaa408201 ultrasimple picker stub 2013-10-10 14:09:57 +02:00
perploug 9514654ca4 wrong tree root link 2013-10-10 14:09:31 +02:00
perploug e34e63db51 hides empty divs on initial load 2013-10-10 13:34:02 +02:00
perploug c6c07b3861 missing char 2013-10-10 13:33:42 +02:00
perploug 6f39f190a4 Adds guid to entitybasic 2013-10-10 13:33:25 +02:00
perploug e2c06852d5 adds "overload" to member editor so it can accept a member ID 2013-10-10 13:32:53 +02:00
perploug f45d25c09a minor member docs update 2013-10-10 13:32:31 +02:00
perploug 2ec96a9123 fixes search menu urls 2013-10-10 13:32:18 +02:00
perploug 2cea2e1b41 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-10 12:44:11 +02:00
perploug 59f711f802 memberpicker search updates 2013-10-10 12:43:59 +02:00
perploug 0d4ee6e5d1 fix missing data annotations reference 2013-10-10 12:43:48 +02:00
Shannon f9319c0db9 Lots more work done with members mostly around passwords and membership provider - can't yet update your password but it's close 2013-10-10 20:56:30 +11:00
Shannon 3ff4930e8a Properly exposes the IRememberBeingDirty.ResetDirtyProperties required method 2013-10-10 19:03:59 +11:00
Shannon ee3fb3745c Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-10 18:46:55 +11:00
Shannon b512376c5c more member editor updates 2013-10-10 18:46:28 +11:00
perploug d97ae3fbd2 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-10 08:52:40 +02:00
perploug a3e4eaa2e4 membersearch support 2013-10-10 08:51:55 +02:00
perploug a2df4ea742 support for fetching a specific tree 2013-10-10 08:51:46 +02:00
perploug 79f7ea60f2 Memberpicker search field 2013-10-10 08:51:25 +02:00
Shannon 52aac5ba10 Ok, got members creating so long as the umbraco membership provider is being used - otherwise currenlty you'll get a ysod saying we don't support that. Now to get updating working. 2013-10-10 17:44:56 +11:00
Shannon 63a4e00f52 tweaks to membership providers so if we cast we can specify the member type. 2013-10-10 17:23:29 +11:00
Shannon 5df30ac0cc tweaks to membership providers so if we cast we can specify the member type. 2013-10-10 17:22:57 +11:00
Shannon cb8c1a31cb Fixes/updates more of the member repository and related items
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
2013-10-10 16:50:57 +11:00
Shannon 8ad4ee4e58 Fixes/updates more of the member repository and related items 2013-10-10 16:48:02 +11:00
Shannon 6c77749e32 Fixes: U4-3077 No id "xxxx" exists in dictionary 2013-10-10 15:45:52 +11:00
Shannon 4170713e29 More member service and provider updates
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
2013-10-10 14:51:01 +11:00
Shannon 8917a5ad92 More member service and provider updates 2013-10-10 14:50:25 +11:00
Shannon 49110ffaf7 Changes the legacy membership provider to use the custom member converter which works like the legacy one used to - the new extension method isn't quite there yet. 2013-10-10 14:13:21 +11:00
Shannon a3bca42117 updates UmbracoMembershipMember 2013-10-10 14:10:28 +11:00
Shannon 7919a39bb6 updates UmbracoMembershipMember 2013-10-10 14:10:04 +11:00
Shannon 80488e012f Fixes up and implements more if the IMemberService, repository and membership providers (both legacy and what seems to be the new one). 2013-10-10 14:00:35 +11:00
Shannon 0856173c9c Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-10-10 13:41:11 +11:00
Shannon 98832357bf Lots of work on the member editor - creates new email address prop editor, allows text prop editor to be required based on config, fixes the section directive bug, creating change password prop ed, streamlines more of the services layer to ensure that the things that need to be public are public 2013-10-10 13:41:06 +11:00
Shannon 0843388a41 Fixes up and implements more if the IMemberService, repository and membership providers (both legacy and what seems to be the new one). 2013-10-10 13:39:17 +11:00
Shannon 71e6ea70b2 Updates member repository and tests to ensure that an existing password will not be replaced if the password specified is null or empty. 2013-10-10 12:22:38 +11:00
Shannon a87b37d6ca Cleans up more of the IContentService and ensures that we have PublishStatus returned from the publishing methods instead of hiding them internally. 2013-10-10 09:35:23 +11:00
wtct b6cf182341 Affect the order of domains 2013-10-09 17:52:05 +02:00
Tim Geyssens 0594bafa5b Member picker prop editor: more WIP 2013-10-09 16:39:53 +02:00
perploug 2214916fed Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-09 15:55:45 +02:00
perploug 8618947d62 fixes non-working content picker 2013-10-09 15:55:30 +02:00
perploug 912a111f14 broken da.xml file 2013-10-09 15:54:18 +02:00
Tim Geyssens 47c7f9bfda Member picker prop editor: More WIP 2013-10-09 15:29:02 +02:00
Tim Geyssens d844c33a2d Member picker prop editor: Adds stubs 2013-10-09 15:15:21 +02:00
perploug fac71dfd11 Merge killed the listview namespace 2013-10-09 15:12:43 +02:00
perploug 1e6b80e45e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
2013-10-09 15:10:51 +02:00
perploug 31d3b88a5b dictionary tree icons 2013-10-09 15:07:17 +02:00
perploug de14a6dad7 labels for localization support 2013-10-09 15:07:09 +02:00
perploug e3102cf95b style updates 2013-10-09 15:06:36 +02:00
perploug ce97350d76 listview bugfixes 2013-10-09 15:06:21 +02:00
perploug a5b597e2f7 localized tree names 2013-10-09 15:05:52 +02:00
perploug 2b76d4b22d Adds publishById method to contentController 2013-10-09 15:05:27 +02:00
perploug d7b732ba4b working clientside localization 2013-10-09 15:05:05 +02:00
perploug 2d3cf3da23 section mapper 2013-10-09 15:04:30 +02:00
perploug 2ff5b63089 RTE now works without a provided configuration 2013-10-09 15:04:05 +02:00
Shannon 530f88aa11 Changes how the property and tab validation is notified about validation changes - we use a new directive on the parent form to notify child changes, this is much better for performance so we don't have multiple $watches. This also fixes the tab validation since watching $invalid on a form for some reason isn't always accurate. 2013-10-09 23:16:09 +11:00
Shannon c42e957c4c fixes unit tests 2013-10-09 20:36:12 +11:00
Shannon 659cba563a Changes property editor controller namespace to be PropertyEditors instead of just Editors 2013-10-09 20:02:39 +11:00
Shannon d255b3a6a3 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-09 19:54:08 +11:00
Shannon ba7713fb93 Auto selects all text in the header if it is still empty 2013-10-09 19:53:29 +11:00
Sebastiaan Janssen d5498cc66e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-09 10:45:43 +02:00
Sebastiaan Janssen a023ddb76b Fix json.net NuGet problem 2013-10-09 10:44:54 +02:00
Shannon f7c49758e1 Fixes more of the umbcontentname directive - but we still have no design to show a validation message 2013-10-09 19:42:41 +11:00
Shannon 95a834b8b6 Started creating the member create dialog - but really we should just do this like content/media will save this revision since it was a nice form :) 2013-10-09 19:08:03 +11:00
Shannon 5d71e08922 Fixes manifest file again - just tested that the app loads even if a manifest is invalid 2013-10-09 18:22:27 +11:00
Shannon e51b43084b Fixes: U4-2762 Handle errors in package.manifest & fixes manifest stylesheet parsing with unit test 2013-10-09 18:13:24 +11:00
Shannon f299fe76e4 fixes localization with empty recycle bin menu 2013-10-09 17:35:16 +11:00
Shannon 128cceaf91 Fixes: U4-3045 Can't empty recycle bin with unit tests 2013-10-09 17:32:13 +11:00
Shannon ccedd6757b removes cascade deletes for upgrade since we do not support these for install currently and we want to make sure they are the same... and i don' thave time to implement that. 2013-10-09 16:26:43 +11:00
Shannon a94f61702f Changes plugin folder convention to use sub folder BackOffice instead of umbraco 2013-10-09 16:08:39 +11:00
Shannon 2b2cf48fdb Implements HideLabel for property editor value editors for both c# and manifest declarations. 2013-10-09 16:06:07 +11:00
Shannon 858135175e Completes: U4-2956 Update all services with correct public methods/properties 2013-10-09 15:21:01 +11:00
Shannon de8b69a399 Creates public IApplicationTreeService and ISectionService interfaces, adds initialization methods 2013-10-09 14:31:30 +11:00
Shannon 27e6e9b91c removes duplicate declaration 2013-10-09 13:52:44 +11:00
Shannon 1c13a896eb Fixes up merge issues. 2013-10-09 13:52:24 +11:00
Shannon f8d6c85779 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/Models/ContentBase.cs
	src/Umbraco.Core/Models/ContentTypeBase.cs
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Core/Services/IMemberTypeService.cs
	src/Umbraco.Core/Services/MemberTypeService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs
2013-10-09 13:41:14 +11:00
Shannon 09b7186713 Completes: U4-2963 Updated EntityService / IUmbracoEntity to have a dictionary to fill additional data - fixes merge issues and explicitly implements interface for entities that are not UmbracoEntity and hides other implementations from intellisense. 2013-10-09 13:32:58 +11:00
Shannon c6389852ea Adds public ctors for ApplicationContext, ServiceContext, DatabaseContext, RepositoryFactory, makes IDatabaseFactory public, makes an interfaces for IEntityService, adds EnsureContext methods for ApplicationContext - to set the singleton. 2013-10-09 13:17:19 +11:00
Shannon 49f10ccd32 Fixes merge issue , fixes the ServiceContext lazy fields to be the underlying interfaces, adds public ctor 2013-10-09 12:18:42 +11:00
Shannon a8b037f2e0 Fixes member type repository when member types don't have properties declared and adds tests. Adds IMemberTypeService.
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Services/ServiceContext.cs
2013-10-09 12:09:28 +11:00
Shannon 3c38b335a6 Converts DlrScripting & xslt to the correct webforms structure. 2013-10-09 12:07:50 +11:00
Shannon 3a8bbcc8fc Fixes up the PartialView, PartialViewMacro and Xslt create dialogs after merge and ensures PartialView dialog is up to v7 legacy standard 2013-10-09 11:57:14 +11:00
Shannon 1ecb864e5f Fixed umbsections directive - do not make any requests until the user is logged in - if they are already logged in, the event still executes. 2013-10-09 11:29:41 +11:00
Shannon d281f97659 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web.UI/umbraco/create/xslt.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
2013-10-09 11:12:33 +11:00
Shannon 38761e1413 started on member create dialog (wip!) 2013-10-09 11:01:43 +11:00
Sebastiaan Janssen f85f418d52 We need Json.Net v5+ 2013-10-08 20:41:54 +02:00
Sebastiaan Janssen 0184b396be Whoops! Left a weird linebreak in there 2013-10-08 19:08:30 +02:00
Sebastiaan Janssen 8b2e2f8447 Create appSettings.config / connectionString.config if they don't exist yet 2013-10-08 19:00:57 +02:00
Sebastiaan Janssen 2fc8244f71 Fix NuGet package creation 2013-10-08 19:00:24 +02:00
perploug 7c5b6851a1 Added standard js libs to usercontrol proxy 2013-10-08 15:29:53 +02:00
perploug a2ebb1b06f support for loading actions directly from search results 2013-10-08 15:04:47 +02:00
perploug 196ce492be Section menu overflow detection and extra tray 2013-10-08 13:18:42 +02:00
Stephan a5848a17c5 Commit missing files after merge 2013-10-08 11:22:33 +02:00
Stephan 31535e3bd8 Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web.UI/umbraco/create/xslt.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
2013-10-08 11:21:38 +02:00
perploug dfc3e468c4 fixes: U4-3046 rollback dialog 2013-10-08 11:07:42 +02:00
perploug 90ec849b5f adding tree states css 2013-10-08 10:35:13 +02:00
perploug 30f147a9d3 excluding appsettings and connectionstrings config 2013-10-08 10:27:22 +02:00
Stephan e7a238b2bc Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 2013-10-08 09:48:11 +02:00
Stephan 17c055472d Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-08 09:44:37 +02:00
perploug dd4827493b missing files in sln 2013-10-08 09:31:30 +02:00
Shannon 572e23d307 Adds methods to IMemberTypeService 2013-10-08 17:58:38 +11:00
Shannon febff1560e Added member type controller and resource, started getting creating members dialog working. 2013-10-08 17:49:40 +11:00
Shannon 7b14e8eacc Fixes member type repository when member types don't have properties declared and adds tests. Adds IMemberTypeService. 2013-10-08 17:47:29 +11:00
Shannon 881d922f30 Adds another overload for GetBigThumbnail, adds better thumbnail err checking to the folder browser thing and updates the file uploader to use this thumbnail proxy, now upgrades should be good. 2013-10-08 16:20:22 +11:00
Shannon 8b358da2f0 Creates big thumbnail proxy on the MediaController, now to wire it up with the folder browser and upload controls 2013-10-08 15:58:37 +11:00
Shannon 19d96ac0e2 ensures the lsit is created for styles. 2013-10-08 13:02:46 +11:00
Shannon 3a33a39411 Adds node styles and ensures they are set for the content tree nodes, now to get them to display styles 2013-10-08 12:58:11 +11:00
Shannon 883a662240 Moves tree/menu models into the Models.Trees namespace 2013-10-08 12:38:27 +11:00
Shannon e6908c7678 Adds tag support to member repository. 2013-10-08 12:29:56 +11:00
Shannon 0b8b413f2f Adds tag support for any IContentBase and to the MediaRepository, adds test to ensure tags relations are removed. 2013-10-08 12:25:03 +11:00
Shannon 38a5b49ea3 renames methods on ITagsRepository to make it clear that the tags repo/db table ONLY deals with published tags. 2013-10-08 12:07:08 +11:00
Shannon 6a43972267 Adds content service tests for tags 2013-10-08 12:05:24 +11:00
Shannon d102db795e Adds better compatibility for the legacy data layer and the ToXMl method - using our new xml converter. 2013-10-08 11:22:08 +11:00
Shannon 6f2a7180d8 Adds new ConvertDbToXml converter on the PropertyValueConverter and simplifies the ToXml method for PropertyExtensions. 2013-10-08 11:08:36 +11:00
Shannon 6cec665f7d Renames the PropertyValueEditor converter methods to be inline with the new converter method names 2013-10-08 10:58:47 +11:00
Shannon d0cd8ba346 Moves GetPath to EntityController and entityResource since all entities can have a path not just content. 2013-10-08 10:55:47 +11:00
Shannon 16bce4248d Fixes merge issues with 6.2 and copying across TempData properly. 2013-10-08 10:46:02 +11:00
Shannon a2e9ec0412 Merge remote-tracking branch 'origin/6.1.6' into 6.2.0
Conflicts:
	src/Umbraco.Web/Mvc/UmbracoPageResult.cs
2013-10-08 10:37:46 +11:00
Shandem 11c9abf359 Merge pull request #145 from florisrobbemont/6.1.6
U4-3007 RouteDefinition should not store instance of controller
2013-10-07 16:31:50 -07:00
perploug 4b942dcc32 Working link picker and TinyMCE plugin 2013-10-07 15:15:02 +02:00
Sebastiaan Janssen 12b7a9d874 Argh, didn't save csproj file before committing. 2013-10-07 13:20:34 +02:00
perploug ec4eeb5de6 tree syncing 2013-10-07 10:09:03 +02:00
perploug f676ce6ac2 Remove missing file to unbreak build 2013-10-07 10:08:48 +02:00
perploug aa0bb166a8 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-07 10:08:28 +02:00
perploug 60a81ac879 Allows legacy editors to sync the tree 2013-10-07 09:48:08 +02:00
perploug a9bc67538d Fixes: U4-3000 2013-10-07 09:39:25 +02:00
perploug c0a7a9a427 adds section alias to framed urls 2013-10-07 09:33:29 +02:00
Sebastiaan Janssen df909983db Update NuGet Core dependency to AutoMapper 3+ 2013-10-07 08:37:33 +02:00
Sebastiaan Janssen 1a9e5f20a8 U4-2511 Locallink:NODEID not working 2013-10-07 08:36:26 +02:00
Sebastiaan Janssen a90f32035d U4-2733 call to umbraco.library:Request broken? 2013-10-07 08:18:44 +02:00
Sebastiaan Janssen 33b09c80aa Forgot to commit csproj file 2013-10-06 18:55:52 +02:00
Sebastiaan Janssen b2980cedc6 Also apply to media types - U4-541 Wrong dictionary key when using in backend template names 2013-10-06 18:54:46 +02:00
Sebastiaan Janssen 34b7f86b8b U4-541 Wrong dictionary key when using in backend template names 2013-10-06 18:24:46 +02:00
Sebastiaan Janssen 130f6d3a42 Additions for U4-2776 Default Content For A Razor Layout Section 2013-10-06 17:52:46 +02:00
Sebastiaan Janssen 3ff9d6adbc U4-2509 Umbraco backend search not working correctly with spaces - Also updated search.aspx dialog 2013-10-06 16:55:54 +02:00
Sebastiaan Janssen fd5de171c9 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-10-06 16:45:31 +02:00
Sebastiaan Janssen 45ad51b8df U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2013-10-06 16:45:21 +02:00
Floris Robbemont b02657f32c Cleaning up commit for issue U4-3007
Changed documentation on UmbracoMvcHandler
2013-10-05 23:31:02 +02:00
Sebastiaan Janssen 9f3784aaed U4-1242 Template editor sometimes stops editing. 2013-10-05 19:26:01 +02:00
Sebastiaan Janssen 2ab2a5a9f3 Fix bug where Right ALT+S would save in Firefox instead of inserting the correct character 2013-10-05 19:23:57 +02:00
Sebastiaan Janssen 2d83ba06a5 Fix small styling issues in installer 2013-10-05 19:18:11 +02:00
Sebastiaan Janssen 06d5c60803 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-10-05 19:09:49 +02:00
Sebastiaan Janssen fe18722e1f Merge pull request #147 from AndyButland/u4-2958
Fix for issue U4-2958 Member can edit & Show on profile do not persist on Member Type editor
2013-10-05 19:08:03 +02:00
Sebastiaan Janssen 4935525591 Merge pull request #147 from AndyButland/u4-2958
Fix for issue U4-2958 Member can edit & Show on profile do not persist on Member Type editor
2013-10-05 10:04:08 -07:00
Stephan c2e7fc2f10 PropertyValueConverter - add converters for built-in data types 2013-10-04 20:14:38 +02:00
Stephan e31dd688bf Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
2013-10-04 14:54:18 +02:00
perploug 5060dab7a5 adds getpath to contentController 2013-10-04 14:01:07 +02:00
perploug c8fa22c767 Tree can now sync, only need to bridge it with the old legacy umbClient calls 2013-10-04 14:00:43 +02:00
perploug 418a29cbbf Odd, missing config files crashed the site 2013-10-04 11:18:57 +02:00
perploug 0b907d4ae3 more work on link picker, added dialog service and views 2013-10-04 10:53:07 +02:00
perploug 765ed9687a Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-04 09:37:09 +02:00
perploug 66e7a6322a Start on link picker for RTE 2013-10-04 09:36:53 +02:00
Sebastiaan Janssen b595ec4d88 Merge pull request #149 from bjawnie/patch-1
Made two minor corrections to the text
2013-10-04 00:25:59 -07:00
Shannon 7425e070d2 Got the SetTags and RemoveTags methods in place and working. 2013-10-04 17:13:57 +10:00
Shannon 3cb70f67c9 TagsRepository is all working with unit tests, now to make the service and integrate the extension methods. 2013-10-04 16:11:51 +10:00
Shannon a029d98209 Adds db index to cmsTags over tag/group 2013-10-04 14:35:51 +10:00
Shannon db6b8930ab Removes appsettings,connectionstring configs from the repo and adds them to the ignore list. 2013-10-04 12:18:05 +10:00
Shannon 4d8a3f4453 Updated the proj file to create the appSettings, connectionString config files if they are missing, then we also ignore these files and remove them from the repo - just like the web.config 2013-10-04 12:15:35 +10:00
Shannon f1f5374b81 Fixed that damn upgrade checker to not throw exceptions 2013-10-04 11:05:19 +10:00
Shannon 961928105c Moves connectionStrings to external file, now to figure out how to deal with both of these files with multiple devs 2013-10-04 10:53:22 +10:00
Shannon c6229f131a Moves appSettings to external file and updates the code that modifies the app settings. 2013-10-04 10:34:00 +10:00
Shannon ff3aebd4b1 Completes: U4-2893 Remove the entire umbraco.macroRenderings assembly 2013-10-04 10:01:57 +10:00
Shannon ad6e4ae745 Adds ability to use the c# property name as the pre-value field key, adds examples of declaring pre-value fields. 2013-10-04 09:22:07 +10:00
Shannon b462082ed9 Fixes up some naming conventions and removes need to instantiate another umbraco helper 2013-10-04 09:00:02 +10:00
perploug 95f120e98f Unpublishing button on the content editor 2013-10-03 22:18:44 +02:00
perploug a42bd4dbf0 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-03 20:59:04 +02:00
perploug 21d6209793 Removing unussed libraries, moving legacy tinymce plugins 2013-10-03 20:58:47 +02:00
perploug 9ee1584ede Initial PublishedContent service for niceUrl access 2013-10-03 20:58:16 +02:00
perploug a3d77b7e72 Adds RTE and stylesheet services 2013-10-03 20:57:36 +02:00
perploug 14e1e741ed Added configuration fetching to tinymce service 2013-10-03 20:53:34 +02:00
perploug 94f72b3938 minor log.resource docs update 2013-10-03 20:53:16 +02:00
bjawnie 20ab14beb4 Made two minor corrections to the texts.
"Content>alias" changed to "Alternativ link" from "Alias", so it makes more sense.

"defaultdialogs>treepicker" changed to "Vælg" from "Vælg punkt", so it fits in the button.
2013-10-03 20:43:42 +02:00
Stephan e14e5bee95 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
2013-10-03 18:49:58 +02:00
Stephan 9e1364db42 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-10-03 18:48:42 +02:00
Stephan 1902bc4807 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 2013-10-03 18:17:35 +02:00
Stephan a264342bcc Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
2013-10-03 18:16:29 +02:00
Stephan 08660704cc Core.StringExtensions - adjust to new default IShortStringHelper (see f64b8d6) 2013-10-03 18:10:51 +02:00
Stephan 4c13dbf8b7 Core.StringExtensions - fix methods that should be extension methods 2013-10-03 18:10:50 +02:00
Stephan 9a10863760 Core.EnumerableExtensions - bugfix f9663a9 2013-10-03 18:10:48 +02:00
Tim Geyssens 74e414d858 Related links prop editor WIP 2013-10-03 16:46:32 +02:00
Tim Geyssens 6a1072e918 Related links prop editor: more WIP 2013-10-03 15:09:52 +02:00
Tim Geyssens fb1ea4b880 Related links prop editor: more work 2013-10-03 14:58:12 +02:00
Tim Geyssens cbe566302c Related links prop editor: first attempt at UI 2013-10-03 14:20:13 +02:00
Tim Geyssens 4ace6e10db Related links prop editor: adds RelatedLinksPropertyEditor.cs 2013-10-03 13:27:13 +02:00
Tim Geyssens bd32c7cc4a Related links prop editor: adds controller / view stubs 2013-10-03 13:05:13 +02:00
mortenbock c74cdb28d6 Testing the wrapping of view engines 2013-10-03 11:01:37 +02:00
Shannon 25a0c595e7 Fixes up the DashboardController to use the new configuration classes, creates DashboardSecurity (which needs some unit testing) and removes all that ugly code. 2013-10-03 19:00:31 +10:00
Shannon 3d3be5ecbc Renames Control to DashboardControl so it has some meaning. 2013-10-03 17:59:23 +10:00
Shannon 1730005a58 Updates web.config template and transform for new dashboard section. 2013-10-03 17:54:10 +10:00
Shannon b9257fceeb New dashboard config classes all tested 2013-10-03 17:50:42 +10:00
Shannon e2f9b1c7d9 Got the dashboard config section classes working with tests, now to add more tests 2013-10-03 17:17:53 +10:00
Shannon 03b1c9e5ee Fixed build issue, started adding dashboard config section as real .net section. 2013-10-03 17:06:58 +10:00
Shannon 85098b84f7 started proxying events to the old tree but think it should be done opposite. 2013-10-03 15:57:32 +10:00
Shannon 936be3934b Updated MenuItemCollection with MenuItemList for full featured List access to the items. Added the MenuRendering event to TreeController, updated the tree controller events to be TypedEventHandler's though developers will need to cast the TreeController to the type they are expecting - still better than 'object'. 2013-10-03 15:05:48 +10:00
Shannon ed8f22c371 Completes: U4-2829 Allow for JSON objects to be saved/retrieved by property editors - OH YEAH!! 2013-10-03 13:52:33 +10:00
Shannon 969abb5057 Fixes merge issues 2013-10-03 12:53:26 +10:00
Shannon 21c0152131 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Tests/BusinessLogic/BaseTest.cs
	src/Umbraco.Web.UI/install/steps/theend.ascx
	src/Umbraco.Web.UI/umbraco/Default.aspx
	src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
	src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
	src/Umbraco.Web/UmbracoContext.cs
	src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/library.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs
	src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs
	src/umbraco.businesslogic/Utils/TypeFinder.cs
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.cms/businesslogic/Packager/PackageActions/addRestExtension.cs
	src/umbraco.cms/businesslogic/Packager/PackageActions/addXsltExtension.cs
	src/umbraco.cms/businesslogic/skinning/Skin.cs
	src/umbraco.cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs
	src/umbraco.cms/businesslogic/skinning/tasks/ModifyCss.cs
	src/umbraco.cms/businesslogic/skinning/tasks/ModifyTemplate.cs
	src/umbraco.controls/CodeArea.cs
	src/umbraco.controls/ProgressBar.cs
	src/umbraco.editorControls/macrocontainer/Editor.cs
2013-10-03 12:51:46 +10:00
Shannon 86430f1b01 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-10-03 12:46:01 +10:00
Shannon 55247fe31d Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :) 2013-10-03 12:45:40 +10:00
Shannon 6ac724951b Explicitly adds automapper to the UI proj so we don't get that strange YSOD that says it's not there sometimes. 2013-10-03 12:18:21 +10:00
Shannon b0dfc90557 Added docs on creating trees and view path location conventions. 2013-10-03 12:11:22 +10:00
Shannon b09a743beb Gets view paths to load in dynamically based on whether a core or plugin tree is rendering, this allows us to store view files based on conventions for packages. Completes: U4-2849 Ensure editor views, etc... can exist outside of the /umbraco folder for package devs 2013-10-03 11:25:26 +10:00
Shannon 2ed4206f93 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Web/WebBootManager.cs
2013-10-03 09:01:24 +10:00
Shandem a806f40093 Merge pull request #146 from mortenbock/6.2.0
Custom ProfilingViewEngine
2013-10-02 15:53:58 -07:00
Andy Butland 693778fe74 Fixed issue where member type properties would not persist after first save without reloading page 2013-10-02 21:20:05 +02:00
perploug 4283734a94 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-02 19:23:57 +02:00
perploug 6c20815210 Initial commit of rte prevalue editor 2013-10-02 19:23:36 +02:00
perploug a371ebe841 Progressbart convert to css3 from gif 2013-10-02 19:23:20 +02:00
perploug 92a32a8f8d rollback dialog polish 2013-10-02 19:23:04 +02:00
perploug bb1a47aa81 Permissions dialog polish 2013-10-02 19:22:54 +02:00
perploug 6126a52156 child action icon alignment tweak 2013-10-02 19:22:34 +02:00
mortenbock 24020cfea3 Make sure the profilingengine doesn't wrap itself 2013-10-02 18:30:59 +02:00
Stephan 1b2f0246e8 Oops, fix build 2013-10-02 18:00:02 +02:00
mortenbock 9ec30860b0 Wrap all ViewEngines in a profiler
Wrap all ViewEngines in a custom profiler view engine, using the
ProfilerResolver to track performance
2013-10-02 17:48:44 +02:00
Stephan 19784e04bf Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs
2013-10-02 17:42:59 +02:00
Stephan 3ee4399fca Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs
2013-10-02 17:40:03 +02:00
Stephan 06206c60d9 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-02 17:06:46 +02:00
Stephan 5937a7e976 CoreXml - fix tests CRLF issues for build server, take 2 2013-10-02 17:03:50 +02:00
Stephan f64b8d680d Core.StringExtensions - switch over to the new DefaultShortStringHelper 2013-10-02 16:54:56 +02:00
Stephan f9663a9e80 Core.EnumerableExtensions - refactor InGroupsOf to enumerate source only once 2013-10-02 16:54:47 +02:00
Stephan c604cc5c2f CoreXml - fix tests CRLF issues for build server 2013-10-02 16:39:54 +02:00
Shannon dc42c1ebb7 More work on streamlining package development for views and conventions. 2013-10-02 21:03:51 +10:00
Shannon 92efd6d645 Got menu items working with external packages to look for views by convention inside of their package folder. 2013-10-02 20:48:15 +10:00
Shannon 6560865f61 Fixed view path conventions for menu items 2013-10-02 20:20:02 +10:00
Shannon 8f53bea3d7 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-02 20:00:34 +10:00
Shannon 89f7a31bef Updates the Create/AddMenu overloads to ensure a name is specified, fixes all localization of all menu items for all new trees. 2013-10-02 20:00:01 +10:00
Stephan 424b8cd408 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 2013-10-02 11:49:23 +02:00
Stephan 65898411e7 Core.Resolution - umbraco.cms.Action should NOT reset resolution 2013-10-02 11:48:50 +02:00
Stephan 759a3619ca Core.Resolution - fix concurrency issues 2013-10-02 11:48:30 +02:00
Stephan 520ebc3394 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-02 11:43:10 +02:00
Stephan e6bb999d83 Core.Resolution - umbraco.cms.Action should NOT reset resolution 2013-10-02 11:42:17 +02:00
Stephan cdd1a0a4cb Core.Resolution - fix concurrency issues
Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs
2013-10-02 11:41:48 +02:00
Stephan 5e0fbe5634 Macros - bugfix parameters 2013-10-02 11:16:39 +02:00
Stephan e5b3ca1907 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-02 11:14:08 +02:00
Stephan efb4a6652d Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 2013-10-02 11:11:38 +02:00
Stephan 9b43a86b94 Core.Resolution - fix concurrency issues 2013-10-02 11:09:26 +02:00
Shannon 1090248223 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-02 18:58:21 +10:00
Shannon 880077f6e9 Created TagRepository, added foreign key to cmsTags.ParentId 2013-10-02 18:57:44 +10:00
perploug ffc1b62b8a Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-02 10:56:54 +02:00
perploug 17f2602ca2 icon finder now loads .icon-* from all registered stylesheets 2013-10-02 10:56:40 +02:00
perploug a71e255468 re-adds tree cache 2013-10-02 10:55:58 +02:00
perploug f2458b833e consistent create dialogs 2013-10-02 10:55:48 +02:00
perploug 2b2d986371 Content copy with relation in js layer 2013-10-02 10:55:38 +02:00
perploug 1ed21a3ffb Better font handling with correct weights 2013-10-02 10:55:20 +02:00
perploug 1f32373bd2 sample manifest with css 2013-10-02 10:54:59 +02:00
perploug 5b1c626714 Reverts meadia sort to legacy dialog 2013-10-02 10:54:37 +02:00
perploug ce30153830 Enables the manifest to load custom stylesheets outside the js loading 2013-10-02 10:54:25 +02:00
perploug 727f3a804d Removes osx shadow files 2013-10-02 10:53:12 +02:00
Shannon be7179b962 Fixed up the TagRelationshipDto to have the correct columns, keys, etc.. as our upgrade, updated the old tags API to support the new changes. 2013-10-02 17:10:12 +10:00
Shannon 7eee954d4d OOPS! didn't mean to delete this a couple days ago :P 2013-10-02 15:56:53 +10:00
Shannon 36cb078073 Tags db upgrades done, now to look at ensuring the legacy tags stuff works. 2013-10-02 15:51:02 +10:00
Shannon 8b6171bb13 Almost got the tags tables upgraded 2013-10-02 13:50:42 +10:00
Shannon 917d5b39ec Changes auth controller post login to return an normal validation response instead of 4.3 so the err msg doesn't show up. 2013-10-02 13:42:36 +10:00
Shannon 65f809a0fb chagnes IsAuthenticated to not return a 403 so the warning msg doesn't display. 2013-10-02 09:53:58 +10:00
Shannon bad4d0c6e6 fixes merge issues 2013-10-02 09:30:53 +10:00
Shannon 2a1e3dc2f8 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
2013-10-02 09:22:33 +10:00
perploug 5199a5dc99 Move, Copy, protect, notifications dialogs polish 2013-10-02 00:11:10 +02:00
perploug 2e8a8e3623 Working move dialog, needs feedback and validation 2013-10-01 16:14:54 +02:00
perploug 1ec74a5ae8 Fixes: U4-3005 userdialog refuses to close 2013-10-01 15:51:39 +02:00
perploug 6c02eadd88 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-01 15:37:19 +02:00
perploug 60c4307f2e Fixes: u4-3009 missing context menu in search results 2013-10-01 15:37:05 +02:00
perploug e1c0e70d07 Fixes: U4-3001 missing root node in tree selectors 2013-10-01 15:36:42 +02:00
Floris Robbemont 9ddee615cc U4-3007 RouteDefinition should not store instance of controller 2013-10-01 14:09:38 +02:00
Shannon 2c88c7c971 Fixed up content tree to check for IsContainer with the new entity AdditionalData, fixes up the AddContainerView to be part of the ContentModelMapper. 2013-10-01 21:12:32 +10:00
Shannon 9e361b7669 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-01 21:02:47 +10:00
perploug e64eb05dcd adds alt+click to context menu to skip default action 2013-10-01 12:32:43 +02:00
perploug 0898638e33 Fixes: U4-2982 missing translation on contextmenu 2013-10-01 12:32:27 +02:00
perploug 5dd9510d69 Fixes: U4-2973 - View editor save button broken 2013-10-01 11:51:19 +02:00
perploug 229b770447 fixes: U4-2854 Re-adds actions on root tree nodes 2013-10-01 11:40:56 +02:00
Shannon 434e194ba7 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-01 19:38:18 +10:00
Shannon 9c96b247be Completes: U4-2963 Updated EntityService / IUmbracoEntity to have a dictionary to fill additional data 2013-10-01 19:37:51 +10:00
Morten Christensen 74f6a34651 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-10-01 10:20:29 +02:00
Morten Christensen 7dee2802fe Fixing Member and MemberType, so the ids are properly assigned through the repositories.
Adding test to assert that no Properties, PropertyTypes or PropertyGroups exists without an id when loaded from the db.
NOTE Changes signature of Member class as Email, Username and Password is required.
2013-10-01 10:20:16 +02:00
perploug 15d25ebb3d Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-01 10:11:08 +02:00
perploug fbe388a616 Cleans up rte embed dialog 2013-10-01 10:10:55 +02:00
perploug 891955f164 Fixes: U4-2953 - could not load google fonts file 2013-10-01 10:10:41 +02:00
Shannon f7103c97cf Completes: U4-2768 Remove legacy/unused webforms files/classes in folder: /umbraco 2013-10-01 17:03:03 +10:00
Shannon a90e96d066 Completes: U4-2926 Remove unused/obsoleted 'tasks' for media & content 2013-10-01 16:42:32 +10:00
Shannon 4e56d88eb5 Fixes: U4-2672 Fix how trees are rendered when a start node is applied, the Content/Media titles must always be visible 2013-10-01 16:38:10 +10:00
Shannon 770514919d Gets member deleting working and adds refresh to each letter node. 2013-10-01 15:54:44 +10:00
Shannon 31a5951626 Updated member tree/editor to use the GUID 2013-10-01 15:36:08 +10:00
Shannon 76b7b131a9 Gets members saving (initially) still needs lots more work though, waiting on some feedback from morten in the meantime. 2013-10-01 15:25:04 +10:00
Shannon 4602a6b989 Fixes an issue with the MemberTypeReadOnlyFactory 2013-10-01 14:46:16 +10:00
Shannon e27a0e2bd2 updates boolean and check box list to use onValueChanged to detect any server value changes. 2013-10-01 14:16:57 +10:00
Shannon e5c7a35e8f updates g-maps editor to use onValueChanged to detect if a server val has changed. 2013-10-01 14:12:15 +10:00
Shannon 6277bc379e updates mediapicker to use onValueChanged in case the server value changes. 2013-10-01 14:10:11 +10:00
Shannon 2bb279d8f7 Ensures rte controller will re-load itself if server data has changed. 2013-10-01 14:08:14 +10:00
Shannon a8f87d6dc1 Updates mediapicker to not use jquery each methods since they are not DOM items, use underscore instead. 2013-10-01 14:07:56 +10:00
Shannon bb350035ef Fixed merge issues 2013-10-01 13:43:55 +10:00
Shannon 6f6c33a721 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Relators/PropertyDataRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/BusinessLogic/BaseTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/TestHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
2013-10-01 13:38:17 +10:00
Shannon 7451e83c73 Integrates authentication within the routes and prevents controllers from being loaded when the user isn't authorized. Ensures we also have a /login route and allows routes to redirect when auth fails. 2013-10-01 13:23:13 +10:00
Shannon 79e35d5c06 Ensures that if a user session times out and another user logs in that we redirect to root 2013-10-01 10:08:55 +10:00
Shannon 59196020bb Fixes up content controller move/copy actions 2013-10-01 10:04:07 +10:00
Marc Brooks b200cb463e Make CacheHelperExtensions public so we can call CachedPartialView and ClearPartialViewCache
In order to allow extensions to the logic and usage of the CachedPartial HtmlHelper, expose CachedPartialView and ClearPartialViewCache by making the wrapping static class public.
2013-09-30 18:28:45 -05:00
Marc Brooks cdf5ddf539 Added cacheKeyBuilder optional argument to allow the key used for caching to be contextual.
when building cached partials that work with many different instances of the same  partial view (e.g. using the same partial more than once on a page with different ViewDataDictionary or different model), it is necessary to either name each instance differently (ugh), or not cache.

By adding an optional argument to the CachedPartial Html helper method, we can vary the cache-key depending on the context of insertion. For maximum flexibility, pass the model and the viewData to the function so it can use that data to format a cacheKey suffix.

A typical use would be something like:

@Html.CachedPartial(
"EventListings"
, FeedRepository.getFeed(new CalendarEventsModel
  {
     StartingDate = DateTime.UtcNow.Date
     , Count = 10
  })
, 0
, contextualKeyBuilder: (model, viewData) =>
  {
     return (model as CalendarEventsModel).StartingDate.ToString();
  }
)
2013-09-30 18:23:56 -05:00
perploug fc1e4f959e adds container doctype lookup
TODO: find a better/faster way to do this
2013-10-01 00:54:46 +02:00
perploug 146aca31a0 Updating legacy domain, publsh and sort dialogs 2013-10-01 00:47:18 +02:00
perploug c928769911 adds container UI to doctype editor 2013-09-30 23:34:43 +02:00
perploug cdbc02354d umbracoField dialog tweaks 2013-09-30 23:34:20 +02:00
perploug bd3cdd83f6 WIP: adds move and copy methos to content contoller 2013-09-30 23:34:07 +02:00
perploug 5a757f129c Implements doctype container 2013-09-30 23:33:27 +02:00
perploug 987c4401a3 U4-2852: Fixes error messages 2013-09-30 23:32:35 +02:00
perploug dee067d071 cleans up umbfield legacy dialog 2013-09-30 21:37:35 +02:00
perploug d901f4d4f1 umb-dialog visual tweaks 2013-09-30 21:36:49 +02:00
perploug 081457ddc8 enables classes on inline modals 2013-09-30 21:36:22 +02:00
perploug 4f98a1b0c8 adds move to content.resource 2013-09-30 21:36:08 +02:00
perploug 7668c3bafa adds initial loading back to umb-tree 2013-09-30 21:35:54 +02:00
Sebastiaan Janssen 8eee7cae2f Merge branch '6.1.6' 2013-09-30 16:10:14 +02:00
Sebastiaan Janssen 5238293c09 Merge branch '6.1.6' into 6.2.0
Conflicts:
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
2013-09-30 16:09:25 +02:00
Sebastiaan Janssen 226e35d65a NuSpec update: we can only accept a specific version of MySQL 2013-09-30 14:32:06 +02:00
Stephan 05f7ede26a Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Web/umbraco.presentation/macro.cs
2013-09-30 14:12:36 +02:00
Stephan ea638c37b7 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Web/UmbracoContext.cs
2013-09-30 14:05:12 +02:00
Stephan bfa7ab788b Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-09-30 14:00:01 +02:00
Stephan 5a15c93195 PublishedContent - ensure exceptions don't corrupt InPreviewMode 2013-09-30 13:58:02 +02:00
Stephan 77777c8007 Bugfix e775421 2013-09-30 13:57:58 +02:00
perploug 85e2c3e5b1 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-30 13:19:10 +02:00
perploug 47d124a41b wraps datepicker valye set in apply 2013-09-30 13:18:56 +02:00
perploug ca56539c65 Fixes U4-2980 - tabs not in the right order 2013-09-30 13:18:34 +02:00
perploug 8b25210895 adds localdata to timepicer hide event 2013-09-30 13:10:58 +02:00
perploug 9c4dc838a5 Adds number prevalue editor 2013-09-30 13:10:34 +02:00
perploug 57511b9c5a Fixes: U4-2977 legacy tabs reset to one one submit 2013-09-30 13:10:15 +02:00
Sebastiaan Janssen cdda69c4cd U4-2788 Error installing Umbraco 6.1.5 with SQL CE 4 option 2013-09-30 12:39:28 +02:00
Shannon 472ef6e48c Starts fixing: U4-2947 Fix complex property editors with $watch expressions 2013-09-30 20:33:19 +10:00
Shannon 9ff74b39f8 fixed web.config xform for debugging 2013-09-30 20:24:11 +10:00
Morten Christensen 5aa01e78ab Updating conn.string in test 2013-09-30 12:13:49 +02:00
Morten Christensen a21bee6683 Fixing MemberType- and MemberRepository so properties, property types and property groups are properly initialized. 2013-09-30 12:12:58 +02:00
Shannon 0cff484113 fixes unit test 2013-09-30 12:12:17 +02:00
Shannon 3e9afcfc41 Finishes: U4-2678 Fix logging out and then logging in as another user, the sections, etc... do not get updated. 2013-09-30 20:08:15 +10:00
Shannon 830fde372e Fixes EditUser.aspx 2013-09-30 11:49:31 +02:00
Shannon ac2a4a1e0a Fixing: U4-2678 Fix logging out and then logging in as another user, the sections, etc... do not get updated. - all event broadcasting is now centralized. 2013-09-30 19:14:30 +10:00
Shannon 5ffca11c5b Fixing: U4-2678 Fix logging out and then logging in as another user, the sections, etc... do not get updated. 2013-09-30 18:58:24 +10:00
Shannon 35f65a2c64 re-enables LoadMinimalDocument and adds this to the optimized check, even in optimized model the OnRenderNode can still execute with a minimal doc. 2013-09-30 10:55:38 +02:00
Shannon e5320f0abd Obsoletes the LoadMinimalDocument flag since it no longer serves a purpose. 2013-09-30 10:55:26 +02:00
Sebastiaan Janssen 965a7fc500 Fixes: U4-2925 Tree performance is very poor in 6.1.x when having event subscriptions 2013-09-30 10:55:13 +02:00
Sebastiaan Janssen abbf8aeb42 U4-2709 Error after upgrading from 6.1.3 to 6.1.4 2013-09-30 10:49:33 +02:00
Sebastiaan Janssen 328ada2f38 Bump version number 2013-09-30 10:46:08 +02:00
Sebastiaan Janssen 767252cdf1 Creates IDisposeOnRequestEnd and ensures UmbracoContext and UmbracoDatabase implement it, then we only dispose of these types of objects at the end of the request if they are part of the httpcontext items (U4-2738). Fixes: U4-2988 UmbracoObjectTypesExtensions is not thread safe 2013-09-30 10:31:45 +02:00
Sebastiaan Janssen 010d47c68b Fixes U4-2822 Datepicker throws "Specified cast is not valid" when saving through API 2013-09-30 10:23:43 +02:00
Shannon 56f1062db8 Fixes up EditUser - non-admins who have access to the Users app can edit other non-admins and cannot change anyone to be admin, but only admins can edit other admins that are not the root admin. Only the root admin can edit the root admin. 2013-09-30 17:28:44 +10:00
Shannon a11e947f96 Fixes: U4-2780 UserPermissions editor just YSODs 2013-09-30 17:12:31 +10:00
Shannon 0be07f467f Fixes: U4-2989 Username & password must be changed if login credentials are invalid in order to submit again. 2013-09-30 17:03:26 +10:00
Shannon 1a9ced80f9 Fixes: U4-2974 Authentication fail displays username and password 2013-09-30 16:31:52 +10:00
Shannon 33599a15a2 Fixes: U4-2952 Preview mode causes ysod - null reference 2013-09-30 16:06:56 +10:00
Shannon 42f9427e24 ignores the built in member properties for now, adds more logging to Resolution to try to figure out the underlying problem. 2013-09-30 15:42:29 +10:00
Shannon e0878fdd9f fixes unit test 2013-09-30 14:48:05 +10:00
Shannon fb3bad90d6 had to change port 9999 to 9990 because the new sony vaio admin uses 9999 2013-09-30 14:24:39 +10:00
Shannon 590838302b Merge remote-tracking branch 'origin/6.2.0' into 7.0.0-member-editor-wip
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
2013-09-30 14:19:12 +10:00
Shannon c9aac96c1a Fixes EditUser.aspx 2013-09-30 14:15:39 +10:00
Shannon bbdce28951 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0-member-editor-wip
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs
2013-09-30 13:52:01 +10:00
Shannon cf6ecf5bc9 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-member-editor-wip
Conflicts:
	src/Umbraco.Web.UI/config/trees.config
2013-09-30 13:51:18 +10:00
Shannon 4df79ce55b re-enables LoadMinimalDocument and adds this to the optimized check, even in optimized model the OnRenderNode can still execute with a minimal doc. 2013-09-30 13:47:19 +10:00
Shannon 15d2021786 Obsoletes the LoadMinimalDocument flag since it no longer serves a purpose. 2013-09-30 13:36:49 +10:00
Shannon a8f6b9eeb9 Fixes: U4-2925 Tree performance is very poor in 6.1.x when having event subscriptions 2013-09-30 13:31:48 +10:00
Shannon 3d4b403c0e Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-30 12:02:51 +10:00
Shannon 957760d29a Creates IDisposeOnRequestEnd and ensures UmbracoContext and UmbracoDatabase implement it, then we only dispose of these types of objects at the end of the request if they are part of the httpcontext items (U4-2738). Fixes: U4-2988 UmbracoObjectTypesExtensions is not thread safe 2013-09-30 12:02:35 +10:00
Stephan 928f7a1ed0 Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs
2013-09-29 16:05:52 +02:00
Stephan a7603747a6 XmlPublishedCache - 'version' is not a property 2013-09-29 15:22:39 +02:00
Stephan e7754213f1 INode to IPublishedContent transition for Razor macros 2013-09-29 15:22:35 +02:00
Stephan ea82e9c67e Web.Routing - fix PublishedContentRequest exception message 2013-09-29 15:22:31 +02:00
Stephan 182cc1ace7 Web.UmbracoHelper - add Url overload w/mode 2013-09-29 15:22:27 +02:00
Stephan 205b9889f2 Macros - PartialViewMacro use IPublishedContent, not INode 2013-09-29 15:22:23 +02:00
Stephan 4a58fbfa1d PublishedContent - add OfType<> extension to IPublishedContent 2013-09-29 15:22:19 +02:00
Stephan af534e87f3 PublishedContent - bugfix IsDraft on previewed document 2013-09-29 15:22:15 +02:00
Stephan 53c753b8d9 Fix build after merge 2013-09-28 17:11:05 +02:00
Stephan a8a2c706ba Merge branch '7.0.0' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Core/PublishedContentHelper.cs
2013-09-27 15:59:42 +02:00
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 6ee7dbb7e6 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-27 13:38:44 +02:00
perploug f0692329b6 Moved contentpicker button to bottom 2013-09-27 13:36:59 +02:00
Sebastiaan Janssen 4f43172d29 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-27 13:36:17 +02:00
Sebastiaan Janssen f74b9f9071 Renaming columns in SQL CE is a bit more elaborate.. 2013-09-27 13:35:52 +02:00
Lars-Erik Aabech b6777e4635 Recursive PublishedContentExtensions IsDocumentType
Optional recursive parameter defaulted to false for backwards compatibility and no performance hit.
Settings recursive = true fetches content type for content and checks ancestor content types for the same alias.
2013-09-27 13:12:16 +02:00
perploug 0b856302d9 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-27 12:23:33 +02:00
perploug 540a28ea8b Fixes image upload extensions
filters out disallowed
converts images to mediaType=image
everything else type = file
2013-09-27 12:23:12 +02:00
Sebastiaan Janssen 46590c8fce Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-27 12:02:16 +02:00
Sebastiaan Janssen 962bab088c Update nuspec files to get the correct dependencies with the correct versions 2013-09-27 12:00:36 +02:00
perploug 0c8a7f3466 Updates missing dashboard paths 2013-09-27 11:35:59 +02:00
perploug dcb08250ab Minor search visual tweaks 2013-09-27 11:23:38 +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 10b58fbd29 Adds drag drop to media dashboard 2013-09-27 11:22:26 +02:00
perploug 812ed78cd9 made mediatype editor async 2013-09-27 11:21:56 +02:00
perploug ba838e893e Polished nodetype dialog windows 2013-09-27 11:21:33 +02:00
perploug 1db94711f5 tree icons updated 2013-09-27 11:21:10 +02:00
perploug 08e21e36a6 minor styling updates 2013-09-27 11:03:01 +02:00
perploug 249015a0e9 Remove non-working doctype add link 2013-09-27 11:02:40 +02:00
Shannon a3d674f574 Updated the saving model and validator inheritance chain to better support members, have the members editor display data and posting/validating data - now need to get the correct fields being displayed and the correct tab/layout but coming along very nicely! 2013-09-27 16:59:38 +10:00
Stephan 9a66948857 Merge pull request #141 from IDisposable/patch-1
Fix order of null-check versus dotting through to .UmbracoContext.
2013-09-26 23:29:59 -07:00
Shannon 82c784d560 Most of the member tree working, have the member editor rendering data 2013-09-27 15:19:39 +10:00
Shannon 30095000e6 Updates to latest version of JSON.Net 2013-09-27 13:25:28 +10:00
Shannon 5d224cca9b Updates to latest version of Microsoft.Net.Http 2013-09-27 13:22:27 +10:00
Shannon c5c1a7ddfc Upgrades to latest AutoMapper lib 2013-09-27 13:16:25 +10:00
Shannon 7684381326 Fixes issue with media edit controller not having a $timeout reference. 2013-09-27 13:05:57 +10:00
Shannon ed7851c962 Fixes more issues with the legacy API backwards compatibility issues with new property editor that don't have legacy predecessors. - can now create a member. 2013-09-27 12:51:52 +10:00
Shannon bf124cb326 Fixes: U4-2957 Member type saving generates YSOD 2013-09-27 12:39:52 +10:00
Shannon e0fb09c6bc Added better backwards compatibility for when people are using the legacy business logic APIs but they are using new property editors when there is no legacy property editor predecessor (IDataType implementation). 2013-09-27 11:02:59 +10:00
Shannon 49554b7983 updates macro script web.config to what it should be 2013-09-27 09:30:08 +10:00
Shannon 6cf689220e Fixed up the log controller & models (based on feedback http://bit.ly/1h6KiJf ) 2013-09-27 09:25:08 +10:00
perploug 51912bd50f Fixes those resizing issues we've been having 2013-09-26 23:07:51 +02:00
perploug afb5139aec enables the super rough search data in navigation 2013-09-26 22:56:01 +02: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 67a81d7b2d content name directive exit method change 2013-09-26 21:43:55 +02:00
perploug 7c66d26973 Latest edits dashboard 2013-09-26 21:43:42 +02:00
perploug bcac690fd5 Media picker tinymce icon 2013-09-26 21:43:33 +02:00
Marc Brooks b5022bb183 Fix order of null-check versus dotting through to .UmbracoContext.
The order of operations in the constructor dots through to the _routingContext.UmbracoContext before checking if the value was null and throwing the argument exception (which really isn't an ArgumentException...)
2013-09-26 13:41:51 -05: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
Sebastiaan Janssen 5d9ffde268 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-26 15:45:44 +02:00
Sebastiaan Janssen e37ce030f9 Pointing to the Belle docs for building from source 2013-09-26 15:44:12 +02:00
Sebastiaan Janssen 2e9bc3bb2b Oops updated wrong branch 2013-09-26 15:43:08 +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 f2e7cff048 Minor css updates 2013-09-26 15:35:44 +02:00
perploug 0c350e9cc1 Content name directive refactor 2013-09-26 15:35:28 +02:00
perploug 33b4a73794 Beginning work on localization 2013-09-26 15:34:58 +02:00
perploug e52cbf7130 Log resource 2013-09-26 15:34:10 +02:00
Sebastiaan Janssen 98e487753f Pointing to the Belle docs for building from source 2013-09-26 14:52:48 +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
Stephan ce15d46a5e Merge remote-tracking branch 'fork1/6.2.0-pubcontent' into 7.0.0-pubcontent 2013-09-26 09:12:02 +02:00
Stephan 02ffebde49 Merge branch '7.0.0' into 7.0.0-pubcontent 2013-09-26 09:06:01 +02:00
Stephan 2e06c61a4f Fix issues after merge 2013-09-26 09:04:23 +02:00
Stephan 36d6e4b4da Merge branch '7.0.0' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/PublishedContentHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Models/XmlPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
	src/Umbraco.Web/Templates/TemplateUtilities.cs
2013-09-26 08:57:01 +02:00
Shannon 57af8727e9 fixes an async issue with .net 4.5 - well actually it fixes an issue with previous versions :) 2013-09-26 16:36:48 +10:00
Shannon 4212199226 Fixes: U4-2941 Sort dialog YSODs on root node and updates media GetChildren to be the same as content with options/sorting/filtering. 2013-09-26 16:26:05 +10:00
Shannon 18c1ec8ae7 fixed issue with the 'do something else' button 2013-09-26 16:05:42 +10:00
Shannon e1cf3bc597 Implements: U4-2937 A tree item should be able to have a default action 2013-09-26 15:55:38 +10:00
Shannon c9fd168cbd Fixes: U4-2905 Refresh node at tree root (i.e. content/media) doesn't work 2013-09-26 14:28: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 36ddb872fa fixes: U4-2942 re-publish all on content root not displaying 2013-09-26 13:03:09 +10:00
Shannon 29d849754c Fixes: U4-2703 Content editor save/publish should update modified attributes 2013-09-26 12:53:33 +10:00
Shannon f9055016ff Completes: U4-2868 Remove ActionSave, fixes unit tests 2013-09-26 12:21:52 +10:00
Shannon 00cb8f08a0 Fixes unit tests 2013-09-26 12:18:52 +10:00
Shannon 0371b44a84 fixes some unit tests 2013-09-26 11:58:03 +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
Shannon 611f3a04b6 Fixes api controller tests 2013-09-26 10:00:01 +10:00
perploug aca64ae08e Fixes: U4-2871 2013-09-25 16:03:34 +02: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 123e70ae21 Small tweaks on the macro dialog 2013-09-25 15:15:52 +02:00
perploug 8a3f1e6fbf NH code refactor
Moved view into directive
Moved dropzone into directive
Reused in media dialog
2013-09-25 15:15:35 +02:00
perploug 7d50d0fc6c Replaces all the old core dashboards 2013-09-25 15:14:09 +02:00
Shannon d689ad488c Fixes macro rte editor to use the current page id 2013-09-25 21:46:04 +10:00
Shannon 1901351f3a Changes the property convert to log errors when it cannot find a property editor - this means that packages can still install 2013-09-25 21:35:24 +10:00
Stephan 725b938de1 PublishedContent - revert to using property.Value vs .ObjectValue 2013-09-25 13:17:21 +02:00
Shannon f976a9b246 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-25 21:10:13 +10:00
Shannon 394915fa05 centralizes the thumbnail/image handling 2013-09-25 21:09:59 +10:00
Stephan 042973ce19 PublishedContent - revert to using property.Value vs .ObjectValue 2013-09-25 12:54:24 +02:00
Tim Geyssens fb811ce810 Embed rte plugin: minor copy update 2013-09-25 12:16:11 +02:00
Tim Geyssens 32ba52f340 rte: adds iframe as allowed element 2013-09-25 12:07:25 +02:00
Tim Geyssens 04275eba63 Embed rte plugin: prettify 2013-09-25 11:51:47 +02:00
Shannon f01e3ee9f2 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-25 19:27:12 +10: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
Tim Geyssens ab2b916103 Embed rte plugin: adds cancel button to dialog 2013-09-25 11:21:10 +02:00
Tim Geyssens b3914c4eaa Embed rte plugin: changes icon 2013-09-25 11:17:32 +02:00
Shannon f356b94c39 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/NullCacheProvider.cs
	src/Umbraco.Core/Cache/StaticCacheProvider.cs
2013-09-25 19:09:16 +10:00
Shannon 5fd25e26f5 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-25 19:04:12 +10:00
Shannon e02dddc747 obsoleting legacy prop eds 2013-09-25 19:03:05 +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 a1f87c7232 Fixes: U4-2918 After I set admin password, the error shows.(7.0.0-build.85, new install) 2013-09-25 16:52:26 +10:00
Shannon 55e9a4fbb0 fixes rte property editor to ensure that data is saved since tinymce events are a bit strange. fixes up selection changes and ensures that macro markup in the editor can never be modified. 2013-09-25 16:30:13 +10:00
Shannon 06400f8db5 Gets the modal content loading in the rte on editor load all in async, fixes an issue with valtogglemsg when used in a modal to ensure we unsubscribe from the events when the modal element is destroyed. 2013-09-25 14:29:59 +10:00
Shannon 6c9fe2ebd0 Adds dynamic filtering to EntityService (post filtering for GetAll) - updated the insert macro dialog to ensure that it only shows macros flagged for the rte when in rte mode, otherwise shows all of them. adds unit tests for dynamic queryable stuff. 2013-09-25 13:54:25 +10:00
Shannon f127d31928 Gets the rte macro contents rendering with macro parameter values. 2013-09-25 12:05:07 +10:00
Stephan f9022d8189 Cleanup project after merge 2013-09-24 16:31:26 +02:00
Stephan 7f4a98883b Merge branch '7.0.0' into 7.0.0-pubcontent 2013-09-24 16:24:20 +02:00
Stephan 8ff0307a95 Fix bugs & tests after merge 2013-09-24 16:23:03 +02:00
perploug 3dd583b1d3 Fixes broken table drag n drop 2013-09-24 16:03:09 +02:00
perploug 5c8d027383 Media delete dialog, missing D attr validation 2013-09-24 16:02:58 +02:00
Stephan 917c514fab PublishedContent - use generic published content in MacroController 2013-09-24 15:05:53 +02:00
perploug e9f69e39ab Adds folder icons to the photo folder directive 2013-09-24 14:47:06 +02:00
perploug 9a1457fb6d Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-24 12:15:52 +02:00
perploug 828965b902 umb photo folder directive 2013-09-24 12:15:15 +02:00
Stephan 2ef4b77bd9 Fix broken tests 2013-09-24 11:28:54 +02: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
Stephan c7ac4eea2f Merge branch '7.0.0' into 7.0.0-pubcontent 2013-09-24 10:53:26 +02:00
Stephan fae9fc6e2d Merge branch '6.2.0' into 6.2.0-pubcontent 2013-09-24 10:51:44 +02:00
Stephan 000e278e48 Fix bugs & tests after merge 2013-09-24 10:49:30 +02:00
Shannon 5fc8e7b0fb Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-24 18:47:17 +10:00
Shannon d3a9087093 Got the macro dialog working with previously selected macros in the rte and pre-fills the data that was previously there. 2013-09-24 18:46:53 +10:00
perploug 020f4f9fc5 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-24 09:40:06 +02:00
perploug 468238e4d2 more work on the sorting, almost works on tables now too 2013-09-24 09:39:55 +02:00
Niels Hartvig 26ab581af5 Updates to folderbrowser view - still WIP.
Needs code review as there's some non-clean NG work needed to provide
the clean view. Upload haven't been styled yet. Working on it.
2013-09-24 09:36:39 +02:00
Stephan bcfb562dde Fix build after merge 2013-09-24 09:12:58 +02:00
Shannon dbf9f70369 Fixed more styling and validation bits for insert macro dialog. 2013-09-24 16:01:00 +10:00
Shannon 1ce9554e66 Fixes width styles for prop editors 2013-09-24 15:32:32 +10:00
Shannon f6db9d9189 Updates textbox/textarea property editors to show field level validation for the regex/required server validation. 2013-09-24 15:00:43 +10:00
Shannon 42e8e9442e Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-24 13:34:36 +10:00
Shannon 972d33ccec Got macro content loading in editor async updated more of the macro plugin to ensure the macro contents cannot be edited. 2013-09-24 13:34:29 +10:00
Shannon 099c1ff2ea Fixes: U4-2914 Examine doesn't index newly created items 2013-09-24 10:39:47 +10:00
perploug 13ea14e3a9 WIP on sorting directive, but index switching works now 2013-09-24 00:31:24 +02:00
Jeremy Pyne 5716edcf80 Added node type to quick search(as a toooltip).
Added node type to search results.
2013-09-23 16:19:05 -04:00
Stephan 3ca8b356ee Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/NullCacheProvider.cs
	src/Umbraco.Core/Cache/StaticCacheProvider.cs
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Dynamics/PropertyResult.cs
	src/Umbraco.Core/Models/IPublishedContentProperty.cs
	src/Umbraco.Core/Models/PublishedItemType.cs
	src/Umbraco.Core/PropertyEditors/IPropertyEditorValueConverter.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyValueConvertersResolver.cs
	src/Umbraco.Core/PublishedContentExtensions.cs
	src/Umbraco.Core/PublishedContentHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs
	src/Umbraco.Tests/LibraryTests.cs
	src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
	src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
	src/Umbraco.Web/ExamineExtensions.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Templates/TemplateUtilities.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/umbraco.MacroEngines/RazorDynamicNode/PropertyResult.cs
	src/umbraco.MacroEngines/RazorDynamicNode/PublishedContentExtensions.cs
2013-09-23 21:57:22 +02:00
perploug 60dab31656 Canvas directive for preview 2013-09-23 21:55:04 +02:00
perploug 0383ec5ed1 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-23 21:26:39 +02:00
perploug ad0ec30e62 styling cleanup 2013-09-23 21:26:23 +02:00
Niels Hartvig 32f4eaf900 WIP on image uploading
UX work - broken atm.
2013-09-23 21:24:34 +02:00
Per Ploug Krogslund 46ccb616f3 typo in helveticons.less 2013-09-23 21:20:41 +02:00
Stephan 6c32cf9529 Fix broken build 2013-09-23 17:30:09 +02:00
Stephan d925f856ae Take care of FIXMEs 2013-09-23 16:55:59 +02:00
Stephan 3de2196e01 PublishedContent - reorg. existing IPropertyValueConverter impl. 2013-09-23 16:42:35 +02:00
Stephan ac2d010df3 PublishedContent - refactor PublishedContentType cache 2013-09-23 16:18:39 +02:00
Anders Stentebjerg 3104e234c9 Styling
Replaced Open Sans fonts locally with googleapis
Styling sections menu
2013-09-23 14:12:07 +02:00
perploug d0c500824e Added umb-editor width classes to all property editors 2013-09-23 14:10:39 +02:00
perploug 640286c283 minor tweaks 2013-09-23 13:32:26 +02:00
perploug b9d066b262 Fixes rte property validation null refs 2013-09-23 13:32:18 +02:00
perploug 6ab4d177e4 fixes xslt dialog ysod 2013-09-23 13:31:12 +02:00
perploug 0adf0d1fb6 Css for panel footer 2013-09-23 13:30:50 +02:00
perploug 7f8045dc55 Filters out media items that returns null 2013-09-23 13:30:39 +02:00
perploug 9bad5d0233 Updateds media picker styles 2013-09-23 13:29:44 +02:00
Stephan eb4317a9c1 Take care of FIXMEs 2013-09-23 13:08:45 +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 dc258400f1 Have the RTE insert macro stuff working, needs a few tweaks and needs to load content but its working. YOU NEED A FULL BRAND NEW DB RE-INSTALL FOR THIS. 2013-09-23 13:49:24 +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 c6a86d15a2 Fixes up more compatibility issues with the GUID -> alias change, completes U4-2909 Remove unused/obsoleted interfaces in interfaces.dll 2013-09-23 09:00:12 +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 f30bac2919 Fixes: U4-2800 ContentPostValidate apparently doesn't work - need to look into it 2013-09-21 12:29:53 +10:00
Shannon a065874421 Fixes some issues with the GUID change and psot validate attributes 2013-09-20 17:27:26 +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 661bc3149f Fixes macro parameter id assignment at the repo level. 2013-09-20 13:40:32 +10:00
Shannon 6a343ef2b6 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2013-09-20 09:58:24 +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
Tim Geyssens 9c19f161dc List view editor: adds delete confirmation 2013-09-19 16:22:37 +02:00
Tim Geyssens 42e3a3cf2b List view editor: disable bulk actions if action is in progress 2013-09-19 16:10:31 +02:00
Tim Geyssens da0c98e158 List view editor: small copy update 2013-09-19 16:07:18 +02:00
Tim Geyssens f79be4ecf7 List view editor: updates progress message on bulk actions 2013-09-19 16:05:58 +02:00
Tim Geyssens 3d28db6897 List view editor: hooks in notification service 2013-09-19 16:03:42 +02:00
Tim Geyssens d7c0e897cf List view editor: make sure delete docs get removed from the selection 2013-09-19 15:23:19 +02:00
Tim Geyssens 35f62ffa67 List view editor: makes bulk publish work 2013-09-19 15:17:21 +02:00
Tim Geyssens 03ddc14ba5 List view editor: adds stubs for bulk publish/unpublish 2013-09-19 15:11:47 +02:00
Tim Geyssens c3c89cb577 List view editor, adds some feedback on bulk delete progress 2013-09-19 15:06:10 +02:00
Tim Geyssens cc8c477b16 List view editor, make bulk delete work 2013-09-19 14:58:32 +02:00
Tim Geyssens 36133a3ee4 List view editor, make select all function and show bulk actions when at least 1 thing is selected 2013-09-19 14:47:08 +02:00
Tim Geyssens 2d569b40d2 List view editor, disable icon from item view since that wasn't working anyway and did strange stuff with the checkbox 2013-09-19 14:19:03 +02:00
Tim Geyssens 39fb77cf93 List view editor, removing some unnecessary labels from the row view 2013-09-19 14:04:48 +02:00
Tim Geyssens 0746a73860 List view editor, makes paging work 2013-09-19 13:48:21 +02:00
Tim Geyssens 0a11d8beda List view editor, makes error on filtering go away (content controller still need to implement filtering) 2013-09-19 13:44:56 +02:00
Tim Geyssens d9dae1e71a List view editor, makes sorting work 2013-09-19 13:42:11 +02:00
Tim Geyssens 18c00e21ce List view editor, fixes "Duplicates in a repeater are not allowed.” error 2013-09-19 13:25:22 +02:00
Tim Geyssens 8d9fc7fad9 List view editor, make sure edit goes to correct place 2013-09-19 13:20:41 +02:00
Stephan c3caf7ff04 PublishedContent - align with v7, refactor IPublishedProperty & names 2013-09-19 13:12:18 +02:00
Tim Geyssens 9162dac22a List view editor, small update to controller to make sure fetching children doesn't fail 2013-09-19 13:11:57 +02:00
Tim Geyssens 1a38e3ccb9 Oops didn't want to commit this file in preview commit 2013-09-19 13:00:56 +02:00
Tim Geyssens b8cac519fa List view editor, make sure create passes content id 2013-09-19 12:42:54 +02:00
Tim Geyssens a233c30f07 List view editor, make create link to correct place 2013-09-19 12:23:01 +02:00
Shannon 90fe92da82 Getting parameter editor architecture done: we can share with prop eds or create standalone in both c# and in manifest. 2013-09-19 20:17:12 +10:00
Stephan f9cae9c4d8 PublishedContent - align with v7, refactor IPropertyValueConverter 2013-09-19 12:07:43 +02:00
Stephan dd16af0989 PublishedContent - align with v7, refactor PublishedPropertyType 2013-09-19 12:07:30 +02:00
perploug aa2f020aa4 added lisview guid - does all editors need that? 2013-09-19 11:21:59 +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
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 ec3761baa0 Creates parameter editor manfests and resolver, updates the legacy macro editor to resolve items from here. 2013-09-19 15:33:47 +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 d88221cad3 Fixes up more legacy biz logic macros 2013-09-19 14:54:00 +10:00
Shannon 1ae6aac489 Attempting to update the legacy macro business logic code to support the db structure changes. 2013-09-19 13:35:00 +10:00
Shannon 33cad8ed78 Removes the table cmsMacroPropertyType, tests install upgrade and new installs. 2013-09-19 13:05:36 +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 d673bed168 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-18 15:45:03 +02:00
perploug 4891c54ef5 Migrated the old content picker to the new dialogs 2013-09-18 15:44:50 +02:00
perploug 4dd708820f default dialog padding 2013-09-18 15:44:21 +02:00
Tim Geyssens f09225eb48 Updates loading animation on embed rte plugin 2013-09-18 15:15:05 +02:00
Tim Geyssens 1a53334bf2 And make sure insert button only works after succesfull embed 2013-09-18 15:04:43 +02:00
Tim Geyssens b469ed92ff Also make sure the embed rte plugin only shows resize options if provider supports it 2013-09-18 15:03:23 +02:00
Tim Geyssens 8eb07963ec Update to the embed rte plugin, adds code that makes the resize work 2013-09-18 14:52:03 +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 82f3f5bc61 removes iframe borders 2013-09-18 13:11:29 +02:00
perploug c5000b9656 Better click detection for closing dialogs 2013-09-18 13:11:19 +02:00
perploug 2cea746644 Updates legacy editor visuals 2013-09-18 13:11:03 +02:00
perploug 408740b3dd Iconpicker dialog to use promise 2013-09-18 13:10:16 +02:00
perploug 13baaf5182 Changes icon loading into a promise 2013-09-18 13:10:03 +02:00
perploug 445e749372 Fixes: Legacy dialogs couldnt close 2013-09-18 13:09:40 +02:00
Stephan c2db7b2b9b Core.Cache - bugfix + add new method to remove items from cache 2013-09-18 12:52:57 +02:00
Stephan c118990a4c Merge branch '6.2.0' into 6.2.0-pubcontent 2013-09-18 12:51:07 +02:00
Morten Christensen ebf60071ab Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-18 11:51:13 +02:00
Morten Christensen f4b8d9bd6e Fixing broken Publishing test after the service and repository tests are probably setup. 2013-09-18 11:50:52 +02:00
Morten Christensen 5cf07ba6be Refactoring how DeleteVersion and DeleteVersions is used in the Content- and MediaRepository, so we ensure that the latest version is never deleted. Worse case would have been an incomplete content node, which we want to avoid. So better to have a fail safe way of deleting versions, and use the regular Delete method for deleting the latest version. 2013-09-18 11:49:36 +02:00
Stephan cb4eef54a4 Core.Cache - fix issue introduced in 761354d 2013-09-18 11:47:37 +02:00
Stephan 7a541ba489 Merge branch '6.2.0' into 6.2.0-pubcontent 2013-09-18 11:34:00 +02:00
Stephan d2647ea607 Core.Cache - fix issue introduced in 761354d 2013-09-18 11:33:42 +02:00
Shannon 491b56ee27 Completes: U4-2874 Add a unique index to column cmsMacroProperty.macro + cmsMacroProperty.macroPropertyAlias, U4-2875 Add unique index to column cmsMacro.macroAlias with tests 2013-09-18 19:20:36 +10:00
Shannon f0a141567e Fixes db fluent index builder 2013-09-18 19:18:28 +10:00
Stephan a785cd1569 Merge branch '6.2.0' into 6.2.0-pubcontent 2013-09-18 10:56:07 +02:00
Stephan d1f36346de Core.Cache - fix bug in StaticCacheProvider 2013-09-18 10:55:20 +02:00
Stephan 761354dbf5 Core.Cache - add new method to remove items from cache 2013-09-18 10:55:10 +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
Stephan 1e786ac311 PublishedContent - proper PublishedContentType cache management 2013-09-18 10:09:11 +02:00
Stephan 0c28e01347 Core.Cache - add new method to remove items from cache 2013-09-18 10:09:08 +02:00
Stephan 08566f32de Take care of more FIXMEs 2013-09-18 10:09:05 +02:00
Morten Christensen dc1a67bfa2 Fixes U4-2822 Datepicker throws "Specified cast is not valid" when saving through API 2013-09-18 10:06:08 +02:00
Shannon 95df28bf64 Fixes issue with runtime cache provider when retrieving all items of a certain type, we were sending back an array of nulls if the cache was expired. 2013-09-18 17:44:25 +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
Shannon 258d26dda4 changes form styles slightly to show the error styles when the form is dirty, not necessarily the individual items. 2013-09-18 17:30:57 +10:00
Shannon e261018e3c Fixes issue with runtime cache provider when retrieving all items of a certain type, we were sending back an array of nulls if the cache was expired. 2013-09-18 17:10:40 +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
perploug fe71974ce4 updated docs to use alias 2013-09-18 08:59:51 +02:00
Shannon a027c3cb22 Found out if we don't do ToArray here and if we were caching we'd end up with null values in the cache, do to yield return i think. 2013-09-18 16:08:15 +10:00
Shannon 09b2a1f5d0 updated entity resource docs 2013-09-18 15:39:17 +10: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 f1c0aa2439 adds a comment 2013-09-18 15:21:35 +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 422a22f150 Adds unique db index to macro alias since there can never be duplicates. 2013-09-18 14:14:48 +10:00
Shannon 2a143aec46 Fixed up remaining macro service tests 2013-09-18 14:05:00 +10:00
Shannon 67171db955 Fixes merge issues... but now have to fix all the unit tests 2013-09-18 13:26:09 +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 c8fa881bc5 Ensures all service tests do not use any caching in their underlying repos. This change has been made to the base database test classes so any repo/service access done for inheritors also ensure that no cache is used for tests. 2013-09-18 12:54:06 +10:00
Shannon b17db9f143 Fixed last failing unit test with repo's 2013-09-18 12:42:18 +10:00
Shannon 23b7e94ce3 Fixes pretty big issue with MediaType's not implementing the same IsDirty property check rules as ContentType when they should have shared the same rules. After removing caching on the unit tests, this bug became known. 2013-09-18 12:36:38 +10:00
Shannon 8fe7c0da9e Changed all repository tests to ensure they are not testing with cache enabled... now to fix the problems :( 2013-09-18 11:40:40 +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 526f2f2e81 Fixes broken doctype editor 2013-09-17 13:43:47 +02:00
perploug 4b3db20d90 Fixes bug with multiple TinyMCE editors on the same page 2013-09-17 13:43:38 +02:00
perploug b8ae98ab13 Updates TinyMCE to 4.0.6 2013-09-17 13:43:19 +02:00
perploug 2ac84a467d rte.controller 2013-09-17 12:50:20 +02:00
perploug e452ff6e36 Adds editor context
Enables property editors to access the complete entity when editing
2013-09-17 12:44:52 +02:00
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
Stephan 16ec58f338 Merge branch '6.2.0' into 6.2.0-pubcontent 2013-09-17 10:49:46 +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
Stephan e8fd6a6ece Take care of FIXMEs 2013-09-17 10:18:26 +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
Stephan ee4f4440d5 PublishedContent - implement strongly typed methods for other axes 2013-09-16 17:17:51 +02:00
Stephan f4d060f3eb PublishedContent - implement strongly typed methods for parent, children, ancestors & descendants axes 2013-09-16 17:17:49 +02:00
Stephan 85cb7fadfc PublishedContent - implement a model factory 2013-09-16 17:17:48 +02:00
Stephan ac19ac7a6b PublishedContent - use PublishedContentModelFactory in XmlPublishedCache 2013-09-16 17:17:46 +02:00
Stephan 0415a31d0e PublishedContent - the big refactoring 2013-09-16 17:17:45 +02:00
Stephan 912716f889 Content - add @isDraft to preview Xml for draft content 2013-09-16 17:17:42 +02:00
Stephan 5dc9bb752e Macros - cache xslt settings 2013-09-16 17:17:41 +02:00
Stephan cf435011df Macros - support navigable caches 2013-09-16 17:17:39 +02:00
Stephan f63514e8ea Web.PublishedCache - add XPathNavigatorIsNavigable to caches 2013-09-16 17:17:38 +02:00
Stephan 1ddf2fa365 Core.Xml - import NavigableNavigator initial version 2013-09-16 17:17:36 +02: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
Kalle Ekstrand 7e1d8a6108 Swedish languagefile
This is a fully translated languagefile fpr the swedish language.
2013-09-13 12:10:16 +02:00
Mads Krohn 0fe33c120b Removing unwanted ToList() 2013-09-13 10:42:08 +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
Mads Krohn 10ea234dbf Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-13 10:29:12 +02:00
Mads Krohn 31f146fc6f Updates to the media trashed state handling
Tweaked the logic for determining when a media item is trashed or not.
Added unit tests. Removed unnecessary comments.
2013-09-13 10:29:03 +02: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
Shandem b6d4415f5c Merge pull request #131 from neehouse/6.2.0
Removing file location restriction from PartialViewMacro
2013-09-11 21:47:51 -07:00
Shannon df4453b099 Completes: U4-2836 Remove EXSLT xslt extensions since many have been broken for some time 2013-09-12 14:26:20 +10:00
Shannon 24471c32f9 Improved search with "and", partial match U4-2509
- added partial matching on each word.
- fixed bug so 'all' words match rather than 'any' words.
2013-09-12 14:12:33 +10:00
Shandem a353f6fb74 Merge pull request #135 from Myster/master
Fix multiple words in search U4-2509
2013-09-11 19:33:47 -07:00
Murray Roke a64efb93b3 Improved search with "and", partial match U4-2509
- added partial matching on each word.
- fixed bug so 'all' words match rather than 'any' words.
2013-09-12 14:30:42 +12:00
Murray Roke cf9f11ff45 Improved admin search splitting query U4-2509 2013-09-12 13:22:14 +12:00
Murray Roke d7481b5ca4 Fix multiple words in search U4-2509
When multiple words are entered in the search field no results are
returned.
This pull req. contains the fix suggested by Tony.
2013-09-12 10:22:59 +12:00
Mads Krohn 0af73b0290 Fixed U4-2842 Umb 6.1.5 - moving a media item from recycle bin / trash 2013-09-12 00:14:44 +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
perploug 377d72b5da better handling of closing dialogs 2013-09-11 14:03:59 +02:00
perploug c3e67a2144 chore: less cleanup 2013-09-11 14:03:28 +02:00
perploug 998e8bf9bd Updates header css class to include padding 2013-09-11 14:03:13 +02:00
perploug 4719caf653 Changes span size on c# panel 2013-09-11 14:02:45 +02:00
Stephan f53a23553b Core.Attempt - replace calls to obsolete ctor 2013-09-11 11:06:14 +02:00
Stephan 42c432caa0 Merge branch '6.2.0' into zb-cleanup 2013-09-11 10:39:40 +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
Morten Christensen e69b043cfa Oops, double column is no good syntax... 2013-09-11 10:24:05 +02:00
Morten Christensen 812d5c1391 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-11 10:17:08 +02:00
Morten Christensen 8d510fd512 Committing some POC code in the test project for strongly typed models/queries 2013-09-11 10:16:49 +02:00
Morten Christensen c5c44cec37 Correcting syntax output for AlterColumnExpression, so Shannon's migrations will work 2013-09-11 10:15:31 +02:00
Stephan 82f81d1f4f Core.Attempt - backport and refactor Attempt.Outcome from v7 2013-09-11 10:03:17 +02:00
Stephan 32e3048717 Core.Attempt - refactor Succ() into Succeed() 2013-09-11 09:30:00 +02:00
Shannon 86d73712fd Changes the migration script to set any unknown editors to label 2013-09-11 13:22:00 +10:00
Shannon d39cea7edd Fixes merge issues with new member stuff regarding the column controlId -> propertyEditorAlias change. Removed the old sqlce sql scripts (
U4-2802  Obsolete unused/obsolete legacy umbraco.datalayer SQL utilities and installers)
2013-09-11 13:19:35 +10:00
Shannon e75c050eff Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias
Conflicts:
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
2013-09-11 13:07:22 +10:00
Shannon 4c5d6b5730 Fixes: U4-2832 Could not load stylesheets tree 2013-09-11 12:54:35 +10:00
Shannon 15518f2069 Completes: U4-2749 Fix auth filters to return 401 when not logged in and 403 when the user has no access - adds ngSanitize which is required for ng-bind-html so we can add a bit of html to the notification msgs (like line breaks) and since devs might do this as well we require ngSanitize so that unsafe html cannot be injected. 2013-09-11 12:40:43 +10:00
Shannon 90abe8c25f Fixes: U4-2823 RenderRouteHandler.GetUmbracoRouteDefinition() fails to store the route definition when an incidental alias-controller match is made 2013-09-11 12:15:29 +10:00
Shannon 9f1d212375 Implements: U4-2824 Type Converter for string type with unit test 2013-09-11 11:57:15 +10:00
Shannon 01de1158f4 Completes: U4-2835 Remove unused/obsoleted code from namespace umbraco.cms.presentation.developer & U4-2801 Remove legacy/un-used editDataType.aspx webforms editor 2013-09-11 11:11:34 +10:00
perploug 3aa9873db9 legacy Editmacro editor tweaks 2013-09-10 23:33:26 +02:00
perploug 4a84b039c1 remove debugging alert 2013-09-10 18:04:03 +02:00
perploug 17833022a3 Update dev section editors 2013-09-10 18:03:50 +02:00
perploug d5846a5a4c delete unneedded files 2013-09-10 18:01:52 +02:00
perploug 9846823688 notifications css tweak 2013-09-10 18:01:13 +02:00
perploug 9ba341d490 Made dialogservice return the dialog obj instead of dom 2013-09-10 18:01:03 +02:00
perploug bd85f9b5b7 Speechbubble fixes for legacy editors 2013-09-10 18:00:34 +02:00
Stephan 9ca048f0ad Core.Attempt - maintain backward compatibility 2013-09-10 17:56:49 +02:00
Stephan 85ab96f71a Core.Attempt - refactor and cleanup 2013-09-10 17:56:47 +02:00
Stephan 1ba8ad5fbb Comments - UmbracoModule 2013-09-10 17:56:46 +02:00
Stephan 433e141761 Comments - misc 2013-09-10 17:56:44 +02:00
Stephan 9fa5821f07 Comments - Web.Standalone 2013-09-10 17:56:43 +02:00
Stephan 447b3227a9 Web.Routing - remove duplicate code 2013-09-10 17:56:41 +02:00
Stephan ddfd9eeb18 Core.UriExtensions - refactor + issue with IsClientSideRequest 2013-09-10 17:56:39 +02:00
Stephan 6e0fa9f945 Core.Configuration - support missing notDynamicXmlDocumentElements 2013-09-10 17:56:38 +02:00
Stephan 4d726167f6 Core.XmlHelper - refactor 2013-09-10 17:56:36 +02:00
neehouse 1781528390 Removing Whitespace 2013-09-10 09:36:09 -04:00
neehouse c0214ac4ec Modified the MacroRendering event as requested. Removed the unnecessary check for the file path from the Partial View Macro as it would not be hit anyhow since the macro engine is determined using the same rule. U4-2644 & U4-2643 2013-09-10 09:34:19 -04:00
perploug f1dda1b86c Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-10 15:09:36 +02:00
perploug 64fc4f617d Hide nav on tree item click 2013-09-10 15:08:15 +02:00
perploug 4f2abcab1c wrapping pane class in dialog 2013-09-10 15:07:58 +02:00
perploug 27f28dffef events on nav for touch support 2013-09-10 15:07:43 +02:00
perploug 121b7c391b udated datepicker icons 2013-09-10 15:07:29 +02:00
perploug ae24b280ec Base classes on index and dialog 2013-09-10 15:07:17 +02:00
perploug aeb3b466dc Simple create dialog html 2013-09-10 15:07:01 +02:00
perploug 7139fda098 Adds pane cssclass attr 2013-09-10 15:06:46 +02:00
perploug fcc07bc663 minor dialog and modal css updates 2013-09-10 14:37:10 +02:00
perploug 11cceaceab fixes the broken tree icons 2013-09-10 14:36:50 +02:00
perploug d8b9437986 adds $event to enter and leaver treees for touch compat 2013-09-10 14:36:35 +02:00
perploug 9c26462d29 Only prevent default when non-ctrl-meta click 2013-09-10 14:35:59 +02:00
perploug 6adace58fd Better click detection for modal closing 2013-09-10 14:35:44 +02:00
Shannon b097f33bc9 Fixes: U4-2789 Tree.config registeres tree inconsistently 2013-09-10 18:28:45 +10:00
Shannon 7061051d2c added support for the legacy closeTriggers for legacy modals. 2013-09-10 18:07:22 +10:00
Shannon 8d83dc462d Fixes: U4-2777 Get legacy tree pickers working - calls the close callback by inside of the umb client mgr instead of having to modify the dialogservice, this works well for legacy pickers. 2013-09-10 17:58:59 +10:00
Shannon 404062b4d0 Removes committed code for contour installation. 2013-09-10 17:41:32 +10:00
Shannon 42c86a05b8 Completes U4-2390 Remove VersionID Guid in IPublishedContent properties 2013-09-10 17:37:10 +10:00
Shannon 4957acb8d3 Completes: U4-2693 Make package.manifest less complex - WARNING: You need to upgrade your package.manifest files to support the new syntax. If you don't have validation specified then you just need to update the "prevalues" key. See the issue for details. 2013-09-10 17:20:13 +10:00
Shannon a244516b19 changed to deal with a 403 2013-09-10 15:39:42 +10:00
Shannon 261828f7e5 Streamlined response messages and http codes for validation and authorization all relating to U4-2749 Fix auth filters to return 401 when not logged in and 403 when the user has no access 2013-09-10 15:37:44 +10:00
Shannon 9b2af87115 Have re-added the permissions check for content [ContentPostValidate] 2013-09-10 14:03:08 +10:00
Shannon c11adccb53 Fixes: U4-2818 Sort Dialog cancel button are causing the submit POST to occur 2013-09-10 13:45:02 +10:00
Shannon 5036df4174 Fixes permissions issue with default permissions and ensures default permissions come from the user type instead of the unused db column in the umbracoUser table. Fixes up the FilterAllowedOutgoingContentAttributeTests attribute with the new permissions changes. Fixes: U4-2771 Content sort dialog, ysod on loading children 2013-09-10 13:38:45 +10:00
Shannon edc4dc6f7f Fixed merge issues 2013-09-10 11:51:57 +10:00
Shannon e962e86c3c Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Models/Rdbms/MemberReadOnlyDto.cs
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
	src/Umbraco.Web/Umbraco.Web.csproj
2013-09-10 11:49:05 +10:00
Shannon 105af392dc Obsoletes all legacy installer classes from the legacy data layer. 2013-09-10 11:43:07 +10:00
Shannon e60f20a6a2 MIgration script updated to set any property editor that doesn't have a GUID-> alias map to a text box. 2013-09-10 11:31:57 +10:00
Shannon 41766d7738 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias 2013-09-10 11:29:11 +10:00
Shannon b2deb3def3 Fixes: U4-2815 The code to determine the macro type is currently case sensitive 2013-09-10 11:15:25 +10:00
Per Ploug Krogslund d7c68b7f12 tutorials index.ngdoc update to include part 4 2013-09-09 20:26:54 +02:00
neehouse 998e222881 Adding event to RenderMacro methods to allow for manipulation of the MacroModel. 2013-09-09 14:00:08 -04:00
perploug f1bd8d29c6 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-09 16:31:22 +02:00
perploug f6fbf1fa51 merge 2013-09-09 16:31:04 +02:00
perploug 3b6d0055ed Merge pull request #130 from stocksr/patch-1
fix typo - getImagePropertyVaue should be getImagePropertyValue
2013-09-09 07:28:04 -07:00
perploug 6bc8713b7f Remove vaue->value typo in all files 2013-09-09 15:26:22 +01:00
Per Ploug Krogslund e69f0ae6a3 karma conf update 2013-09-09 14:38:02 +02:00
Per Ploug Krogslund d2e68cca54 Docs update 2013-09-09 14:37:49 +02:00
Per Ploug Krogslund 0da60087ae Adds touch and swiping support to navigation and all modals 2013-09-09 14:37:42 +02:00
perploug ed3ef2d1c7 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-09 11:15:40 +02:00
perploug 3ba7fbd0e7 Assets service spec for testing lib loading 2013-09-09 10:15:27 +01:00
Per Ploug Krogslund 752e4af59a imagehelper typo fix 2013-09-09 11:12:00 +02:00
Per Ploug Krogslund 69c5183dac tree touch specific padding 2013-09-09 11:11:37 +02:00
Per Ploug Krogslund 2f055e0c31 Fixes type in imagehelper method? 2013-09-09 11:11:13 +02:00
Per Ploug Krogslund ff65237414 removes service.active clause in nav.closeNav method 2013-09-09 11:10:56 +02:00
Per Ploug Krogslund a8caee75a5 Adds ngTouch events to main navigation 2013-09-09 11:10:31 +02:00
Shannon 6647aaeed1 Added data migration script for the GUID -> alias change, just waiting on feedback from the core. 2013-09-09 18:38:42 +10:00
Shannon 96fe478ac6 Fixes issue with DynamicNode trying to call OrderBy on a newer extension method 2013-09-09 18:38:11 +10:00
Shannon 3468f776d1 Adds another unit test and assertion for package service to make sure it can import the legacy IDs and the new Aliases without error. 2013-09-09 17:35:21 +10:00
Shannon cded3ae6dd Another change to the packaging service to support the legacy GUID 2013-09-09 17:20:52 +10:00
Shannon ec2dd5bad1 Updates packaging service to export the property editor alias instead of the legacy id and changes it's import logic to detect a GUID for comparison against the legacy control id. 2013-09-09 16:43:53 +10:00
Shannon 719b921e0b Created the maps for all core property editors to map from legacy GUID to new alias with unit tests. 2013-09-09 15:57:22 +10:00
Shannon 26a47e7ee1 Updated the published conversion process with the new PropertyValueConverter and migrated the old core IPropertyEditorValueConverters to the new format. 2013-09-09 15:17:33 +10:00
Sebastiaan Janssen 58ba7d2d6d Fixes U4-502 TextString/TextBox multiple don't accept polish Ś character 2013-09-08 21:29:20 +02:00
Sebastiaan Janssen edd9aa80ae Fixes U4-489 Installer, link to folder permission video broken 2013-09-08 21:18:00 +02:00
Sebastiaan Janssen 7ddb77db66 Fixed U4-576 Umb 4.7.x - Dashboards 2013-09-08 21:06:22 +02:00
Sebastiaan Janssen b25e015890 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-09-08 19:42:51 +02:00
Sebastiaan Janssen 686250c586 Fixed U4-608 Empty tinymce config throws null ref exception 2013-09-08 19:42:34 +02:00
Robert Stocks 98d1b93862 Fix all references to to getImagePropertyVaue 2013-09-07 14:32:01 +01:00
Stephan c5197dbe17 U4-2807 - better exception message on bogus domain 2013-09-07 10:25:39 +02:00
neehouse d821401ea2 Removing file location restriction from PartialViewMacro to allow custom paths. 2013-09-06 15:34:19 -04:00
Stephan 39316a345f Tests - stop deleting dummy.txt files 2013-09-06 20:24:22 +02:00
Sebastiaan Janssen 349dc9a228 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-09-06 16:20:16 +02:00
Sebastiaan Janssen 303c1e16b8 Change document type did unnecessary checks on root node which resulted in YSOD 2013-09-06 16:17:08 +02:00
stocksr a99deb655b Update util.service.js
Fix typo
2013-09-06 15:09:03 +01:00
Shannon 8adfec51d0 Getting more unit tests fixed up, removed the old SQL installer scripts since there are not used whatsoever anymore 2013-09-06 18:03:00 +10:00
Shannon b3ec44b61d Getting all the unit tests working again with the GUID to alias change, lots of little fixes everywhere. 2013-09-06 17:50:31 +10:00
Shannon cf6a3cdfef A bunch more work done to convert the GUID -> alias for prop eds 2013-09-06 16:00:35 +10:00
Shannon 9a017279ae More work converting obsoleted methods to new ones 2013-09-06 15:37:01 +10:00
Shannon 78741bf134 more work on removing the GUID requirement for prop editors, removes legacy editDataType webforms editor (U4-2801 Remove legacy/un-used editDataType.aspx webforms editor) 2013-09-06 15:27:38 +10:00
Shannon b1b7a330b5 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias 2013-09-06 15:09:24 +10:00
Shannon c2b1ed205b Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-06 11:40:56 +10:00
Shannon fee02af4eb Completes: U4-1639 Add support to generate GET urls to SurfaceController actions 2013-09-06 11:40:37 +10:00
perploug b3c68d44f1 Getting closer to the sorting to work 2013-09-06 01:12:12 +02:00
dprothero 6675bac1dc Fix #U4-2796 - fixed copy/paste error (does not affect functionality) 2013-09-05 15:23:25 -07:00
dprothero 0d49a59cfe Fix #U4-2796 Possible to have duplicate Login Name (Member.LoginName) for Umbraco Members 2013-09-05 15:15:40 -07:00
leekelleher 4770e903fb Minor corrected to uQuery doco/comments. 2013-09-05 18:22:48 +01:00
perploug 37c07bbc51 Working css for IE 2013-09-05 15:17:10 +02:00
Stefan Kip baa22301e9 Added Exception which tells you which datatype is unable to load 2013-09-05 11:31:06 +02:00
Morten Christensen e080965468 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-05 11:28:45 +02:00
perploug 70a1b63813 make rte handle null images from dialog 2013-09-05 11:14:56 +02:00
perploug 779ba61fb1 removes uglify from build for now 2013-09-05 11:14:38 +02:00
perploug b30bcec390 Normaliize dialogservice method signature 2013-09-05 11:14:24 +02:00
perploug d2df96e2e0 Comment outnContentPostValidate as its currently broken 2013-09-05 11:13:55 +02:00
perploug cb06b97d69 Making propertyeditor and attribute public 2013-09-05 11:13:22 +02:00
Morten Christensen 0c05836537 Fixes U4-2791 Error creating node containing @ v6.1.4.
Adding unit test which covers both U4-2791 and U4-2607
2013-09-05 10:44:28 +02:00
Shannon 45dabd6293 Lots of work on U4-2722 Change Property Editors over to use unique alias instead of GUID
it compiles but i haven't had time to test anything yet, will start all unit testing/fixing tomorrow, just needed to save this work somewhere.
2013-09-05 18:38:54 +10:00
perploug 39233aa219 gruntfile 2013-09-05 08:33:40 +02:00
Shannon e4cb079ae1 Fixes template drop down data and persisting an updated template. 2013-09-05 15:14:28 +10:00
Shannon 0026f7bd01 More ignores 2013-09-05 14:55:55 +10:00
Shannon 0b1cad7687 Fixes app.dev to not include ui.sortable. Fixes server vars mocks to have an entry for dashboardApiBaseUrl, adds dashboard.mocks to not throw an exception when trying access that data. 2013-09-05 14:54:40 +10:00
Shannon 038780614c Re-deletes files that should not be committed! Seriously WHY DOES THIS KEEP HAPPENING??! Have updated the ignore to try and stop this 2013-09-05 14:38:22 +10:00
Shannon c269f55074 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-05 14:01:48 +10:00
Shannon 177486418d Implements: U4-1639 Add support to generate GET urls to SurfaceController actions 2013-09-05 14:01:28 +10:00
perploug ac4eb18b55 Add ngmin and uglify to grunt setup RERUN NPM INSTALL 2013-09-04 23:31:05 +02:00
perploug cab92d203e Delete contour files checked in by mistake 2013-09-04 21:08:48 +02:00
perploug 9414639ee1 icons and modal css updates 2013-09-04 21:07:10 +02:00
Morten Christensen 3393b6b0da Adding comments to the MemberService methods 2013-09-04 16:35:54 +02:00
Morten Christensen 33bba57047 Implementing addtional methods in the MemberService 2013-09-04 16:30:51 +02:00
perploug c27f6e3458 merge legacy client 2013-09-04 16:02:23 +02:00
Morten Christensen 269f573b82 Refactoring the GetById method in the MemberService. 2013-09-04 16:00:38 +02:00
perploug 8e93cfa94d merge 2013-09-04 16:00:30 +02:00
Morten Christensen 2ec367fd59 Removing the SecurityHelper and moving the 3 methods into the Provider as private classes, as they aren't used anywhere else.
The SecUtility will be removed along with the legacy MembershipProvider when cleanup is possible.
2013-09-04 15:44:29 +02:00
perploug 334374b9f6 New sorter and contentType editor 2013-09-04 15:43:56 +02:00
perploug a5445bb779 media picker icons 2013-09-04 15:43:41 +02:00
perploug fd06c1b785 add jqueyr sortable lib 2013-09-04 15:43:24 +02:00
perploug d59963a53e Comment jquery UI for new sorter 2013-09-04 15:43:00 +02:00
Morten Christensen 72dcb32ac2 Refactoring the TypedModelBase and UmbracoTempaltePage for the TypedModel POC 2013-09-04 15:42:25 +02:00
perploug 025b952fb6 Remove old debug valu from content picker 2013-09-04 15:42:23 +02:00
Morten Christensen 1f68cad45b Refactoring MemberService and MembersMembershipProvider from Darrens pull request to fit the changes made the past week.
SecurityHelper is moved to the Umbraco.Web.Security namespace.
MembershipExtensions are changed to the new models
2013-09-04 15:42:01 +02:00
perploug ed4c22b2c1 css updates 2013-09-04 15:40:56 +02:00
perploug f2376c4340 add datatype.getall resource 2013-09-04 15:40:46 +02:00
perploug 00534251ea Remove old ui.sortable while I work on the new one 2013-09-04 15:40:31 +02:00
perploug b97b4eaa89 Revert "Revert "Remove jquery sourcemap reference""
This reverts commit 87df168c7d.
2013-09-04 15:39:50 +02:00
perploug 87df168c7d Revert "Remove jquery sourcemap reference"
This reverts commit fbdd94e577.
2013-09-04 15:35:57 +02:00
perploug fbdd94e577 Remove jquery sourcemap reference 2013-09-04 15:35:32 +02:00
Morten Christensen 8ffbad4b49 Merge pull request #118 from darrenferguson/6.2.0
Adding new Memership provider implementation
2013-09-04 06:14:40 -07:00
Morten Christensen 24091991fa Updating MemberRepository test fixture. All tests ignored while using local db for testing. 2013-09-04 14:47:42 +02:00
Morten Christensen d65e94f519 Adding LocalizationService test fixture class 2013-09-04 14:43:48 +02:00
Shannon 0273b79935 Fixes the dialogs when used by the legacy umb manager to ensure that they only close the latest open (which is what the legacy stuff is expecting), now the xslt visualizer works with the picker as well. Completes: U4-2777 Get legacy tree pickers working 2013-09-04 20:42:37 +10:00
Shannon ecdfecd173 Fixed the dialog service to be able to call registered callbacks even if the dialog is an iframe, this helps fix the legacy tree pickers, fixed up the legacy tree control so that it can load in new trees as well 2013-09-04 20:06:41 +10:00
Morten Christensen 966416c0a5 Updating classes for small TypedModel POC 2013-09-04 11:30:21 +02:00
Morten Christensen 09de4a3666 Adding LocalizationService to ctor 2013-09-04 11:30:00 +02:00
Shannon b105bd305b Ok, getting pretty close to making those legacy tree dialogs work. 2013-09-04 18:10:57 +10:00
Shannon be9c3b8996 Got a solution for legacy dialog trees with the new format trees, just committing all of the work in case i need to come back and reference some stuff I'm about to remove. 2013-09-04 17:36:05 +10:00
Shannon db79d87c08 Fixes infinite loop ... oops. 2013-09-04 16:09:54 +10:00
Shannon 838788c270 Fixes a few stupid medium trust issues... even though running in full trust... it never ends! :/ 2013-09-04 13:18:23 +10:00
Shannon f6ea604101 First attempt at getting legacy tree dialog to work with new trees. Just saving this revision since I might need to reference the code later but am going to revert since this doesn't seem like the way to go. 2013-09-04 12:01:41 +10:00
Morten Christensen f2f1d265ec Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-03 17:15:03 +02:00
Morten Christensen 642c6c1afe Implementing a POC and tests for a simple TypedModel base class 2013-09-03 17:03:35 +02:00
Morten Christensen c5945789f0 Refactoring the MemberRepository to use the new Member class 2013-09-03 17:02:15 +02:00
Morten Christensen 6742bf4708 Removing the old Member, MemberType and MemberGroup classes from the Model.Membership namespace 2013-09-03 17:01:34 +02:00
Sebastiaan Janssen 5e83023ce5 Merge pull request #126 from Jeavon/6.2.0
U4-2783 url attribute in installedPackages.config is not populated when ...
2013-09-03 05:55:51 -07:00
Jeavon Leopold 05039fdd7c U4-2783 url attribute in installedPackages.config is not populated when a package is installed 2013-09-03 13:32:10 +01:00
perploug 91de4ebd42 datatype tree icons update 2013-09-03 14:26:07 +02:00
perploug 6c4fba1a4e client-side icons update 2013-09-03 14:26:06 +02:00
perploug f6f6da2f21 Tree icons update 2013-09-03 14:26:04 +02:00
perploug 0175bb0d9e IAction icons update 2013-09-03 14:26:03 +02:00
Shannon c40e4fed87 Got the file upload making thumbs based on pre-vals - U4-2778 FileUploadValueEditor - need to create pre-values like we had in v6 including thumb sizes. 2013-09-03 18:33:17 +10:00
Sebastiaan Janssen 21954f7bc6 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-09-03 10:31:17 +02:00
Sebastiaan Janssen 25d2b56ed7 U4-2776 Default Content For A Razor Layout Section 2013-09-03 10:31:00 +02:00
Shannon e5633df6c3 Added pre-vals for the file upload property editor (backwards compatible format) and fixed saving a data type. 2013-09-03 18:28:14 +10:00
Shannon 70eb3e8613 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Tests/Models/DataValueSetterTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
	src/Umbraco.Web/Controllers/RegisterController.cs
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
2013-09-03 17:30:08 +10:00
Shannon eeeb99b3b5 Fixes U4-2738 Collection Disposal issue when deploying 6.1.4 on Windows Server 2008 (Random, environment specific) 2013-09-03 17:19:31 +10:00
Shannon 7c9f5eda9d Fixes up more permissions checks, refactors MediaController.PostAddFile to use the correct WebAPI usage. Fixes issue with UmbracoClientManager throwing errors because the treeProps didn't include all called props. 2013-09-03 16:35:36 +10:00
Shannon f0a2bfdea4 Updates EntityController with corrected permissions checking, updated media controller with correct permissions checking, added unit tests for the permisions filters. 2013-09-03 13:59:25 +10:00
Shannon aee521ce1a Fixes: U4-2770 Legacy content dialogs doesnt render and removes a file that shouldn't have been committed. 2013-09-03 12:27:48 +10:00
perploug 020623acd3 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-02 17:09:16 +02:00
perploug 427efcdfe2 stadard icon sizing 2013-09-02 17:08:59 +02:00
perploug 9f4ac8a1af image picker multiple select toggle 2013-09-02 17:08:48 +02:00
perploug ede8f837a0 media picker item html 2013-09-02 17:08:27 +02:00
perploug 5c6578c06b recommit iconpicker 2013-09-02 17:08:15 +02:00
perploug 9a33849f6e Auto resize image on insert 2013-09-02 17:08:04 +02:00
Morten Christensen 008d413302 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
2013-09-02 15:55:05 +02:00
Morten Christensen 186d5157ec Implementing the read only side of the MemberType/MemberTypeRepository.
PropertyTypes and PropertyGroups are loaded as part of the MemberType in one go.
MemberTypeRepository uses the same approach as the ContentTypeRepository and MediaTypeRepository for saving/updating.
Refactoring how the 9-PropertyType convention is handled.
2013-09-02 15:53:09 +02:00
Anders Stentebjerg 5b2705181b Styling Mediapicker dialog 2013-09-02 15:44:41 +02:00
perploug c49ee0da7a Mocks merge 2013-09-02 15:43:33 +02:00
perploug 623a28c158 delete fontawesome 2013-09-02 15:40:14 +02:00
perploug 26da26fe8d add icon picker dialog 2013-09-02 15:34:48 +02:00
perploug 2a0878a071 move markdown editor to umbraco.packages module 2013-09-02 15:34:35 +02:00
perploug 551c7b38b7 rte tweaks 2013-09-02 15:34:14 +02:00
perploug 0f108eb842 seach headline 2013-09-02 15:34:07 +02:00
perploug f4310687ea tree search css 2013-09-02 15:33:23 +02:00
perploug fa6c9b3ba4 image helper for resizing 2013-09-02 15:33:08 +02:00
perploug 5713226297 add umbraco.package module 2013-09-02 15:32:55 +02:00
perploug 2324e4f810 Media mocks 2013-09-02 15:32:31 +02:00
Anders Stentebjerg 350d90e9a3 Changed from Font Awsome to Helveticons + custom Umbraco icons 2013-09-02 14:47:31 +02:00
Niels Hartvig 2fb55cb831 Enhanced permission checking on views and snippets
Thanks to Richard Turnbull from NGS Secure Research who discovered a
minor issue that made it possible for authenticated Umbraco Users to
view files beyond their permissions
2013-09-02 14:23:27 +02:00
Sebastiaan Janssen 35c7b224bd Fix merge issue 2013-09-02 12:49:01 +02:00
Sebastiaan Janssen 437408464f Merge branch '6.1.5' into 6.2.0
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
2013-09-02 12:29:47 +02:00
Sebastiaan Janssen 0e6a926a3f Merge branch '6.1.5' 2013-09-02 12:24:26 +02:00
Shannon dc05b10f46 Added more config defaults + unit tests 2013-09-02 19:54:31 +10:00
Shannon 30b42332e1 Completes: U4-2434 Remove legacy webservices and config section from umbracoSettings 2013-09-02 19:46:31 +10:00
Shannon a5f31dba1a moved tests into diff files 2013-09-02 19:44:02 +10:00
Shannon 6367b33980 Updated more default config values with unit tests. 2013-09-02 19:42:51 +10:00
Sebastiaan Janssen 173ac65eb5 Remove misleading comment as this has been moved out of the if statement 2013-09-02 11:41:13 +02:00
Sebastiaan Janssen 7c28e1aeba Fixed U4-2763 Content rollback generates duplicates 2013-09-02 10:56:42 +02:00
Shannon 6fd091b7a3 Added a lot more defaults to the config section + unit tests to test the default values. Removed the web services config: U4-2434 Remove webservices config section from umbracoSettings - then need to remove the webservices themselves. 2013-09-02 18:49:00 +10:00
Morten Christensen 969dece8fc Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-02 09:53:42 +02:00
Shannon 6bf0a255b6 updated case 2013-09-02 17:44:56 +10:00
Shannon b99c29b404 changing file name to change case 2013-09-02 17:44:41 +10:00
Shannon a99794c34c Fixed up a couple things based on code review 2013-09-02 17:43:56 +10:00
Shannon 0be1604163 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-02 16:37:02 +10:00
Shannon 5cd04b5c9e Got lots of the default values configured with unit tests, still need to finish the rest though. 2013-09-02 16:36:47 +10:00
Shannon 5989d19f7f Re-fixes the issue with using IDataValueSetter.SetValue on the DefaultData implementation and ensures that when there is a null value that it reverts to an empty string since this was what the default value was in the Value getter of DefaultData when there was no value. Have added a couple unit tests to support. 2013-09-02 13:27:48 +10:00
Shannon da1c33a034 Fixes unit test 2013-09-02 12:57:56 +10:00
Sebastiaan Janssen 2111a5e31e Fix MySQL install failing on UmbracoServer table 2013-09-01 17:28:22 +02:00
Sebastiaan Janssen 5478de911b Merge pull request #115 from stocksr/6.2.0
U4-516 - Fix DatePicker with time default value
2013-09-01 17:24:03 +02:00
Sebastiaan Janssen 7765acb130 Merge pull request #124 from AndyButland/wip-u4-2759
U4-2759 - member authorise attribute was not restricting for group
2013-09-01 17:23:53 +02:00
Sebastiaan Janssen a535a4c96f Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-01 17:21:32 +02:00
Sebastiaan Janssen c3ef39661b Fix MySQL install failing on UmbracoServer table 2013-09-01 17:21:19 +02:00
enkelmedia fdfb6187e9 Removing SVG from staticContent before addings it. 2013-09-01 16:51:00 +02:00
Sebastiaan Janssen e9b9fb15c1 Can't install starterkits message was always showing, even if install folder was present 2013-09-01 16:47:28 +02:00
Sebastiaan Janssen 3d4b54064f I love managing files in csproj files.. NOT. 2013-09-01 15:32:55 +02:00
Sebastiaan Janssen 14303fab0c File move didn't make it into the csproj file previously, leading to build errors. Fixed!
Also changed default PartialView template and added another Empty one
2013-09-01 15:05:17 +02:00
Sebastiaan Janssen 262ef8d305 Merge pull request #115 from stocksr/6.2.0
U4-516 - Fix DatePicker with time default value
2013-09-01 05:34:18 -07:00
Sebastiaan Janssen 6e6ac8a4d5 Merge pull request #124 from AndyButland/wip-u4-2759
U4-2759 - member authorise attribute was not restricting for group
2013-09-01 05:22:51 -07:00
enkelmedia 69830f28c2 Added SVG as static content so SVG-icons in the backoffice will be served by IIS 2013-09-01 14:05:54 +02:00
AndyButland a262f0b342 Fixed bug where member authorise attribute was not restricting for groups 2013-08-31 22:52:54 +01:00
Morten Christensen 5640daff32 Fixes U4-2752 ContentService.DeleteVersion and DeleteVersions fail
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
2013-08-31 19:19:25 +02:00
Morten Christensen a1cae3f286 Fixes U4-2731 Document.BeforeMove + Document.AfterMove Doesn't get fired.
Using the legacy Document and Media classes for the .Move and .Copy calls as they already use the new services under the hood, so shouldn't make any noticeable difference except that the legacy events will also work.

Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
2013-08-31 19:18:47 +02:00
Morten Christensen 20b4975cfb Creating a new Member/IMember and MemberType/IMemberType class under the Umbraco.Core.Model namespace in order to move away from the weird structure that we initially ported over.
Refactoring the MemberTypeRepository to use the new MemberType class.
Starting the implementation of ReadOnly DTOs for MemberType.
Starting the implementation of the factory for the MemberTypeReadOnlyDto.
2013-08-31 19:13:36 +02:00
Morten Christensen 757283a3ff Making explicit references to the legacy member class to avoid ambiguous references to the new member classes 2013-08-31 19:09:29 +02:00
Morten Christensen ea76c42c7b Updating Resolves_Assigned_Mappers test to reflect current number of mappers 2013-08-31 18:02:10 +02:00
Shannon d22dbb4654 Fixes U4-2734 Don't set the cache references to null when disposing the UmbracoContext 2013-08-31 11:11:25 +02:00
Shannon 7806762b80 Implemented a real .Net configuration section for umbracoSettings.config + unit tests for every property. NOTE: This isn't referenced in the codebase yet, going to start setting default values for most of the properties so that we can remove them from the config file for shipping (ship minimal config) then reference these settings in the codebase. 2013-08-31 11:28:19 +10:00
Morten Christensen 0196afa12a Correcting the update of the cmsContentVersion table so the UpdateDate is updated properly 2013-08-30 17:24:42 +02:00
Morten Christensen 5d5c25f0e4 Implemented new IMemberType, MemberTypeFactory, MemberFactory and MemberTypeMapper.
Started implementation of MemberTypeRepository.
2013-08-30 17:24:06 +02:00
perploug c7c3bb6183 Forgot to update the dashboard.release.config 2013-08-30 12:29:48 +02:00
Stephan 4d5a8298b0 U4-2549 - fix it differently 2013-08-30 12:22:58 +02:00
Stephan 9e2733ce69 U4-2549 - fix issue with last chance content finder
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj

Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2013-08-30 12:22:36 +02:00
perploug 6a480b9def Fixes the imageHelper image lookup so it works with and without tabs 2013-08-30 12:05:05 +02:00
Sebastiaan Janssen fbfdd8d398 Bump version number 2013-08-30 12:00:33 +02:00
Stephan 2552dffdad U4-2691 - fix issue with alt template and internal redirects 2013-08-30 11:59:28 +02:00
Sebastiaan Janssen 52540165f1 Creating a partial view now inherits from UmbracoTemplatePage (in 6.2.0 there will be 2 snippets, one for UmbracoViewPage<dynamic>, for MVC experts and one for UmbracoTemplatePage, the default). 2013-08-30 11:47:39 +02:00
perploug e921c670dd Another missing package file 2013-08-30 10:54:28 +02:00
Morten Christensen 09c9fb4e8f Fixes U4-2731 Document.BeforeMove + Document.AfterMove Doesn't get fired.
Using the legacy Document and Media classes for the .Move and .Copy calls as they already use the new services under the hood, so shouldn't make any noticeable difference except that the legacy events will also work.
2013-08-30 10:52:58 +02:00
Shannon 2b408df24c Fixes: U4-2727 PluginManager's TypeList can contain duplicates - updates the locks to be upgradeable read locks, changes over all lists/collecitons to be HashSet<T> this ensures no duplicates and also improves performance. 2013-08-30 10:51:06 +02:00
Morten Christensen d44318f589 Fixes U4-2752 ContentService.DeleteVersion and DeleteVersions fail 2013-08-30 10:50:43 +02:00
Shannon d559411187 Fixes U4-2300 6.1.0: Changing a template's parent causes tree to collapse 2013-08-30 10:45:13 +02:00
Sebastiaan Janssen 3a4a6579d3 Fixes: U4-2711 DAMP throws unknown exception on image upload with image cropper 2013-08-30 10:40:29 +02:00
perploug a057e9bcbd Missing file in vs csproj 2013-08-30 10:32:31 +02:00
perploug d004d529b7 New dashboard using angular 2013-08-30 10:17:46 +02:00
Morten Christensen 9112e2e626 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-08-30 09:43:11 +02:00
Shannon 9b56c7eab6 Fixes U4-2300 6.1.0: Changing a template's parent causes tree to collapse 2013-08-30 14:15:51 +10:00
Shannon f332e6530a Ensures the whole ancestry of view data is merged in with unit tests. 2013-08-30 12:50:39 +10:00
Shannon c228c24ba5 Creted MergeParentContextViewData filter, this is by default applied to SurfaceController's and the PartialViewMacroController. Now if you are rendering a partial view macro or a child action from a SurfaceController and are putting data into ViewData on a POST, you don't have to access the ViewData from the ParentViewContext. 2013-08-30 12:03:16 +10:00
Shannon 697aa03758 Fixes U4-1339 SurfaceController returning PartialView - cannot use ModelState - TempData merge correctly. 2013-08-30 11:34:02 +10:00
Stephan c62689450b Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2013-08-29 17:28:46 +02:00
Jeremy Pyne e65a71a05a Added code to pre-select the current node in content tree pickers based on the location of the document in the tree.
This is a HUGE time saver with an even moderately complex site hierarchy.
2013-08-29 11:14:51 -04:00
Jeremy Pyne 7a2a444579 Fix for select parent o move or copy in 6.1.3. 2013-08-29 11:14:35 -04:00
Jeremy Pyne e16ebecda4 Merge branch '6.1.3-clean' into select-parent-on-movecopy 2013-08-29 11:09:20 -04:00
Stephan 0ed4c1868b U4-2549 - fix it differently 2013-08-29 17:08:16 +02:00
Sebastiaan Janssen 2bdbd6c7d9 Updated controller, more flexible, moved UmbracoProperty to Umbraco.Web.Helpers 2013-08-29 16:12:50 +02:00
Sebastiaan Janssen 23517d0c36 Argh, starter kit is hardcoding a content type, so I have to register the new member type with a different Id 2013-08-29 16:10:23 +02:00
Sebastiaan Janssen 2238f81d83 Oops, accidentally killed creating a partial view from the backoffice as it's also using PartialViewTasks.cs (like when you create a partial view macro) 2013-08-29 16:09:23 +02:00
Morten Christensen 37ce5c7a22 Implementing subquery addon for PerformGetByQuery, which allows for better querying first level properties as well as the property collection on a member 2013-08-29 15:42:13 +02:00
Sebastiaan Janssen 4ef10c8afe Install a default member type during initial setup 2013-08-29 13:54:30 +02:00
Morten Christensen e5145f3eb0 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-08-29 12:51:43 +02:00
Shannon aa0fca5de9 Fixes small error with entityresouce, adds app based security to some of the entity controller methods, need to add diff sec checks to the other ones based on the type requested. 2013-08-29 20:15:08 +10:00
Shannon ac83fa781b Completed a backwards compatible radio button list property editor - re-uses all of the other already created list type editors. 2013-08-29 18:06:16 +10:00
Shannon 339ee11dc0 Completes U4-2744 Remove very old TinyMCE 2 and all that is related to it 2013-08-29 17:45:16 +10:00
Shannon 52700c0c18 Fixes: U4-2730 500 - PostSave 2013-08-29 17:26:18 +10:00
Shannon 72a90cb865 Completes: U4-2743 Remove legacy/un-used code from the namespace UmbracoExamine.* 2013-08-29 17:17:01 +10:00
Shannon 733b6aa945 Completes: U4-2742 Remove legacy xsltExtensions.config - xslt extensions are configured using attributes 2013-08-29 17:14:34 +10:00
Shannon cd7f737fa6 Removes remaining references to the restExtensions.config 2013-08-29 15:55:58 +10:00
Shannon 89324370b4 Completes U4-2415 Remove legacy RestExtensions and restExtensions.config 2013-08-29 15:50:48 +10:00
Shannon 63455f1555 Completes U4-2423 Remove legacy installation webforms classes 2013-08-29 15:36:23 +10:00
Shannon b8ff20073a Completed U4-2741 Removed un-used obsoleted code in namespace umbraco.presentation.cache 2013-08-29 15:23:43 +10:00
Shannon f7e7687f27 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/TypeFinder.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
2013-08-29 15:18:19 +10:00
Shannon c53c644868 Completes U4-2740 Remove un-used legacy classes from namespace "umbraco" 2013-08-29 15:14:12 +10:00
Shannon 244dcff8da Fixes: U4-1339 SurfaceController returning PartialView - cannot use ModelState ? 2013-08-29 14:51:30 +10:00
Shannon 2e747caa10 Fixes: U4-2727 PluginManager's TypeList can contain duplicates - updates the locks to be upgradeable read locks, changes over all lists/collecitons to be HashSet<T> this ensures no duplicates and also improves performance. 2013-08-29 13:33:01 +10:00
Shannon 93691f13df Fixes U4-2734 Don't set the cache references to null when disposing the UmbracoContext 2013-08-29 12:38:14 +10:00
Shannon 258d526435 Merge branch 'U4-2711-Fix-imagecropper-ToXMl' of https://github.com/stocksr/Umbraco-CMS into stocksr-U4-2711-Fix-imagecropper-ToXMl
Conflicts:
	src/umbraco.editorControls/imagecropper/DataTypeData.cs
2013-08-29 12:31:08 +10:00
Shannon 357dc6ec8e Fixes: U4-2711 DAMP throws unknown exception on image upload with image cropper 2013-08-29 12:27:49 +10:00
Shannon 232c81543a Fixes the rest of U4-2713 Property Editor Value Converters don't get applied to Umbraco.TypedMedia 2013-08-29 12:11:48 +10:00
Shannon 581f3a1893 Fixes build errors 2013-08-29 12:01:30 +10:00
Shannon 9fc3efd73a Fixes U4-2713 Property Editor Value Converters don't get applied to Umbraco.TypedMedia 2013-08-29 11:59:07 +10:00
Shannon 9445f008bc Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-08-29 10:09:09 +10:00
Shannon 36c281a19a updated ignore 2013-08-29 10:08:54 +10:00
perploug d6493a742d wip on the media picker cropper 2013-08-28 23:13:32 +02:00
perploug 4ebf44ed88 Fixes imageHelper prop lookup 2013-08-28 23:13:21 +02:00
Per Ploug Krogslund 74339f9a55 Started working on the media picker config 2013-08-28 21:30:31 +02:00
Per Ploug Krogslund c6211c2aab Latest docs on build, running and getting started 2013-08-28 21:30:30 +02:00
perploug 8a9f38f97c Adding GetByIds to mediaService.cs 2013-08-28 20:57:42 +02:00
Stephan 3fc4f36859 U4-2549 - fix issue with last chance content finder
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2013-08-28 18:16:20 +02:00
Sebastiaan Janssen 02566589fe Added admin permission for change doctype action to the OOB installer 2013-08-28 17:52:44 +02:00
Sebastiaan Janssen 49637e62fe Updated, more robust versions of the Member template/snippets 2013-08-28 17:52:06 +02:00
Morten Christensen 136673fd23 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-08-28 17:27:43 +02:00
Morten Christensen c7351dfad7 Adding additional methods to the MemberRepository to support various types of lookups/queries, and experimenting with adding dummy properties to the model so a strongly typed query can be translated using mappers.
GetByQuery needs to be refactored so the selection is done in a subquery, so we don't loose properties in the result set
2013-08-28 17:27:29 +02:00
Morten Christensen 575abc6abf Implementing the mapper for Member. Refactoring the MemberProfile, IMember and IMembershipUser interfaces 2013-08-28 15:24:22 +02:00
Morten Christensen 6f63369e11 Updating the Member and MemberProfile class to include the standard UmbracoEntity properties.
Refactoring the sql query and the dtos to use the PropertyType as Primary and Property as secondary as a Property might be empty for a defined type.
Adding labels to the conventional Member PropertyType aliases.
2013-08-28 14:17:16 +02:00
Darren Ferguson 1995b25092 Adding new Memership provider implementation
Obsolete SecUtility class
Add Security Helper class
2013-08-28 12:48:04 +01:00
Sebastiaan Janssen f26d759c84 Moved controllers and models as per Shannon's suggestion
Added LoginStatus and updated Register
Updated to use CDF instead of <script> tags
2013-08-28 13:36:04 +02:00
Shannon 2d0b7f0b3b Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-28 18:52:26 +10:00
Shannon 4b4fc037dd Fixes up pre-value formatted data so it doesn't include ID in the value since this confuses things. 2013-08-28 18:52:00 +10:00
perploug d9bb7ba7cb Removes the temp mediaupload ctrl 2013-08-28 10:05:27 +02:00
Shannon 68b337729b fixed sort order on prop editor drop down 2013-08-28 18:01:30 +10:00
Shannon 0ebe9ec0fa Updated some of the property editor API to ensure that when formatting data for persistence we have access to the pre-values as well since these might need to be used to format the persisted data. Completed the new property editor: Multiple text box and it is saving the data in a backwards compatible format. Changed the internal AsDictionary method of the pre value collection to be a public method called FormatAsDictionary. 2013-08-28 17:53:31 +10:00
Morten Christensen 3f0dc7f652 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-08-28 09:38:40 +02:00
Sebastiaan Janssen 8274883fa5 Bump version number to 6.2.0 2013-08-28 09:09:21 +02:00
Shannon bec36fd91b Fixes notifications if they dont' contain a body, so it doesn't contain a colon 2013-08-28 14:49:45 +10:00
Shannon 79ab84a793 Fixes some issues with pre-values with the previous changes made to include the IDs of the pre-values, needed to ensure they are formatted incoming/outgoing properly so the id isn't included. 2013-08-28 14:45:33 +10:00
Shannon cb368b4335 Implemented the numeric property editor 2013-08-28 13:30:05 +10:00
Shannon 008b5f0d2a Fixed build errors 2013-08-28 11:14:49 +10:00
Shannon d257835cb5 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Models/ContentTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
2013-08-28 11:08:23 +10:00
Shannon 2ed97fe957 small css change 2013-08-28 11:03:16 +10:00
Shannon 861d4fe14a fixes up some css styles with approved colors 2013-08-28 11:01:42 +10:00
Shannon dedaa2125d Fixes up a few issues found with media uploading 2013-08-28 10:45:50 +10:00
Shannon f03180e6f8 Fixes up security issues with MediaUploadController, removes Delete since we shouldn't be arbitrarily deleting any media files without referencing media items, fixes up disposables and naming conventions. 2013-08-28 10:15:43 +10:00
Shannon 0cb084b9d1 Removes images that shouldn't be checked in 2013-08-28 09:51:19 +10:00
Shannon bb6adcab92 Fixed up new actions in MediaController 2013-08-28 09:50:15 +10:00
Shannon 8fc127e195 Fixes up coding standards, null checks and strongly typed enums in EntityController 2013-08-28 09:34:48 +10:00
Sebastiaan Janssen 12b3d50717 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-08-27 19:29:43 +02:00
Sebastiaan Janssen 86276206d5 Add register member partial view macro template 2013-08-27 19:29:15 +02:00
Stephan da719377df U4-2691 - fix issue with alt template and internal redirects 2013-08-27 18:06:53 +02:00
Robert Stocks 614dc8f4d1 Fix U4-2711 add Null Check to ToXMl method
Fixes Object reference not set to an instance of an object. at
umbraco.editorControls.imagecropper.DataTypeData.ToXMl(XmlDocument data)
2013-08-27 16:10:04 +01:00
perploug 8b1fcf3e07 Media dialog upload and folder creation 2013-08-27 16:01:39 +02:00
Morten Christensen a3f41af3ba Updating the sql query in the MemberRepository 2013-08-27 15:50:17 +02:00
Morten Christensen 342232f21e Updating the Member class and adding an UmbracoMember wrapper as a bridge between MembershipUser and Member 2013-08-27 15:49:46 +02:00
Morten Christensen c3c9c10060 Implementing a factory for readonly Member objects 2013-08-27 15:48:58 +02:00
Morten Christensen 89fbad447b Adding propertytype alias conventions for Member 2013-08-27 15:48:18 +02:00
Morten Christensen 0aa38728fc Updating the readonly dtos 2013-08-27 15:48:00 +02:00
Robert Stocks 23e4003af0 U4-516 - Fix DatePicker with time default value
Enables the standard jQuery date picker to parse the current value of
the field correctly, this prevents it from defaulting to Today and
overwriting the currently stored value.
2013-08-27 12:04:20 +01:00
perploug 208453f364 Entity and backoffce controller updates for JS sergvices 2013-08-27 12:02:23 +02:00
Sebastiaan Janssen 53b6fb7b56 Add login template to partial view macros 2013-08-27 11:37:20 +02:00
Shannon 61aa102268 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-27 18:37:31 +10:00
Shannon 8863a9bb86 Got the color picker pre-values updated to dynamically display the color they are typing in. 2013-08-27 18:31:40 +10:00
perploug f25d1ec917 Fixes readonly validator issue 2013-08-27 10:07:48 +02:00
perploug d81ccecd10 Media service 2013-08-27 10:05:36 +02:00
perploug 6a1a478cdd start on improved cropper and media picker 2013-08-27 10:05:35 +02:00
perploug 0ec4e70a1b Added entity service overloads, 2013-08-27 10:05:34 +02:00
Anders Stentebjerg c03839d985 ImageCropper
- Media Picker grid
- Image Cropper dialog
- Updated Font Awsome to 3.2.1
2013-08-27 09:52:13 +02:00
Sebastiaan Janssen 6bbc2de43e Update failing unit test due to added action for changing the document type on a node 2013-08-27 09:37:00 +02:00
Shannon 76666a4c67 Lots more done on the multi-value property editors like drop down list, check box list, color picker in regards to the pre-value editor and ensuring correct validation is done on the server side including some unit tests. Also allows for updating values not just removing and adding. Now need to make a directive of it so we can customize more for the color picker. 2013-08-27 17:33:11 +10:00
Shannon e448436614 Color picker is working, added custom validation to the pre-values but need to get them working a bit better and showing the colors in the pre-val editor as well. Then also need to update the other list pre-value editors to be able to update values so we don't have to remove and re-add them. 2013-08-27 15:02:24 +10:00
Shannon 3e95b0468f Checkbox list property editor is now working. 2013-08-27 13:18:47 +10:00
Shannon 562a8f38bb Attempted to fix up validation for header but still jumps around and wont work with the label message because the H1 tag is block 2013-08-27 12:26:13 +10:00
DougMac 0218e39664 Fixes: U4-2060 Spell Checker Broke After Google Update 2013-08-26 22:50:53 +01:00
Sebastiaan Janssen 91590c824f Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-08-26 17:28:31 +02:00
Sebastiaan Janssen d17b2cf884 Added ability to have predefined templates for Partial View Macros 2013-08-26 17:28:15 +02:00
Morten Christensen aed017641d Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-08-26 17:01:05 +02:00
Morten Christensen 2b82e74b90 Adding test fixture for the MemberRepository 2013-08-26 17:00:12 +02:00
Morten Christensen 37d190c97d Implementing read-only DTOs for improved reading of Members from db.
Started implementation of Member, MemberType and MemberGroup repositories.
2013-08-26 16:59:41 +02:00
Morten Christensen f1818aae1b Updating the Profile and Member classes 2013-08-26 16:58:08 +02:00
Per Ploug Krogslund f40de60fc4 set default w/h on rte images 2013-08-26 15:17:27 +02:00
Per Ploug Krogslund f6fcc9d314 uncommented debugging code 2013-08-26 15:05:07 +02:00
perploug 1e3d505df1 Serverside js loader 2013-08-26 15:04:02 +02:00
Per Ploug Krogslund 840d425502 Missing spans 2013-08-26 15:03:31 +02:00
Per Ploug Krogslund b86f2474d5 missing files 2013-08-26 14:48:58 +02:00
Per Ploug Krogslund 266840cfdb Adding jquery file upload and modal tweaks 2013-08-26 14:48:58 +02:00
Sebastiaan Janssen ee4312b7f2 U4-2464 Single user protection, password not changeable! 2013-08-26 13:56:22 +02:00
Sebastiaan Janssen 2345a5e133 U4-2477 Member editing - Indicate which box is active and which is inactive 2013-08-26 13:45:09 +02:00
Sebastiaan Janssen cbe8f15007 U4-2636 Allow at root property are outside of view in backoffice 2013-08-26 12:11:07 +02:00
Shannon 86a82a666f Got all drop down editors working: normal, multiple, normal publishing keys, multiple publishing keys and should be backwards compatible. 2013-08-26 19:00:04 +10:00
Sebastiaan Janssen dd59038369 Fixes U4-2686 Error when trying to delete member group with ampersand in name. 2013-08-26 10:29:30 +02:00
Shannon a6f70619eb Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-26 18:04:06 +10:00
Per Ploug Krogslund cec3518347 Markdowneditor package files merge 2013-08-26 10:03:55 +02:00
Shannon 3708b0de65 Got value editors being able to handle 'object' not just string so we can post and return json structures directly to the angular editors, got the multiple drop down list working and saving data. U4-2704 Change property editor value editor to return/receive object instead of string 2013-08-26 18:03:35 +10:00
Per Ploug Krogslund 1553b66943 Merge 2013-08-26 10:02:35 +02:00
Per Ploug Krogslund a2a6e899ec merge branch ahead 2013-08-26 09:58:49 +02:00
Per Ploug Krogslund d2cfb83817 Remove old headline 2013-08-26 09:57:17 +02:00
Shannon 5b289a4971 Implemented much more for the new drop down property editors to ensure backwards compatibility, had to implement a new required method for property editors to format their data for cache storage. Changed how the drop down angular list is generated, now it uses a dictionary which is much more elegant with less code. Got drop down (normal) and drop down publishing keys working and saving the correct data types, nearly have drop down list multiple working but going to change the property editors to be able to post object (json) instead of just a string for values. 2013-08-26 17:24:08 +10:00
Shannon 5844c54a1f Fixed build error 2013-08-26 11:28:15 +10:00
Shannon 2157942b38 Adds GetAllUsers to the UserService and converts the call in the UserController (and removes the need for User model mapper as we just use auto-mapper now). U4-2720 Add a get all users method to the UserService 2013-08-26 11:26:58 +10:00
Sebastiaan Janssen c9942d7ca5 Merge pull request #106 from pynej/code-mirror-search
Added plugin to all code area editors to suppressed normal browser Find ...
2013-08-25 08:37:08 -07:00
Sebastiaan Janssen ab8e6b8f33 Merge branch 'wip-dragdrop2' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-dragdrop2 2013-08-25 17:26:08 +02:00
Sebastiaan Janssen d21f10ec1e Db migration to allow admins to change the document type 2013-08-25 17:14:01 +02:00
Sebastiaan Janssen 76d0ffb797 Merge branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
2013-08-25 15:50:07 +02:00
Sebastiaan Janssen 6437179a83 Merge pull request #112 from dampee/6.1.3
U4-2638 Developer/Packages/Install Starterkit give 500 server error
2013-08-25 05:36:49 -07:00
Sebastiaan Janssen f26280fff6 Merge branch '7.0.0' of github.com:umbraco/Umbraco-CMS into 7.0.0 2013-08-23 16:54:34 +02:00
Sebastiaan Janssen 120f707c67 Fixes a unit test 2013-08-23 16:53:15 +02:00
Sebastiaan Janssen cc45bbeca6 Fix unit tests that failed because UmbracoSettings.config was being cleaned up 2013-08-23 16:22:26 +02:00
perploug 1b0bffbe04 Changing karma log back to info level 2013-08-23 15:51:10 +02:00
perploug bbc04c23b4 Missing imageHelper rename 2013-08-23 15:49:43 +02:00
perploug a7754c7e8c image helper rename 2013-08-23 15:43:23 +02:00
perploug 0b116b8082 Missed a delete on the sample 2013-08-23 15:40:46 +02:00
perploug fe7d61ef37 The completed markdown sample 2013-08-23 15:40:20 +02:00
Per Ploug Krogslund 1d60cdb2bc Property editor tutorials 2013-08-23 15:26:00 +02:00
Per Ploug Krogslund 7763550a89 Renames umbImageHelper to imageHelper 2013-08-23 15:26:00 +02:00
perploug 13afb127f4 Whoops, broke build, now fixed 2013-08-23 14:19:16 +02:00
Sebastiaan Janssen 8cd9266ea6 Updated obsolete msg after feedback here: https://github.com/umbraco/Umbraco-CMS/commit/2b532f72c34a33e2966b1fb5c7f068564e518c91#commitcomment-3899011 2013-08-23 14:17:40 +02:00
Per Ploug Krogslund c77f17962e Add more documentation on property editors 2013-08-23 14:08:23 +02:00
Sebastiaan Janssen ad44feb6dd Don't throw exception when node has no template and asking for GetTemplateAlias (return string.Empty instead) 2013-08-23 14:08:13 +02:00
Sebastiaan Janssen 16ed85ecc9 Merge branch '4.11.10' into 6.2.0
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/GlobalSettings.cs
2013-08-23 13:48:38 +02:00
Sebastiaan Janssen 9d45b10ee5 Merge pull request #104 from umbraco/6.0.7
6.0.7
2013-08-23 04:46:41 -07:00
Sebastiaan Janssen e9f8cf25b9 Merge branch '6.0.0-PetaPocoExtension' into 6.2.0
Conflicts:
	.hgignore
2013-08-23 13:42:26 +02:00
perploug b916de4cf7 git broekN 2013-08-23 13:01:14 +02:00
perploug b850cd68a1 csproj file updates 2013-08-23 12:22:37 +02:00
Sebastiaan Janssen 19a3b8809e Merge branch '4.11.9' into 6.2.0
Conflicts:
	.hgtags
2013-08-23 12:18:25 +02:00
Sebastiaan Janssen 96e40b8b4f Merge pull request #101 from umbraco/4.11.8
Closing branch 4.11.9 as that version number was used for the emergency ...
2013-08-23 03:17:46 -07:00
Sebastiaan Janssen 53aeb59eb4 Merge pull request #100 from umbraco/6.0.5
Closing branch 6.0.5 as that version number was used for the emergency s...
2013-08-23 03:17:29 -07:00
Sebastiaan Janssen befb42cd68 Merge pull request #99 from umbraco/4.11.7---cmsContentXml-fixes
Close 4.11.7 - cmsContentXml fixes branch
2013-08-23 03:17:06 -07:00
Sebastiaan Janssen 15bab05e18 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-08-23 12:15:37 +02:00
Sebastiaan Janssen 7d2e408363 Merge branch '4.11.5' into 6.2.0
Conflicts:
	.hgtags
2013-08-23 12:15:28 +02:00
Sebastiaan Janssen c1cc62543d Merge pull request #97 from umbraco/6.1.0-public
Close 6.1.0-public branch, merged.
2013-08-23 03:13:19 -07:00
Sebastiaan Janssen 6d61c93f62 Merge pull request #96 from umbraco/6.0.0-LegacyApi-Refactor
Close 6.0.0-LegacyApi-Refactor branch
2013-08-23 03:12:29 -07:00
Sebastiaan Janssen 38c8860e92 Merge pull request #95 from umbraco/6.0.0-Repository-Resolvers-refactor
Closing branch after having merged the changes to events to the main 6.0...
2013-08-23 03:12:08 -07:00
Sebastiaan Janssen 4719bfb4ad Merge pull request #94 from umbraco/4.10.1
Close 4.10.1 branch
2013-08-23 03:11:49 -07:00
perploug f52bf5f4a4 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-23 12:10:56 +02:00
perploug c076d21151 New users.resource 2013-08-23 12:10:44 +02:00
Sebastiaan Janssen b5719ab103 Merge pull request #93 from umbraco/4.6.1
Closing branch
2013-08-23 03:10:24 -07:00
perploug eb60593815 Fxies the headline directive to actually work 2013-08-23 12:10:16 +02:00
Sebastiaan Janssen c82573a697 Merge pull request #92 from umbraco/4.7.1
Closing branch
2013-08-23 03:10:03 -07:00
Sebastiaan Janssen 6448554343 Merge pull request #91 from umbraco/4.7.2
Closing branch
2013-08-23 03:09:40 -07:00
Sebastiaan Janssen c0b9e803d9 Merge pull request #90 from umbraco/4.8-apptreexml-wip
Closing branch
2013-08-23 03:08:55 -07:00
Sebastiaan Janssen ab06a22272 Merge pull request #89 from umbraco/4.8-tinymce-wip
Closing old branch
2013-08-23 03:08:31 -07:00
Sebastiaan Janssen eac56eba47 Merge pull request #88 from umbraco/4.8-solutioncleanup-wip
Close 4.8-solutioncleanup-wip branch
2013-08-23 03:07:25 -07:00
Sebastiaan Janssen 0e822bdc81 Merge pull request #87 from umbraco/4.6.0
Closing branch
2013-08-23 02:52:25 -07:00
Shannon b1f3e8d8ef Drop down list seems to be working with pre-values :) 2013-08-23 18:38:33 +10:00
Shannon fbaaf7a6cb Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-23 18:10:49 +10:00
Shannon 59a8e03c79 Got further with pre-value editors and strongly typed stuff, got the pre-value editor for drop down list working and saving array objects. Now need to wire that up to the editor but think i need to change how the drop down list displays it's values. 2013-08-23 18:10:32 +10:00
Sebastiaan Janssen 1e76cf67d3 Fix merge problem 2013-08-23 08:57:02 +02:00
perploug 3835b50a44 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-23 08:31:57 +02:00
perploug 66684bc6f5 Tried writing assets and keyboard tests, both failed :( 2013-08-23 08:31:47 +02:00
Shannon fff8eac43f Implemented: U4-2692 Add attribute access to property editor prevalues 2013-08-23 15:33:52 +10:00
Shannon ec4f6de631 Fixes: U4-2701 The media creation process needs to be optimized, there's far too much IO occuring 2013-08-23 13:41:16 +10:00
Shannon 3bb61294e9 Ensures all IDisposables are in a using clause for all processes involved with the media uploader, there were also a few streams not being closed or disposed either!
U4-2699 The media upload process doesn't dispose all resources
2013-08-23 11:46:55 +10:00
Shannon c477da95fd Ensures all IDisposables are in a using clause for all processes involved with the media uploader, there were also a few streams not being closed or disposed either! 2013-08-23 11:20:00 +10:00
perploug 258b5ee2dd Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-22 14:46:51 +02:00
perploug baaecedac2 Finetuning html adding prevalue editors 2013-08-22 14:46:43 +02:00
Sebastiaan Janssen 61149f8112 Merge branch '6.1.4'
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/install/steps/database.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
	src/umbraco.editorControls/mediapicker/mediaChooser.cs
2013-08-22 14:46:11 +02:00
Sebastiaan Janssen adb059e0da Revert U4-2511 Locallink:NODEID not working as it was breaking expectations of people running site without this fix 2013-08-22 13:13:32 +02:00
Morten Christensen 4337976887 Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4 2013-08-22 12:59:08 +02:00
Morten Christensen efe5de87a6 Updating readme for nuget packages 2013-08-22 12:58:53 +02:00
Shannon ad4ebe3755 Updated a lot more of the pre-values stuff and the data type editor, updated lots more of the dropdown property editor and now have serialized/deserialized values working for pre-values. Now just need to finish off the pre-value field for the drop down list. 2013-08-22 18:38:57 +10:00
Shannon 6127cfccbd Fixed up the umbPropEditorHelper to ensure that the correct path is returned for views (because we can have relative views specified too). Moved angularhelper to it's own file, started on the DropDown property editor in c#. 2013-08-22 16:37:21 +10:00
Shannon e463faa943 Got the template drop down working with the dropdown property editor which allows some config. 2013-08-22 15:48:32 +10:00
Shannon 49dc33c713 Fixes up the content editor js, updates some docs to reflect correct naming conventions. 2013-08-22 13:03:12 +10:00
perploug d24b349073 last tweaks to the app.js 2013-08-21 22:20:08 +02:00
perploug 789b0d1c41 Moved 1.1.5 to folder, added 1.2Rc1 2013-08-21 21:13:23 +02:00
perploug 6264e6f15d added 1.2 upgrade note 2013-08-21 21:12:24 +02:00
perploug 6cee33a1fc $location.search will stop working with null 2013-08-21 21:11:54 +02:00
perploug d181a39343 Added 1.2 references to app.js and dev.app.js 2013-08-21 21:11:15 +02:00
perploug 16c67bd435 Added seperate test watcher in gruntfile 2013-08-21 21:10:33 +02:00
perploug d1d84e8be6 Delete old angular files 2013-08-21 21:09:55 +02:00
Sebastiaan Janssen 389642946e Merge pull request #85 from rolfis/patch-1
Update sv.xml
2013-08-21 09:03:37 -07:00
rolfis 53d30aa3cb Update sv.xml
Changed {0} to %0% in login screen bottomText to display correct end year of copyright notice.
2013-08-21 16:55:53 +02:00
perploug f9e6efbf8f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-21 14:57:24 +02:00
perploug e2ddaff401 start on migration to 1.2 2013-08-21 14:57:14 +02:00
Per Ploug Krogslund 5bd1b4bef3 Angular 1.2 files 2013-08-21 14:54:11 +02:00
perploug b0e78e5b92 Adds wrapper html to navigation for better css 2013-08-21 14:25:24 +02:00
perploug 5cd7fc128a CloseDialogs() ignores clicks inside the #navigation 2013-08-21 14:25:09 +02:00
perploug 35538d0fa2 Makes the grid work in chrome, ff, and ie10 2013-08-21 14:24:42 +02:00
perploug fc87a91e14 Adds a delay to the navigation hide 2013-08-21 14:24:29 +02:00
perploug 50845c63a8 Makes the grunt engine faster and only acts on specific files 2013-08-21 14:24:16 +02:00
perploug 4e1c915781 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-21 13:10:16 +02:00
perploug a75cfc5a2d legacy dashboard url fix 2013-08-21 13:10:05 +02:00
Per Ploug Krogslund 3c55ccb590 loader.js 2013-08-21 13:08:52 +02:00
Per Ploug Krogslund 39ae3f6160 Fixes firefox height scale issues 2013-08-21 13:08:52 +02:00
perploug 1cff6d99ef Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-21 10:35:06 +02:00
perploug e18a07e908 Unlocks the login button, failed attempt to test the keyboard service reverted 2013-08-21 10:34:53 +02:00
Shannon ed68f2d28f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-21 17:55:31 +10:00
Shannon 5581af2d25 Fixed up the file uploading and the readonly property editors and saving/updating their data/control based on the data changed on the server side.
U4-2680 Fix file uploading
2013-08-21 17:54:30 +10:00
perploug 6c9f4c6353 Removes missing files from web.ui csproj 2013-08-21 09:32:50 +02:00
Shannon 466b2a1cb2 Fixes: U4-2677 Fix content/media creation for media 2013-08-21 14:13:22 +10:00
Shannon 0dab52e8f6 Fixes creating content: U4-2677 Fix content/media creation - now to fix media 2013-08-21 13:38:49 +10:00
Shannon b2eac9ab8f Merge remote-tracking branch 'origin/6.1.4' into 7.0.0
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/BusinessLogic/BaseTest.cs
2013-08-21 11:36:37 +10:00
Shannon e233cffb9d Changes the cache keys in PluginManager to reference a const to make it a bit more clear. 2013-08-21 11:19:27 +10:00
Shannon 9e58ebed24 Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4 2013-08-21 11:14:59 +10:00
Shannon f51c4e332e Fixes: U4-2653 BeginUmbracoForm should use absolute path with query string URLs without the protocol 2013-08-21 11:14:37 +10:00
Sebastiaan Janssen 8cfb39ba2b Fix a strange VS2012 build targets problem 2013-08-20 18:08:34 +02:00
Sebastiaan Janssen 03a0a0a0e9 Fix a strange VS2012 build targets problem 2013-08-20 18:06:09 +02:00
Sebastiaan Janssen 0939a31c84 Merge branch '7.0.0' of github.com:umbraco/Umbraco-CMS into 7.0.0 2013-08-20 16:43:59 +02:00
Sebastiaan Janssen 9b70c0fbbf Fix wrong path and don't include index.html in build 2013-08-20 16:43:36 +02:00
perploug 121d5462e9 Missing $scope in content edit controller 2013-08-20 16:07:46 +02:00
perploug d09b1d9949 7.0.0 merge changed .cs from shannon 2013-08-20 15:26:53 +02:00
perploug 5c59269340 Fixes broken scope reference for rebinder 2013-08-20 15:22:30 +02:00
perploug ff5afb91e6 Set a default avatar on navivation 2013-08-20 15:22:06 +02:00
perploug 3b7f12c883 set content to default section in the routes 2013-08-20 15:21:27 +02:00
perploug dd7e4f19ba Removed keyboard service debug logging 2013-08-20 15:21:12 +02:00
perploug 2e90e354bc Fixes dashboard redirect on login 2013-08-20 15:20:46 +02:00
Sebastiaan Janssen e71fa681e6 Update build to v7 and include belle files 2013-08-20 14:18:02 +02:00
Shannon 7df641cf2b Got Data Type Creation working. Need to look at fixing up the issues with creating content/media tomorrow. 2013-08-20 18:10:19 +10:00
Shannon b901ae3269 Updated the data type controller post method and moved validation, etc... over to a filter, updated data type tree with the create menu action to launch into a blank element. 2013-08-20 17:25:17 +10:00
Shannon ddef2cc7ff Got validation working properly with pre-values, updated the content editing helper to be more generic and work with different editors like the data type editor that supports umb-property. 2013-08-20 16:02:10 +10:00
Shannon 949748a7f7 Added some overloads to the data type service to be able to save data types + pre-values in one transaction, and also to be able to update pre-values (before we could only insert). Got the data type editor now validating and saving values back to the db. Updated the content views (content/media) to have a correct form structure with ng-submit working. 2013-08-20 14:44:59 +10:00
Shannon ea8d7c842e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-20 11:33:56 +10:00
Shannon a29706b5ce Updated the model mappers to include the pre-value value which is now wired up to the display, now just need to get the data type's persisting. 2013-08-20 11:33:41 +10:00
Sebastiaan Janssen dcb381770f Fix unit test that was looking at the wrong filename 2013-08-19 12:54:20 +02:00
dampee fb03de37ce U4-2638 Developer/Packages/Install Starterkit give 500 server error 2013-08-19 12:51:13 +02:00
Sebastiaan Janssen 65db0e69a9 Fixes: U4-2642 Make SQL CE more resilient to server crashes 2013-08-19 12:26:01 +02:00
Sebastiaan Janssen 23c6a91e9c Fixes merge issue 2013-08-19 11:47:53 +02:00
Sebastiaan Janssen a03c6dcf13 Merge pull request #80 from ThomasSkyldahl/6.1.4
UmbracoViewPage.WriteLiteral(object value)  optimized memory usage and combined markup injection
2013-08-19 02:34:13 -07:00
Sebastiaan Janssen 3029d97f33 Merge pull request #78 from dprothero/6.1.4
Fixed membership provider to correctly log failed attempts.
2013-08-19 02:06:15 -07:00
Sebastiaan Janssen f41d967864 Fixes: U4-2637 Error adding a User using AD Membership Provider when no Email Address Defined 2013-08-19 10:41:49 +02:00
perploug ab2be923ff Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-19 10:06:46 +02:00
perploug b357989f18 Keyboard service test WIP 2013-08-19 10:06:32 +02:00
Shannon e783b35a3a Updated the data type controller to return the correct data for the editor, including more models and model mappings. 2013-08-19 17:39:50 +10:00
Shannon 78e836025b Fixes EntityController to have a correct model mapper and removes invalidly named 'map' method. Removes the key from entity since we don't need it. Added some notes to the controller since we have to implement security for the results. 2013-08-19 16:49:07 +10:00
Shannon 024511a605 got data type editor dynamically loading pre-vals when the drop down changes, got the mock services to save the data. 2013-08-19 12:37:04 +10:00
DougMac 7e645f9a6a Fixes: U4-2060 Spell Checker Broke After Google Update
The Google spell check at https://www.google.com/tbproxy/spell no longer
works. This updates to a newer Google Api (again undocumented)
2013-08-17 10:50:26 +01:00
perploug bcf49c440a Fix create dialog paths 2013-08-16 15:42:10 +02:00
perploug 5ff32b5c11 Fx url list 2013-08-16 15:41:59 +02:00
perploug c85ca2b65b Fix content picker url listing 2013-08-16 15:41:50 +02:00
perploug 05dea9707b Fix login css glitch 2013-08-16 15:41:38 +02:00
perploug 2b0e32cdcf Linking tree header to dashboard 2013-08-16 15:41:27 +02:00
perploug 55e74eba39 Fixing the folder uploader for media section 2013-08-16 15:41:13 +02:00
perploug ce7c4833f4 merge 2013-08-16 13:30:51 +02:00
perploug a82c367db8 merge content/edit.html 2013-08-16 13:29:23 +02:00
perploug 6df9a912f0 Adds keyboard.service for hotkeys, final contentpicker 2013-08-16 13:13:46 +02:00
Thomas Skyldahl Sørensen 4a481b05d4 Optimized WriteLiteral 2013-08-16 10:09:09 +02:00
Shannon ddccc378d5 Started getting the creation process working for data types, created custom mock data type trees and menu's to get it all up and running but is still in progress. Will finish that on Monday along with dynamically changing the pre-value editors based on the drop down changing. 2013-08-16 17:25:52 +10:00
Shannon 7c1687710b re-deleted the 'property editors' folder in the UI project since there should be no space. Fixed up more of the pre-value definitions and tests. Got an initial demo working of pre-value editors in the mock data 2013-08-16 16:15:08 +10:00
Shannon 315652e384 Got the data type editor drop down working properly, implemented structure for pre-value editor including the manifest 2013-08-16 13:33:43 +10:00
Shannon 66c6b5b524 Fixes: U4-2632 Remove the recursive permissions check on the move/copy dialog 2013-08-16 12:46:40 +10:00
Shannon e3b0f71549 Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4 2013-08-16 12:25:55 +10:00
Shannon 973b466798 Fixes: U4-2627 Ensure that the plugins cache files are named with the machine name 2013-08-16 12:25:38 +10:00
Shandem fa0eef4333 Merge pull request #79 from sniffdk/6.1.4
Moved WriteLiteral method to UmbracoViewPage
2013-08-15 19:12:54 -07:00
Shannon 3fc44d9a34 Streamlined more of the validation directives, fixed up the regex val directive with the pre-value changes got validation working properly with the data type editor, finally on track with validation! 2013-08-16 11:29:59 +10:00
Mads Krohn a343a76a26 Moved WriteLiteral method to UmbracoViewPage
When we use a custom model through a custom controller, in our view, we
inherit from UmbracoViewPage, so the WriteLiteral method, which provides
preview badge and miniprofiler code, should be placed there.
2013-08-16 00:01:31 +02:00
Shannon 6c46aa4727 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-15 19:20:26 +10:00
Shannon f2f1106034 Started on data type editor 2013-08-15 19:20:06 +10:00
Morten Christensen d0a9e3236e Promise for the changed unit test was incorrect, so correcting it in this commit 2013-08-15 10:26:24 +02:00
Morten Christensen b899805ec9 Correcting issue introduced in d3b69e04e1 where the returned IProfile would contain the Username and not the Name. This will have changed the Creator and Writer name in the xml cache to be the Login instead of the Name of the user, so for those that use these fields its important to republish to update the xml cache.
Fixes U4-2628 creatorName and writerName should use username - not loginname. Also verified through file history back to v4.
2013-08-15 10:08:59 +02:00
perploug 15fc3a3665 content picker 2013-08-15 09:47:12 +02:00
Shannon 2153dc2f56 Getting data type (pre-value) editor going (WIP) 2013-08-15 17:27:31 +10:00
Shannon 8fbbd3d8a0 Fixes issue with invalid cookie 2013-08-15 17:14:05 +10:00
Shannon bedd938553 fixes issue with legacy data types and new-prevalues 2013-08-15 13:29:35 +10:00
Shannon b3defcb007 fixes merge issues 2013-08-15 13:05:09 +10:00
Shannon 89ce60ef0f Merge remote-tracking branch 'origin/6.1.4' into 7.0.0
Conflicts:
	src/Umbraco.Core/Events/RecycleBinEventArgs.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/SimilarNodeNameComparer.cs
	src/Umbraco.Web.UI/config/ExamineIndex.config
	src/Umbraco.Web/Strategies/DeleteFilesAfterEmptiedRecycleBin.cs
	src/Umbraco.Web/Umbraco.Web.csproj
2013-08-15 12:59:05 +10:00
Shannon 66cdd90994 fixes up legacy trees with the correct alias and forces legacy root nodes to load the dashboard route. 2013-08-15 12:57:56 +10:00
Shannon 3b749073d7 updated ignore to ignore these new strange merge files for routes.js 2013-08-15 12:47:56 +10:00
Shannon d4f8cb4e41 remove un-needed files 2013-08-15 12:40:16 +10:00
Shannon bb36477207 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
	src/Umbraco.Web.UI.Client/src/routes.js
2013-08-15 12:36:35 +10:00
Shannon c61206d03f Changed routes to have section + tree 2013-08-15 12:34:22 +10:00
Shannon 59d40c4127 fixed build error 2013-08-15 10:34:32 +10:00
perploug 523434a126 Fixes broken content model test 2013-08-14 21:45:09 +02:00
Per Ploug Krogslund 8b71b6bf70 broken routes 2013-08-14 21:44:26 +02:00
Morten Christensen 766497e355 Refactoring QueryHelper to be a base class instead.
Fix U4-2607 Creating nodes with special characters causes YSOD
2013-08-14 17:07:21 +02:00
Morten Christensen 67a2a9cfe4 Refactoring the optimized Recycle Bin, so that the Recycle Bin's repository is more independent and easier to use with the new events added to the Content- and MediaService. 2013-08-14 16:12:13 +02:00
Per Ploug Krogslund f13d5c48fe Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/routes.js
2013-08-14 14:30:23 +02:00
Per Ploug Krogslund 99d41ca63a added ace editor directive 2013-08-14 14:28:17 +02:00
Per Ploug Krogslund 8a32753cbc Replaced codemirror lib with ace 2013-08-14 14:26:40 +02:00
Shannon 4a8026c902 Got the Date and Date/Time new property editors created, fixed up a few date casting issues with data. These editors 'should' be compatible with the previous legacy date/datetime editors, just need to test it. 2013-08-14 20:08:45 +10:00
Shannon 3e675ff2cc Converted over pre-value config to be a dictionary, not an array. To do that I needed to create a new PreValueCollection object which encapsulates support for legacy (array based) pre-vals which get converted to a dictionary and newer dictionary pre-vals... which we will now require because we'll support pre-value overrides eventually. Fixed up the mapper unit tests and added other unit tests. 2013-08-14 19:24:20 +10:00
Shannon 6d3008b053 Fixed up some more validation issues with the reshuffling of how properties are rendered. 2013-08-14 17:52:16 +10:00
Shannon c3619d9ac5 Fixes plugin mgr to not resolve types that shouldn't be resolved. Fixes mntp legacy editor to not throw exceptions when initializing because the legacy tree no longer exists. Fixes authentication when an invalid cookie is detected. 2013-08-14 13:38:28 +10:00
Shannon 4a7fbfa3fa Fixes the datepicker control, updates it so that it supports time and a format that is configurable (pre-values) fixes toIsoDateTimeString() method. 2013-08-14 11:08:40 +10:00
Shannon 599caeb933 removed test examine settings 2013-08-14 10:08:59 +10:00
dprothero 766ba0c8f5 Fixed membership provider to correctly log failed attempts. 2013-08-13 13:46:32 -07:00
Morten Christensen ca71c59880 Fixes U4-2218 Document Type copy looses property tab assignment 2013-08-13 17:41:35 +02:00
Morten Christensen 6c87cf729a Fixes U4-2592 Cannot delete a node when the node has just a closing bracket in the name. 2013-08-13 11:27:39 +02:00
Shannon 5c63afa31a removed my test examine settings 2013-08-13 18:26:32 +10:00
Shannon fa88768c91 removed my test examine settings 2013-08-13 18:25:39 +10:00
Shannon d7fd1efd60 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0
Conflicts:
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Tests/Models/ContentExtensionsTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
2013-08-13 18:22:45 +10:00
Shannon 4e13b0afe6 Converted the DataType tree to the new tree structure, now need to start creating the pre-value editor. Obsoleted IDataType and a bunch of other things associated with IDataType. Obsoleted old tree classes that we've replaced so far. 2013-08-13 18:19:56 +10:00
Shannon 2e2229e388 Created a sortable directive to share the markup between content and media and got media sorting done too. 2013-08-13 17:48:56 +10:00
Shannon bfabfd9fa5 Updated to latest Examine version (contains bug fix for U4-2180 Problem with Examine MultiIndexSearcher after upgrading from 4.11.3 to 4.11.8) and removes the partially trusted callers attribute from the PDF lib because itextsharp by default doesn't support med trust. 2013-08-13 15:41:40 +10:00
Shannon aa1c411c8c Fixes U4-2618 PDF indexer does not ensure spaces are added to textual content and fixes med trust compat relating to U4-2180 Problem with Examine MultiIndexSearcher after upgrading from 4.11.3 to 4.11.8 2013-08-13 13:47:57 +10:00
Shannon 4a778ac1d3 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
2013-08-13 11:36:36 +10:00
Shannon 642c4d10fe Fixes date picker value that is posted 2013-08-13 11:34:27 +10:00
Shannon c52c452b36 Fixes issue relating to the fix for U4-2589 where we need to clear the published db flag for previous versions when creating a new published version. 2013-08-13 11:01:49 +10:00
perploug 9c38670dde Nicer modal animations, fixes rte bug 2013-08-12 22:23:06 +02:00
Morten Christensen 86811fe507 Fixes U4-2397 IContent Properties added with incorrect Value when read from Cache, and adds unit test for verifying types saved and returned for 24 standard DataTypes. 2013-08-12 16:20:32 +02:00
perploug 5a435523ed merge 2013-08-12 15:26:31 +02:00
perploug e825c08901 Added events.Service and xmlhelper.service 2013-08-12 15:17:34 +02:00
perploug 3e3f12bf63 Added events.Service and xmlhelper.service 2013-08-12 15:06:12 +02:00
Morten Christensen 363de53b82 Updates query to limit results in subquery for MySql according to U4-2329 Browsing Media Slow in 6.1.1 2013-08-12 12:42:21 +02:00
Shannon 50aa9d7144 Adds more functionality to prop editors to be able to flag the value editor as readonly so no bound values will be persisted (ie. for the label property editor) 2013-08-12 18:09:16 +10:00
Shannon c3e773b598 Wires up release and expire dates to be persisted, template is wired up but need to get the picker rendering. 2013-08-12 16:45:00 +10:00
Shannon 8525468312 Get the generic property tab rendering properly with a url list as well. 2013-08-12 15:57:54 +10:00
Shannon 1e2af42ce6 Ensures internal generic properties are all wired up in c# and fixes up the boolean editor, adds templatepicker html file so that something is rendered and there are no js errors. 2013-08-12 14:16:45 +10:00
Shannon afe1023e19 Fixes EntityController to accept multiple query string values, adds null checks to the parameter and to null (not found entities). 2013-08-12 11:53:50 +10:00
Shannon 31d6575746 removes space in 'property editors' 2013-08-12 11:41:33 +10:00
Shannon ecb7a1cda2 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 2013-08-12 11:36:40 +10:00
Shannon c7f8a65a43 removes the space from 'property editors' folder, removes file commits to App_Plugins in the UI proj. 2013-08-12 11:36:11 +10:00
Shandem 958fb66f2c Merge pull request #73 from florisrobbemont/6.1.3
U4-2596: UmbracoControllerFactory method ReleaseController should be virtual
2013-08-11 18:13:06 -07:00
Morten Christensen 30e12c1367 Final piece to the puzzle for U4-2571 Need to optimize empty recycle bin. Needed to hack around the ordering of items in the recycle bin because of the self-referencing constraint - parentID to id in the umbracoNode table by updating all parentID entries, which bypasses any reference issues with the foreignkey. 2013-08-11 21:12:02 +02:00
Per Ploug Krogslund 930bca4a2b start on new property editors 2013-08-10 20:04:17 +02:00
Morten Christensen 89ff7d85e2 Correcting DELETE FROM query so it works with sql ce as well. 2013-08-09 17:44:57 +02:00
Per Ploug Krogslund 369b0b74c0 updated docs 2013-08-09 16:25:05 +02:00
Per Ploug Krogslund f777fdc843 Added mntp changes 2013-08-09 15:36:36 +02:00
Per Ploug Krogslund ebaf353e4a Content picker full api and test coverage 2013-08-09 15:24:43 +02:00
Per Ploug b3f1c7fa1e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-09 13:40:18 +02:00
Per Ploug 6abb98d9c3 Added entityController 2013-08-09 13:40:09 +02:00
Per Ploug Krogslund 23459719f6 Added entityResource + entity mocks 2013-08-09 13:39:07 +02:00
Shannon 4241916d14 Started adding more permissions checks for media 2013-08-09 18:18:32 +10:00
Shannon f518076ab8 Added permissions check to sort on content controller 2013-08-09 18:13:05 +10:00
Shannon 437f2dc588 Added more security checks to the content controller 2013-08-09 18:04:44 +10:00
Shannon b8df64742c Fixes up the permissions attribute and tests... was accidentally storing persisted data in the attribute. 2013-08-09 17:27:02 +10:00
Shannon 0a3cdfbd40 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-09 16:53:33 +10:00
Shannon f04d5f43e0 Fixed media editor (to be the same as content). Implemented media permissions check when retreiving node. 2013-08-09 16:53:20 +10:00
Per Ploug Krogslund 8f37925aef adds a pre tag to render the raw model to the editor, this can be toggled in main.ctrl 2013-08-09 08:46:31 +02:00
Shannon 49f3c9e4b2 Adds more code and tests for permissions checks 2013-08-09 16:39:09 +10:00
Shannon 4bb71273e2 doh, re-publicized EntityPermissions... caused test errors. 2013-08-09 16:00:09 +10:00
Shannon 88e9c9c522 Fixes up tests for content permissions repository with permissions repo change. 2013-08-09 15:58:49 +10:00
Shannon 4267b88f77 Changed the PermissionsRepository to be more like the RecycleBinRepository in that it is stand alone and just gets created by other repos that need it (instead of being inhertied from). Added more methods for querying permissions and added these methods to the user service/repository. Converted one of the webapi permission check filters to use the new api. 2013-08-09 15:26:34 +10:00
Shannon df0cb49728 Fixed up the server validator 2013-08-09 13:54:48 +10:00
Shannon 3169b52bf4 Updates more of WebSecurity to use the new user api. 2013-08-09 13:45:57 +10:00
Shannon 0228d745f9 Fixes recursive lock on cache providers 2013-08-09 13:41:45 +10:00
Shannon a1b6917c10 Changes the port back to what it should be 2013-08-09 13:39:17 +10:00
Shannon c5a80ccb03 Changed WebSecurity to expose IUser instead of User, then fixed up the knock-on effect, obsoleted all calls to the legacy User object in the base classes to point to use the WebSecurity class to access the new user object. 2013-08-09 13:24:26 +10:00
Shannon f5c4aad270 Added overload to User object to be created from an IUser object. Added GetUserSections to IUserService. 2013-08-09 13:23:27 +10:00
Shannon 8d4c8ab10e Adds more tests for caching 2013-08-09 12:24:29 +10:00
Shannon f4bd10065e Fixes up some v7 failing tests. 2013-08-09 12:10:42 +10:00
Shannon 01510ce126 Fixes up the tests with changes to cache helper 2013-08-09 11:42:20 +10:00
Shannon 75ceb539b4 Streamlines cache helper ctor's 2013-08-09 11:37:57 +10:00
Shannon 4d55122cd4 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 2013-08-09 11:18:32 +10:00
Shannon cc5912f7e1 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2013-08-09 11:17:38 +10:00
Shannon b62d5125d5 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-08-09 11:16:34 +10:00
Shannon 6522193118 Simplifies the caching interfaces and updates the CacheHelper to expose the different caching levels (obsoletes it's normal methods) 2013-08-09 11:16:10 +10:00
Shannon 61fbf2cfc6 reverts PersistDeletedItem transaction because i forgot that the Commit() method of the UOW already takes care of the transaction. 2013-08-09 10:52:24 +10:00
Shannon ce847e97a8 Updates the PetaPocoRepositoryBase to ensure that the deletion process is wrapped in a transaction so if any of the processes fail, it all gets rolled back. 2013-08-09 10:07:03 +10:00
Shannon 1e61563f79 Ensures the deletions are wrapped in a transaction - for performance and to mitigate db corruption if one of the deletes fails. 2013-08-09 10:01:28 +10:00
Per Ploug Krogslund 2ef0b1d56e Fixes dialog closing too fast 2013-08-08 16:01:21 +02:00
Per Ploug Krogslund 3d39fa8f03 Boolean type change 2013-08-08 15:40:13 +02:00
Per Ploug 155873cb43 Changes Request.properties contentItem lookup
Content by id failed due to key not found exception
2013-08-08 15:39:32 +02:00
Morten Christensen b4f9985695 Last bits to implement U4-2571 Need to optimize empty recycle bin 2013-08-08 15:12:26 +02:00
Per Ploug Krogslund 0578d30711 Mocked generic properties, removes the tab filter again 2013-08-08 14:05:57 +02:00
Per Ploug Krogslund 2222e1356e Changes the property editor to use model again 2013-08-08 13:48:02 +02:00
Shannon 8fea9530b5 Simplified the base cache provider, no generics, these will be taken care of by extensions 2013-08-08 20:25:26 +10:00
Shannon 8c55946b1b Worked on the application cache, added request cache, changed some stuff over to be interfaces, added unit tests suite (need mroe) to test all caching providers. 2013-08-08 19:46:58 +10:00
Morten Christensen 82f19ede8c Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4 2013-08-08 10:22:38 +02:00
Shannon a72512da72 Changed the outgoing date/time format to the base content controller 2013-08-08 16:31:55 +10:00
Shannon 66595a53c1 Fixes issue with saving to filter out the extra custom generic tab properties before submitting. Removes date filter because we aren't dealing with JS date objects from the server, only strings which are always formatted consistently. 2013-08-08 16:10:05 +10:00
Shannon 8d8d62c3bc Fixed most of the remaining issues with validation 2013-08-08 15:13:03 +10:00
Shannon 918366ef25 Fixes up issues with the refactoring of how properties are being rendered, fixes up the validation bits and pieces and unit tests. Adds a new validatable property in the mock data so that validation actually occurs. 2013-08-08 14:51:23 +10:00
Shannon 0fbc32a87f Fixes up logic for creating new versions (U4-2589 Save and Publish is not creating version of document) 2013-08-08 10:42:06 +10:00
Jeremy Pyne f3e8359e36 Added plugin to all code area editors to suppressed normal browser Find function with internal code mirror functions. This is needed for search to work on long documents and also adds more advanced regex search and replace options including:
Ctrl-F / Cmd-F
Start searching
Ctrl-G / Cmd-G
Find next
Shift-Ctrl-G / Shift-Cmd-G
Find previous
Shift-Ctrl-F / Cmd-Option-F
Replace
Shift-Ctrl-R / Shift-Cmd-Option-F
Replace all

Demo: http://codemirror.net/demo/search.html
2013-08-07 16:08:40 -04:00
Floris Robbemont dc2de4b5e7 U4-2596: UmbracoControllerFactory method ReleaseController should be virtual 2013-08-07 15:06:41 +02:00
Per Ploug 2ca894f605 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-07 13:48:21 +02:00
Per Ploug 55385d6374 Removes hardcoded reference to shannons users dir from sln file 2013-08-07 13:48:12 +02:00
Per Ploug Krogslund 8ddaee9e00 basic indent on content editor 2013-08-07 13:45:55 +02:00
Per Ploug Krogslund 5cd197ffe0 Merg listview.controller.js 2013-08-07 13:41:07 +02:00
Per Ploug Krogslund aeedcae088 Moved additional docs to tutorial section 2013-08-07 13:36:22 +02:00
Shannon cbc841301b Got more of the sorting stuff working, started implementing much of the back office security checks in the content controller, updates some of the c# unit tests and got a self-hosted test running (but commented out currently until we can mock things properly). 2013-08-07 19:28:32 +10:00
Shannon d01f3a1012 Got the sort dialog posting the correct data and displaying a success message. Updated the alerts.less to not have a txt shadow as it looks pretty bad with the colors we have. 2013-08-07 15:42:28 +10:00
Shannon 371bf785b0 Changed to jquery 2.0.3, added a few jquery ui bits and pieces, got the sort dialog working with an angular-ui sortable directive and styled it. 2013-08-07 14:25:30 +10:00
Shannon c3737018e0 Fixes overflow on dialogs when there too much content, fixes date format for content mocks. 2013-08-07 12:27:50 +10:00
Shannon 91a2ffcf1d removes js files we aren't using, if we need them later we can add them back. 2013-08-07 12:26:49 +10:00
Shannon 7125231e43 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0
Conflicts:
	src/umbraco.sln
2013-08-07 11:54:12 +10:00
Shannon 5fce741940 another sln update 2013-08-07 11:53:09 +10:00
Shannon 14e4a8061c removes the vs profiling files from the sln. 2013-08-07 11:49:48 +10:00
Shannon 1b9f071581 Fixes: U4-2589 Save and Publish is not creating version of document and adds a few unit tests 2013-08-07 11:39:25 +10:00
Shannon 65d7e04049 fix up merge errors 2013-08-07 10:34:51 +10:00
Shannon 0a26eccd2d Merge remote-tracking branch 'origin/6.1.4' into 7.0.0
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
	src/Umbraco.Core/Security/UserData.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
	src/umbraco.sln
2013-08-07 10:29:34 +10:00
Morten Christensen 79141ef86d Initial work on U4-2571 Need to optimize empty recycle bin 2013-08-06 15:08:05 +02:00
Shannon 66fc7e91dd Got the GetChildren wired up to the back end, updated the sort and list view controls to use the new resource with promises, updated unit tests to support. 2013-08-06 18:42:36 +10:00
Sebastiaan Janssen 08609a887c Merge branch '6.1.4' of github.com:umbraco/Umbraco-CMS into 6.1.4 2013-08-06 10:24:42 +02:00
Sebastiaan Janssen b11932240c Fixes U4-2587 Regression: Hide Preview Button on nodes that have no template
Now also checks if the template still exists and if it's allowed on that document to determine when to enable the preview button
2013-08-06 10:24:20 +02:00
Shannon ec0e5107ea Ensures all controller names are consistent. 2013-08-06 14:24:30 +10:00
Shannon 94a67d12ef Got content/media thumbnails rendering properly even with old legacy ones (file based). 2013-08-06 14:15:35 +10:00
Shannon 801e2dea7b Removes tree icon filters and just ensures the data is formatted on retrieval, this is much better for performance and just makes a lot more sense. 2013-08-06 13:24:49 +10:00
Shannon d47b4517c1 Fixes unit tests 2013-08-06 13:06:25 +10:00
Morten Christensen 226a13c6e1 Minor adjustment related to U4-2560 Working with ContentService can give 2 versions of a document as "newest" 2013-08-05 14:30:03 +02:00
Per Ploug Krogslund 319da4816a replaces scriptLoader references with assetsService 2013-08-05 14:16:04 +02:00
Per Ploug Krogslund 31aa7a4ff9 Re-adds event bubble to tree, renames scriptLoader to assetsService
adds docs for assetsService.loadcss and .loadjs
2013-08-05 14:16:04 +02:00
Shannon 968e6224c7 Changed over the content/media type mappers to be auto-mapper based 2013-08-05 19:29:47 +10:00
Shannon ab594db5fc Got the media tree converted to new tree structure. 2013-08-05 19:22:00 +10:00
Shannon 603e698621 Fixes issue with ensuring the correct section is assigned to each menu item 2013-08-05 18:48:01 +10:00
Shannon 4b996ac693 Got the legacy refresh action working (should work for all trees) 2013-08-05 18:27:05 +10:00
Shannon 4b7345bfbd Ensures auth proceeds for /base request too 2013-08-05 16:20:39 +10:00
Shannon 8aa547123f Fixes deleting, ensures it is moved to the recycle bin when necessary or deleted permanently if already in there and fixes finding a node even if the Ids are of a different clr type 2013-08-05 16:13:27 +10:00
Shannon c40084c625 updates the forms auth stuff to be more inline with how v6 operates. Cookie is always stored for 1 day and we need to ensure that https and httponly is checked. 2013-08-05 15:39:18 +10:00
Shannon d78a03a610 Massively improves performance for the packaging service (converting docs to XML) which is used in republishing the tree. 2013-08-05 13:11:47 +10:00
Shannon b7a1123319 U4-2579 BulkPublishController causes YSOD when there are invalid child elements due to InvalidProperties having a null reference 2013-08-02 16:23:32 +10:00
Shannon 7e9cad34db Creates an SQL Server version check for bulk sql imports. 2013-08-02 16:01:54 +10:00
Shannon c4b44ea0e3 Fixes: U4-2577 Can't save umbraco user - without re-filling in the password
Fixes: U4-541 Wrong dictionary key when using in backend template names
This changes the way that the value that is stored in the auth cookie. Previously we just stored a GUID which was the user's contextid stored in the db, now we store encrypted values of a few necessary user objects. In 6.2 we'll actually set a real .Net user object on the HttpContext. For now, the http module will simply just ensure that the culture is set correctly for the currently logged in user.
2013-08-02 15:16:04 +10:00
Sebastiaan Janssen 3435a75e9e U4-2553 Double tabs when installing package that makes use of Dictionary Items to translate document types
Forgto to commit a file :)
2013-08-01 14:39:22 +02:00
Sebastiaan Janssen bdb6c5768a U4-2553 Double tabs when installing package that makes use of Dictionary Items to translate document types
Added GetRawCaptionById method for the packager so the generated XML is correct
2013-08-01 13:40:23 +02:00
Shannon 62aafc6606 Lots of work on trees and menus. Got delete and empty recycle bin working as well as refresh (first menu action). 2013-08-01 18:35:55 +10:00
Shannon 2ebf6d09c6 Gets delete and empty recycle bin working, adds unit tests for tree service, ensures that the recycle bin shows children whenever something is deleted (though, i now realize i need to refresh the recycle bin node and expand it when something is deleted). Renames some namespaces for content/media/etc... controllers and makes the file names more readable. 2013-08-01 14:51:35 +10:00
Shannon f63988639f Updates content tree class heirarchy, updates all IActions to have the correct icon in c# and udpates the icon mapping 2013-08-01 12:20:28 +10:00
Sebastiaan Janssen 87a3c53e22 Merge branch '6.1.4' of github.com:umbraco/Umbraco-CMS into 6.1.4 2013-07-31 18:31:56 +02:00
Sebastiaan Janssen 898d25f3cb Include lang files in project so they'll actually end up in the final build 2013-07-31 18:31:39 +02:00
Shannon 60b40b09ff fixes tree item option showing 2013-07-31 19:25:06 +10:00
Shannon 813750b0a9 Fixes merge issues 2013-07-31 19:14:02 +10:00
Shannon 66c2157bea Merge remote-tracking branch 'origin/6.1.4' into 7.0.0
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/MediaController.cs
	src/Umbraco.Web/Install/UmbracoInstallAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoApiController.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
2013-07-31 18:52:14 +10:00
Shannon 4e24016052 adds a region 2013-07-31 18:32:14 +10:00
Shannon d8630a3ec1 Fixes cast issue 2013-07-31 18:28:18 +10:00
Shannon dcf730a1bc ensures the ui cultures are set in the back office. adds WebSecurity as a dependency for UmbracoContext. 2013-07-31 18:21:27 +10:00
Shannon 9bc3fdd555 Makes UmbracoContext disposable and fixes the module's DisposeHttpContextItems to actual perform the disposal of each item. 2013-07-31 17:34:42 +10:00
Shannon cbda86fe92 Fixes build error, streamlines all calls to validate a user for base controllers. 2013-07-31 17:24:36 +10:00
Shannon 6f464567bb Implements real FormsAuthentication for back office cookie authentication... finally :) 2013-07-31 17:08:56 +10:00
Shannon b48f0f52e0 updates uri extensions + tests
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
2013-07-31 17:08:10 +10:00
Shannon b9cb3de167 updates uri extensions + tests 2013-07-31 17:06:45 +10:00
Shannon e2eeafcbfc Fixes: U4-2232 UmbracoAuthorizeAttribute breaks Relfection methods - ensures that no singleton instances are passed into attributes since they only ever get created once, meaning we're left with a stale version in the attribute. 2013-07-31 16:45:11 +10:00
Shannon 53a0041c6e Implemented logout 2013-07-31 11:12:18 +10:00
Shannon ad697db42b Fixes an issue with WebSecurity logout 2013-07-31 11:10:33 +10:00
Shannon 2f80aee165 Fixes an issue with WebSecurity logout 2013-07-31 11:09:30 +10:00
Shannon 5987d6fa13 Implemented logout functionality in the mocks proj 2013-07-31 11:01:02 +10:00
Shannon 6b9bf8d952 Updates login screen with validation and messaging 2013-07-30 21:46:07 +10:00
Shannon 217bcaf625 Added the permissions checks in the new content tree including start node rendering 2013-07-30 15:30:04 +10:00
Shannon 2d38938d86 Added native events to base tree class so they will all have them. 2013-07-30 14:23:39 +10:00
Shannon 2bbc610550 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-07-30 13:29:21 +10:00
Shannon b3b2b5b9ee Implemented much more of the new tree api structure. Have converted most of the content tree over to use it. 2013-07-30 13:29:05 +10:00
Shannon 9bb31e9456 Merge branch '6.1.4-cmsContentXml_Optimizations' into 6.1.4 2013-07-29 17:45:48 +10:00
Shannon a195d33332 Added another benchmark for removing/re-inserting records for cmsContentXml table using one transaction which again improves performance. Now have changed the rebuild xml method in the content service to : Lookup all data that it needs to insert first, then we begin a transaction and inside of the one transaction we clear the data and re-insert it so if anything fails in this process it should be rolled back. 2013-07-29 17:45:05 +10:00
Shannon 82a87cbd92 Doh, missed file 2013-07-29 16:46:30 +10:00
Shannon 5b26436862 Removes all references to the legacy Document.RepublishAll and replaces it's logic with the correct logic. 2013-07-29 16:45:54 +10:00
Shannon eed61f9053 Adds unit test for U4-2556 to ensure that it is solved. 2013-07-29 16:42:53 +10:00
Shannon 55c68485e9 Changed the logic of the GetByPublishedVersion to only return from cache if the cache item is published. 2013-07-29 16:03:37 +10:00
Shannon b9ba350a2f Updated the RebuildXmlStructures method with performance improvements. Added cache checking to the GetByPublishedVersion method since published content should always be 'latest' this will speed things up tremendously if items are found there. Added 2 more performance tests which show very large perf improvements, namely the Get_All_Published_Content_Of_Type shows a 77% improvement. 2013-07-29 15:49:56 +10:00
Shannon 696306e7c9 Implements the bulk insert procedure for re-populating the cmsContentXml tables, removes the need to rebuild all xml structures when sorting if in LB environments 2013-07-29 13:25:02 +10:00
Per Ploug Krogslund 9592c44849 Fixed what the merge before broke 2013-07-28 01:05:56 +02:00
Per Ploug Krogslund f9f54b3ee7 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/services/util.service.js
	src/Umbraco.Web.UI.Client/src/routes.js
2013-07-28 01:01:50 +02:00
Per Ploug Krogslund 0877a69a3e Removed trailing space from ngdoc declaration 2013-07-28 00:41:28 +02:00
Per Ploug Krogslund 82a756dbb5 Added directives, filters and resources to doc generation 2013-07-28 00:39:13 +02:00
Per Ploug Krogslund a21a6c440a Adds manual tabs to the header tab collection 2013-07-27 23:21:32 +02:00
Sebastiaan Janssen 9bf86aff09 Merge branch '6.1.4' of github.com:umbraco/Umbraco-CMS into 6.1.4 2013-07-26 15:17:20 +02:00
Sebastiaan Janssen f50de5b049 U4-2550 Could not load file or assembly 'HtmlAgilityPack, Version=1.4.5.0 2013-07-26 15:16:55 +02:00
Sebastiaan Janssen d734ba6136 U4-2543 In the back office its possible to get Response Validation errors 2013-07-26 12:43:19 +02:00
Morten Christensen c49becea53 Cleanup of unused using statements in a few files 2013-07-26 12:35:40 +02:00
Shannon 614aea203d Merge remote-tracking branch 'origin/6.1.4' into 6.1.4-cmsContentXml_Optimizations 2013-07-26 18:14:13 +10:00
Shannon ed88bbf75f Fixed up BaseDatabaseFactoryTests so that it only loads in one db factory with the correct conn strings, now we can easily override to use a custom db. Added benchmark tests for bulk inserting records for the cmsContentXml table which shows how we can improve performance quite a bit especially for larger node sets. Added more unit tests for bulk inserting and fixed it up a bit more. 2013-07-26 18:13:56 +10:00
Sebastiaan Janssen e41d3c7e84 Increase version to 6.1.4 2013-07-25 11:59:37 +02:00
Sebastiaan Janssen a099af39c2 xmlrpcnet was missing from nuspecs 2013-07-25 11:50:56 +02:00
Shannon bf1f78e3aa Finished content and media model mapping using AutoMapper and now the tabs display composite properties correctly. 2013-07-25 16:08:18 +10:00
Shannon 4b8fed9f06 Started converting content model mapping over to use AutoMapper to fix the composite tabs/properties. New unit tests for the mapping as well. 2013-07-25 15:31:26 +10:00
Shannon 118f9b02e2 Fixes: U4-1027 Media Sort Usability -> changed the sorting to use Web API instead of asmx web service. 2013-07-25 12:29:41 +10:00
Sebastiaan Janssen 38778cc7c7 Fixes U4-2488 Edit datatype: Media Picker appears incorrectly 2013-07-24 14:52:25 +02:00
Shannon 7d6736907f adds correct messaging for when publishing fails even after validation might fail 2013-07-24 14:59:49 +10:00
Shannon 500d25fd5a Merge remote-tracking branch 'origin/6.1.3' into 7.0.0
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
2013-07-24 13:10:43 +10:00
Shannon ffff9efaa8 Fixes: U4-2535 The actions/publish.aspx page does not publish correctly and show the correct publish result 2013-07-24 13:06:25 +10:00
Shannon 7f4abb4893 Fixed editContent.aspx to let the business logic handle the property validation when trying to publish and show the correct status message result (if it was not publishable). Adds the invalid properties collection to the PublishStatus so those can be shown too. 2013-07-24 12:54:10 +10:00
Shannon 4d39ce1202 Fixes Allow At Root styling 2013-07-24 11:44:26 +10:00
Shannon 7164f23a98 Fixes up validation styling and the validation summary close button display. 2013-07-24 11:31:31 +10:00
Shannon 8b2d1b8eab Fixed Template model class to not have it's own NodePath property which was always null since it wasn't mapped (and there was no point in it). 2013-07-24 10:11:05 +10:00
Shannon 80394f08fb Fixed runtime cache provider issues & unit tests. 2013-07-24 09:36:01 +10:00
Sebastiaan Janssen ca1fe5ff2a Unit test for: U4-2514 Checkboxlist prevalues in packages broken 2013-07-23 16:13:20 +02:00
Sebastiaan Janssen a1037ce43c Fixes U4-2187 - Enable support for MySQL on Linux 2013-07-23 15:38:26 +02:00
Sebastiaan Janssen 89622998e0 Merge pull request #34 from luckyrat/6.0.7
Fixes U4-2187 - Enable support for MySQL on Linux
2013-07-23 06:24:42 -07:00
Sebastiaan Janssen 2cd2f3741d Merge branch '6.1.2' of https://github.com/stevetemple/Umbraco-CMS into stevetemple-6.1.3 2013-07-23 15:20:28 +02:00
Sebastiaan Janssen e634dba4ea 2nd attempt: U4-2514 Checkboxlist prevalues in packages broken 2013-07-23 13:16:18 +02:00
Shannon 5dc43e99fa Got media controllers working just like content, have tried to share as much code as possible between them. Can probably do a bit better but there's minimal code replication. 2013-07-23 18:55:31 +10:00
Shannon e7ed08b260 Fixes auto fill props when multiple files. 2013-07-23 18:03:35 +10:00
Shannon d1eb8fd9eb Obsoletes UmbracoFile with new UmbracoMediaFile in the Core assembly and wraps the legacy class to use the new one. Improves performance of UmbracoMediaFile by ensuring any IO is lazy loaded and then saved to a local property so it doesn't need to re-read the file for things like length/size.
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
2013-07-23 17:59:44 +10:00
Shannon 4dbec9264f obsoletes all of the old "DataType" classes since they won't be used anymore. 2013-07-23 17:53:56 +10:00
Shannon a1206b25b7 Adds media service events to fill in all of the image properties in the uploadField property editor... at least this logic isn't completely hacked into the FileHandlerData anymore! 2013-07-23 17:51:37 +10:00
Shannon 739a6c47a4 Obsoletes UmbracoFile with new UmbracoMediaFile in the Core assembly and wraps the legacy class to use the new one. Improves performance of UmbracoMediaFile by ensuring any IO is lazy loaded and then saved to a local property so it doesn't need to re-read the file for things like length/size. 2013-07-23 17:49:54 +10:00
Shannon 53891a69af Fixed up the media uploader property editor so that it doesn't store any json, this leaves it as fully backwards compatible with 6.x < but also still allows us to upload multiple images if we want. 2013-07-23 16:43:08 +10:00
Shannon 5aeac564cb Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 2013-07-23 14:01:55 +10:00
Shannon dadb98176d starts fixing up upload prop editor to be the same as the 6.x < one so that it is 100% compatible 2013-07-23 14:01:41 +10:00
Shannon 2e91c89c02 Fixes null check for changes to RuntimeCacheProvider 2013-07-23 14:00:52 +10:00
Shannon d9deae39ef fixed merge issue 2013-07-23 13:46:59 +10:00
Shannon 4df80eb976 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0
Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
2013-07-23 13:41:42 +10:00
Shannon d657f2c3cb Gets the back office routing to /umbraco again. 2013-07-23 13:33:37 +10:00
Shannon 8be54ba0cc Fixes: U4-1970 v6 API - need to implement caching for templates since we're doing a db lookup on a front-end request. This is a temporary fix until we implement the ApplicationCache properly but it still works by utilizing the existing RuntimeCacheProvider singleton. I've tweaked this provider as well to ensure we use the HttpRuntime.Cache when it is available (during a web session). We don't want to have a seperate caching bucket so that IIS can manage cache memory properly. Have ensured that the template cache is cleared when templates are updated/removed. 2013-07-23 11:46:18 +10:00
Shannon 3da7682415 reverted change for U4-2514 as this change will cause other unwanted problems. Added logging for DefaultDataKeyValue instead of blindly swallowing an exception. 2013-07-23 10:50:48 +10:00
Sebastiaan Janssen 775892ff5a U4-2514 Checkboxlist prevalues in packages broken 2013-07-22 16:23:16 +02:00
Sebastiaan Janssen f30b4c8184 Slight refactor of UmbracoFile 2013-07-22 13:55:10 +02:00
Sebastiaan Janssen 319ba5c791 U4-2524 If tinyMCEImageHelper.DoResize fails, the src gets removed from the img tag 2013-07-22 13:51:13 +02:00
Sebastiaan Janssen 398bc6d767 Fix merge issue 2013-07-22 12:15:54 +02:00
Sebastiaan Janssen 5d3ef8d97f Merge branch '6.1.3' of https://github.com/Myster/Umbraco-CMS into Myster-6.1.3
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
2013-07-22 12:09:41 +02:00
Sebastiaan Janssen 08a300fbe5 U4-2370 Style sheet property sorting broken 2013-07-22 10:47:01 +02:00
Shannon b565a3468b Moves larger util classes to their own files, fixes up the notification service to ensure notifications go away properly. 2013-07-22 18:40:02 +10:00
Shannon feb1892e9e Gets notification msgs on the server side to be displayed. Fixes property existence checking... was checking on id before but that is incorrect, needs to be on alias since a new property id is gen'd on each save and we're not re-wiring them back up. Fixes YSOD messaging for content as well. Changes the ModelState to modelState to be consistent in js. 2013-07-22 18:16:50 +10:00
Shannon ae2ed17050 missing files. 2013-07-22 17:13:56 +10:00
Shannon b9d0bca1b6 Fixed up validation messages when we are not redirecting, fixed up how we re-bind the content values to make sure we only set the values if they have been changed by the server and added unit tests for that. Added more properties to our display model including a new INotificationModel to put localized notifications in. 2013-07-22 17:13:38 +10:00
Sebastiaan Janssen 845770c4bb Merge pull request #69 from abryukhov/patch-2
tinyMCE internal language pack - RU
2013-07-22 00:05:22 -07:00
Sebastiaan Janssen 771dc10c85 Merge pull request #68 from abryukhov/patch-3
tinyMCE internal language pack - RU
2013-07-22 00:04:23 -07:00
Sebastiaan Janssen 2ac76202e5 Merge pull request #67 from abryukhov/patch-4
tinyMCE internal language pack - RU
2013-07-22 00:04:11 -07:00
Sebastiaan Janssen a5ecbe96e2 Merge pull request #66 from abryukhov/patch-5
tinyMCE internal language pack - RU
2013-07-22 00:04:03 -07:00
Sebastiaan Janssen 7240b22e48 Merge pull request #65 from abryukhov/patch-6
tinyMCE internal language pack - RU
2013-07-22 00:03:51 -07:00
Sebastiaan Janssen 1f00589cb4 Merge pull request #64 from abryukhov/patch-7
tinyMCE internal language pack - RU
2013-07-22 00:03:33 -07:00
Sebastiaan Janssen 60b14487a9 Merge pull request #63 from abryukhov/patch-8
tinyMCE internal language pack - RU
2013-07-22 00:03:24 -07:00
Sebastiaan Janssen 33bc85a843 Merge pull request #62 from abryukhov/patch-9
tinyMCE internal language pack - RU
2013-07-22 00:03:14 -07:00
Sebastiaan Janssen e6642674d4 Merge pull request #61 from abryukhov/patch-10
tinyMCE internal language pack - RU
2013-07-22 00:03:01 -07:00
Sebastiaan Janssen 8ad5fb3c44 Merge pull request #60 from abryukhov/patch-11
tinyMCE internal language pack - RU
2013-07-22 00:02:50 -07:00
Sebastiaan Janssen 1752d14c57 Merge pull request #59 from abryukhov/patch-12
tinyMCE internal language pack - RU
2013-07-22 00:02:40 -07:00
Sebastiaan Janssen ec4ccba1a7 Merge pull request #58 from abryukhov/patch-13
tinyMCE internal language pack - RU
2013-07-22 00:02:32 -07:00
Sebastiaan Janssen 0244492a89 Merge pull request #57 from abryukhov/patch-14
tinyMCE internal language pack - RU
2013-07-22 00:02:22 -07:00
Sebastiaan Janssen 546cf2c84d Merge pull request #56 from abryukhov/patch-15
tinyMCE internal language pack - RU
2013-07-22 00:02:14 -07:00
Sebastiaan Janssen d354dde774 Merge pull request #55 from abryukhov/patch-16
tinyMCE internal language pack - RU
2013-07-22 00:02:03 -07:00
Sebastiaan Janssen 22c9e9acd9 Merge pull request #54 from abryukhov/patch-17
tinyMCE internal language pack - RU
2013-07-22 00:01:47 -07:00
Shannon 8b7bbed1b5 Implemented YSOD overlay when an unhandled server exception is thrown, this also ensures only when debug=true in the web.config which is injected into the server vars. 2013-07-22 15:18:10 +10:00
Alexander Bryukhov 5dd14723e9 tinyMCE internal language pack - RU 2013-07-22 10:29:12 +07:00
Alexander Bryukhov 7134e80c44 tinyMCE internal language pack - RU 2013-07-22 10:27:31 +07:00
Alexander Bryukhov f7196ee8f9 tinyMCE internal language pack - RU 2013-07-22 10:26:47 +07:00
Alexander Bryukhov fdecd697b7 tinyMCE internal language pack - RU 2013-07-22 10:26:04 +07:00
Alexander Bryukhov 6c03dac869 tinyMCE internal language pack - RU 2013-07-22 10:25:18 +07:00
Alexander Bryukhov 6cdb564a9f tinyMCE internal language pack - RU 2013-07-22 10:24:31 +07:00
Alexander Bryukhov 0da8a8db36 tinyMCE internal language pack - RU 2013-07-22 10:23:51 +07:00
Alexander Bryukhov a4a9620889 tinyMCE internal language pack - RU 2013-07-22 10:22:46 +07:00
Alexander Bryukhov 2307424fb6 tinyMCE internal language pack - RU 2013-07-22 10:22:01 +07:00
Alexander Bryukhov ca124fb662 tinyMCE internal language pack - RU 2013-07-22 10:21:16 +07:00
Alexander Bryukhov 6787252f9b tinyMCE internal language pack - RU 2013-07-22 10:20:36 +07:00
Alexander Bryukhov ef3094f8d9 tinyMCE internal language pack - RU 2013-07-22 10:19:51 +07:00
Alexander Bryukhov a2a20133aa tinyMCE internal language pack - RU 2013-07-22 10:18:38 +07:00
Alexander Bryukhov bb750d186a tinyMCE internal language pack - RU 2013-07-22 10:17:56 +07:00
Alexander Bryukhov f2a7dde5ce tinyMCE internal language pack - RU 2013-07-22 10:16:00 +07:00
Alexander Bryukhov 73e2559a13 tinyMCE internal language pack - RU 2013-07-22 10:14:48 +07:00
Shannon 80f8a9d01c Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-22 12:44:06 +10:00
Shannon 6f9883d373 Fixes MNTP required validation (U4-1975) 2013-07-22 12:30:12 +10:00
Shannon 41c920a4ec Updated to latest CDF version which contains some fixes. 2013-07-22 11:29:32 +10:00
Per Ploug Krogslund 9421ae054f Removes security.service
Merges into user.service, moves the umbraco.security module into
umbraco.services, instead of in the root module, we could consider
doing that for umbraco.resources as well.
2013-07-21 22:14:05 +02:00
Sebastiaan Janssen 1f79b71738 Merge branch '6.1.3' of github.com:umbraco/Umbraco-CMS into 6.1.3 2013-07-19 15:59:09 +02:00
Sebastiaan Janssen 64fb588556 defaultDocumentTypeProperty is no longer case-sensitive. Added to the Release config as well so it makes it into the umbraco downloadable package. 2013-07-19 15:41:29 +02:00
Sebastiaan Janssen 90cfd004cb Merge branch 'wip-u4-1949' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-1949 2013-07-19 15:41:15 +02:00
Sebastiaan Janssen b5494546c7 defaultDocumentTypeProperty is no longer case-sensitive. Added to the Release config as well so it makes it into the umbraco downloadable package. 2013-07-19 15:40:12 +02:00
Sebastiaan Janssen 7bac1ef1cd Merge branch 'wip-u4-1949' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-1949 2013-07-19 15:22:05 +02:00
Sebastiaan Janssen ad927ec6c1 Merge pull request #53 from abryukhov/patch-1
Update of ru.xml with latest keys
2013-07-19 06:20:55 -07:00
Sebastiaan Janssen 8a19d28859 Merge pull request #52 from enkelmedia/patch-1
Update to readme to contain info about the support for MVC
2013-07-19 06:20:37 -07:00
Sebastiaan Janssen 7e24af9daf Merge branch '6.1.3' of github.com:umbraco/Umbraco-CMS into 6.1.3 2013-07-19 15:19:27 +02:00
Sebastiaan Janssen 7518b514a7 Merge pull request #51 from kipusoep/master
Updated the download link
2013-07-19 15:19:01 +02:00
Sebastiaan Janssen da15d40b04 Merge pull request #51 from kipusoep/master
Updated the download link
2013-07-19 06:18:13 -07:00
Sebastiaan Janssen 96c38f50e4 Merge pull request #49 from lars-erik/6.1.3
Prettifying norwegian translation
2013-07-19 06:17:48 -07:00
Sebastiaan Janssen e723f1169f Merge pull request #48 from marc303/patch-1
Updated DE to 6.1.2
2013-07-19 06:16:48 -07:00
Sebastiaan Janssen 914005b2b6 Merge pull request #46 from michielvoo/u4-2417
U4-2417 Could the preview thumbnail link to the full image
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
	src/umbraco.editorControls/mediapicker/mediaChooser.cs
2013-07-19 15:09:07 +02:00
Sebastiaan Janssen 67bd303173 Merge pull request #46 from michielvoo/u4-2417
U4-2417 Could the preview thumbnail link to the full image
2013-07-19 06:02:51 -07:00
Sebastiaan Janssen 972b903f52 Merge pull request #32 from AndyButland/wip-u4-1285
Fix for U4-1285: Apostrophes in member groups cause exceptions
2013-07-19 14:40:28 +02:00
Sebastiaan Janssen 20e6843bf0 Merge pull request #32 from AndyButland/wip-u4-1285
Fix for U4-1285: Apostrophes in member groups cause exceptions
2013-07-19 05:39:38 -07:00
Sebastiaan Janssen 61d072c8d6 Fix merge issue 2013-07-19 13:32:24 +02:00
Sebastiaan Janssen 8740848aac Merge pull request #42 from michielvoo/u4-232
Enabled support for integrated security for SQL Server to the installer.
Conflicts:
	src/Umbraco.Web.UI/install/steps/database.ascx
2013-07-19 13:29:07 +02:00
Sebastiaan Janssen 85c80b07f9 Merge pull request #42 from michielvoo/u4-232
Enabled support for integrated security for SQL Server to the installer.
2013-07-19 04:26:50 -07:00
Sebastiaan Janssen 6766aa9732 Merge pull request #41 from michielvoo/u4-667
U4-667
2013-07-19 13:19:30 +02:00
Sebastiaan Janssen 557dccd88b Merge pull request #41 from michielvoo/u4-667
U4-667
2013-07-19 04:18:29 -07:00
Sebastiaan Janssen a57334d1f7 Merge pull request #40 from michielvoo/u4-663
U4-663
2013-07-19 12:55:16 +02:00
Sebastiaan Janssen 334f0bfd2b Merge pull request #40 from michielvoo/u4-663
U4-663
2013-07-19 03:53:15 -07:00
Sebastiaan Janssen 3dea16fad1 U4-2309 BackOffice / ExamineMngr : "Optimize index" don't ends correctly when website has not members. 2013-07-19 12:39:50 +02:00
Shannon 1bf4121796 Fixes a null check in UmbracoTemplatePage 2013-07-19 12:36:02 +10:00
Shannon 93bebdd50b Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-19 12:27:59 +10:00
Shannon 6a9532f10a Fixes: U4-1599 [MVC] ChangeContentType doesn't work in macros rendered from a View -> We need to manually reset the ContentType after we execute a webforms based macro because Server.Execute resets the ContentType back to the default. 2013-07-19 12:27:37 +10:00
AndyButland 986d37afd6 Removed debugging console.log reference 2013-07-18 21:23:05 +02:00
Sebastiaan Janssen d88494e90e U4-638 Bug (and fix/solution): Saving inline base64 image (or any attribute value with equal sign at the end) 2013-07-18 17:09:26 +02:00
Sebastiaan Janssen e48f08b657 When using Public Access > Single User Protection the email of the member is empty, this caused errors because the result of GetMembersFromEmail is null 2013-07-18 16:07:39 +02:00
Shannon d58b1ac107 Changed serverValidationService to be called serverValidationManager and added a bunch of unit tests for it. 2013-07-18 19:18:53 +10:00
Sebastiaan Janssen a79e349f3d U4-2467 v4.11.1: Membership search does not search on email address anymore 2013-07-18 11:00:56 +02:00
Shannon d5c9d278df Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-07-18 17:06:07 +10:00
Shannon d3fe37a080 Adds RequiredForPersistenceAttribute to easily detect if any entity fails validation in a way that it cannot be persisted to the data store. Changes all tree events to not be jquery events and to not require a 'callback' jquery object, instead we just use angular events broadcast globally, much nicer. 2013-07-18 17:05:40 +10:00
Shannon 17eb3db336 Fixed validation problems when creating new content without the absolute mandatory values needed to create something (like name) 2013-07-18 12:28:01 +10:00
Shannon 4cd0489540 Fixed up creating content so that after creation it re-routes back in to edit mode so we don't just keep the 'create' flag. This caused some issues with validation because after creation the edit page needs to re-bind the entity from the server and previous to now that means that the server validation collection would have been cleared. We now persist the collection and it's up to the controller to re-bind if necessary. 2013-07-18 11:45:45 +10:00
Per Ploug Krogslund 8df39ddeab Docs update 2013-07-17 22:46:00 +02:00
Shannon 6f4a7f06a5 Changed naming conventions of spec files so they are human readable. Fixed up the route handling when clicking on nodes to ensure the query/search is cleared (so there's no overlap with creating nodes). Moved much of the data handling functionality of the content edit controller to a new service called contentEditingHelper which I've now written unit tests for. 2013-07-17 17:04:52 +10:00
Shannon 16574c2de3 Fixes tree re-loading when it doesn't need to based on navigating to the same section that was just accessed, improves performance a lot. 2013-07-17 14:58:15 +10:00
Shannon 428cb89ade updated getting started docs 2013-07-17 14:28:55 +10:00
Shannon 1c70570078 Fixes : U4-2055 Unpublish Date Bug in Umbraco 6.0.3 -> with unit test to ensure that all dates are formatted as ISO date standards when used in SQL 2013-07-17 14:16:38 +10:00
Alexander Bryukhov 197dacfae7 Update of ru.xml with latest keys 2013-07-17 09:56:50 +07:00
Shannon d8aad718d5 Fixed broken unit test 2013-07-17 11:28:46 +10:00
Sebastiaan Janssen 1d7bfc2781 U4-2465 "Login Name already exists" when creating a new member that existed before 2013-07-16 13:33:52 +02:00
Sebastiaan Janssen 8063717e4c U4-2511 Locallink:NODEID not working 2013-07-16 13:21:27 +02:00
Lars-Erik Aabech 3900b7ebc8 Remove WebForms from nuspec file
Not just WebForms anymore. :)
2013-07-16 13:09:53 +02:00
Shannon 2212de3455 Got server side field validation wired up to non-user defined properties (such as name). 2013-07-16 18:52:58 +10:00
Shannon e2fa610358 Lots of work for validation. We have a different type of validation model in Umbraco where we still save content even if some things are invalid (we just don't publish) so we have to take all of this into account. We also have other rules where if it is new content but required fields like 'name' are empty we cannot continue to save. Also started working on dealing with server side validation errors for content fields (not just user defined fields). 2013-07-16 18:23:20 +10:00
Shannon c7b4cfd375 Creates umb-content-name to share amongst editors so we have less html duplication. 2013-07-16 12:58:57 +10:00
Shannon c4d2c7d31a Fixes issue with 'headline' when there is no content. Added client side validation to the content name. 2013-07-16 12:25:54 +10:00
Shannon 6251b86a0a Fixes content type icons and removes reference to tagsResource since it doesn't actually exist (Think Per hasn't checked it in yet) 2013-07-16 11:58:45 +10:00
Shannon 0296c646cb Fixes up a small code issue for U4-2505 2013-07-16 11:45:28 +10:00
enkelmedia 275dbc83dd Update to readme to contain info about the support for MVC 2013-07-15 19:38:10 +02:00
Sebastiaan Janssen 1cd2dc8a42 Fixes U4-2436 Editing an existing property changes its alias 2013-07-15 16:52:23 +02:00
Sebastiaan Janssen 60867af1a7 Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico
Also fixes casing of folder names
2013-07-15 16:31:19 +02:00
Sebastiaan Janssen 1e129bcc4d Fixes U4-2505 umbraco 6.1.2 throws System.NullReferenceException on the first publish after site compilation 2013-07-15 16:16:39 +02:00
Sebastiaan Janssen e5c758bbc1 Fixes U4-1838 uGoLive Success/Failure Images not showing 2013-07-15 16:07:42 +02:00
Shannon 66dd37b911 Fixes del animations when collapsing child nodes. 2013-07-15 23:41:27 +10:00
Shannon 556360143e Fixes issues with ObjectExtensions when converting an entity to XML. U4-2473 Installer throws examine exception: Unable to cast object of type 'System.Int32' to type 'System.String' 2013-07-15 23:27:15 +10:00
Shannon 5c9dabeeb6 Fixes delete animation issue with collapsing nodes. 2013-07-15 23:21:35 +10:00
Shannon 82cce853da Cleans up the navigationController to not have to duplicate all props of the nav service, we just make 'nav' a property of the scope that equals the nav service. 2013-07-15 23:08:23 +10:00
Shannon 10a0c33a99 Fixed up del animations to be dynamically set so they dont animate when switching sections. Added the loading bar for when the node is being deleted from the server to indicate activity. Updated the navigationService.currentTree to be currentSection since that is actually what it is. 2013-07-15 22:31:01 +10:00
Shannon b624f95e2a got deleting working properly with the node animation and color changes. 2013-07-15 20:11:56 +10:00
Shannon 5738b5a4b8 Updated media/content type services to allow us to now create content/media at the root. 2013-07-15 18:05:58 +10:00
Shannon 28eff9b34b Updated the tree structure to support the root section node. Now we actually get a menu listing for section roots when there is only one tree (i.e. media/content). 2013-07-15 17:56:34 +10:00
Shannon 7926318709 start looking at tree service to remove a node but realized that our initial app tree loading isn't correct, we need to have a true root node but currently we dont. 2013-07-15 17:05:54 +10:00
Shannon f2b28e6bfb Adds 'native' content deleting (not via the legacy objects) and updates the mock data to support this in the Client proj. 2013-07-15 16:48:29 +10:00
Shannon 25780663a6 Fixes: U4-1304 Umbraco.Field not replacing localLink when recursive:true . 2013-07-15 15:26:18 +10:00
Per Ploug Krogslund 4ff4e3dfab Deleted unneeded icons files from pagedown 2013-07-12 11:59:55 +02:00
Per Ploug Krogslund 9daf61fd5a Completed the Property editor ngdoc 2013-07-12 11:55:02 +02:00
Per Ploug e4a72caf96 merge 2013-07-12 11:51:39 +02:00
Per Ploug 22f6be61de Updates yepnope, adds markown sample editor 2013-07-12 11:36:22 +02:00
Shannon e2ef802f65 Got delete working for legacy items... just need to get the tree to respond, do tree syncing, etc... but it is working. 2013-07-12 14:36:35 +10:00
Shannon cdf114df4b Converted all resources over to use a newer structure for generating URLs, created unit tests for those, fixed the js build so that the name is still "umbraco" not "umbraco 7" since that causes problems with css and other file references. 2013-07-12 13:26:11 +10:00
Shannon 812686f5e2 Fixes merge issues 2013-07-12 11:51:10 +10:00
Shannon de2660cfb2 Merge branch '4.11.7---ITask-updates' into 7.0.0
Conflicts:
	.gitignore
	.hgtags
	src/Umbraco.Core/XmlExtensions.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
2013-07-12 11:30:06 +10:00
Shannon deceec3fa2 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.businesslogic/packages.config
	src/umbraco.cms/Actions/ActionNew.cs
2013-07-12 11:03:49 +10:00
Shannon f0e4977d41 Created new base api controller for json only, started implementing the legacy controller for dealing with legacy delete, etc.. calls (based on the ui.xml) 2013-07-12 10:57:54 +10:00
Shannon 550f8b196d Fixed manifest comments, streamlined how the navigationService ensures only one dialog exists at a time and removes that functionality from the navigationController. Changes how the menu's work with showing dialogs and displaying the correct dialog title, the delete dialog is looking good! 2013-07-12 10:42:18 +10:00
Shannon 9e0dec89b1 updated ignore, we don't want to commit anything to App_Plugins, if you want stuff there you'll need to add them explicitly. 2013-07-12 09:20:25 +10:00
Per Ploug Krogslund cfd4ded456 Start on property editor tutorial 2013-07-11 22:13:16 +02:00
Per Ploug Krogslund 18a0ff4fdd Adds dialog, notications and scriptloader docs 2013-07-11 14:01:38 +02:00
Shannon 5222cfcfe7 Got pretty far with deletions. It still doesn't actually do the deletions but the dialog is in place, now just need to inject some more metadata into the menu item to get the legacy delete controller to call the correct rest method to delete the legacy items (again, this is based on the silly ui.xml stuff) 2013-07-11 19:46:13 +10:00
Stefan Kip 63ea79a4d6 Updated the download link 2013-07-11 10:03:25 +02:00
Shannon 824b5ad5a4 Fixes issue with showing the recycle bin menu 2013-07-11 17:04:30 +10:00
Shannon e7a00adff4 Removes hack for defaultAction, navigationService.showMenu now returns a promise because it needs to get the defaultAction from the resource. Fixes up the mock menu to have metaData assigned. 2013-07-11 16:18:58 +10:00
Shannon a00074af44 Updated menu items and legacy action converters, now all legacy dialogs should now load. Now need to get legacy js actions being handled (i.e. just raw js calls like deleting) 2013-07-11 13:26:54 +10:00
Shannon 9d2c3865ed Updated icon mappings and updated to latest font-awesome but I have no idea how to make the font-awesome.min.less file from the download... will leave for Per :) 2013-07-11 11:03:03 +10:00
Shannon 35753a12a7 Fixes navigationController selectedSection issue 2013-07-11 10:11:15 +10:00
Shannon b1a1bb547a Similar fix to the last commit, fixes the navigation controller when working in the UI project and the create action is displayed by default instead of the menu, the menuDialog was not being cleared when changing nodes. This causes a stack overflow exception and also causes the html stack to build up. However, now there's a flicker because the html is being replaced, not sure the best way to fix this ? 2013-07-11 10:06:34 +10:00
Shannon c89efc8497 Fixes navigation controller sometimes trying to perform an apply when there's already one in progress. 2013-07-11 09:50:21 +10:00
Shannon 7395eba161 Fixes action dialog so that it doesn't keep appending content to the container each time you move to a diff tree node and click create. Before there was nothing removing the previous $modal object from the container so you'd end up with the same create action dialog being shown for each node and then it would eventually show a munged up duplicated markup and jquery would throw a stack overflow exception. 2013-07-11 09:43:47 +10:00
Per Ploug 410b664f7f Got legacy create dialogs working
Its not pretty, but it works, and over time these hacks should slowly
fade away
2013-07-10 15:35:38 +02:00
Per Ploug Krogslund 8ff4d9c24c harcoded create dialog hacks 2013-07-10 13:58:21 +02:00
Per Ploug beef52e555 adds nodetype to tree converter 2013-07-10 13:57:58 +02:00
Per Ploug Krogslund a16855dac2 Fixes the dialog I broke yesterday
Adds some defaults to the dialogs, so we can open the inline without
animation as well
2013-07-10 13:12:07 +02:00
Sebastiaan Janssen aa327696fe Fixes U4-2354 MiniProfiler - Show SQL parameter values and more stacktrace info
Refactored duplicate code
2013-07-10 12:35:21 +02:00
Shannon e7b816a958 All resources now converted to using resourcePromise. 2013-07-10 18:48:14 +10:00
Shannon 0060aa816b Converts media resource to use correct structure, fixes up the media editor and controller so at least stuff renderes now. 2013-07-10 18:18:48 +10:00
Shannon 6652016faa Makes the 'active' property on a tab a server side thing, updates more resources to use the resourcePromise. 2013-07-10 17:28:15 +10:00
Shannon 0f207b01f2 Integrated auth into the UI project and unit tests (you need to log in each time with arbitrary username/password). Fixes authorization, the auth check SHOULD return a 401 so that the MainController re-fires the auth check in order to re-set the 'authenticated' scope flag. Fixed err caused by trying to launch login dialog too many times when too many http calls fail. Converted over authResource to use correct resourcePromise structure. The mock auth is done with angular cookies, so integrated that too. Removes main.js since we don't use it anymore. Fixes media mocks. Removes call to get sections in navigationService since it is irrelevant and causing more issues when not authenticated. 2013-07-10 13:24:28 +10:00
Shannon 5a18c0b0e2 Fixes up resourcePromise 2013-07-10 11:33:36 +10:00
Shannon 74ca129697 Changed auth.resource to use the new resource promise and also enhanced the resource promise + docs. 2013-07-10 11:08:58 +10:00
Shannon 08f6f92e8c Fixed JS Build issues - Mixed spaces/tab issues, missing semi-colon. Fixed grunt build to ensure that a self executing function wraps the JS build output. 2013-07-10 10:38:16 +10:00
Per Ploug Krogslund 58500bd5b8 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Conflicts:

src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
2013-07-09 22:22:29 +02:00
Per Ploug Krogslund 245c764bf1 docs on navigationService
working ngDocs setup, started adding docs to navigation and dialog
service
2013-07-09 22:17:23 +02:00
Shannon 5af57d9667 Fixed up the 401 issue with checking authentication which led to other issues of lazy loading in the legacy js tree JS block. 2013-07-09 21:01:29 +10:00
Lars-Erik Aabech 1272a7c74b Prettifying norwegian translation
Removed obsolete, translated new, removed incorrect spacing and
hyphenation, misc. improvements in term usage. Ref.
http://i18n.skulelinux.no/nb/Fellesordl.eng-no.html.
2013-07-09 12:56:13 +02:00
Shannon 76c6d952f3 Fixed up the 401 issue with checking authentication, but now have other auth issues... but better than before :) 2013-07-09 20:13:26 +10:00
Shannon 9af23fdaf7 Converted compat.js to use namespaces 2013-07-09 19:21:44 +10:00
Shannon 7e0066f405 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
2013-07-09 18:52:54 +10:00
Shannon a6acb4c558 Got tree menu items loading async so the menu is not part of the treenode json. Created docs for using Umbraco resources and how to use promises properly. Created a helper: angularHelper.resourcePromise for use with all of our resources (still need to convert the rest). Got the legacy tree data working with seperate requests for menu items (not too easy!) 2013-07-09 18:51:45 +10:00
esn303 dcbe6726b0 Updated DE to 6.1.2
Markup encoded instead of CDATA blocks
2013-07-09 10:30:20 +02:00
Shannon ba68da5736 Makes Domain.GetDomains public (#U4-2483) 2013-07-09 11:55:29 +10:00
Shannon fdabd945dc Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-09 11:48:03 +10:00
Shannon 868edee5e6 Fixes: #U4-2161 - permissions inheritance. Fixes up how user permissions cache is invalidated and looked up (it is now lazy and not forced). User permissions are also cached as a low priority for now and only for 20 mins based on #U4-2474. 2013-07-09 11:47:46 +10:00
Shannon b91d0bb117 Updates ContentRepository to bulk insert all parent permissions at once (overload to the AssignEntityPermissions method) 2013-07-09 10:08:31 +10:00
Murray Roke cc91977e94 Fix notification-email link to unpublished page
http://issues.umbraco.org/issue/U4-2482
I've added links to language files which did not contain it.
I used the %5% syntax in the sv.xml file which seems to otherwise use
{5} syntax
2013-07-09 11:19:51 +12:00
Per Ploug df98ad4edf Sets the installer redirect to umbraco/default 2013-07-08 15:54:07 +02:00
Shannon 90b94f6ffb Fixes: #U4-2476 2013-07-08 18:58:38 +10:00
Shannon 3c4cf56309 Fixes: #U4-2475 2013-07-08 18:47:53 +10:00
Shannon b7f6195791 Started adding base PermissionsRepository for sub classes to use for assigning permissions, created a BulkImport extension methods for PetaPoco with tests since we'll be needing that for assigning permissions in a nice way. Wrote unit tests for all sql gen for permissions and assigning permissions. This all starts fixing #U4-2161 but there's still a bit more work to do. 2013-07-08 17:29:26 +10:00
Per Ploug 34f64fbb2f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-07-05 16:10:08 +02:00
Per Ploug f51306b0e2 Removed js redirect from logout.aspx 2013-07-05 16:10:00 +02:00
Per Ploug Krogslund 92c797d837 Adds native events to the umb-tree directive
Better and isolated callbacks
2013-07-05 16:08:16 +02:00
Per Ploug Krogslund 0c3d274232 merge 2013-07-05 14:27:26 +02:00
Per Ploug Krogslund 852fe4210a Removes left-col leftover file, adds contentLoaded to contentEdit controller 2013-07-05 14:26:43 +02:00
Per Ploug 1b03dbd9c2 Adds compat.js click registering, adds bg load 2013-07-05 14:22:19 +02:00
Per Ploug 291c5920d8 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-07-05 14:14:31 +02:00
Per Ploug 18a7f3dcc3 html encodes profile link to aspx page 2013-07-05 14:14:20 +02:00
Per Ploug Krogslund 63323c494f Adds body click detection to legacy pages 2013-07-05 14:13:45 +02:00
Per Ploug 699f76282d Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-07-05 12:58:45 +02:00
Per Ploug cfd299562e rename umb leftcol to umb navigation 2013-07-05 12:58:36 +02:00
Per Ploug Krogslund d88c817770 User profile link in dialog 2013-07-05 12:57:46 +02:00
Per Ploug Krogslund 2580f13978 Changesection should trigger a $location.path change 2013-07-05 12:46:11 +02:00
Per Ploug 4a83262e1f Routes fallback to content if set to default 2013-07-05 12:45:37 +02:00
Per Ploug Krogslund fd1e647ca7 Changes dashboard routing to the real dashboard.aspx 2013-07-05 12:26:06 +02:00
Per Ploug Krogslund 00ca7242b9 Adds user modal and history service
User can now log out, and see recent actions
2013-07-05 12:25:47 +02:00
Per Ploug Krogslund 63495d05e1 merge 2013-07-05 11:05:43 +02:00
Morten Christensen 42eb82e6ca Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-05 10:55:12 +02:00
Morten Christensen 93def731ef Fixes #U4-2466 2013-07-05 10:51:19 +02:00
Per Ploug Krogslund 0a08dce8f5 Modifies the dialog css class loading and allows for left side modals 2013-07-05 10:48:12 +02:00
Per Ploug 0030488b61 Fixes dialog service instant closing modals 2013-07-05 10:40:28 +02:00
Shannon 60805f91d6 bit of code cleaning. 2013-07-05 16:58:51 +10:00
Shannon 048480d5be Fixes: #U4-2460 - UmbracoHelper.RenderTemplate will now execute the complete MVC cycle when rendering MVC templates whereas before it would only execute the view which means any actionfilters, etc... applied would never have fired (as well as other things) 2013-07-05 14:12:31 +10:00
Per Ploug d9e79666ca css-template editor tweaks, more compat polish 2013-07-04 13:33:06 +02:00
Morten Christensen 173d388c12 Fixes #U4-2450 2013-07-04 12:31:31 +02:00
Morten Christensen b1285fa7e3 Add missing id to unique naming overload 2013-07-04 12:31:10 +02:00
Morten Christensen e34c857f6c A bit of refactoring around unique naming, and implementing it for media as well 2013-07-04 11:22:59 +02:00
Morten Christensen 7ff0e6cd4b Fixes #U4-2458 2013-07-04 10:50:02 +02:00
Per Ploug Krogslund a984bf0d68 Fixes failing tests
Adds a seperate unit test app loader, removes e2e backend from tests
adds scope.digest and httpbackend.flush to tests
2013-07-04 09:28:27 +02:00
Shannon 371a0cc65a Fixes SectionService to properly return the user's allowed sections now that the IUserRepository is working nicely. 2013-07-04 15:33:24 +10:00
Shannon 7e345fda70 puts angular.js source back in repo as it is good for debugging/learning. Fixed editContentController tests, but now there's other test issues which I'm not sure how to fix ? 2013-07-04 15:16:02 +10:00
Shannon 15f0503a99 Added js unit tests for icon helper 2013-07-04 13:11:07 +10:00
Shannon 93844f30ac Re-fixed the section icons, deals with legacy icons, new icons and legacy file based icons 2013-07-04 12:50:25 +10:00
Shannon 0f06308efc removed VS build events, hopefully that can kick start the build server 2013-07-04 12:36:28 +10:00
Shannon 1f30a427b0 Reverted Tea commerce commit 2013-07-04 12:30:52 +10:00
Shannon 0683094f84 oops, overwrote previous changes to CmsNode, now merged them back in properly. 2013-07-04 12:20:25 +10:00
Shannon 983b7a85e1 Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-04 12:13:24 +10:00
Shannon d015780b9f Fixes: #U4-2447 - non thread safe icon lookup 2013-07-04 12:13:02 +10:00
Michiel van Oosterhout e4df176a37 U4-2417: show media picker image as link to the original image.
Order of the views in the markup did not match the order of the Style enum.
ImageViewer control now selects the view by matching the ViewerStyle enum to a View ID. This way the order of the views in the markup is no longer important.

Also:
Removed user control from Umbraco.Web project, moved designer code and added code behind class for user control to Umbraco.Web.UI
Refactored code to use Umbraco.Core.IO
Removed some code that was commented out
2013-07-03 17:36:28 +02:00
Per Ploug 01d55625d5 merge 2013-07-03 14:04:00 +02:00
Morten Christensen aeece499bb Fixing unit test for PublishedMedia cache, which had expected result set incorrect 2013-07-03 14:00:44 +02:00
Per Ploug 693c0cb2a5 working modals 2013-07-03 13:55:33 +02:00
Morten Christensen 8465b4e556 Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 12:34:52 +02:00
Morten Christensen e280785f48 Adding Msdeploy PropertyGroup to build prop file, so both FileSystem and MsDeploy package will include the umbraco and umbraco_client folders 2013-07-03 12:30:34 +02:00
Shannon 71bff2d1d7 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Core/Models/Membership/UserProfile.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
	src/Umbraco.Core/Services/UserService.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
2013-07-03 20:24:02 +10:00
Shannon 5e0a59e4b3 Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 19:47:25 +10:00
Morten Christensen 30835797ff Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 11:47:09 +02:00
Shannon 4077a01a6b Fixes: #U4-2344 - fixes examine re-indexing for media and a null check for DataType.Data 2013-07-03 19:47:06 +10:00
Morten Christensen aed70ae40c Updating dependencies in our own nuspec file 2013-07-03 11:46:53 +02:00
Morten Christensen 6d44628352 Merge pull request #45 from jhauge/PublishUmbracoFiles
Add Umbraco files during publish
2013-07-03 02:39:12 -07:00
Jesper Hauge 7a398d34b1 Added file-reg to .nuspec 2013-07-03 11:33:05 +02:00
Morten Christensen 69c5aeb1b3 Updating nuget dependencies for test project 2013-07-03 11:29:58 +02:00
Shannon da545b890b Updated UserRepository to not contain the general query methods, we do those in the service. 2013-07-03 19:26:28 +10:00
Morten Christensen 6609bc09f2 Updating nuget dependency for HtmlAgilityPack 2013-07-03 11:26:17 +02:00
Morten Christensen f06a6f42da Updating nuget dependency for ClientDependency 2013-07-03 11:20:42 +02:00
Jesper Hauge c9065d96a9 These files will add MSBuild target that copies /umbraco /umbraco_client and /App_Browsers files to .csproj files, during install of NuGet package UmbracoCms
Functionality has been tested by creating af copy of the current Nuget package and add these files to the package, then using this package on a new Web application project. Building and doing a VS Publish to the filesystem.
2013-07-03 11:17:47 +02:00
Morten Christensen 9d4e1362c4 Updating nuget references for ASP.NET MVC, Razor, WebPages and WebApi to latest patch release 2013-07-03 11:11:37 +02:00
Shannon d3b69e04e1 Updated IUserService and added more unit tests for new methods. Fixed unit tests that were failing due to incorrectly set settings... not sure how this is working on the server but oh well. 2013-07-03 19:01:37 +10:00
Morten Christensen 0d54e8df89 Updating MySql package dependency 2013-07-03 11:00:26 +02:00
Morten Christensen 8f949d0a2f Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 09:40:17 +02:00
Shannon d67480e98b Updated UserService, didn't need one of the methods on there, updated the unit tests to test all the other methods. 2013-07-03 17:09:14 +10:00
Shannon 5d76ead469 backported changes to IUserRepository from v7 2013-07-03 16:52:00 +10:00
Shannon 2796100067 added another unit test. 2013-07-03 16:45:56 +10:00
Shannon a132f609d7 backports changes for -> Finished upgrading the UserRepository and entities to properly support Users' Allowed Sections & streamlines Persistence/Mappers with less code duplication. 2013-07-03 16:40:22 +10:00
Shannon d85c454012 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
2013-07-03 16:10:10 +10:00
Shannon 32ee1fadd6 Finished upgrading the UserRepository and entities to properly support Users' Allowed Sections 2013-07-03 16:07:20 +10:00
Shannon a9efd08b08 Created new IUserProfile to support the Sections stuff as an interface to work in the IUserRepository 2013-07-03 11:16:45 +10:00
Shannon 3e31faee3b Moving UserSection implementation to one-many relationship with User object. 2013-07-03 10:29:05 +10:00
Per Ploug a798b5c343 Try to get the dialogService to intercept legacy modals
replace modals with dialogservice
2013-07-02 16:17:59 +02:00
Per Ploug 2e636d5bcb fixes testing due to wrong httpbackend injection 2013-07-02 15:46:50 +02:00
Morten Christensen 7f7456701d Adding license 2013-07-02 15:32:53 +02:00
Per Ploug Krogslund 4c7351aa8a Working tree mock data 2013-07-02 10:45:43 +02:00
Shannon ff410a9d7f Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
2013-07-02 17:47:57 +10:00
Shannon 3779e79367 Changes over SectionCollection to SectionService, ApplicationTreeCollection to ApplicationTreeService. Starts implementing UserSectionRepository for use with SectionService. Streamlines BaseMapper implementations. 2013-07-02 17:47:20 +10:00
Per Ploug Krogslund 7c63b88925 changed runner to phantomjs from chrome 2013-07-02 09:33:43 +02:00
Per Ploug Krogslund 0e431ffd3c File rename, refactor $httpBackend mocks 2013-07-02 09:17:32 +02:00
Shannon 9e419f9bcc Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 2013-07-02 12:58:40 +10:00
Shannon 357e29ebe1 implemented section resource and mocks to load in the sections (applications) 2013-07-02 12:57:28 +10:00
Per Ploug 32d7b88b45 Removes the ng-hide when unauthed
Not needed anymore, still something weird with the retry queue tho
2013-07-01 16:17:20 +02:00
Per Ploug 2b13dff769 Fixes login and tree
Adds tree loader, fixes icons, fixes toggle arrows
Refactors httpbackend into nicer system
Testing of promises are broken :(
TODO: update docs
2013-07-01 16:06:41 +02:00
Per Ploug Krogslund 0d44189f7f Mocked login works again 2013-07-01 09:58:10 +02:00
Shannon a06821ffc0 missing files 2013-07-01 14:24:28 +10:00
Shannon 388f55d7fd Moved application logic into Core which are now 'Sections'. Have proxied all calls from the legacy application to sections. Streamlined how automapper configs are registered (much better now). Updated some unit tests to use the new classes instead of the legacy ones. Created the sections controller to return the sections from the back office. Changed the TypeFinder to search all types not just public ones, changed the boot managers to not have to explicitly modify the resolvers with internal types because now internal types are automatically found. 2013-07-01 14:23:56 +10:00
AndyButland 2fd9efffa1 Styling of drop zone for draggable document type properties 2013-06-29 23:37:02 +02:00
AndyButland 91465c6aa2 Fixed issue with re-ordering on a single tab 2013-06-29 23:15:41 +02:00
AndyButland f4eb8c7517 Localised no properties message 2013-06-29 22:57:53 +02:00
AndyButland bd3616239f Fixed issue where dropped properties not saving when dropped on a tab inherited from a parent document type 2013-06-29 22:42:41 +02:00
AndyButland ef0744a849 Drag/drop UI for document type properties and tabs 2013-06-29 22:42:15 +02:00
AndyButland adeb859195 Reload content page when document type changed if content already loaded; improved display of confirmation screen 2013-06-29 22:30:12 +02:00
AndyButland aaec90e47a Used override on change document type to clear properties; display of summary on completion 2013-06-29 21:54:48 +02:00
Michiel van Oosterhout d926180e3a Added special overload for creating a connection string with integrated security.
Actually disable checkbox is the selected database type is not Microsoft SQL Server.
Refactored saveDBConfig for readability.
2013-06-28 16:40:23 +02:00
Per Ploug ad766a2544 Authentication almost done
Missing some styling and we are good to go on promised based
authentication
2013-06-28 15:49:28 +02:00
Sebastiaan Janssen ffce1a3e6b Open new branch for 6.1.3 2013-06-28 14:44:56 +02:00
Sebastiaan Janssen e553f2c671 Correct little mistake in nuspec file 2013-06-28 14:21:25 +02:00
Sebastiaan Janssen d4d21c18b2 Correct little mistake in nuspec file 2013-06-28 14:21:00 +02:00
Per Ploug Krogslund 86a330ae8e enabled the security interceptor 2013-06-28 14:13:20 +02:00
Per Ploug 453719e07b Mocked server variables 2013-06-28 14:07:38 +02:00
Per Ploug Krogslund 0744adf8a2 Start on a proper httpbackend 2013-06-28 14:00:52 +02:00
Morten Christensen 42c6533e16 Correcting merge issues 2013-06-28 13:33:41 +02:00
Morten Christensen b0f4cb7d02 Merge branch '6.0.7' into 6.1.2 2013-06-28 13:30:04 +02:00
Morten Christensen f809dec874 Updating repository factory to inject unique name setting into ContentRepository 2013-06-28 13:28:03 +02:00
Morten Christensen 2477500045 Fixes #U4-2414 and removes internal usage of action handlers Yay! 2013-06-28 13:27:23 +02:00
Michiel van Oosterhout 72bb1b3583 U4-667
Added a script to make the checkbox "Render content in editor" dependent on the "Use in editor" checkbox.
Also refactored the create.aspx code-behind so it's easier to see what control is loaded in the dialog when debugging.
2013-06-28 10:44:24 +02:00
Michiel van Oosterhout 240e58e061 U4-663
Do not overwrite existing files when creating a new template.
2013-06-28 10:42:51 +02:00
Michiel van Oosterhout e980296d6d Enabled support for integrated security for SQL Server to the installer. 2013-06-28 10:39:48 +02:00
Shannon a077836936 Implemented the required/regex validation that is applied to PropertyType's on a Document type (this might be temporary if we get around to implementing pre-value overrides). Changed the name from ManifestValueValidator to just ValueValidator and allows for property editors to override the defaults if they need to change how the regex/required validation is processed against the property's value. Have streamlined all of the validation directives to require an FormController which we then listen to. Have removed valBubble as we don't actually need that functionality anymore and this simplfies input elements too. 2013-06-28 12:23:15 +10:00
AndyButland 9d0f544840 Handled inherited properties on source and destination side 2013-06-27 22:24:10 +02:00
AndyButland 3ecd564c57 Sync tree once document type changed 2013-06-27 21:49:06 +02:00
AndyButland 9c23bbd87a Minor styling improvements 2013-06-27 21:44:53 +02:00
AndyButland d3562b797e Back-office UI for change of document type for content item 2013-06-27 21:29:27 +02:00
AndyButland d23482b7a6 Moved setting for DefaultDocumentTypeProperty from GlobalSettings to UmbracoSettings 2013-06-27 16:00:49 +02:00
Morten Christensen d89539a437 Merge branch '6.1.2' of https://github.com/umbraco/Umbraco-CMS into 6.1.2 2013-06-27 15:36:46 +02:00
Morten Christensen 4368f15097 Updating nuspec files which is a bit different for 6.1.x then 6.0.x 2013-06-27 15:36:25 +02:00
Morten Christensen b90150279b Merge branch '6.0.7' into 6.1.2
Conflicts:
	build/Build.proj
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
2013-06-27 15:27:31 +02:00
Morten Christensen ca1b05e30d Correcting unit test after update to ContentType ctor 2013-06-27 15:23:15 +02:00
Morten Christensen 5c09ba9a2d Updating nuspec files and build 2013-06-27 15:15:27 +02:00
Sebastiaan Janssen cfa3e3aff1 Bump version number 2013-06-27 15:09:44 +02:00
Morten Christensen 59ff4a0484 It hurts having to do this, but Sebastiaan says I have to. So re-wiring the BulkPublishController to use the legacy Document class so legacy events are also fired. 2013-06-27 12:30:16 +02:00
Morten Christensen b1db99f639 Fixing issue in previous fix for #U4-2182 2013-06-27 10:57:49 +02:00
Morten Christensen ccbb838cef Fixing another part of #U4-2186 2013-06-27 10:56:45 +02:00
Shannon 8001a78b68 updated some legacy references 2013-06-27 15:28:30 +10:00
Shannon 7417e1706e Fixed naming conventions and changed new classes to internal since we shouldn't expose these publicly (they are already legacy) 2013-06-27 15:27:05 +10:00
Steve Temple b12f60e443 Allow for absolute URLs as well as virtual in ResolveUrl to allow for FileSystemProviders that use CDNs 2013-06-27 00:04:37 +01:00
Sebastiaan Janssen 0d5ec8bfd5 Merge branch '6.0.7' into 6.1.2 2013-06-26 20:57:32 +02:00
Sebastiaan Janssen 5f67e85471 Merge branch '6.0.7' of github.com:umbraco/Umbraco-CMS into 6.0.7 2013-06-26 20:55:11 +02:00
Sebastiaan Janssen d9228c368f Fixes U4-2404 Photo gallery broken on Azure - Since the template saving routine is doing ToSafeAlias, we should also do it when setting the default template 2013-06-26 20:54:36 +02:00
AndyButland 212800f706 Added config setting for default document type property; used setting to set default new property type 2013-06-26 17:25:44 +02:00
Chris Tomlinson ea1aefa09e Fixes U4-2187 - Enable support for MySQL on Linux 2013-06-26 15:46:50 +01:00
Morten Christensen 8226505e5b Merge branch '6.0.7' into 6.1.2 2013-06-26 15:55:49 +02:00
Morten Christensen 41b8de09b7 Fixes U4-2234 including test case from issue 2013-06-26 15:49:00 +02:00
Per Ploug d2273ee8ce Updated karma to 0.9
Tests are now cross-platform and runs in local phantomJS instead of in
chrome, remember to run npm install to upgrade
2013-06-26 15:46:36 +02:00
Morten Christensen bbf06cd13d Fixes U4-2234 2013-06-26 14:31:36 +02:00
Morten Christensen 639cb17741 Fixes U4-2182 and U4-2167 2013-06-26 14:31:10 +02:00
Morten Christensen 4643d34546 Moving generation of xml from ContentExtensions to the PackagingService 2013-06-26 13:30:54 +02:00
Sebastiaan Janssen 50035eae49 Merge pull request #33 from bokmadsen/6.0.7
Bugfix for previous pullrequest "Duplicate e-mail addresses: U4-315, U4-...
2013-06-26 02:43:34 -07:00
Per Ploug 7a89cf1ffd Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-06-26 11:12:24 +02:00
Per Ploug d214935ecb Panel, Tabview, Propertie controls converted
Changed the html to output bootstrap html, masterpages load our belle
css + bootstrap.min.js
2013-06-26 11:12:06 +02:00
Bo Kingo Damgaard 2d857a8635 Bugfix for previous pullrequest "Duplicate e-mail addresses: U4-315, U4-2147, U4-304"
There was a bug in the previous pullrequest that didn't allow a member
to saved if the email wasn't changed. Furthermore duplicate emails are
now prevented if requireUniqueEmail was false, but is switched to true
(when saving a member)
2013-06-26 10:47:27 +02:00
Shannon abbd79f4d0 adds notification msgs for failed validation. ensures that the subscriptions to the servervalidationservice are unsubscribed on $destroy = very important! 2013-06-26 14:36:45 +10:00
AndyButland d47ff4005c Support for deleting member groups with apostrophes 2013-06-26 06:16:39 +02:00
AndyButland dfeb1c7a0b Support for displaying and editing member groups with apostrophes 2013-06-26 06:16:23 +02:00
Shannon e571e68d0c ensures validation msgs are not shown until the first submit. 2013-06-26 13:33:24 +10:00
Shannon f2283d8457 fixes js errors 2013-06-26 13:03:03 +10:00
Shannon 7b35e7627a fixes js errors 2013-06-26 13:02:47 +10:00
Shannon 6ee1171e9c Got tab validation indication working. 2013-06-26 13:01:40 +10:00
Jeremy Pyne fe23502e67 Added code to actually pre-select the parent node instead of just locating it in the tree. This seams keeps the Ui in a sane state.
Updated control code in Umbraco.Web.Ui from Umbraco.Web.
2013-06-25 15:48:16 -04:00
Shannon 43972a66c2 another tweak to property level validation 2013-06-25 22:53:59 +10:00
Shannon d290ea81a2 css class adjustments for test prop ed 2013-06-25 22:49:27 +10:00
Shannon 4718b5e3e5 Got server validation working better and targetting specific fields properly, adjusted form styles to work with angularjs validation. 2013-06-25 22:45:08 +10:00
Shannon 3de98b60c4 fixes prop editor view path 2013-06-25 22:15:33 +10:00
Shannon 5148687ed3 Wired up validation elements and have server side validation nearly working properly 2013-06-25 22:10:39 +10:00
Morten Christensen e4387b8dae Adding some internal bits in the ServiceContextManager and PackagingService 2013-06-25 13:43:57 +02:00
Morten Christensen 188aca499a Merge branch '6.0.7' into 6.1.2 2013-06-25 11:54:24 +02:00
Morten Christensen 3040d362ef Fixes #U4-2361 2013-06-25 11:48:37 +02:00
Shannon 808d9fe589 Removes umbpropertyinclude directive since we won't be lazy loading js files for prop editors, they'll be included in the manifest. Fixes JS errors from grunt after re-enabling some of the validation stuff. Had to adjust the jshint build to ignore some of the warnings. 2013-06-25 14:54:42 +10:00
Shannon a2e16b4922 Fixed up gravatar with a watch, started implementing legacy proxy JS notification calls to our angular services. 2013-06-25 14:02:31 +10:00
Shannon 68a648d3ba Merge remote-tracking branch 'origin/6.1.2' into 7.0.0
Conflicts:
	.hgignore
2013-06-25 10:01:23 +10:00
Shannon a57aa07721 Updated default controller resolver to use new IRenderMvcController interface, fixed some merge issues. 2013-06-25 09:55:45 +10:00
Shannon f2b8e3407b Merge remote-tracking branch 'origin/6.0.7' into 6.1.2
Conflicts:
	src/Umbraco.Web/Mvc/RenderControllerFactory.cs
	src/Umbraco.Web/Mvc/RenderMvcController.cs
	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
2013-06-25 09:41:27 +10:00
Shannon 1ec7cd3b89 Implements: #U4-2342 - IRenderMvcController 2013-06-25 09:33:48 +10:00
Shannon 39d7676bee Got the legacy editors working and iframe implementation almost done! 2013-06-25 08:54:36 +10:00
Jeremy Pyne ad2764e3ac Added code to select the parent node when doing Move/Copy operations. This will save lots of time for users.
This code can also be added to other places that use the TreeControl to pre-select the currently selected item(media pickers for example) so that changing content will be quicker.
2013-06-24 14:51:52 -04:00
Sebastiaan Janssen bd77463fa4 Merge branch '6.0.7' into 6.1.2
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Core/Models/ContentTypeBase.cs
	src/Umbraco.Core/Models/IContentTypeBase.cs
	src/Umbraco.Core/Models/PropertyGroupCollection.cs
2013-06-24 12:06:58 +02:00
Sebastiaan Janssen 368954226a Update to not require specific version of MVC4, just 4.0.20710.0 and higher 2013-06-24 12:05:22 +02:00
Sebastiaan Janssen 496d51c2a0 Merge pull request #25 from kipusoep/Duplicate-words-domainHelp
Duplicate words removed
2013-06-24 01:30:04 -07:00
Stefan Kip b01b4f7aa7 Forgot to update XML comments
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
2013-06-24 10:29:03 +02:00
Stefan Kip 49a699c858 Added RemovePropertyGroup method
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
2013-06-24 10:28:42 +02:00
Morten Christensen f68571ef7c Merge pull request #24 from kipusoep/U4-2421-RemovePropertyGroup
U4-2421 Added RemovePropertyGroup method
2013-06-24 01:18:21 -07:00
Shannon 5af8e86e3b updated web.config settings and default settings. 2013-06-24 13:37:25 +10:00
Stefan Kip 6cc1735363 Duplicate words removed 2013-06-23 21:49:43 +02:00
Stefan Kip d553dfd4b0 Forgot to update XML comments 2013-06-23 20:24:22 +02:00
Stefan Kip f3e737720b Added RemovePropertyGroup method 2013-06-23 16:38:11 +02:00
Stefan Kip 22cf59345c Removed space before UmbracoModule
Removed space before UmbracoModule
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
2013-06-23 16:02:02 +02:00
Michiel van Oosterhout 16a46a4ea4 Changed default user email address to use the example domain, instead of domain.com 2013-06-23 16:01:04 +02:00
Sebastiaan Janssen 09d9728fb8 Merge branch '6.0.7' into 6.1.2
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2013-06-23 15:16:44 +02:00
Sebastiaan Janssen c0df3e0202 Match IIS Express port number to Umbraco version so it's easier to use a few copies of the repo locally
(you don't have to re-map your port to the correct folder)
2013-06-23 15:13:27 +02:00
Sebastiaan Janssen d09e283900 Merge branch '6.0.7' into 6.1.2
Conflicts:
	.hgtags
2013-06-23 15:00:14 +02:00
Sebastiaan Janssen 507c6c23b9 If you never had VS2010 installed, the build now works, checking if the Publishing Tasks dll exists now 2013-06-23 14:57:53 +02:00
Sebastiaan Janssen 3daf936623 Remove hgignore files 2013-06-23 14:52:45 +02:00
Sebastiaan Janssen e93c910347 Fix more unit tests 2013-06-22 17:32:22 +02:00
Sebastiaan Janssen 7139e30296 Don't delete the config file directory, it can't sometimes
For now, don't delete umbracoSettings.config either, it makes a lot of tests fail
2013-06-22 15:53:10 +02:00
Sebastiaan Janssen df1940a01c Fix unit test by ensuring config file is copied if it doesn't exist 2013-06-22 15:07:40 +02:00
Sebastiaan Janssen aafb5a0285 Merge branch '6.0.7' into 6.1.2
Conflicts:
	src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs
2013-06-22 14:22:43 +02:00
Sebastiaan Janssen 033f981718 Fix unit test 2013-06-22 14:19:22 +02:00
Sebastiaan Janssen 5bd55bdd09 Merge branch '6.0.7' into 6.1.2 2013-06-21 17:33:42 +02:00
Sebastiaan Janssen 76358e3e13 U4-2374 Mono port to do: dealing with empty string 2013-06-21 17:29:55 +02:00
Sebastiaan Janssen 35c0eb3b0c U4-2377 Mono port to do: Universal currency character does not work as split character unless given in unicode. 2013-06-21 17:22:13 +02:00
Sebastiaan Janssen 7fad8ca98b U4-2378 Mono port to do: TypeFinder needs exclusions for Monodevelop Nunit 2013-06-21 17:15:42 +02:00
Sebastiaan Janssen a2da27121e U4-2335 [Regression] YSOD when editing stylesheet property on 6.0.6 2013-06-21 17:00:40 +02:00
Sebastiaan Janssen 23ec07276a U4-2369 Wrong path for Umbraco/Config/Lang/xx.xml for publish notification mail 2013-06-21 16:56:59 +02:00
Sebastiaan Janssen 96cec0b407 U4-2410 EditRelationType.aspx missing virtual path - 6.0.6 2013-06-21 16:30:44 +02:00
Sebastiaan Janssen 47b94e68e3 Merge branch '6.0.7' of github.com:umbraco/Umbraco-CMS into 6.0.7 2013-06-21 15:26:10 +02:00
Sebastiaan Janssen 0f4b1752e0 U4-2416 Missing colon in file ListChildPagesOrderedByProperty causes Web site not to run 2013-06-21 15:25:46 +02:00
Shannon ed1aee5047 Implements: #U4-1770 - no more umbracoDebugMode, will use the compilation setting in the web.config 2013-06-21 16:20:18 +10:00
Shannon c81cd0fd1d Merge branch '6.1.2' into 7.0.0
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/config/ClientDependency.config
2013-06-21 15:49:40 +10:00
Shannon eac66f5696 Merge branch '6.0.7' into 6.1.2 2013-06-21 13:00:56 +10:00
Shannon b2c604f7b3 updated ignore 2013-06-21 11:26:23 +10:00
Shannon 3f626b444f re-enables CDF logger 2013-06-21 10:55:38 +10:00
Shannon c5b8931aa6 Merge branch '6.0.7' into 6.1.2
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
2013-06-21 10:50:35 +10:00
Shannon 818d22ba61 updates CDF config examples (#U4-2331) 2013-06-21 10:49:27 +10:00
Shannon f9902964b0 Merge branch '6.0.7' into 6.1.2
Conflicts:
	src/Umbraco.Web.UI/config/Dashboard.config
	src/Umbraco.Web.UI/config/ExamineIndex.config
2013-06-21 09:20:53 +10:00
Shannon 27fdb1ebab removed custom dashboard, re-put back in the external index (must have got removed by accident) 2013-06-21 09:19:50 +10:00
Shannon 7a94b49b34 Merge branch '6.1.2' into 7.0.0 2013-06-21 08:47:29 +10:00
Shannon 1368ba8dc9 Fixes unit tests 2013-06-21 08:47:01 +10:00
Shannon ae8820849b Fixes unit tests 2013-06-21 08:45:08 +10:00
Sebastiaan Janssen 1628dfaa2f Update version to 4.11.10 2013-06-20 17:20:17 +02:00
Sebastiaan Janssen 9a3c2bbc5c Merge pull request #19 from michielvoo/master
Changed default email address in the installer
2013-06-20 07:47:50 -07:00
Michiel van Oosterhout 0b0fb92cf1 Changed default user email address to use the example domain, instead of domain.com 2013-06-20 16:01:03 +02:00
Sebastiaan Janssen 6f09da0927 Merge pull request #17 from kipusoep/patch-1
Removed space before UmbracoModule
2013-06-20 06:18:21 -07:00
Stefan Kip febe6ec241 Removed space before UmbracoModule
Removed space before UmbracoModule
2013-06-20 14:56:39 +02:00
Shannon 3ff888f77a Fixes: #U4-2403 2013-06-20 14:47:59 +02:00
Murray@tbpc10.terabyte.co.nz 9af3a10da8 #U4-2326 Added Try Catch for PlatformNotSupportedException
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
2013-06-20 14:46:21 +02:00
Sebastiaan Janssen 0470a0ca51 Add gitignore 2013-06-20 14:46:13 +02:00
Shannon 06bbfe2960 Gets the context menu items actually resolving from the server data, created converters to convert legacy menu items to new ones including more icon converters (still need to get more stuff on menu items working and planned out but the data is from the server). Updated the mocks to include a menu structure with each node, creaeted a simply context menu directive. 2013-06-20 19:49:27 +10:00
Shannon 44b02a851f Got application level trees working (rendering) now, now to see how to render an iframe! 2013-06-20 17:47:14 +10:00
Shannon b6cbd521ce Merge branch '6.1.2' into 7.0.0
Conflicts:
	src/Umbraco.Core/Models/ContentExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
2013-06-20 16:06:23 +10:00
Shannon 3618722574 Fixed some merging issues. 2013-06-20 15:57:23 +10:00
Shannon 24a76f53b4 Merge branch '6.0.7' into 6.1.2
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/Xml/XmlNodeExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.config
	src/Umbraco.Web/DefaultPublishedContentStore.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
2013-06-20 15:49:55 +10:00
Shannon 86ce48ddc8 Fixes: #U4-2312 - Moving content with the new API (and in the old api when calling library.UpdateDocumentCache(p.Id)) The document is actually moved properly in the content XML structure without republishing it and then rebuilding the entire XML structure, it just does it inline. Have also updated MoveAndCopy.aspx dialog to use the new API which now saves on about 20+ queries that were not needed. Also updated the MoveAndCopy dialog to have the correct code behind structure. 2013-06-20 15:34:57 +10:00
Shannon befc0943b1 Merge branch '6.1.2' into 7.0.0 2013-06-20 11:26:18 +10:00
Shannon cb592d687c Merge branch '6.0.7' into 6.1.2 2013-06-20 11:26:01 +10:00
Shannon 2161ec98b0 Fixes: #U4-2324 - Umbraco.Field will now work with custom routed pages. 2013-06-20 11:25:33 +10:00
Shannon b4ba57695e Merge branch '6.1.2' into 7.0.0 2013-06-20 10:09:39 +10:00
Shannon 5a6ee168c3 Merge branch '6.0.7' into 6.1.2 2013-06-20 10:08:50 +10:00
Shannon 52292cab60 Fixes: #U4-2403 2013-06-20 10:08:02 +10:00
Shannon 24111c52f2 Obsoleted umbraco.businesslogic.ApplicationTree, have moved logic and new classes to core and proxied calls from it to the new ones. The new ApplicationTreeCollection will be the runtime colleciton of trees which can also read/write/save to the xml. 2013-06-20 10:05:51 +10:00
Stephan 2933c879e1 U4-2327 - fix PublishedContentRequest redirect vs. permanent 2013-06-19 20:30:43 +02:00
Sebastiaan Janssen c8a19dff44 Merge branch '6.0.7' into 6.1.2
Conflicts:
	src/Umbraco.Web/Media/ImageUrl.cs
	src/Umbraco.Web/Media/ImageUrlProviders/ImageUrlProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
2013-06-19 18:26:45 +02:00
WadeKallhoff a6768263d3 image thumb extension fix 2013-06-19 18:11:28 +02:00
kensykora e66306978a macro rendering fix 2013-06-19 17:59:30 +02:00
Phil Dye 7f22809ebf U4-1478 Create button still visible when not active 2013-06-19 17:55:00 +02:00
Edwin de Koning 302ebde422 Translating the word "or" 2013-06-19 16:28:58 +02:00
Murray@tbpc10.terabyte.co.nz cf5624f377 #U4-2326 Added Try Catch for PlatformNotSupportedException
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
2013-06-19 16:24:09 +02:00
Morten Bock f386c9d024 U4-1226 Umbraco:image control 2013-06-19 16:18:15 +02:00
Edwin de Koning 530fcf0ea3 Fixes U4-2261 2013-06-19 16:04:56 +02:00
Sebastiaan Janssen 26e4091f28 Due to previous fix we don't need to sort individually any more
(see changeset 32f86f750e)
2013-06-19 16:01:50 +02:00
Dennis Ravn Pedersen 32f86f750e Query would reverse logic sorting of children. Would make move operations ignore sorting.
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
2013-06-19 15:36:08 +02:00
Sebastiaan Janssen ebad631140 Merge branch '6.0.7' into 6.1.2 2013-06-19 15:16:32 +02:00
Sebastiaan Janssen b8304c03ee Merge branch '6.0.7' of https://github.com/bokmadsen/Umbraco-CMS into bokmadsen-6.0.7 2013-06-19 14:50:41 +02:00
Sebastiaan Janssen 556c2d625f Merge branch '6.0.7' into 6.1.2
Conflicts:
	src/umbraco.cms/businesslogic/member/Member.cs
2013-06-19 14:42:14 +02:00
Sebastiaan Janssen 6f85eefd85 updated ignore file with correct case sensitivity
Conflicts:
	.gitignore
2013-06-19 14:39:21 +02:00
Sebastiaan Janssen aaa4469def Merge branch '6.0.7' of github.com:umbraco/Umbraco-CMS into 6.0.7 2013-06-19 14:36:17 +02:00
Sebastiaan Janssen baa0069262 Merge branch 'master' into 6.0.7
Conflicts:
	README.md
2013-06-19 14:22:57 +02:00
Sebastiaan Janssen 9ac4c7aef5 Merge branch 'master' of https://github.com/umbraco/Umbraco-CMS 2013-06-19 14:14:51 +02:00
Sebastiaan Janssen cb2a35594f Merge branch '6.0.6'
Conflicts:
	src/Umbraco.Core/TypeFinder.cs
2013-06-19 14:13:09 +02:00
Sebastiaan Janssen dd501d0198 Merge pull request #16 from darrenferguson/master
Remove obsoletion of Member methods
2013-06-19 05:07:35 -07:00
Sebastiaan Janssen b724d8fb32 Merge pull request #15 from pynej/master
Fix for U4-2384. Author not changed to current user when a node is copied.
2013-06-19 05:06:23 -07:00
Darren Ferguson 7c6aee17e9 Remove obsolete messages from member class
I've removed the obsolete methods from the member class because many of
the suggested alternatives don't work. and some require a lot of
configuration to get working.

Also, the member methods return Members - so they are not obsolete if
you want a reference to a member, you can choose to use System
membership if you want, but for custom properties and groups you need to
fallback to the Umbraco API, so these shouldn't be obsolete! :)
2013-06-19 13:02:58 +01:00
Shannon 2650740fa7 moved umbraco property editors into the core and outside the manifest (as c# declarations). Changed property editor names to not be editor.html and instead be the name of the folder as a convention. 2013-06-19 16:42:50 +10:00
Shannon 8db763c953 Updated server side stuff to work with new yepnope which makes things much simpler. 2013-06-19 13:45:41 +10:00
Shannon f05f1a4302 Merge remote-tracking branch 'origin/4.11.9' into 4.11.7---ITask-updates
Conflicts:
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
2013-06-19 12:06:07 +10:00
Jeremy Pyne 5e2c3a0a8b Fixed a type on content copy. 2013-06-18 10:38:08 -04:00
Jeremy Pyne f5121bd183 Fix for U4-2384. Author not changed to current user when a node is copied. 2013-06-18 09:35:33 -04:00
Bo Kingo Damgaard 51b5334126 Duplicate e-mail addresses: U4-315, U4-2147, U4-304
- Allows for duplicate e-mail addresses in member section by opt-in
(requiresUniqueEmail="false" in
web.config/membership/providers/"UmbracoMembershipProvider").
- Fixes issues with backoffice not checking for duplicate emails when
changing member after creation.
- Lower cases email addresses upon creating member and when searching to
prevent duplicates.
- Added Member.GetMembersByEmail to get alle members with specific email
2013-06-18 14:23:05 +02:00
Shannon 41346a784d adds ngdocs 2013-06-18 20:18:08 +10:00
Shannon 111ae3d3e3 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-18 20:09:30 +10:00
Shannon 608265ff19 Created new directive: umbpropertyinclude which handles the lazy loading of a property editor and then checks if it declares a controller before it compiles it. If it does, we'll make a lazy JS request for it's JS file and then finally compile it. With this in place we could have our own custom directive to officially state that a JS file is required instead of just checking for the ng-controller. 2013-06-18 20:08:00 +10:00
Per Ploug Krogslund f92ee9b768 Updates the mocked content to support new editor path 2013-06-18 11:45:04 +02:00
perploug 26d63439ec Update README.md 2013-06-18 11:43:07 +02:00
perploug bcc0beb79b Update README.md 2013-06-18 12:41:40 +03:00
Per Ploug 1ca883631e Media Resource Mock returns promise 2013-06-18 11:14:16 +02:00
Per Ploug 03b9a91458 merge 2013-06-18 11:09:16 +02:00
Shannon 3caa44d26b Removes property editor filter as it gets executed too many times, changed this into a helper method. 2013-06-18 19:02:53 +10:00
Per Ploug e501e7fb98 chore Clean up the build/belle directory 2013-06-18 10:58:04 +02:00
Per Ploug 4b68d1950c Replaces require.js with jepnope
Gets rid of the AMD pattern, adds scriptLoader service, work on security
service started
2013-06-18 10:51:26 +02:00
Shannon 9720717076 changed default location of prop editor views to not be in the 'umbraco' folder (not needed) 2013-06-18 18:44:33 +10:00
Shannon 895ff65585 Got mock user data working and updated index.html to reflect how we're working with it in the .net solution with correct directives. Now mock tree data seems to be an issue. 2013-06-18 18:36:32 +10:00
Shannon 47b6c42253 removes mock userresource as that doesn't exist. 2013-06-18 18:17:25 +10:00
Shannon 4630ddb818 updated user service to use $q.when so we can just return values instead of promises. 2013-06-18 18:16:11 +10:00
Shannon 1f56d0b280 Starting to move umbraco property editors into the core, not in a manifest. 2013-06-18 17:57:15 +10:00
Shannon 816edce620 Implemented auto-mapper for mapping and converted over the user mappings. Got the gravatar directive working now too. Removed all umbracoUseMediumTrust settings. 2013-06-18 17:22:01 +10:00
Shannon feeba0e6f9 Merge branch '6.1.2' into 7.0.0
Conflicts:
	src/Umbraco.Web/WebBootManager.cs
2013-06-18 15:47:56 +10:00
Shannon 273c1956ab Fixes: #U4-2343 for api controllers, already fixed for surface controllers 2013-06-18 15:46:36 +10:00
Shannon 93fa4c0447 Merge branch '6.1.2' into 7.0.0
Conflicts:
	.gitignore
	src/Umbraco.Web/Mvc/BackOfficeArea.cs
	src/Umbraco.Web/WebBootManager.cs
2013-06-18 15:28:37 +10:00
Shannon eb8f957977 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-18 15:25:12 +10:00
Shannon f7c474ac2c fixed merge issue and ensures UseNamespaceFallback are set for plugin controllers. 2013-06-18 15:24:44 +10:00
Shannon 4143dbd02d Fixed some merge issues 2013-06-18 15:20:18 +10:00
Shannon 768eb3d1ed Merge branch '6.0.7' into 6.1.2
Conflicts:
	src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
	src/Umbraco.Web/Mvc/PluginControllerArea.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
2013-06-18 15:13:43 +10:00
Shannon 120bdca9eb removed constraint names on SurfaceControllers, they don't need to be suffixed with SurfaceController, only Controller. 2013-06-18 15:05:13 +10:00
Shannon a5041aa34e Backported changes to use a real Area to do Umbraco area routes and updates our extension methods with the UseNamespaceFallback data token to only check in one namespace. 2013-06-18 14:59:00 +10:00
Shandem 59811c2841 Merge pull request #11 from florisrobbemont/6.1.2
Fix U4-2286 - IFilteredControllerFactory classes are not resolved by Umb...
2013-06-17 21:27:19 -07:00
Shannon 38eee6135e Merge branch '6.0.7' into 6.1.2 2013-06-18 14:21:11 +10:00
Shannon d3780848dc updated ignore file with correct case sensitivity 2013-06-18 14:20:50 +10:00
Shannon 5719820fad Merge branch '6.0.7' into 6.1.2
Conflicts:
	.gitignore
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
2013-06-18 14:18:17 +10:00
Shannon f0f394263f Removed all build files, updated sln to not try to build website project, 2013-06-18 14:11:23 +10:00
Shannon 15ea17e6d6 started on avatar directive 2013-06-18 12:02:34 +10:00
perploug 00898902a3 Create README.md 2013-06-17 13:36:34 +02:00
Shannon e408d5f536 moves other controllers into separate files 2013-06-17 17:12:19 +10:00
Shannon 6ecfcd3767 Moves main controller into separate file, ignore file removes a bunch of build files that don't need to be there. 2013-06-17 17:02:36 +10:00
Shannon a7b546527c Added more methods to User Repo/Service to get an IUser by id. Upgraded to angular 1.5.5 to fix an animation bug. Got authorization working nicely now. Fixed up the animation.less files with 1.5.5's breaking animation changes. Fixed up WebSecurity class to always have an instance of HttpContextBase (still requires much more fixing though). 2013-06-17 16:03:27 +10:00
Shannon 34c98fe97b Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
Conflicts:
	.gitignore
2013-06-17 05:36:18 +02:00
Shannon 88b84c5bcf Fixed up user login logic and works now, now to clean up the user data. 2013-06-17 05:34:30 +02:00
Shannon c52e51b2d8 Fixed up external templated directives to use the templateUrl property which i didn't previously know about, this ensures that a new scope is not created for these elements which was causing issues. updated ignore file some more, removed committed files that shouldn't be there 2013-06-17 04:51:59 +02:00
Shannon 9d15228c68 manually applies patch for drag/drop fix in media for vdir 2013-06-17 03:06:24 +02:00
Shannon c9c3623457 updated ignore
Signed-off-by: Shannon <sdeminick@gmail.com>
2013-06-17 02:59:00 +02:00
Shannon b50658121d Started integrating authorization services. 2013-06-17 01:06:31 +02:00
Floris Robbemont aecc3d28bf Fix U4-2286 - IFilteredControllerFactory classes are not resolved by Umbraco
Simple fix, just made the FilteredCOntrollerFactoriesResolver public. This way developers can add their own on application start
2013-06-15 22:46:01 +02:00
Sebastiaan Janssen b51022575f Merge pull request #8 from mattbrailsford/6.1.2
Updated RenderMvcController to have the view engines test for file existance
2013-06-13 03:42:34 -07:00
Sebastiaan Janssen 6600e9c899 Merge pull request #6 from dpen2000/UserPermisionsFixIn6.1.2
Fix U4-2320 - Error on saving User Permissions (for 6.1.2 release)
2013-06-13 03:18:37 -07:00
Sebastiaan Janssen 68aa2abbc0 Merge pull request #7 from pynej/6.1.2
Fixed Ctl+S on stylesheets editor.
2013-06-13 03:11:57 -07:00
Sebastiaan Janssen e0a483ca48 Merge pull request #5 from tcmorris/patch-1
Update README.md
2013-06-13 02:05:43 -07:00
mattbrailsford 9b78cb3f7c Updated RenderMvcController to have the view engines test for file existance, rather than assuming views will always be razor. This allows alternative MVC view engines to be used. 2013-06-13 09:26:45 +01:00
Jeremy Pyne c6c90fde44 Fixed Ctl+S on stylesheets editor. 2013-06-12 23:41:49 -03:00
david.pendray 773500332b Fix U4-2320 - Error on saving User Permissions
Nodes can be null but NodeIds property always returns a collection and this will return Ids from Nodes if _nodeIds are null and Nodes is not.
2013-06-13 02:50:25 +01:00
Thomas Morris 95eb00a81c Update README.md
Updating link and formatting
2013-06-12 18:24:54 +02:00
Sebastiaan Janssen 3921b0974e Merge pull request #3 from Jayshoe/patch-1
Sitemap provider be gone! Issue #U4-1950
2013-06-12 07:19:56 -07:00
Jayshoe 2cd07c841f Sitemap provider be gone! Issue #U4-1950 2013-06-12 16:19:14 +02:00
Sebastiaan Janssen 8f80f0e95c Merge pull request #2 from Jeavon/patch-1
Update README.md
2013-06-12 06:38:32 -07:00
Jeavon 73ac2c0309 Update README.md
Readme.md corrections and updates
2013-06-12 15:34:26 +02:00
Sebastiaan Janssen a5ddb6c818 Merge pull request #1 from dpen2000/patch-1
Update README.md
2013-06-12 06:10:28 -07:00
dpen2000 458e61e049 Update README.md
Fix link to Umbraco releases page
2013-06-12 14:45:41 +02:00
Sebastiaan Janssen 0815842640 Update README.md 2013-06-12 11:10:18 +03:00
Sebastiaan Janssen 53b31a5c1b Update README.md 2013-06-12 10:04:31 +02:00
Per Ploug a2e4b6b698 Icons fixed again, F U rebase 2013-06-11 18:16:48 +02:00
Per Ploug a8cf9b1a44 merge 2013-06-11 18:15:17 +02:00
Per Ploug 0ace3a1f74 utill.service.js update to support icons 2013-06-11 18:06:52 +02:00
Shannon 9cc95aba0e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-06-11 18:02:23 +02:00
Shannon 1511a5b951 Got images to work even if they are stored as legacy image data structure 2013-06-11 18:00:25 +02:00
Per Ploug 30ebf71c15 Google maps editor 2013-06-11 17:30:00 +02:00
Shannon 750b5fcaa3 updates ignore 2013-06-11 16:44:43 +02:00
Shannon 141e78064b updated ignore 2013-06-11 16:39:46 +02:00
Shannon ab0ad9b255 Fixed drag drop upload for media in vdir 2013-06-11 16:04:28 +02:00
Shannon 017987f16d updated gitignore to latest 2013-06-11 15:43:33 +02:00
Shannon d32ea915e1 publishing is working 2013-06-11 15:13:45 +02:00
Shannon 5dee0208f5 Fixed content title saving 2013-06-11 15:04:23 +02:00
Shannon c055dedee9 GetByIds content method 2013-06-11 14:43:36 +02:00
Shannon b89958af41 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-11 14:31:14 +02:00
Shannon d4cfa57b2a Got media creation working and fixed updating node names. 2013-06-11 14:30:37 +02:00
Per Ploug Krogslund 20bac8085e Update manifest to support textstring, area, boolean and content picker 2013-06-11 13:19:58 +02:00
Shannon 16d2711177 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-11 13:16:03 +02:00
Shannon a39e57f4d9 added null check for prop editors, got the RTE media picker working properly with correct styles and using the server data. 2013-06-11 13:12:54 +02:00
Per Ploug Krogslund e32d0890c0 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Conflicts:
	.gitignore
2013-06-11 12:29:34 +02:00
Per Ploug Krogslund 8810f7d742 gitignore file 2013-06-11 12:27:05 +02:00
Shannon a656911061 Updating media picker to work and look properly 2013-06-11 12:16:37 +02:00
Per Ploug Krogslund 6061190021 googlemaps update to support duncanson 2013-06-11 12:16:31 +02:00
Shannon da146891ef Updated ignore file and ignored all Belle build files. 2013-06-11 09:32:51 +02:00
Shannon 3fee64d6eb Got media saving now.
Signed-off-by: Shannon <sdeminick@gmail.com>
2013-06-11 02:01:17 +02:00
Sebastiaan Janssen 4bf09089e6 Merge branch '7.0.0' of https://umbmigrate.kilnhg.com/Code/Repositories/Group/UmbMigrate into 7.0.0 2013-06-11 01:05:33 +02:00
Sebastiaan Janssen f4fe0636d8 Update README.md 2013-06-11 00:58:23 +02:00
Sebastiaan Janssen 292dd9115b Update README.md 2013-06-11 00:57:36 +02:00
Sebastiaan Janssen c6d0a9be00 Update README.md 2013-06-11 00:57:34 +02:00
Sebastiaan Janssen 14c3acc4b7 Create README.md 2013-06-11 00:57:31 +02:00
Sebastiaan Janssen a4098b5d25 Update README.md 2013-06-11 00:57:03 +02:00
Sebastiaan Janssen ca4f5a39da Add missing files 2013-06-11 00:49:19 +02:00
Sebastiaan Janssen acdcca0b91 Add missing files 2013-06-11 00:48:29 +02:00
Sebastiaan Janssen 33ff82e766 Add missing files 2013-06-11 00:47:44 +02:00
Shannon aea1a17a03 Last commit into mercurial!!! -- a bunch of model mapping mayhem 2013-06-10 20:24:54 -02:00
Shannon e750fda197 added readonly view to support showing value from legacy data types. 2013-06-10 17:12:59 -02:00
Shannon 711cc3629b Fixed up some model mapping. 2013-06-10 17:01:50 -02:00
Shannon 877c0b85cd Refactors content model mapper to be re-used for media, added new base model class
to deal with content similarities like media. Renamed some service methods to be consistent.
2013-06-10 16:43:42 -02:00
Shannon e8c4063ed1 Fixes data saving services 2013-06-10 15:58:52 -02:00
Shannon 01c48b7dba Fixed content edit data issue and fixes media controller naming 2013-06-10 15:49:35 -02:00
Shannon 655a280cf1 Ensures the tree expansion doesn't happen when there are no child nodes. 2013-06-10 15:03:25 -02:00
Shannon 5a51a8440a updates ignore 2013-06-10 14:51:21 -02:00
Shannon c8df4a08f9 missing file commit 2013-06-10 14:48:29 -02:00
Shannon b12e59cbac Removed temp committed files for belle, added build scripts 2013-06-10 14:46:49 -02:00
Sebastiaan Janssen 5fd90e1c13 Update README.md 2013-06-10 19:17:37 +03:00
Sebastiaan Janssen a6eaec9ecb Update README.md 2013-06-10 19:09:03 +03:00
Sebastiaan Janssen f5553bcc06 Create README.md 2013-06-10 18:05:07 +02:00
Shannon 6b6dfceda0 Fixed issues with tree data loading 2013-06-10 14:03:41 -02:00
Shannon 81f10b72d7 Fixes some issues with merge changes. 2013-06-10 13:39:44 -02:00
Shannon 966531bd95 renames content controllers with correct file names 2013-06-10 13:20:46 -02:00
Shannon fa9c259a84 Adds media views and controllers 2013-06-10 13:19:45 -02:00
Shannon e88c28c486 Fixed JS build issues. 2013-06-10 13:16:13 -02:00
Shannon 10facc24fa ensures media picker html is correct 2013-06-10 13:10:21 -02:00
Shannon afb4867951 Ensures resources are correct 2013-06-10 13:05:57 -02:00
Shannon 77c8b22fe1 Merges in custom controller changes. 2013-06-10 13:01:17 -02:00
Shannon 3bd7fbfa9a Ensures tree directive is using the icon filters (which we'll need to change later) Added
custom validation directives.
2013-06-10 12:56:32 -02:00
leekelleher e0c68a8e1c Resolves #U4-184 Upgrade package when installing a newer version.
Multiple package versions can be installed, only the latest version is listed under "Installed Packages".
When the installed package is viewed, a list of previously installed versions (of that package) are listed.
2013-06-10 13:55:58 -01:00
Shannon 6e83541e05 merging in controllers.js 2013-06-10 11:55:54 -02:00
Shannon bf7eda9347 Removing items that shouldn't be there 2013-06-10 11:19:15 -02:00
Shannon bc5ef66f1a Merge 2013-06-10 11:16:05 -02:00
Shannon df72297429 Got media picker working with real media items. 2013-06-10 11:15:33 -02:00
Per Ploug Krogslund e09272316f Merge 2013-06-10 10:56:44 -02:00
Per Ploug Krogslund 9c32a4ead0 Merge 2013-06-10 10:48:56 -02:00
Per Ploug Krogslund f472e139b5 clearing out legacy common folder 2013-06-10 10:48:36 -02:00
Per Ploug Krogslund 47f1dcf4e5 Missing client files, excluding node_modules 2013-06-10 10:44:40 -02:00
Per Ploug Krogslund 6b6ece01f6 Moved all JS files to umbraco.ui.client folder so naming and structure is consistent with the umrbaco 7 structure
Added locally mocked data in a seperate module
2013-06-10 10:39:34 -02:00
Shannon 47d70e858b Getting media picker working 2013-06-10 10:36:59 -02:00
Shannon 1b59c1ba6e Got content item creation working and rte property editor working/saving 2013-06-09 11:40:52 -02:00
Shannon 083328e473 Fixes tree source parsing. 2013-06-09 06:27:16 -02:00
Shannon 54bad14590 Merge 2013-06-09 06:21:09 -02:00
Shannon Deminick 1f8aa65b5d missing template to get demo working 2013-06-09 06:19:36 -02:00
Shannon 0205f8a025 Merge 2013-06-09 06:19:27 -02:00
Shannon 1da4f2379f Temp removes uGoLive since the old TypeFinder isn't there anymore. 2013-06-09 06:19:08 -02:00
Shannon Deminick b341cf8b93 Commits temp js files needed for demo to work 2013-06-09 06:16:56 -02:00
Shannon Deminick e888bd39d6 Commits some directive views - temporary to get demo working 2013-06-09 05:58:06 -02:00
Shannon Deminick 8e3f075fd9 missing file 2013-06-07 04:18:30 -10:00
Shannon Deminick 6028cebc90 Fixes lookup for getting allowed child content types 2013-06-07 02:45:06 -10:00
Shannon Deminick 9cfbb24f4c Content is now saving properly in the editor. 2013-06-07 02:29:24 -10:00
Shannon Deminick 9431ae7fdb Fixed issues of using StateHelper since we do things in async which don't have an HttpContext.Current, so we use our
UmbracoContext.Current instead if required. Changed StateHelper to be obsolete as we need to replace all calls to it with
proper extension methods. Updated the content model mappers to ensure we ToArray property objects so they don't keep
re-processing the Linq statement when iterating. Content is now saving to the db.
2013-06-07 01:39:53 -10:00
Morten Christensen bc1b2dc5f4 Fixes #U4-2333 2013-06-07 05:19:45 -02:00
Morten Christensen 0bb643672f Adding some minor changes/adjustments to the TypeFinder to make a bit more flexible for external usage. 2013-06-07 05:19:25 -02:00
Shannon Deminick 96fac60c3f So close to having data saving but now we have issues with HttpContext.Current because we are running async processes... fail. 2013-06-05 14:37:19 -10:00
Shannon Deminick 406edc4aab Adds a bunch of directives from my POC to do with validation but haven't implemented them. Ensures that ng-form is applied to each property item. 2013-06-04 23:01:26 -10:00
Shannon Deminick 6dd48262e1 Fixed up how tabs are loading to work with async data and am now displaying real data ! 2013-06-04 22:30:49 -10:00
Shannon Deminick fea28df758 Fixed more tree merge issues, fixed how property editors are rendered. 2013-06-04 15:59:14 -10:00
Shannon Deminick c932f31f40 merged in other styling and fixes from belle repo 2013-06-04 14:39:23 -10:00
Shannon Deminick 55521458b4 Fixed up some merge issues 2013-06-04 14:29:41 -10:00
Shannon Deminick 9e928ef0fa Merged in latest changes from Belle repo 2013-06-04 14:05:13 -10:00
Shannon Deminick 35ada35257 Updated content model mapper to re-use mappings as much as possible. Added most of the missing properties to content and inline with the expected format
in the UI project. Added basic user model and a mapper for that too. updated tree service in UI to automatically create the 'view' for each node based on
the section and id, the same way it updates the level for each node.
2013-06-03 23:50:20 -10:00
Shannon Deminick 13c2aaf346 Fixed hard coded paths, removed html path in markup 2013-06-03 21:43:46 -10:00
Shannon Deminick 34cb8ea633 Changed back office routes to use a proper MVC area and ensures that the controller creations for all controllers are limited
to ONLY look in the namespaces declared for them, this will increase performance and ensure there's not conflicting controller
creation... need to back port this to 6.0.x
2013-06-03 21:38:43 -10:00
Shannon Deminick 8bced15f56 updates icon output 2013-06-03 21:19:38 -10:00
Shannon Deminick bb1052c063 Started integrating the contentTypeResource with the real back office data. 2013-06-03 18:56:16 -10:00
Shannon Deminick 0d071e9fe9 Changed all my custom stuff over to only be a part of the 'umbraco' module, this will just help with merging later so I'm not
mucking about with other module definitions. Added an icon converter so that we can automatically try to map all legacy sprite icons
to the new icons. Merged in recent chagnes from Belle repo to get sections working again.
2013-06-03 17:36:04 -10:00
Shannon Deminick 695b238499 Merge with 6.1.2 2013-06-03 16:27:42 -10:00
Shannon Deminick 813d60521c Merge with 6.0.7 2013-06-03 16:27:20 -10:00
Shannon Deminick 5212d17f49 Fixes: #U4-2313 - manually adding a reserved route value in BeginUmbracoForm 2013-06-03 14:56:15 -10:00
Shannon Deminick 76bbdcd32c Merge with 6.1.2 2013-06-03 13:36:40 -10:00
Shannon Deminick 932115585e Fixes: #U4-2315 - CDF grouping issue, updated to new version 2013-06-03 13:35:41 -10:00
Shannon Deminick edfffad122 updates proj file 2013-06-03 13:09:49 -10:00
Sebastiaan Janssen 948ffe4796 Merge with 6.0.7 2013-06-03 15:11:44 -02:00
Sebastiaan Janssen 6b1dd07310 Fixes U4-2254 [Object object] error when selecting media link for content. 2013-06-03 15:11:23 -02:00
Sebastiaan Janssen dc2554c6d0 Fixes U4-2254 [Object object] error when selecting media link for content. 2013-06-03 15:08:56 -02:00
Shannon Deminick 47af165ad8 Got legacy icons working 2013-06-02 23:00:02 -10:00
Shannon Deminick 1a5eb33422 Ok, no reverted to my merged versions... now we have a clear idea of whats chagned. 2013-06-02 22:34:35 -10:00
Shannon Deminick 87103ceba7 Ok, this is the raw belle files that I've modified which I'll revert to after this commit. 2013-06-02 22:30:34 -10:00
Shannon Deminick 193fcd3083 merged all new changes in... going to revert to the raw belle files after this and then move back to this revision so we have a
clear picture of whats changed.
2013-06-02 22:29:07 -10:00
Sebastiaan Janssen 5c6514929e Opening branch 6.1.2 2013-06-03 06:16:19 -02:00
Sebastiaan Janssen 9739b3e2ef Closing branch 6.1.1 2013-06-03 06:15:57 -02:00
Sebastiaan Janssen 0b1f72f139 Added tag release-6.1.1 for changeset 7271ae03cb53 2013-06-03 06:15:31 -02:00
Shannon Deminick dd3490a2ab added extension.js, trying to add legacy sprites for tree icons, updates tree icon filters (still not working) 2013-06-02 20:34:06 -10:00
Shannon Deminick 4a24abca17 Fixes issues with requirejs not loading in things in order. 2013-06-02 18:42:17 -10:00
Shannon Deminick 575b5b71ab got legacy tree icons showing up now, added a couple of filters for this to work. 2013-06-02 17:09:16 -10:00
Shannon Deminick c60cc5d10d fixes blue tree style, updated tree.html to not show caret when there is no children, applied inline styles to it which
should be moved to the stylesheet.
2013-06-02 15:48:43 -10:00
Shannon Deminick 1fc262063a Fixes tree styles. 2013-06-02 15:20:57 -10:00
Shannon Deminick 8aba37cb10 removes container controller 2013-06-02 14:35:26 -10:00
Shannon Deminick 2cf1ee283f Ensures controllers are authenticated. fixes type with login directive. 2013-06-02 14:35:15 -10:00
Morten Christensen 2a2e867784 Fxies U4-2257 2013-06-02 11:30:27 -02:00
Sebastiaan Janssen 79e0242468 Show containers in folderbrowser again 2013-06-02 05:03:51 -02:00
Morten Christensen 242443d861 Fixes the EntityRepository for Content and Media, so trees load correctly.
Fixes U4-2306
Fixes loading of MNTP.
FolderBrowser is now able to show multiple images on a single media item.
FolderBrowser only shows images and not containers.
2013-06-01 20:40:51 -02:00
Shannon Deminick f3fbae7173 Updated trees to get children nodes from the server... nearly working and also works with proxying
to legacy trees. In fact there are not new trees created yet, just focusing on adapting for legacy trees
which so far seems to be good.
2013-05-31 17:20:56 -10:00
Shannon Deminick 4a57dcfd01 Updates tree service and controller to work with promises when retreiving data for the tree. 2013-05-31 16:14:16 -10:00
Sebastiaan Janssen 7c066b9ded Merge with 6.0.7 2013-05-31 14:01:21 -02:00
Sebastiaan Janssen 159d605434 U4-2262 Release 6.1.0 Build 2 (Beta) has Razor Errors on scripting files 2013-05-31 13:59:35 -02:00
Shannon Deminick ad1a36c0ee Changed new directives over to user proper function declaration with code comments. Added new tree data resource, using
promise api to return the data (handy!)
2013-05-31 04:28:26 -10:00
Sebastiaan Janssen 1971006a48 Merge with 6.0.7 2013-05-31 12:16:09 -02:00
Sebastiaan Janssen 5c0c33a46b Fixes U4-2304 Typo bug in umbraco.cms.businesslogic.packager 2013-05-31 12:14:03 -02:00
Sebastiaan Janssen 9bd255d9a5 Include ExamineManagementIco.png in project so it's included in the build 2013-05-31 11:35:21 -02:00
Shannon Deminick 84856eaf30 Merge with 6.1.1 2013-05-31 03:11:16 -10:00
Shannon Deminick 43c7ccc5cc adds custom directives to simplify the default razor view markup so it can be managed externally. 2013-05-31 03:04:38 -10:00
Sebastiaan Janssen cc7f41d9ee U4-2295 Templates tree doesn't refresh and Master template stays at "None" 2013-05-31 09:15:10 -02:00
Sebastiaan Janssen b4b0a37c2c Fixes U4-2302 Breaking change in 6.1? Macro parameter "contentPicker" no longer
passes an id, but a node
2013-05-31 09:13:25 -02:00
Sebastiaan Janssen 8c841f97cc Merge with 6.0.7 2013-05-31 05:57:18 -02:00
Sebastiaan Janssen a1ee352514 Additional fix for U4-335 Image cropper out of memory 2013-05-31 05:46:10 -02:00
Shannon Deminick 160811e190 added new tests for model mapping and serialization of the content display models. Started integrating trees. Committed the compiled
angular controllers, directives, services, resources since I'll be modifying them to work with the real data services. Then we'll have
to merge back to the belle repo with the changes.
2013-05-30 21:21:52 -10:00
Morten Christensen c25b06b15f Fixes #U4-2296 2013-05-30 14:28:34 -02:00
Sebastiaan Janssen 78bfb6a8cc Fix missing Examine dashboard 2013-05-30 10:26:54 -02:00
Sebastiaan Janssen d8a8bf5f74 Bump version number 2013-05-30 10:26:40 -02:00
Sebastiaan Janssen b70c98ea74 Merge with 6.0.7 2013-05-30 10:25:20 -02:00
Sebastiaan Janssen a8ad8c2a43 Bump version number 2013-05-30 10:23:35 -02:00
Sebastiaan Janssen 96f8cd3d60 Opening branch 6.1.1 2013-05-30 10:21:34 -02:00
Sebastiaan Janssen 91436ad247 Closing branch 6.1.0 2013-05-30 10:20:59 -02:00
Sebastiaan Janssen 678f911ff1 Added tag release-6.1.0 for changeset 8309c3bd6db5 2013-05-30 10:20:36 -02:00
Sebastiaan Janssen afbe3ca3b9 Creating branch 6.0.7 2013-05-30 09:57:33 -02:00
Sebastiaan Janssen 32d6f2e50c Closing branch 6.0.6 2013-05-30 09:57:03 -02:00
Sebastiaan Janssen 9909f5b6be Added tag release-6.0.6 for changeset 953c466faf8f 2013-05-30 09:56:32 -02:00
Sebastiaan Janssen 7b6cda6b44 Closing branch 4.11.9 2013-05-30 09:46:32 -02:00
Sebastiaan Janssen 332d91b6dc Added tag release-4.11.9 for changeset fb8fd83e8e70 2013-05-30 09:46:21 -02:00
Sebastiaan Janssen ddbe15de08 Config file formatting, remove logger from CD for now as it was throwing errors 2013-05-30 08:47:17 -02:00
Sebastiaan Janssen 5c5d63ce9a web.Template.config formatting 2013-05-30 06:26:55 -02:00
Shannon Deminick 03f64521cb updated sln to have a simple website project in the Umbraco.UI.Client folder which will be the Belle development folder, its a website so it doesn't compile or anythng
just a space to be able to edit files. We can probably also update it to launch IIS Express to point to the build folder for testing. Moved the back office
scripts controller actions just to the normal back office controller. Tweaked some of the Belle POC so now it is loading and have created an index.html
file which contains all the belle stuff so people won't have to worry about the container razor file.
2013-05-29 20:25:29 -10:00
Shannon Deminick 957e98ac78 adding libs to repo to support Belle, again these are temporary until the real integration starts in a few weeks. 2013-05-29 17:33:05 -10:00
Shannon Deminick 5d10325d50 Adding required files to get the Belle demo working, these files will are not part of VS project and will actually be removed from this
space in the future, they are here for now until we integrate the belle repo with this one.
2013-05-29 17:30:36 -10:00
Morten Christensen d3916a1d85 Sorting - now it works 2013-05-29 13:37:41 -02:00
Morten Christensen db7cb2dcb4 Merge with 6.0.6 2013-05-29 13:18:40 -02:00
Morten Christensen 6281268954 Updating sort method in Content- and MediaService 2013-05-29 13:18:03 -02:00
Shannon Deminick 936c2a87ab Fixed up the property editors to now all work with saving data, updated the file uploaded to actually save the files, clear the files, and update
its UI accordingly. Ensures that when data is saved we send back down the up-to-date model and re-bind everything which works awesome.
2013-05-28 22:58:31 -10:00
Sebastiaan Janssen cd606a7e9e Merge 2013-05-29 05:41:50 -02:00
Sebastiaan Janssen ae9d77a765 Bump version number 2013-05-29 05:40:55 -02:00
Morten Christensen f6e44b4e7c Merge with 6.0.6 2013-05-29 05:38:35 -02:00
Morten Christensen 8e1c45e981 Updating Sort methods to skip items that hasn't been sorted 2013-05-29 05:37:55 -02:00
Sebastiaan Janssen 955282f260 Merge with 6.0.6 2013-05-29 03:49:44 -02:00
Sebastiaan Janssen 4a7ee52d63 Merge with 4.11.9 2013-05-29 03:47:26 -02:00
Shannon Deminick c5ff9ddec9 Updated property editors deserialization method to accept more information and original values, updated the upload property editor to now save
files in accordance with exactly how we are saving them currently and it is all working... expcept the new uploader can do multiple files. It is
now persisting to the database as well.
2013-05-28 18:27:11 -10:00
Shannon Deminick 94786f08c6 Removes old type finder and type resolver. Updates POC postcode editor to work with new config array. 2013-05-28 16:49:01 -10:00
Shannon Deminick 302b3c3750 Fixed some build problems, replaces all calls to the legacy/obsolete data type factory to the DataTypesResolver and removes test for DataTypeFactoryTests.
Updates data type editor to show legacy data types at the bottom and the new Property editors at the top. Updated the data type editor to use the new api
so that we can test assigning Belle property editors to data types (pre-values have not been converted though). #U4-2289
2013-05-28 15:54:19 -10:00
Shannon Deminick 522d909d37 Merge with 6.1.0 2013-05-28 14:20:43 -10:00
Shannon Deminick e6fcdc8dc6 Fixes: #U4-2279 2013-05-28 14:16:39 -10:00
Shannon Deminick 547a137b9a Merge 2013-05-28 13:49:17 -10:00
Shannon Deminick 5041e6fcc4 Updated to latest CDF version that has a few bug fixes and added a CDF logger. 2013-05-28 13:24:48 -10:00
Sebastiaan Janssen db0d139a39 Merge with 6.0.6 2013-05-28 15:48:51 -02:00
Sebastiaan Janssen fc32100142 Merge with 4.11.9 2013-05-28 15:45:59 -02:00
Sebastiaan Janssen c3c44df52e Merge with 4.11.9 2013-05-28 15:43:40 -02:00
Sebastiaan Janssen 2f61bc27c8 Bump version number 2013-05-28 15:15:32 -02:00
Sebastiaan Janssen f484dbf0fc Fix merge issue 2013-05-28 12:37:29 -02:00
Sebastiaan Janssen 6d0ededd9f Merge with 6.0.6 2013-05-28 12:21:31 -02:00
Sebastiaan Janssen e7d157a209 Merge with 4.11.9 2013-05-28 12:18:49 -02:00
Shannon Deminick cf631974a8 Updated validator definitions, updated ToXml logic to take into account new Property Editors, added Serialization and Deserialization methods
for property editor's to override if necessary, updated the ContentItemBinder to bind the db and dto models so now that validator filter
just validates against the model and doesn't actually do any data lookups itself (much nicer). Now saves and retreives from the database !!
2013-05-27 21:32:37 -10:00
Shannon Deminick 7d7ca4530b Getting server side integration working from ported over Belle POC including temporary custom property editors.
Many files committed will be temporary and will be removed once development between the Belle UI project and this project are merged
and working.
2013-05-27 18:21:07 -10:00
Shannon Deminick 8ab85133bd Merge with 6.1.0 2013-05-27 17:17:52 -10:00
Shannon Deminick f6155d8e49 Fixes: #U4-2243 - reverts code to use the legacy API to create a template until the new template service is updated to work as it did. 2013-05-27 17:13:12 -10:00
Sebastiaan Janssen c1cd609325 Merge with 6.0.6 2013-05-27 10:23:03 -02:00
Sebastiaan Janssen b916360771 Merge with 4.11.9 2013-05-27 10:22:20 -02:00
Sebastiaan Janssen fa8934f89a Merge with 6.0.6 2013-05-27 10:09:00 -02:00
Sebastiaan Janssen c6940096d3 Merge 2013-05-27 10:08:36 -02:00
Sebastiaan Janssen 40868ac361 Merge 2013-05-27 10:02:01 -02:00
Sebastiaan Janssen f399a9f52b Merge with 4.11.9 2013-05-27 10:00:28 -02:00
Shannon Deminick cdbd1b504f upgraded other projs to 4.5, added page to render for back office for, now to get requirejs wired up properly as its not returning the correct
paths.
2013-05-27 01:23:49 -10:00
Morten Christensen 634e4a6949 Merge with 6.0.6 2013-05-27 08:47:14 -02:00
Morten Christensen e61b567ee1 Fixes #U4-2270 and #U4-2269 2013-05-27 08:45:07 -02:00
Sebastiaan Janssen 7ccae64dd1 Fix merge issue 2013-05-27 08:19:20 -02:00
Sebastiaan Janssen aef44065c5 Merge with 6.0.6 2013-05-27 08:17:49 -02:00
Sebastiaan Janssen 4ce22b836e Merge with 4.11.9 2013-05-27 08:16:18 -02:00
Sebastiaan Janssen 2b8544b4c7 Merge 2013-05-27 07:40:59 -02:00
Sebastiaan Janssen 6afa6a277f Fixes U4-2263 unable to create or save stylesheet content 2013-05-27 07:40:29 -02:00
Morten Christensen 469db82f1d Internal creation of backoffice users and unit test to verify 2013-05-27 06:50:14 -02:00
Shannon Deminick faae0b85cb importing more stuff from Belle proj 2013-05-26 19:54:50 -10:00
Shannon Deminick 8b841e19eb Upgrades required projects to .Net 4.5 2013-05-26 13:33:43 -10:00
Morten Christensen e0bc99af9c Merge 2013-05-24 08:14:07 -02:00
Morten Christensen 232581664b Moving internal membership provider classes.
Adding missing alias to AllowedContentTypes on ContentType.
Adding Package export test.
2013-05-24 08:13:24 -02:00
Shannon Deminick 0f5d61bae8 Started importing classes and functionality from the Belle project so we can start wiring up data. 2013-05-23 22:15:52 -10:00
Shannon Deminick ac93406194 Creating v7 branch 2013-05-23 21:32:59 -10:00
Shannon Deminick b15e147d6b Removed internal classes relating to property editors that are not used and were initially ported from v5 but we'll be
creating new/different ones for v7.
2013-05-23 21:32:26 -10:00
Morten Christensen c7a4c782e3 Internal work around the creation of users through the new api. 2013-05-23 13:25:14 -02:00
Morten Christensen 780908e24f Fixing merge issues and updating nodeSorter to use EntityService and new Sort method for improved performance.
Fixes #U4-1750
2013-05-23 11:34:06 -02:00
Morten Christensen 3ac7e237c4 Merge with 6.0.6 2013-05-23 10:38:09 -02:00
Morten Christensen 6943a454f3 Implementing Sort-method for the Content/MediaService 2013-05-23 10:29:44 -02:00
Morten Christensen e870db3c29 Fixing MacroTests that had a dependency on the Profiler, which wasn't setup in the fixture. 2013-05-22 11:24:46 -02:00
Morten Christensen 41b17160f7 Excluding a few new classes, which won't make it into 6.1.0. 2013-05-22 11:08:27 -02:00
Morten Christensen b19621c07b Improving tree performance for Content and Media trees using the new EntityService and the thin IUmbracoEntity object.
Updating a few internal overloads as well as adding new ones to ensure backwards compatibility for events used by the tree.
Fixing issue with the Published/Unpublished/Saved/Pending Changes states shown in the content tree.
2013-05-22 11:06:21 -02:00
Morten Christensen 0ff979e814 Adding missing method for retreiving parent or child relations.
Implements #U4-2237
2013-05-22 07:53:16 -02:00
Morten Christensen f26e39f5ce Adding a new extensibility in relation to #U4-2244 which allows consumers of the CoreBootManager to explicitly set the path to the root of an umbraco site/solution.
A bit of cleanup in the IOHelper class.
2013-05-22 07:48:42 -02:00
Morten Christensen 9a6030a3eb Fixes #U4-2244 2013-05-22 07:12:58 -02:00
Morten Christensen 84ef216d57 Merge 2013-05-17 05:51:49 -02:00
Morten Christensen ecfe51134d Updating the internal standalone context, and adding one that is limited to the core assembly to limit dependencies. 2013-05-17 05:51:22 -02:00
Shannon Deminick c8414116ad Merge with 6.0.6 2013-05-14 14:21:15 -10:00
Shannon Deminick 532f407260 Merge with 4.11.9 2013-05-14 14:20:52 -10:00
Shannon Deminick 2aa902beaf Fixed up unit test 2013-05-14 13:50:16 -10:00
Shannon Deminick 2f16e6662d updates disposable timer to ensure it also outputs to HttpTrace if there is one. 2013-05-14 13:39:55 -10:00
Shannon Deminick 0c4897d7c1 Changed the trace logger for PublishedContentRequestEngine to be correct. 2013-05-13 22:32:02 -10:00
Shannon Deminick 43dc14fa93 Changed over all direct calls to the profiler to use DisposableTimer.DebugDuration 2013-05-13 22:17:55 -10:00
Shannon Deminick e209aa3c2a Streamlined the profiling in the macro class. 2013-05-13 22:13:52 -10:00
Shannon Deminick 5890fe1849 Upgraded DisposableTimer to wrap the profiler... now we should really just use DisposableTimer for all profiling. 2013-05-13 21:11:03 -10:00
Shannon Deminick b6f52bf782 Changed the profiler over to use resolvers again. We no longer will call MiniProfiler directly.
Added an HtmlHelper extension which is used to render the profiler html output.
Added an HtmlHelper property to the new base page too.
2013-05-13 20:10:28 -10:00
Shannon Deminick 922ebe5411 Started implementing static cache provider for the application cache... centralizing static cache. 2013-05-13 19:31:27 -10:00
Sebastiaan Janssen 645637d550 Merge with 6.0.6 2013-05-13 13:48:34 -02:00
Sebastiaan Janssen 5cfe9e57ce Merge with 4.11.9 2013-05-13 13:47:01 -02:00
Shannon Deminick 2486e75210 Merge with 6.0.6 2013-05-12 23:57:09 -10:00
Shannon Deminick c0e1be4df9 Merge 2013-05-12 23:56:47 -10:00
Sebastiaan Janssen a93e562f14 Fixes U4-2209 6.0.5 - Bug - Empty recycle bin DELETES all content 2013-05-13 07:48:35 -02:00
Shannon Deminick 2201c644f7 Merge with 6.0.6 2013-05-12 21:49:38 -10:00
Shannon Deminick 822cac5d87 Adds test for #U4-2207 which will now pass but it will still fail on the website because of the case
sensitive checking for the default proeprty editor lookup. Need feedback from sebastian before continuing
2013-05-12 21:44:02 -10:00
Shannon Deminick d58487fafc Merge 2013-05-12 21:13:50 -10:00
Shannon Deminick ea9653fa83 patches fix for #U4-2214 2013-05-12 21:12:55 -10:00
Shannon Deminick b38397868e Fixes: #U4-2214 - encrypted cookie value issue when it is invalid 2013-05-12 21:07:16 -10:00
Shannon Deminick 7d1a18638b missing proj checking 2013-05-12 21:06:53 -10:00
Shannon Deminick 748e88c3e8 added web.config files to the root of xslt folders which will disable the ability for people
to publicly download other's xslt files .
2013-05-12 19:29:05 -10:00
Shannon Deminick cb8d080f1d Removes the abstraction on the profiler, no need for a resolver, it will work in unit tests and we can override the provider if needed.
Added better support for MVC profiling by using the built in ProfilingViewEngine and ProfilingActionFilter.
2013-05-12 19:05:49 -10:00
Shannon Deminick 3fd3bf0fda updated extensino method to prefix the type name better. 2013-05-12 18:17:53 -10:00
Shannon Deminick 09a6cdc8b6 Removed all MiniProfile calls that were trying to be simple trace messages (not actually profiling). This doesn't actually
work since MiniProfiler was not meant for that and won't actually output them unless you add Thread.Sleep statements into the using
clauses simply to slow down the application, not ideal. Updated the WebProfiler to log a statement when in medium trust.
2013-05-12 18:06:26 -10:00
Shannon Deminick b2fe35695f Fixes MiniProfile implementation for macros. 2013-05-12 17:38:54 -10:00
Shannon Deminick 67b57dea50 Changes profiler over to use a resolver and uses an interface for it. Changes core over to use a
LogProfiler and the web project to use a web profiler (MiniProfiler). Fixes medium trust implementation,
adds performance check for binding to begin request, changes Web profiler over to be decoupled from the
umbraco application objects (binds to events by itself)
2013-05-12 15:25:46 -10:00
Sebastiaan Janssen 3d6172738f Added tag release-6.1.0-beta2 for changeset 7670bb47a671 2013-05-10 11:00:57 -02:00
Sebastiaan Janssen a43e0eb5b8 Display version comment in installer steps ("beta 2" in this case) 2013-05-10 10:55:55 -02:00
Sebastiaan Janssen 3b05663597 Add MiniProfiler as a requirement for the NuGet package 2013-05-10 10:55:28 -02:00
NielsHartvig@UMBRACORATI.localdomain 191d744ec6 Adds profiling support to MVC views 2013-05-10 10:38:59 -02:00
NielsHartvig@UMBRACORATI.localdomain 980cd20e4c Adjustments to profiling 2013-05-10 10:24:25 -02:00
NielsHartvig@UMBRACORATI.localdomain f04916c9a9 Adds MiniProfiler support 2013-05-10 10:15:30 -02:00
Sebastiaan Janssen 8fde65d417 Merge with 6.0.6 2013-05-10 08:50:28 -02:00
Sebastiaan Janssen 8cca1b77b3 Merge with 4.11.9 2013-05-10 08:47:24 -02:00
Sebastiaan Janssen d10eff04a7 Update version 2013-05-10 07:09:43 -02:00
Sebastiaan Janssen 59c36ad70e Fixed U4-2090 Content not published after installing starterkit on fresh site
(Umbraco 6.1 beta)
Reverts previous "fix" as the actual cause was in Document.cs
2013-05-10 06:59:51 -02:00
Shannon Deminick 7b8d526a8a Fixed up some merge issues. 2013-05-08 18:16:58 -10:00
Shannon Deminick f69a017078 Merge with 6.0.6 2013-05-08 18:11:52 -10:00
Shannon Deminick 6f26f7b57c Patching from 6.1 2013-05-08 18:08:55 -10:00
Shannon Deminick bda2614290 Patching from 6.1 2013-05-08 17:49:48 -10:00
Shannon Deminick efc482511e Patching from 6.1 2013-05-08 17:48:17 -10:00
Shannon Deminick 40b90b8a58 Patching from 6.1 2013-05-08 17:45:53 -10:00
Shannon Deminick a009dfe2a1 Patching from 6.1 2013-05-08 17:39:03 -10:00
Shannon Deminick bc0b419288 Merge 2013-05-08 17:12:09 -10:00
Shannon Deminick 806715594e Fixes up created package tree sync. 2013-05-08 17:11:50 -10:00
Shannon Deminick f2a97326fa Fixes macro tree syncing 2013-05-08 17:04:51 -10:00
Shannon Deminick dd1983dc55 Fixes macro script editor and syncing, changes over editPython to use correct webforms file format. 2013-05-08 17:01:48 -10:00
Shannon Deminick 78cd51d333 Fixed xslt editing and syncing. 2013-05-08 16:33:09 -10:00
Shannon Deminick 28b6c5897f Fixes up script editor and tree syncing. 2013-05-08 16:13:18 -10:00
Shannon Deminick baed852767 Re-fixed up stylesheet editing and syncing, starting fixup for script editor/syncing 2013-05-08 15:15:56 -10:00
Shannon Deminick 0762decd92 Fixes up tree syncing for views, stylesheets and partial views. Now ensures we can actually
sync a tree for a file based node that doesn't have a static id. Also ensures that when we change a
Partial view name that we don't end up duplicating some files when we change it twice in the
same session.
2013-05-08 14:18:18 -10:00
Shannon Deminick 0b58c1c03c Patching from 6.1 2013-05-08 17:34:40 -10:00
Shannon Deminick 38c6a21896 Patching from 6.1 2013-05-08 17:33:48 -10:00
Shannon Deminick 15bff44ec1 Patching from 6.1 2013-05-08 17:24:00 -10:00
Shannon Deminick a626efa9b6 Merge with 4.11.9 2013-05-08 17:15:09 -10:00
Shannon Deminick 1f87470f89 Fixes up tree syncing for views, stylesheets and partial views. Now ensures we can actually
sync a tree for a file based node that doesn't have a static id. Also ensures that when we change a
Partial view name that we don't end up duplicating some files when we change it twice in the
same session.
2013-05-08 14:18:18 -10:00
Hendy 54d2258634 added null checks into the uQuery .ToNameIds() methods 2013-05-08 16:29:29 -01:00
Sebastiaan Janssen 6fe3507099 Merge with 6.0.6 2013-05-08 08:13:57 -02:00
Sebastiaan Janssen cba09ed817 Merge with 4.11.9 2013-05-08 08:10:48 -02:00
Morten Christensen d94772892d Merge 2013-05-08 06:28:13 -02:00
Shannon Deminick 55750b534b Fixed the template editor to ensure that the tree syncs and updated much of it to use correct JavaScript, however
id didn't have time to update the whole thing.
2013-05-07 22:19:42 -10:00
Shannon Deminick a31cb3b1df Fixed stylesheet property tree syncing, updated the stylesheet property page to use
correct web forms structure.
2013-05-07 21:13:30 -10:00
Shannon Deminick fc44138d9e Fixes Stylesheet tree-syncing. Converts editStylesheets over to correct web forms structure and
implements the correct Javascript.
2013-05-07 20:49:58 -10:00
Shannon Deminick 0cda994538 Fixes DataTypeCacheRefresher to be a Json cache refresher since it needs to refresh both by GUID and by Int Ids 2013-05-07 19:37:57 -10:00
Shannon Deminick 4b199a9166 Manually applies fix for #U4-2094 since the class structure has changed in 6.1 2013-05-07 19:02:36 -10:00
Shannon Deminick cfe6ac0486 Merge with 6.0.6 2013-05-07 18:57:39 -10:00
Shannon Deminick c52669fb05 Fixes: #U4-2094 - issue with duplicates in getting Descendants for media in mvc. 2013-05-07 18:56:24 -10:00
Sebastiaan Janssen 753fe411c5 Fixes U4-2090 Content not published after installing starterkit on fresh site
(Umbraco 6.1 beta)
2013-05-07 13:01:18 -02:00
Morten Christensen 50c12a5c35 Merge 2013-05-07 12:35:28 -02:00
Morten Christensen b42fb1c5c1 WIP Related to PackagingService 2013-05-07 12:35:13 -02:00
Shannon Deminick f05c77dc78 Fixed med trust issue with SecuritySafeCritical attributes 2013-05-06 17:23:53 -10:00
Shannon Deminick d1677d9d59 Updates: #U4-2192 - moves method call to be inside of the lock. 2013-05-06 15:54:55 -10:00
Shannon Deminick 137685d883 Updates: #U4-2192 - moves method call to be inside of the lock. 2013-05-06 15:49:51 -10:00
Shannon Deminick 266d8ba69a Merge with 6.0.6 2013-05-06 15:20:26 -10:00
Shannon Deminick c4a071523e Merge with 4.11.9 2013-05-06 15:12:10 -10:00
Shannon Deminick f808aac4cd Fixes: #U4-644 - DynamicNode and MVC don't output RTE values for media 2013-05-06 14:36:47 -10:00
Shannon Deminick 0553bd1f9f Merge with 6.0.6 2013-05-06 12:54:43 -10:00
Shannon Deminick 81360f629e Merge with 4.11.9 2013-05-06 12:54:28 -10:00
Sebastiaan Janssen 1b3669787b Merge with 6.0.6 2013-05-06 12:27:56 -02:00
Sebastiaan Janssen aa36c66f39 Fixes U4-2176 6.0.5 Dashboard error 2013-05-06 12:27:15 -02:00
Sebastiaan Janssen 950cb1436a Merge with 6.0.6 2013-05-06 12:07:22 -02:00
Sebastiaan Janssen f9fc2619fa Fixes U4-2179 Error with GetChildNodes after upgrade to Umbraco 6.0.5 from
Umbraco 6.0.0
2013-05-06 12:06:45 -02:00
Sebastiaan Janssen 004d9ab3e6 Merge with 6.0.6 2013-05-06 11:12:31 -02:00
Sebastiaan Janssen 5d8cfa5efb Merge 2013-05-06 11:06:54 -02:00
Sebastiaan Janssen 297f8e2a0b Remove reference to v4 in text. 2013-05-06 11:06:28 -02:00
Shannon Deminick 83584375c1 Merge with 6.0.6 2013-05-06 02:10:26 -10:00
Shannon Deminick 8ddfb5f6ad Merge 2013-05-06 02:09:44 -10:00
Shannon Deminick 9387544865 Fixes test outcome 2013-05-06 02:08:38 -10:00
Shannon Deminick 66ddb21ef8 Fixes null check 2013-05-06 02:03:24 -10:00
Sebastiaan Janssen d746ec6409 Merge with 6.0.6 2013-05-06 09:34:11 -02:00
Shannon Deminick e08322f6fe Fixes merge issues 2013-05-05 23:45:47 -10:00
Shannon Deminick de52f3ee93 Merge with 6.0.6 2013-05-05 23:39:52 -10:00
Shannon Deminick 9d19ed9463 Fix merge issues 2013-05-05 23:35:51 -10:00
Shannon Deminick df62697477 Merge with 4.11.9 2013-05-05 23:23:24 -10:00
Stephan 3c15f9b57c Web.Standalone - refactor 2013-05-05 09:07:51 -02:00
Shannon Deminick bfe5250138 Fixes issue with async delete webforms method not re-setting the umbraco context. 2013-05-04 18:29:24 -10:00
Shannon Deminick 3fa9219c27 Merge 2013-05-04 18:13:03 -10:00
Robert Stocks 4484f83caa Remove extra space in name of http module in web.config 2013-05-03 07:24:28 -01:00
Sebastiaan Janssen 3ada1770eb Merge with 4.11.9 2013-05-06 09:32:23 -02:00
Shannon Deminick cbf84566e2 updated casing in proj file to be correct for a couple elements. 2013-05-02 15:57:02 -10:00
Shannon Deminick 294c2f4fba Fixes: #U4-2183 - null check on UmbracoContext and fixes bad merge issue, the UserTypeCacheRefresher got removed from the proj file. 2013-05-02 14:24:27 -10:00
Shannon Deminick f4dcdf8487 Changed to 4.11.9 2013-05-02 05:40:32 -10:00
Shannon Deminick 0586042535 Merge with 4.11.9 2013-05-02 05:03:07 -10:00
Shannon Deminick 63d52a1e12 Fixes issues with transfering logic over to LegacyDialogHandler 2013-05-02 04:56:05 -10:00
Shannon Deminick 0b6f05e630 Fixes: #U4-2172 - better single threaded supported for the database instance outside http context 2013-05-02 03:48:14 -10:00
Sebastiaan Janssen 85421cf714 Closing branch 4.11.9 as that version number was used for the emergency security fixes 2013-05-01 13:08:21 -02:00
Sebastiaan Janssen 97dd5433e0 Closing branch 6.0.5 as that version number was used for the emergency security fixes 2013-05-01 13:06:59 -02:00
Sebastiaan Janssen a8ab7e4c35 Open new branch 2013-05-01 13:05:12 -02:00
Sebastiaan Janssen c20c9c638f Merge with 4.11.8 2013-05-01 13:04:06 -02:00
Sebastiaan Janssen 2423bdd623 Merge with 4.11.8 2013-05-01 05:33:19 -02:00
Shannon Deminick eca01b845c publicized some ObjectExtensions, added Umbraco.Belle to internals, updated the names in which plugin routes are created,
added HttpUrlHelper extensions for web api
2013-04-30 16:43:59 -10:00
Morten Christensen dc5cf5ef6e Adding strongly typed query POC to test project 2013-04-30 17:41:59 -02:00
Sebastiaan Janssen 7d448d0959 Merge 2013-04-30 05:22:43 -02:00
Sebastiaan Janssen 53fe02db7e And another update for WebPI... 2013-04-30 05:22:21 -02:00
Shannon Deminick af51465a6a Merge 2013-04-29 19:57:44 -10:00
Shannon Deminick b2929ea50a Merge with 6.0.5 2013-04-29 19:56:41 -10:00
Shannon Deminick a03dd7b11e Merge with 4.11.8 2013-04-29 19:56:18 -10:00
Shannon Deminick 8e1f7170c7 Merged in TypeFinder changes from U4-1187 and wrote benchmark unit tests and other general
tests to confirm it is still finding types.
2013-04-29 19:48:11 -10:00
Shannon Deminick 3fd1c49da7 Merge with 6.0.5 2013-04-29 12:09:36 -10:00
Shannon Deminick f0e8252e38 Merge with 4.11.8 2013-04-29 12:09:12 -10:00
Sebastiaan Janssen be049f9093 Fix merge issue 2013-04-29 12:36:03 -02:00
Sebastiaan Janssen 64bbfb8cbc Merge with 6.0.5 2013-04-29 12:31:13 -02:00
Sebastiaan Janssen 0ca52fcc60 Fix merge issues, update version number 2013-04-29 12:29:15 -02:00
Sebastiaan Janssen c53342ba4c Merge with 4.11.8 2013-04-29 12:13:00 -02:00
Morten Christensen b4fd2f6d46 Fixing oversight in SaveAndPublish method - content might not have an Id yet, so take that into account. 2013-04-29 07:09:23 -02:00
Shannon Deminick aba4a9b07c oops, removed test code 2013-04-28 16:15:19 -10:00
Shannon Deminick 577d77cfab Fixes: #U4-1760 - allows a developer to set the default RenderMvcController on startup. 2013-04-28 16:09:24 -10:00
Shannon Deminick 7ff50e2652 Merge with 6.0.5 2013-04-28 13:43:38 -10:00
Shannon Deminick e885384678 Merge with 4.11.8 2013-04-28 13:40:06 -10:00
Shannon Deminick 056696d36f Fixes up more issues with cmsContentXml - got media updating properly now, nearly the same as content and all done with
the new API.
2013-04-25 22:13:05 -10:00
Shannon Deminick 6cffa67518 Fixes merge issues and WebSecurity with the correct encryption (from failed merge along time ago).
Fixes ContentType to ensure that ALL property type values get reset, not just ones assigned to a group.
Fixes logic in ContentTypeService to ensure that xml is re-generated when a property type alias is changed too.
2013-04-25 21:09:07 -10:00
Shannon Deminick d2a285c120 Merge with 6.0.5 2013-04-25 19:43:03 -10:00
Shannon Deminick 153fe248a7 Fixes ContentService fix for issue U4-1772, we don't want to truncate! Plus the truncate term doesn't work in SQLCE anyways. 2013-04-25 19:33:53 -10:00
Shannon Deminick 7fc4822bbe Fixes merge issues. Fixes Fixes for cmsContentXml table since the Content type heirarchy tables are different in v6. 2013-04-25 19:26:06 -10:00
Shannon Deminick d65bee76b2 Merge with 4.11.8 2013-04-25 14:15:09 -10:00
Shannon Deminick 32fa920279 Fixes merge issue, changed to version 4.11.8, removes post build copy (thought that was removed a long time ago) 2013-04-25 13:44:17 -10:00
Shannon Deminick 4a619967bd Merge with 4.11.8 2013-04-25 13:34:19 -10:00
Shannon Deminick 0ae9a75b32 Close 4.11.7 - cmsContentXml fixes branch 2013-04-25 12:20:27 -10:00
Sebastiaan Janssen c2057656bc Merge with 6.0.4 2013-04-25 11:23:31 -02:00
Sebastiaan Janssen 09a4e33f3f Closing again.. 2013-04-25 11:20:21 -02:00
Sebastiaan Janssen e53b388a5e Opening new branch 2013-04-25 11:19:06 -02:00
Sebastiaan Janssen 4fb4af0b4f Added tag release-6.0.4 for changeset 0dee9964687e 2013-04-25 11:18:36 -02:00
Sebastiaan Janssen ab37f9ae35 Closing 6.0.4 2013-04-25 11:16:29 -02:00
Sebastiaan Janssen 8fae55e44e Correct path to Courier 2013-04-25 09:02:58 -02:00
Sebastiaan Janssen a8ca3a89bd Forgot to uncomment some items 2013-04-25 08:51:31 -02:00
Sebastiaan Janssen 765f959f20 Reverting includes removal of courier/contour files 2013-04-25 08:44:37 -02:00
Sebastiaan Janssen 2cf90477ed Make Selenium Contour install work 2013-04-25 08:44:01 -02:00
Sebastiaan Janssen 6ca6a08233 Add RevertToEmptyInstall which installs an empty DB with credentials admin/test
Also deletes all dlls from /bin and rebuilds the project (to remove packages
that have installed dlls).
2013-04-25 07:15:54 -02:00
Sebastiaan Janssen 0119f1eb1b Merge 2013-04-25 06:11:28 -02:00
Sebastiaan Janssen cd4f66e7c5 Making a start on adding Selenium integration/UI tests for the backoffice 2013-04-25 06:10:57 -02:00
Stephan a1d5b61ae5 PublishedContent - create tests to illustrate issues 2013-04-24 11:56:32 -02:00
Morten Christensen 3fdc0e5361 Fixes #U4-2137 Ensuring that existing templates are updated instead of duplicated when installing packages.
Adds test for installing templates and then updating the same templates through another package install.
2013-04-24 07:41:37 -02:00
Shannon Deminick 6818ac4e50 Fixes merge issues, ensures that the UmbracoContext is set for the async operation since
it is required, previous versions didn't require it to be set. Added the WebSecurity property
to UmbracoUserControl, made ContentTypeControlNew inherit from UmbracoUserControl
2013-04-23 22:39:35 -10:00
Shannon Deminick 710c8aa6ea Merge with 6.0.4 2013-04-23 21:52:07 -10:00
Shannon Deminick 4bfb8569c8 Fixed up merge issues 2013-04-23 21:37:03 -10:00
Shannon Deminick df9a887032 Merge with 4.11.7 2013-04-23 20:50:30 -10:00
Sebastiaan Janssen aa84a3f7f2 Fixes U4-2138 Copying a node reverses sort order in target 2013-04-23 12:49:33 -02:00
Morten Christensen c573459626 Fixing nuget related issue #U4-2067 and updating version 2013-04-22 06:01:31 -02:00
Morten Christensen 222723b8fe Fixes #U4-2004 so GetPublishedDescendants retrieves the published version and not the latest version. 2013-04-21 09:06:22 -02:00
Morten Christensen f758b33da5 Properly fixes #U4-2112 and adds option to determine whether or not to import doc type structues. 2013-04-21 07:25:38 -02:00
Morten Christensen eeb0e0026a Making PropertyCollection, PropertyGroupCollection and PropertyTypeCollection return a proper null when FirstOrDefault should return null. 2013-04-20 19:47:30 -02:00
Morten Christensen 082dacf737 Fixes #U4-2029 Finding scripts and stylesheets recursively. 2013-04-20 12:56:43 -02:00
Morten Christensen afc2fd9420 Ensures that CreateDate and UpdateDate is set on both PropertyTypes and Properties for Content and Media.
Fixes #U4-2028
2013-04-20 12:23:14 -02:00
Morten Christensen ff6715d42a Fixes #U4-2013 Localization lost in packaging for DocumentTypes 2013-04-20 11:23:04 -02:00
Morten Christensen b776675ac8 Fixes #U4-2065 Document.AfterMove legacy event handler returns wrong parent. 2013-04-20 11:19:27 -02:00
Morten Christensen 1e21671b62 Fixes #U4-2008 Umbraco.Core.Models.PropertyType -> change ValidationRegExp from internal to public 2013-04-20 11:10:28 -02:00
Morten Christensen 59184981cb Fixes #U4-2009 Delete of media doesnt delete relations 2013-04-20 11:05:48 -02:00
Morten Christensen 0632ffb93d Fixes #U4-2069 2013-04-20 11:03:57 -02:00
Shannon Deminick f8652d98fe Merge with 6.0.4 2013-04-20 04:01:22 +06:00
Shannon Deminick 034aa6d8f9 Fixes merge issue 2013-04-20 03:58:15 +06:00
Shannon Deminick 1484fba1ad Merge with 4.11.7 2013-04-20 03:51:22 +06:00
Shannon Deminick 174ff44e3b proj file update 2013-04-20 00:50:02 +06:00
Shannon Deminick b3c3e114ad missing images 2013-04-20 00:49:39 +06:00
Shannon Deminick 60481e7e02 Fixes: #U4-2093 stylehsheet property cache refresher had wrong id assigned. 2013-04-20 00:18:45 +06:00
Shannon Deminick 12de5d6ed3 Merge with 6.0.4 2013-04-20 00:12:52 +06:00
Shannon Deminick 9ac325c1a4 Fixes: #U4-2130 - regression bug for handling image uploads 2013-04-20 00:04:39 +06:00
Shannon Deminick 7f5457316a Fixed: #U4-2129 - using new api didn't use the CompositionPropertyTypes instead of just PropertyTypes and fixed up cache invalidation for PublishedContentHelper 2013-04-19 23:47:51 +06:00
Sebastiaan Janssen 671c8715b0 Fix merge issue 2013-04-19 10:18:46 -02:00
Sebastiaan Janssen 8c257d39f9 Fix merge issue 2013-04-19 06:43:58 -02:00
Sebastiaan Janssen 76f040aef4 Merge with 4.11.7 2013-04-19 06:42:33 -02:00
Morten Christensen 7ed5a6f706 Fixes #U4-2068 and #U4-2125
Creating test for verifying path is correctly updated when moving items to the recycle bin.
2013-04-19 06:07:25 -02:00
Shannon Deminick d6d630cb2c Merge with 6.0.4 2013-04-19 04:40:49 +06:00
Shannon Deminick 35a698cdc9 Merge with 4.11.7 2013-04-19 04:40:13 +06:00
Shannon Deminick 9fe0b44694 fixed typo 2013-04-19 04:31:55 +06:00
Shannon Deminick d66a0a3105 fixed typo 2013-04-19 04:30:15 +06:00
Shannon Deminick abc1e8d01f fixes typo on word disallow 2013-04-19 04:20:24 +06:00
Shannon Deminick 8be40c5013 Merge with 4.11.7 2013-04-19 04:13:00 +06:00
Shannon Deminick 988940095c Merge with 6.0.4 2013-04-18 23:03:52 +06:00
Shannon Deminick 123e65c55f Fixes: #U4-2118 - BOM encoding issue 2013-04-18 23:00:57 +06:00
Shannon Deminick 08a049594c Merge 2013-04-18 22:01:53 +06:00
Shannon Deminick a895a2a20a Fixes merge issues, ensures that the tree node is reloaded when publishing. 2013-04-18 22:01:28 +06:00
Shannon Deminick a5e33e1e02 Merge with 6.0.4 2013-04-18 21:45:04 +06:00
Shannon Deminick e5e4e7b685 Fixes another merge issue and improves performance slightly for sorting so that we are not double saving the entity if it is published already. 2013-04-18 21:44:38 +06:00
Shannon Deminick a721f06ac8 Merge with 6.0.4 2013-04-18 21:22:32 +06:00
Shannon Deminick 88795b86fd Updated merge issue, and removed the call to refreshXmlSortOrder since we are already republishing which already writes the updated xml 2013-04-18 21:16:00 +06:00
Shannon Deminick 378a544c1a Merge with 4.11.7 2013-04-18 20:59:42 +06:00
Morten Christensen 39095b524c Updating test - Inheritance between parent/child ContentType has been updated so the parent doesn't have to be added to the composition afterwards. 2013-04-18 10:46:15 -02:00
Shannon Deminick 3b1bfe04f2 updates method name 2013-04-18 01:15:25 +06:00
Shannon Deminick 979fe46e9b Updated CDF to 1.6.0.0 2013-04-18 00:55:40 +06:00
Shannon Deminick 0107a10145 Manually merge in changes for previous commits due to the codebase differences in 6.1 2013-04-18 00:06:42 +06:00
Shannon Deminick a38f0af49b Merge with 6.0.4 2013-04-17 23:47:33 +06:00
Shannon Deminick e9a496df4f Merge with 4.11.7 2013-04-17 23:31:52 +06:00
Shannon Deminick 580123cb87 fixed merge issues 2013-04-17 23:03:51 +06:00
Shannon Deminick de0e47d7ef Merge with 4.11.7 2013-04-17 22:50:31 +06:00
Thomas Skyldahl Sørensen c12f9d0272 Optimization for issue: U4-1187
Url: http://issues.umbraco.org/issue/U4-1187

Added assembly filtering, to stop scanning of third party assemblies
that doesn't reference the types we are looking for.
this limits the amount of possible missing references we encounter
when checking against the types
2013-04-17 14:03:54 -02:00
Morten Christensen 83d1e9c76f Merge 2013-04-17 11:25:53 -02:00
Sebastiaan Janssen eba7582a97 Eh, yeah, maybe I should start with making a copy of the element first.. d'oh! 2013-04-17 11:16:15 -02:00
Sebastiaan Janssen 0cf2a1fc2a Possible fix for U4-2097 Package import causes template tree to break - modified
closure problem
2013-04-17 10:57:24 -02:00
Sebastiaan Janssen b40619634d Fix bad merge 2013-04-17 06:36:40 -02:00
Morten Christensen fc84a21f06 Adding a few methods to relate two entities both based on the IUmbracoEntity. 2013-04-17 06:26:59 -02:00
Shannon Deminick 9137ce7cf4 Merge with 6.0.4 2013-04-17 01:57:50 +06:00
Shannon Deminick ff3fc5d825 Merge with 4.11.7 2013-04-17 01:56:20 +06:00
Morten Christensen 9621403f79 Fixes U4-2053 2013-04-16 17:19:46 -02:00
Stephan 3882e1984d U4-2117 - fix Ancestor- vs AncestorsOrSelf inconsistencies 2013-04-16 12:29:58 -02:00
Stephan 2245c88396 U4-2117 - fix Ancestor- vs AncestorsOrSelf inconsistencies 2013-04-16 12:29:58 -02:00
Sebastiaan Janssen 2e39c55d56 Merge 2013-04-16 04:27:44 -02:00
Sebastiaan Janssen e4e0bcf642 Correct spelling error 2013-04-16 04:27:03 -02:00
Shannon Deminick 6d9f989472 Merge with 4.11.7 2013-04-16 04:07:12 +06:00
Shannon Deminick 7537e4c6d6 updated DefaultServerMessenger with more ctor options for testing 2013-04-16 04:05:31 +06:00
Shannon Deminick c410b6dc20 Changed UmbracoSettings back to internal, it should not be exposed atm 2013-04-16 02:49:14 +06:00
Shannon Deminick 1e7e670df3 Fixes #U4-2104 - namespace issue with UmbracoApiControllers 2013-04-15 21:44:26 +06:00
Shannon Deminick da53ffe9f2 Merge 2013-04-15 21:36:35 +06:00
Shannon Deminick 47f6401fcd updates unit test to ensure UmbracoContext.Current is nulled, updates dispose on application context to
not dispose the database if it is not configured.
2013-04-15 21:36:24 +06:00
Sebastiaan Janssen 33190ea5e1 Merge 2013-04-15 12:19:11 -02:00
Sebastiaan Janssen a06951afbd Fix MemberAuthorizeAttribute for UmbracoApiControllers 2013-04-15 12:18:40 -02:00
Sebastiaan Janssen b32ea68fd0 Merge with 4.11.7 2013-04-15 07:36:58 -02:00
Sebastiaan Janssen eb2db791b8 Additional fix for U4-2105 Saving a document will make it look like it is unpublished 2013-04-15 07:33:26 -02:00
Stephan 43d6c9a46d Core.Strings - bugfix DefaultShortStringHelper 2013-04-12 11:32:37 -02:00
Sebastiaan Janssen 7f6d8b6bdd Fixes U4-2105 Saving a document will make it look like it is unpublished 2013-04-12 06:49:06 -02:00
Stephan 0b3eaf9c77 Core.Strings - refactor DefaultShortStringHelper for better backward compat. 2013-04-12 05:33:39 -02:00
Shannon Deminick 0fe8ff57a1 changes a method to be protected instead of private 2013-04-12 05:04:20 +06:00
Shannon Deminick 2642d74450 adds some logging and fixes sequence of events for distributed cache sending 2013-04-12 04:06:24 +06:00
Shannon Deminick 761b749f37 Merge with 6.0.4 2013-04-12 03:08:11 +06:00
Shannon Deminick 22fb7e1706 Merge 2013-04-12 03:07:53 +06:00
Shannon Deminick 4ef9dbb9b4 Merge 2013-04-12 03:07:30 +06:00
Shannon Deminick f716ba380c Merge with 6.0.4 2013-04-12 03:02:40 +06:00
Shannon Deminick 12b1168de9 Fixes merge issues 2013-04-12 02:59:03 +06:00
Shannon Deminick 01290f8174 Merge with 4.11.7 2013-04-12 02:14:59 +06:00
Sebastiaan Janssen 439445aae4 Merge with 6.0.4 2013-04-11 16:39:28 -02:00
Sebastiaan Janssen ba1d0fa193 Improve code for previous fix so we don't need the try/catch any more. 2013-04-11 16:36:26 -02:00
Shannon Deminick 0d79eaf3c5 Merge with 6.0.4 2013-04-12 00:32:19 +06:00
Shannon Deminick e747438a4b Merge 2013-04-12 00:31:28 +06:00
Shannon Deminick 14f71c9059 Fixes #U4-2058 2013-04-12 00:30:45 +06:00
Sebastiaan Janssen 97355bde6f Fixes U4-2091 Inserting image in RTE with mediatype "File" causes YSOD 2013-04-11 13:15:08 -02:00
Sebastiaan Janssen ed35f234de Fixes U4-2100 Media Doesn't Overwrite in 6.0.3 2013-04-11 12:27:11 -02:00
Stephan 5154bcd2e9 Web.Routing - template setter on PublishedContentRequest 2013-04-11 11:55:32 -02:00
Stephan e3af8b4e5f Web.Routing - public, though readonly, UmbracoContext.PublishedContentRequest 2013-04-11 11:44:15 -02:00
Morten Christensen 3e8c1a426c Merge 2013-04-12 03:50:36 -02:00
Morten Christensen d7081dbc6b Implementing new RelationService.
Making EntityService public as it will be used within the RelationService.
2013-04-11 17:12:14 -02:00
Sebastiaan Janssen 1d89702c2c Merge with 6.0.4 2013-04-11 10:21:37 -02:00
Sebastiaan Janssen c874fa6507 Fixes U4-2097 Package import causes template tree to break 2013-04-11 10:20:17 -02:00
Sebastiaan Janssen df26090d63 Fix merge issue 2013-04-11 07:23:13 -02:00
Sebastiaan Janssen 3050258fdc Merge with 6.0.4 2013-04-11 07:20:00 -02:00
Sebastiaan Janssen ba387598ed Merge with 4.11.7 2013-04-11 07:17:23 -02:00
Stephan 84e990c239 Core.Configuration - fix setting that accidentally became public 2013-04-10 14:19:26 -02:00
Stephan 4c3b9c6f35 Close 6.1.0-public branch, merged. 2013-04-10 14:05:11 -02:00
Stephan 911a1cf80b merge 6.1.0-public into 6.1.0 2013-04-10 14:03:47 -02:00
Stephan ef493ef9af fix merge + public 2013-04-10 14:02:16 -02:00
Stephan 76a12f3f33 merge with 6.1.0 2013-04-10 13:56:39 -02:00
Stephan 344a4cc485 merge with 6.1.0 2013-04-10 12:51:49 -02:00
Stephan 5e1115218c Web.Standalone - import initial version
* * *
FOLD 003
2013-04-10 12:50:08 -02:00
Stephan 71a28cbeaa Core.Strings - bugfix error in DefaultShortStringHelper 2013-05-04 14:53:33 -02:00
Stephan 4aa750694a Core - add methods to XmlHelper 2013-05-03 13:56:34 -02:00
Stephan 5d89ab1e2a Web.UI - fix nasty preview bug introduced in 9a92dea49ede 2013-05-03 20:09:15 -02:00
Stephan 262aa3b8fe Web.Routing, Web.Mvc - fix issues with content with no template 2013-05-03 20:09:14 -02:00
Stephan 106d733d08 Web.PublishedCache - support XPathExpression 2013-04-10 12:49:45 -02:00
Sebastiaan Janssen a010448ad1 Merge with 6.0.4 2013-04-10 11:55:36 -02:00
Sebastiaan Janssen 1586f1679a Merge with 4.11.7 2013-04-10 11:54:24 -02:00
Sebastiaan Janssen 111df761aa Merge with 6.0.4 2013-04-10 07:43:10 -02:00
Sebastiaan Janssen 1d6009e3c7 Merge with 4.11.7 2013-04-10 07:42:21 -02:00
Shannon Deminick 5f9c7bb49c changed DefaultServerMessenger to expose login 2013-04-10 09:41:53 +06:00
Shannon Deminick 10f303efec change build version number 2013-04-10 04:34:37 +06:00
Shannon Deminick 0c3b7c27a7 fix merge issues 2013-04-10 04:24:42 +06:00
Shannon Deminick f2293e01fa Merge with 6.0.4 2013-04-10 04:15:26 +06:00
Shannon Deminick 1b086e2267 fixes merge issue 2013-04-10 04:04:33 +06:00
Shannon Deminick 1f86d8c562 fixes merge issues 2013-04-10 03:56:10 +06:00
Shannon Deminick 25b9262cf1 Merge with 4.11.7 2013-04-10 03:51:53 +06:00
Shannon Deminick 7fc7fb0ba9 Merge with 4.11.7 2013-04-10 03:25:45 +06:00
Shannon Deminick 506d32f353 Merge 2013-04-09 22:11:54 +06:00
Shannon Deminick 16746c8548 Updates authorized web services/http handlers to use WebSecurity and implements the new base class
properties available in 6.1. Updates WebSecurity with a few more helpful methods.
2013-04-09 22:11:12 +06:00
Sebastiaan Janssen fb994bdc11 Merge with 6.0.4 2013-04-09 11:45:04 -02:00
Sebastiaan Janssen db4ed70d70 Merge with 4.11.7 2013-04-09 11:37:37 -02:00
Sebastiaan Janssen a9781d79e2 Merge with 4.11.7 2013-04-09 10:22:11 -02:00
Sebastiaan Janssen 29a4cb8b71 Fixes merge issues 2013-04-09 08:34:03 -02:00
Sebastiaan Janssen abee79ca69 Fixes merge issues 2013-04-09 08:08:22 -02:00
Sebastiaan Janssen d8ccf20840 Merge with 6.0.4 2013-04-09 08:04:55 -02:00
Sebastiaan Janssen 9e10694ebb Fixes merge issue, no idea why it's expecting an ApiController.. weird! 2013-04-09 08:03:17 -02:00
Sebastiaan Janssen ffb39de003 Merge with 4.11.7 2013-04-09 07:55:54 -02:00
Sebastiaan Janssen 1c5cd4e245 Merge with 6.0.4 2013-04-09 07:19:47 -02:00
Sebastiaan Janssen a4ed0e266c Merge with 4.11.7 2013-04-09 07:11:54 -02:00
Shannon Deminick 63cae70ec3 Fixes merge issue 2013-04-09 08:05:31 +06:00
Shannon Deminick dd990b5df4 Merge with 6.0.4 2013-04-09 08:00:10 +06:00
Shannon Deminick eadb1bb194 Fixes merge issues 2013-04-09 07:54:32 +06:00
Shannon Deminick 30be665a40 Merge with 4.11.7 2013-04-09 07:41:55 +06:00
Shannon Deminick 6a9f587188 fix merge issue 2013-04-09 07:17:53 +06:00
Shannon Deminick 967b7fec66 Merge with 4.11.7 2013-04-09 07:16:22 +06:00
Shannon Deminick 27f8191852 Fixes merge issue 2013-04-09 07:12:12 +06:00
Shannon Deminick f17218637c Merge with 4.11.7 2013-04-09 07:06:15 +06:00
Shannon Deminick 8b9bae6dcb Merge with 4.11.7 2013-04-09 05:06:13 +06:00
Shannon Deminick 2d37abffb6 checks user timeout in media uploader 2013-04-09 02:46:34 +06:00
Shannon Deminick 0474694790 Fixes GetUserId call to ensure that the call cannot work with an invalid id 2013-04-09 02:26:13 +06:00
Shannon Deminick 5a9bdd20c1 Merge with 4.11.7 2013-04-09 01:10:08 +06:00
Shannon Deminick 15b9a98521 removed un-used web service method, added some docs to UmbracoEnsuredPage 2013-04-09 01:03:21 +06:00
Shannon Deminick cb19fe3902 Secures all ITasks, adds unit tests to ensure they are all secured and the correct app is assigned. 2013-04-08 23:11:47 +06:00
Sebastiaan Janssen d2d1843e03 Fix default branch 2013-04-08 07:03:57 -02:00
Sebastiaan Janssen a773e0a018 Merge with 4.11.7 2013-04-08 06:56:43 -02:00
Morten Christensen efbc461da9 Code cleanup - removing all internal code related to Macros, which was created for v6 but left out for backwards compatibility. 2013-04-07 17:47:10 -02:00
Morten Christensen 97d41f8998 Merge 2013-04-07 16:35:20 -02:00
Morten Christensen 8ef88dc955 Making the topological sorter public 2013-04-07 16:35:02 -02:00
Shannon Deminick fe01bd1f29 Starts securing ITasks 2013-04-06 02:03:46 +06:00
Shannon Deminick e50bac7c9f Merge with 6.0.4 2013-04-06 01:46:13 +06:00
Shannon Deminick 13b73231de Merge with 4.11.7 2013-04-06 01:45:45 +06:00
Shannon Deminick 50a70c28df Merge 2013-04-06 01:45:30 +06:00
Shannon Deminick 01bf0bcfa5 Fixes merge issues 2013-04-06 01:41:06 +06:00
Shannon Deminick 7dcfcaf339 Merge with 6.0.4 2013-04-06 01:23:29 +06:00
Shannon Deminick c39b698d4c Merge with 4.11.7 2013-04-06 00:31:10 +06:00
Shannon Deminick 3d51dd767b Fixed merge issues. 2013-04-06 00:27:44 +06:00
Shannon Deminick e22988e435 Merged with 4.11.7 2013-04-06 00:21:06 +06:00
Shannon Deminick 6badfae849 Merge 2013-04-05 20:44:44 +06:00
Shannon Deminick 9d0dbda3bd Fixed merge issue 2013-04-05 20:44:16 +06:00
Shannon Deminick df986c8254 Merge with 6.0.4 2013-04-05 20:43:24 +06:00
Stephan cd823db766 merge with 6.1.0 2013-04-05 10:28:50 -02:00
Stephan 09400be6e0 U4-2030 - failed to update UmbracoContext on some devt webservers 2013-04-05 10:28:19 -02:00
Stephan 2f9de56968 U4-2030 - failed to update UmbracoContext on some devt webservers 2013-04-05 10:28:19 -02:00
Stephan 49a61c5820 merge with 6.1.0 2013-04-05 06:22:35 -02:00
Shannon Deminick 7edbc34e6c Merge with 4.11.7 2013-04-05 06:46:13 +06:00
Shannon Deminick 2dfdc1050b Updates solution to use latest examine 1.5.1 from official Nuget source. 2013-04-05 06:19:52 +06:00
Shannon Deminick 9e239f135d Fixes: #U4-2027, changes DirectoryBrowser over to use correct webforms file structure, cleans up (a teeny bit)
how this page is structured, at least its not all inline c# code with inline styles.
2013-04-05 06:06:10 +06:00
Sebastiaan Janssen 480b84a223 Added tag release-6.1.0-beta for changeset 87cf618a39e3 2013-04-04 16:59:27 -02:00
Shannon Deminick 635ebcb9be removed error check as this was causing errors 2013-04-05 00:40:03 +06:00
Shannon Deminick 33f7a8477d updated to latest version of Umbraco.Azure via nuget 2013-04-05 00:09:14 +06:00
Shannon Deminick 646194e013 Merge with 6.0.4 2013-04-04 23:36:57 +06:00
Shannon Deminick 425fcf36eb un-reverted changes to UserType cache refresher 2013-04-04 23:36:31 +06:00
Shannon Deminick 31fd05ebca Merge 2013-04-04 23:30:36 +06:00
Shannon Deminick 495b4ed9e0 Refactors the WebSecurity class to not be static and be part of the UmbracoContext. Makes a few methods internal on it so that
it's not relying on the legacy User class. Cleans up the new BasePage and EnsuredUmbracoPage
2013-04-04 23:30:17 +06:00
Stephan e1c810c033 merge with 6.1.0 2013-04-04 14:27:11 -02:00
Shannon Deminick 87c904cc96 Fixes: #U4-2044, #U4-2048 2013-04-04 21:57:41 +06:00
Morten Christensen 792599a42f Minor correct to the doc.SaveAndPublish method. 2013-04-04 12:20:50 -02:00
Morten Christensen 03c65c8eec Updating build version to 6.1.0 beta
Updating nuspec with new references.
2013-04-04 12:13:59 -02:00
Morten Christensen 14aeb55c14 Removing unused ServiceStack.Text reference/nuget package.
Ignore Macro tests for the model and repo as its not used and still internal. Might be an idea to remove it altogether.
2013-04-04 12:02:27 -02:00
Sebastiaan Janssen 7ddbc83731 Merge gone wrong, my bad! 2013-04-04 10:20:13 -02:00
Sebastiaan Janssen 17533c57d3 Merge with 6.0.4 2013-04-04 10:04:29 -02:00
Sebastiaan Janssen 433668e202 Merge 2013-04-04 09:46:34 -02:00
Sebastiaan Janssen 9edcc0c903 Revert UserType caching changes until Shannon can commit UserTypeCacheRefresher 2013-04-04 09:46:20 -02:00
Morten Christensen 7610ee5f8b Adding event proxies to the ContentService for publishing events for easier discoverability.
Fixes U4-2046
2013-04-04 07:16:33 -02:00
Morten Christensen eab9be4ef7 Fixing issue with reimporting document types and the structure of allowed doc types.
Removing old code from Installer.
2013-04-04 06:02:08 -02:00
Stephan 7a1e3b96b8 Web.PublishedCache - IPublishedCaches doesn't return !contextual caches anymore 2013-04-04 05:10:53 -02:00
Shannon Deminick f747f69c62 Merge with 6.0.4 2013-04-04 05:46:25 +06:00
Shannon Deminick e48a030aab Merge 2013-04-04 05:46:01 +06:00
Shannon Deminick e07985439a Fixed up some unit tests 2013-04-04 05:05:52 +06:00
Shannon Deminick 620f21d7d7 Converted over Application.cs to use ApplicationContext.Current 2013-04-04 04:42:36 +06:00
Shannon Deminick 4a13047d5d Converted ApplicationTree to use ApplicationContext.Current.ApplicationCache 2013-04-04 04:34:40 +06:00
Shannon Deminick 446a480f21 converted ui to use ApplicationContext.Current.ApplicationCache 2013-04-04 04:19:05 +06:00
Shannon Deminick b56f8c8fb3 Fixes: #U4-2043 - User Type cache is not invalidated in LB scenarios 2013-04-04 03:43:05 +06:00
Morten Christensen e207b1f1e1 Adds new test case for single doc type imports.
Corrects issue with installing/importing single or multiple doc types, which is not part of the usual complete package xml.
2013-04-03 18:26:54 -02:00
Shannon Deminick 296c24f829 Fixes: #U4-2042 - ensures users cannot continue to user the back office after they've been disabled and
ensures that the user context cache is cleared when users are saved which will work in LB environments.
Changes more HttpRuntime.Cache dependencies to ApplicationContext.Current.ApplicationCache.
2013-04-04 02:11:31 +06:00
Shannon Deminick c5e88ef69f Fixes: #U4-2041, #U4-2040 - user cache is not invalidated when permissions change across LB environments, also streamlined how caching is handled in
these classes which now use the standardized events way to do things. Fixes a performance issue and ensures that the cache is not invalidated for 'micro'
operations during permission changes.
2013-04-04 00:30:28 +06:00
Shannon Deminick 2a7e493c74 Changes all instances of the legacy Cache class to be using ApplicationContext.Current.ApplicationCache.
Fixes: #U4-2039 - ensures macro xslt cache is invalidated in LB scenarios.
2013-04-03 23:39:51 +06:00
Shannon Deminick e14d3fd379 changes all instances accessing cache by key "contentItem" to use CacheKeys.ContentItemCache and replaces
all of it's cache usages with the ApplicationContext.Current.ApplicationCache. Obsoletes a couple of methods
that are not used.
2013-04-03 22:34:40 +06:00
Shannon Deminick fd3540f92d Removes unused private method 2013-04-03 20:40:06 +06:00
Sebastiaan Janssen fa43cfd58f Silly designer file, of course you need to change to. kthxbi 2013-04-03 11:43:28 -02:00
Sebastiaan Janssen 711afe8bb7 Breaking changes reverted 2013-04-03 11:41:53 -02:00
Stephan 4abb9fff3e merge with 6.1.0 2013-04-03 11:19:41 -02:00
Stephan 23525300bb Web.PublishedCache - add XPathNavigator support 2013-04-03 11:19:10 -02:00
Stephan 2490908401 merge with 6.1.0 2013-04-03 08:41:53 -02:00
Stephan b93ea7c69b U4-2033 - fix the tests, now we're returning lower case 2013-04-03 08:40:09 -02:00
Morten Christensen 640be73a66 A few refactoring bits for the FolderBrowserService. 2013-04-03 07:03:57 -02:00
Morten Christensen 32ae88fc81 Merge 2013-04-03 05:25:42 -02:00
Morten Christensen a4c9c3bfd9 Updating EntityService and repository to add content and media specific properties to the UmbracoEntity for performance enhancements.
Adding sample implementation in the BaseMediaTree but keeping it commented out as it won't work with the legacy events.
And a bit of code cleanup
2013-04-03 05:25:26 -02:00
Shannon Deminick 182107286c Fixes merge issues 2013-04-02 23:08:43 +06:00
Shannon Deminick a7e939e71f Merge with 6.0.4 2013-04-02 22:39:39 +06:00
Shannon Deminick b9d7f0c5a5 Fixes merge issues, merge ensures that js error is fixed and that thread-safe caching is in place
in the ContentType.cs class.
2013-04-02 22:06:15 +06:00
Shannon Deminick 3d76614a78 Merge with 4.11.7 2013-04-02 21:31:21 +06:00
Stephan 4217949719 merge with 6.1.0 2013-04-02 11:35:06 -02:00
Stephan 83d05bd01c U4-2033 - url segment is not lower case 2013-04-02 11:34:40 -02:00
Stephan fc68ba69e2 merge with 6.1.0 2013-04-02 09:24:36 -02:00
Stephan 9fb10ea004 presentation.UmbracoContext - get property values from appropriate sources 2013-04-02 09:23:53 -02:00
Stephan c916df0d13 Core.Strings - apply 2551076f571a to 6.1.0 2013-04-02 09:19:49 -02:00
Stephan 28892a7bb2 merge with 6.1.0 2013-04-01 16:35:52 -02:00
Stephan 99a63a3cdb fix build 2013-04-01 16:35:03 -02:00
Sebastiaan Janssen 19c2841576 Fixes U4-535 Stylesheet content gets deleted if you change case 2013-04-01 14:27:20 -02:00
Sebastiaan Janssen eeaef5ac5c Merge 2013-04-01 11:51:48 -02:00
Sebastiaan Janssen ff337457f8 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:31:03 -02:00
Stephan 65cb6fbaff merge with 6.1.0 2013-03-31 19:19:24 -02:00
Stephan 4b49f9779f merge with 6.1.0 2013-03-31 19:05:24 -02:00
Stephan c5b6bb52e0 Web.PublishedCache - refactor how caches manage preview 2013-03-31 18:47:25 -02:00
Stephan efee4d0c0c Web.PublishedCache - IPublishedCaches creates contextual caches 2013-04-04 05:09:26 -02:00
Stephan b89951dd11 Web.PublishedCache - refactor contextual caches & inner caches management 2013-03-31 18:44:29 -02:00
Stephan 70ad3edc1f Web.UmbracoContext - refactor constructor to use IPublishedCaches 2013-04-03 08:40:35 -02:00
Stephan 8d33488923 Web.PublishedCache - make parts of XmlPublishedCache virtual 2013-03-31 18:40:55 -02:00
Stephan 32a6a49077 Macros - bugfix & cleanup macros 2013-03-31 18:47:37 -02:00
Stephan ad52c0f033 Web.Cache - add notes to cache refreshers re. dependencies 2013-03-31 18:40:55 -02:00
Stephan 9982a09826 Web.PublishedCache - merge resolvers so caches can be related 2013-03-31 18:40:55 -02:00
Stephan 83308c3d5f Core.Xml - support XPathExpression 2013-04-10 12:47:11 -02:00
Stephan 495b661263 Core.Xml - refactor 2013-04-10 12:47:09 -02:00
Stephan f2d7e3549d XmlPublishedCache - fix casting exception messages 2013-04-04 15:24:29 -02:00
Stephan 4201d678fa XmlPublishedCache - GetXml() can be private, no need for internal 2013-04-04 15:24:29 -02:00
Stephan ff6ee360da ItemRenderer - cleanup access to Xml cache 2013-04-04 15:24:29 -02:00
Stephan 1f999d7e22 Macros - bugfix & refactor access to Xml cache 2013-04-04 05:02:55 -02:00
Stephan be24075850 presentation.library - get Xml navigator via Web.UmbracoContext 2013-04-04 05:03:01 -02:00
Stephan 6d18d32356 Web.Routing - bugfix PublishedContentRequestEngine
no macro would run when rendering a 404 document
2013-03-31 18:40:54 -02:00
Stephan 75f0f1f4ee Web.UmbracoContext - allow for InPreviewMode override in tests 2013-03-31 18:40:54 -02:00
Stephan 425a9f6a34 Core.Xml - import framework xml tests 2013-03-31 18:40:54 -02:00
Stephan 1d5f7ae822 Core.Strings - handle config. errors in DefaultShortStringHelper 2013-03-31 18:40:54 -02:00
Morten Christensen 49b5ddf850 Refactor of fix for U4-2014 2013-03-31 18:17:01 -02:00
Morten Christensen 3f7a93e0c9 Adding test fixture for the EntityService.
Refactoring sql query used in the EntityRepository.
Correcting a few issues with the UmbracoObjectTypes extensions.
2013-03-30 09:52:37 -01:00
Shannon Deminick b449b8762b Merge 2013-03-29 23:53:08 +06:00
Shannon Deminick 13e555f50b Fixed merge issue based on overlap with class + namespace name. 2013-03-29 23:52:40 +06:00
Shannon Deminick 48c809a797 Merge with 4.11.7 2013-03-29 23:22:18 +06:00
Sebastiaan Janssen 8612113fc0 Merge 2013-03-29 15:02:43 -01:00
Sebastiaan Janssen 69b0c7cf09 Fixes: U4-2024 Umbraco 6.0.3 : Error while importing Document Type 2013-03-29 15:01:04 -01:00
Shannon Deminick 72ad9f51c1 Merge with 6.0.4 2013-03-29 21:41:08 +06:00
Shannon Deminick 37a97a2e7c Merge with 4.11.7 2013-03-29 21:34:56 +06:00
Sebastiaan Janssen 44f5c3a34f Fixes U4-2019 Create new Document Type dialog displays poorly in Chrome 2013-03-29 09:13:44 -01:00
Sebastiaan Janssen a33ae696a2 Fixes U4-2014 Can't install XSLTSearch 3.0.4 with Umbraco 6.0.3
Updated the topological sorter to only add items that exist in the indexes
2013-03-29 08:46:09 -01:00
Sebastiaan Janssen 2705efb809 Updated file for WebPI builds 2013-03-29 08:34:34 -01:00
Shannon Deminick 20fb27f7e1 Fixed server registration ctor and factory to ensure IsActive is correct. 2013-03-28 11:27:13 +06:00
Shannon Deminick c8e20cf64b Fixes: #U4-2012, #U4-2005 2013-03-28 09:07:36 +06:00
Sebastiaan Janssen 648d631151 Opening new branch 2013-03-27 14:48:13 -01:00
Sebastiaan Janssen a89a122b09 Merge with 6.0.3 2013-03-27 11:56:44 -01:00
Sebastiaan Janssen c9b0362c62 Closed 6.0.3 branch 2013-03-27 11:54:12 -01:00
Sebastiaan Janssen 11e5bdf556 Added tag release-6.0.3 for changeset aed55cba2900 2013-03-27 11:14:18 -01:00
Shannon Deminick 3accecd504 Merge with 6.0.3 2013-03-27 03:09:57 +06:00
Shannon Deminick a0651f4383 Merge with 4.11.6 2013-03-27 03:09:36 +06:00
Shannon Deminick d9121b4684 fixes merge 2013-03-26 22:12:35 +06:00
Shannon Deminick 132ec1702c Merge with 6.0.3 2013-03-26 22:09:50 +06:00
Shannon Deminick 43795f0007 Merge with 4.11.6 2013-03-26 22:03:23 +06:00
Shannon Deminick a4e3127704 Ensures that xslt can throw exceptions too with the new settings - #U4-497 2013-03-26 21:40:50 +06:00
Sebastiaan Janssen d4ab60f8af Merge with 4.11.6 2013-03-26 13:29:45 -01:00
Sebastiaan Janssen 2678e23c7d Update Resolves_Assigned_Mappers to make sure the unit tests run 2013-03-26 12:26:08 -01:00
Stephan 6148d63b02 merge with 6.1.0 2013-03-26 11:37:52 -01:00
Sebastiaan Janssen 8edfc0ffdd Merge with 4.11.6 2013-03-26 09:53:59 -01:00
Sebastiaan Janssen 9dde86d591 Fixes U4-1999 When copying content with subcontent, the new subcontent data is a
direct reference to the old.
2013-03-26 08:39:50 -01:00
Sebastiaan Janssen b4ce4fbdef Logging warning when package installer can't create a property due to a missing
datatype for that property
2013-03-26 07:55:43 -01:00
Sebastiaan Janssen 4285484c1b Update code comment 2013-03-26 07:19:39 -01:00
Sebastiaan Janssen 2fd299ebfc Change TinyMCE to use the mediaservice to get the original image + some updates
to the new mediaservice method.
2013-03-26 07:15:22 -01:00
Morten Christensen f545f293b1 Adding GetMediaByUrl method to MediaService cause Sebastiaan needs it for less hacky code. 2013-03-26 05:46:20 -01:00
Morten Christensen 4dc94d1e0b Merge 2013-03-26 05:00:04 -01:00
Morten Christensen b058b1e345 Removing LEFT JOIN from query as its already part of the builder 2013-03-26 04:59:56 -01:00
Morten Christensen dfa1e73ddf Continueing implementation of the EntityRepository and Service. 2013-03-25 18:54:12 -01:00
Sebastiaan Janssen b745c0ae90 If the image is not resized, there's probably not going to be an underscore,
just query for the whole image source then.
2013-03-25 18:18:14 -01:00
Sebastiaan Janssen f2efff5411 Temporary fix until we can fix this properly for U4-1812 - Changing Width or
Height in Insert Picture popup results in NaN in other dimension
2013-03-25 18:09:31 -01:00
Shannon Deminick 390f56a64d Merge with 6.0.3 2013-03-25 20:54:49 +06:00
Shannon Deminick 04c623f19c Merge 2013-03-25 20:54:31 +06:00
Shannon Deminick 633d88c8c4 Changed DefaultServerMessenger to have an overridable method to send the request, added some internals visible to. 2013-03-25 20:54:21 +06:00
Sebastiaan Janssen 9ef5890636 Changing sortorder on tabs now also re-orders the tabs in the contenttype editor 2013-03-25 13:33:32 -01:00
Sebastiaan Janssen bc9fd04a36 Related to U4-1847 - Tabs weren't imported with the correct sort order and when
a datatype can't be found we should silently fail and not create the property
that wants that datatype (that's how v4 did it).
2013-03-25 12:49:43 -01:00
Sebastiaan Janssen 185c5d78f1 Query changed due to fix fe02cef72d87 that uses 1/0 instead of True/False 2013-03-25 11:27:54 -01:00
Brian Powell 3ea9963166 Fixes U4-1904 / U4-1905 2013-03-25 10:39:35 -01:00
Sebastiaan Janssen ab40822a98 Fix merge issue by re-applying Stephen Roberts' patch 2013-03-25 10:30:55 -01:00
Sebastiaan Janssen dffce76e29 Merge with 4.11.6 2013-03-25 10:24:36 -01:00
Stephan 3ed4da19c2 merge with 6.1.0 2013-03-25 09:46:25 -01:00
Sebastiaan Janssen d1e02f506c PropertyGroupId can be null 2013-03-25 07:51:44 -01:00
Morten Christensen 40a9da5ee0 Merge with 6.0.3 2013-03-23 07:24:27 -01:00
Morten Christensen 5e18d13178 Fixing parsing issue with saving boolean values in the Integer column for Members.
Related to issue U4-1989
2013-03-23 07:22:43 -01:00
Shannon Deminick 3b982b80f5 Fixes test issues, needed to disable application cache for these tests since the cache invalidation happens at the CacheRefresher level but for these
tests (any many other ones) we are not 'booting' umbraco with the Boot managers so the CacheRefreshers are not wired up to listen to events to clear
the cache. This puts us another step closer to having a proper global cache solution that will work for everything. At least now, all of the legacy
code is using the ApplicationCache which we can now control from a central location. Changed NiceUrlsProviderWithDomainsTests to only require a new db
schema per fixture.
2013-03-23 04:01:52 +06:00
Shannon Deminick 1cada5aeb5 Merge with 6.0.3 2013-03-23 02:35:21 +06:00
Shannon Deminick 1dfca6836d Merge with 4.11.6 2013-03-23 02:34:59 +06:00
Shannon Deminick 64719586dc Merge 2013-03-23 02:32:07 +06:00
Shannon Deminick 63d010f78f Fixes: #U4-497 2013-03-23 02:31:24 +06:00
Shannon Deminick e97a01c75c Fixes: #U4-1992 - Creates DictionaryCacheRefresher to ensure that all cache associated with the dictionary is updated amongst all
servers when it is changed/removed. Removes RemoveByJson as we only actually require RefreshByJson since we can put any sort of parameters
in a custom json string including whether it is a remove operation (if required)
2013-03-23 01:59:25 +06:00
Stephan a9df92b7a3 merge with 6.1.0 2013-03-22 17:45:42 -01:00
Stephan 65ae43918d merge 2013-03-22 17:45:10 -01:00
Stephan 6e4d8b638e merge 2013-03-22 17:40:29 -01:00
Stephan 21c635f61a Core.Strings - Add support for UrlReplaceCharacters to DefaultShortStringHelper 2013-03-22 17:39:35 -01:00
Stephan 6cc747bf76 Core.Strings - fix bug in helper freeze 2013-03-22 17:38:28 -01:00
Shannon Deminick af2693af76 Fixes how language and dictionary items are cached (ConcurrentDictionary), also fixes up how the Language object
is created and how it raises it's new event and fixes thread safety with it. Also fixes how Language was not checking
for invalid culture codes.
2013-03-23 00:24:37 +06:00
Shannon Deminick d95fc0210e Merge with 6.0.3 2013-03-22 22:11:56 +06:00
Shannon Deminick 74362fba23 Merge 2013-03-22 22:11:26 +06:00
Shannon Deminick 00de509478 Merge 2013-03-22 22:11:08 +06:00
Shannon Deminick 1b5139889c Changed event handler to AfterDelete for DataTypeDefinition, fixes merge issue with Entity and changes WasCancelled to be tracked. 2013-03-22 22:10:24 +06:00
Morten Christensen 112502cf18 Fixes U4-547 2013-03-22 15:09:36 -01:00
Shannon Deminick d976fbe4de Merge with 6.0.3 2013-03-22 22:03:50 +06:00
Stephan 47474d31d6 Web.PublishedCache - rename LegacyXmlCache into XmlPublishedCache 2013-03-22 15:02:26 -01:00
Shannon Deminick 1db7f808c9 Merge with 4.11.6 2013-03-22 21:59:52 +06:00
Shannon Deminick 840a95ba62 Merge 2013-03-22 21:56:43 +06:00
Shannon Deminick e18d8da872 Fixes: #U4-1931 - allow setting an empty string to a dictionary item. 2013-03-22 21:56:25 +06:00
Morten Christensen 65dc5eaeee Corrects incorrect sql query in the ContentTypeBaseRepository and looping through property types in the DataTypeService.
Adds initial test fixture for the DataTypeService.
Fixes U4-1939
2013-03-22 14:54:44 -01:00
Morten Christensen 4f81e06d3d Fixes U4-1894 by ensuring that all overloads of SetValue uses the IOHelper.SafeFileName 2013-03-22 14:18:45 -01:00
Morten Christensen 6b74b75b6f Adding a few checks to ensure that we don't try to bulk save an empty list 2013-03-22 14:08:20 -01:00
Morten Christensen 98e53b3d74 Correcting a few checks for multiple or single item imports in the PackagingService 2013-03-22 13:58:21 -01:00
Morten Christensen a1f01f9d5c re-inverting the check for existing datatypedefinitions in the packaging service 2013-03-22 13:48:51 -01:00
Sebastiaan Janssen f5d8cb0275 Merge 2013-03-22 13:36:26 -01:00
Sebastiaan Janssen 0d8b65caea Merge 2013-03-22 13:36:04 -01:00
Sebastiaan Janssen 70285991bb I think this was an oversight, if a definition is NOT null, then fill it 2013-03-22 13:35:47 -01:00
Sebastiaan Janssen a336eaa4a1 Check all of the elements for null, apparently any kind of installable thing can
be missing from the install xml file
2013-03-22 13:35:19 -01:00
Morten Christensen fdefe993b7 Fixes U4-1990 2013-03-22 12:54:46 -01:00
Morten Christensen ba0e72a1c1 Fixes U4-1937 by calling save when media is updated with new properties. Also uses the incremented folder count instead of the property id. 2013-03-22 12:30:20 -01:00
Morten Christensen c5710277a5 Redoing the fix for U4-1875 2013-03-22 12:13:06 -01:00
leekelleher b6ec364156 Updated references to the new constants for Application and MediaType aliases. 2013-03-22 13:13:05 +00:00
leekelleher 6b07ee83eb Added constants for Application (section aliases), System (node IDs) and MediaType aliases. 2013-03-22 13:11:27 +00:00
Morten Christensen 9c89a56d8d Fixes U4-1938 by actually calling and checking the Before/AfterDelete events for DataTypeDefinitions. 2013-03-22 10:53:07 -01:00
Morten Christensen 9ba7664f78 Updating repositories to handle sort order upon updating in a consistent manner.
Related to U4-1828
2013-03-22 10:34:05 -01:00
Morten Christensen 4b87a5c2d3 Adding safe alias cast to Templates.
Updating doc type create dialog to verify alias before saving.
Updating ContentTypeRepository to Mandate that the alias is not empty.
Fixes the cause for U4-1976
2013-03-22 09:56:21 -01:00
Shannon Deminick 7e0c1fac36 Fixes: #U4-1717 - UmbracoContext.EnsuresContext is public. 2013-03-22 05:23:11 +06:00
Shannon Deminick 8cdfba42d5 Moves clearing of the routes cache for when domains are changed to the DomainCacheRefresher. 2013-03-22 05:15:58 +06:00
Shannon Deminick e8dd56786b Fixes: #U4-1986 - data type cache is not refreshed in load balanced environments. 2013-03-22 05:04:32 +06:00
Shannon Deminick 2a9309ea38 un-obsoletes a bunch of the Member api since it shouldn't be obsoleted. Ensures that members cache is cleared when a member is updated or deleted using
the API and that this cache is also refreshed on other servers.
2013-03-22 04:34:57 +06:00
Shannon Deminick c732ee6eb2 Fixes: #U4-1982 - removes the RelationType cache 2013-03-22 02:54:59 +06:00
Shannon Deminick ee2f2dfda0 Fixes: #U4-1981 - ensures template cache is properly refreshed amonsgst all servers 2013-03-22 02:08:55 +06:00
Shannon Deminick 9d6b38a1c1 Fixes: #U4-1980 - stylesheet and stylesheet property cache is not refreshed in load balanced environments. 2013-03-22 01:49:34 +06:00
Morten Christensen f0699afb6e Fixes U4-1974 2013-03-21 18:45:06 -01:00
Shannon Deminick f6490a897a Fixes: #U4-1978 - Creates DomainCacheRefresher - domain cache is now refreshed across all servers 2013-03-22 00:49:07 +06:00
Shannon Deminick ce8f5c167c Fixes: #U4-1933 - Adds LanguageCacheRefresher, removes the invalidate cache calls from within the legacy language object. 2013-03-22 00:35:15 +06:00
Morten Christensen b4d5658d45 Fixes U4-1828 by correctly incrementing the sortorder ... doh! 2013-03-21 17:34:08 -01:00
Morten Christensen d485c3da97 Fixes U4-1875 by correcting the Creating events in the ContentService and MediaService, so null is returned if the creation of an object is cancelled.
In the legacy Document and Media classes we check if the created object is null to determine if the event has been cancelled through the new api.
2013-03-21 16:09:45 -01:00
Shannon Deminick 5f242aa3f6 Converts the media cache refresher to be a json cache refresher since it was impossible before to have media cache
cleared when media was deleted. Created base classes for cache refreshers, we now have a new event - CacheUpdated
which can now be used by code to execute on each individual server when any cache refresher is updated. Listening to events
normally only fire on the individual server so if people are wanting to refresh their own cache there was previously no way
to do that.
2013-03-21 22:53:58 +06:00
Morten Christensen 1214082997 Fixes U4-1883 by setting the Document/Media UpdateDate property in the Save/SaveAndPublish methods 2013-03-21 14:56:50 -01:00
Morten Christensen 1a56e6693a Removing dictionary from DataTypeDefinition as it wasn't used.
Updating package xml to include DatabaseType for testing.
2013-03-21 14:50:39 -01:00
Morten Christensen c6b7f20dab Fixes U4-1849 by introducing a new attribute for packaged DataTypes, so it stores information about the database type.
Will still default to Ntext, but seeing as the database type has never been used before it always defaulted to Ntext.
2013-03-21 14:40:17 -01:00
Morten Christensen 5cc55ad6e2 Fixing U4-1948 by setting the Published property when using document.Publish so updating the cache won't be skipped. 2013-03-21 13:51:45 -01:00
Morten Christensen a55fedab0a Adding a few checks to ensure package installation doesn't fail when properties are not present in the xml. 2013-03-21 13:40:54 -01:00
Shannon Deminick ab8b0f4ebb Merge with 6.0.3 2013-03-21 20:39:33 +06:00
Shannon Deminick a57d3f7eba Merge 2013-03-21 20:31:23 +06:00
Shannon Deminick f5a1e41569 missing checkin file 2013-03-21 20:30:32 +06:00
Morten Christensen 0e12f14a4a Making the export method internal until its been properly implemented 2013-03-21 13:10:31 -01:00
Morten Christensen 3e25b71d9e Updating test for adding PropertyType outside a group to use the proper method for doing so. 2013-03-21 12:58:55 -01:00
Morten Christensen 63de9e6691 Refactoring package installer to use the new PackagingService.
Refactoring ImportDocumentType dialog to import through the PackagingService.
Making a few corrections to the ProppertyGroup and PropertyType classes to support bulk saving.
2013-03-21 12:34:10 -01:00
Stephan 8c79977a23 Web - move GetByAlias out of PublishedCache 2013-03-21 08:54:25 -01:00
Shannon Deminick 52f05612ad Adds another method of distributed cache syncing using a custom json payload. this is necessary for things like ContentType cache
updates especially when deleting one since we require all sorts of Ids from the object but the object will be deleted by the time
the request reaches other servers so instead we create a json payload to send to other servers which contains all information necessary
to refresh/clear the cache on the other servers. This will probably be the preferred way going forward to handle cache refreshing.
With this in place, when removing a conent type cache is removed based on events.
This also adds a 'class' generic argument constraint to the repository base classes to guarantee we can do null checks and then we also
fix a null check on RepositoryBase. Updates the Entity class to properly support tracking properties - this now allows us to determine if
an entity was new, which is now used to ensure we don't re-update all of the content cache when a new content type is created.
Have also changed the deletion and creation of document types to use the new API, this allows for a lot less processing and streamlining how
all cache is invalidated. Fixes the construction of a new Template and Content Type in the v6 api and ensures that default values are set - #U4-1972, #U4-1971
2013-03-21 08:38:18 +06:00
Morten Christensen b9ea85d29d Updating Template to have a lazy master template id.
Adding a few new methods to the DataTypeService, which were needed for the import of DataTypes.
Adding bulk saving of templates.
Adding TopologicalSorter for sorting dependencies.
Implementing import of DataTypes and Templates.
Renaming the import test fixture for consistency after having creating the PackagingService.
2013-03-20 20:31:44 -01:00
Shannon Deminick c5a0da6aa5 Updated ContentTypeCacheRefresher to ensure that content xml cache is only refreshed for doc types not
media types, also ensures that the route cache is cleared (#U4-1969). Changes the deletion of media and
doc types to use the new Api - this ensures that cache is refreshed properly.
2013-03-21 01:04:27 +06:00
Shannon Deminick 266aa3423b Merge 2013-03-21 00:06:50 +06:00
Shannon Deminick 7ea87638f7 Updates all Entity models to use SetPropertyValueAndDetectChanges for setting all simple properties so that
tracking changes works the way it is supposed to. Creates a TracksChangesEntityBase class for any other entity
that wants to implement IRememberBeingDirty (now Entity inherits from this). Upgraded a bunch of other entities that
were not tracking changes properly.
2013-03-21 00:05:56 +06:00
Shannon Deminick b96b372400 Ensure ResetDirtyProperties(false); is set where appropriate (any PerformGet and the base Get)
relates to : #U4-1946
2013-03-20 23:13:55 +06:00
Stephan fcb8f0d417 Web.Routing - RoutesCache goes with PublishedCache 2013-03-20 16:01:49 -01:00
Stephan 6e3c4854b9 Web - add extension methods to ContextualContentCache 2013-03-20 16:01:48 -01:00
Stephan ba24deffc9 Core.Configuration - fix version 2013-03-20 16:01:48 -01:00
Shannon Deminick aa7fd7bb2b Removed cache refreshing code from inside of the ascx control as it is now all handled via business logic. 2013-03-20 22:03:35 +06:00
Shannon Deminick e7a6a29e59 Merge 2013-03-20 21:18:24 +06:00
Shannon Deminick c43efbbfc4 Changed the remaining/relavent properties on ContentTypeBase to use the SetPropertyValueAndDetectChanges
to set property values.
2013-03-20 21:03:48 +06:00
Shannon Deminick adedc9b64b Ensures mocked test entities don't have dirty properties on initialization. Ensures content xml structure
is rebuilt when a content type's alias is changed or a property type is removed from it. Adds ability  to rebuild
content xml structures for specified content types, not for all content. Adds ContentTypeExtensions and
more unit tests for ContentTypeTests. Changes RuntimeCacheProvider to use new ConcurrentHashSet instead of a dictionary
with the same key/value. Adds overload to IRepositoryCacheProvider to clear cache by type. Clears the IContent cache when
a Content type is saved.
All relates to fixing #U4-1943
2013-03-20 20:53:12 +06:00
Morten Christensen d0787e92fe Implementing PackagingService and moving Import Export methods to this service to have it specialized and centralized around packaging operations. 2013-03-20 13:51:46 -01:00
Morten Christensen ffe9953c43 Merge 2013-03-19 20:08:40 -01:00
Morten Christensen 99a9f1ab87 Adding note to mediaService regarding issue U4-1937 2013-03-19 20:06:33 -01:00
Morten Christensen 7def26a489 Implementing import methods in the Content- and ContentType services.
Adding tests to verify import is correct.
2013-03-19 20:05:55 -01:00
Stephan 73d77083ae Web.PublishedCache - bugfix & fix tests 2013-03-19 17:54:41 -01:00
Stephan b2a1f67fb4 Web.PublishedCache - move XML away from UmbracoContext 2013-03-19 17:54:41 -01:00
Stephan 3a0d617b14 Web - cleanup UmbracoHelper XPath methods 2013-03-19 17:54:37 -01:00
Stephan ce0c72d9f8 Web.PublishedCache - introduce contextual caches 2013-03-19 17:51:55 -01:00
Stephan cb966ac70b Web.Routing - use UmbracoContext.ContentCache 2013-03-19 17:50:38 -01:00
Shannon Deminick 6c40f32c2a Fixes merge issues. 2013-03-20 00:50:37 +06:00
Stephan cce32f406f Web.PublishedCache - move caches to UmbracoContext 2013-03-19 17:50:36 -01:00
Shannon Deminick 610ff91a9d Merge with 6.0.3 2013-03-20 00:23:24 +06:00
Shannon Deminick a76ffe8daf Backported changes from 6.1 to fix how RePublishAll behaves in the content service to ensure its the same as what was done with
Document.RePublishAll
2013-03-20 00:19:36 +06:00
Shannon Deminick 45f39158ba Merge 2013-03-19 23:55:29 +06:00
Shannon Deminick d7b5d73e62 updated merge 2013-03-19 23:54:56 +06:00
Shannon Deminick 780a9632f0 Merge 2013-03-19 23:49:51 +06:00
Shannon Deminick 603b6c73f7 Adds some notes. 2013-03-19 23:49:20 +06:00
Shannon Deminick 1b66c42c9b Fixes RePublishAll method to ensure it performs the same function as the legacy Document.RePublishAll - it just
re-generates the XML in the cmsContentXml table. Updates the Sql providers to support truncate table. Updates the RepublishAll
unit test. Adds a TruncateTable extension to PetaPoco. Adds locking to certain service methods that perform more than once function.
2013-03-19 23:46:13 +06:00
Morten Christensen 5175fb5188 Updating the EntityService implementation 2013-03-19 09:34:36 -01:00
Shannon Deminick b260769799 Fixes: #U4-1946 - when entities are constructed via the factories (i.e. from the database), ensure that
properties are not tracked as dirty already.
2013-03-19 07:37:33 +06:00
Shannon Deminick 4495fd05c4 Creates IRememberBeingDirty interface to track the properties that we're changed before the last commit for a given entity.
Adds internal property and tracks it's dirty changes to the ContentTypeBase - HasPropertyBeenRemoved.
Fixes: #U4-1942 - ensures content xml cache is refreshed even across servers when a property is removed or when the alias is changed.
2013-03-19 06:38:15 +06:00
Morten Christensen 923653f2b5 Merge 2013-03-18 20:19:09 -01:00
Morten Christensen 083320002b Continueing with the implementation of the EntityRepository 2013-03-18 20:18:12 -01:00
Shannon Deminick 3052c7311f Converts dictionary cache in ContentType to use concurrent dictionary. Changes ContentTypeControlNew to
not call the propertytype.delete() method if it is a DocumentType or MediaType (should only be called for
legacy code like members). Updates ContentTypeCacheRefresher to ensure that all of the content type cache is
cleared properly in the ICacheRefresher.
2013-03-19 02:02:11 +06:00
leekelleher 3af7958940 Updated references for alias conventions constants across the solution. 2013-03-18 17:55:02 +00:00
leekelleher c7498cec03 Added constants for regular conventions within the Umbraco core.
e.g. popular property-type aliases.
2013-03-18 17:51:57 +00:00
Stephan abe4ec6524 Core.Configuration - simplify 2013-03-18 15:49:43 -01:00
Shannon Deminick e3a8b4ac78 Moves some legacy classes into LegacyClasses.cs and un-seals some refreshers with comments to support legacy classes. 2013-03-18 21:18:22 +06:00
Morten Christensen 365dffe2db Merge 2013-03-18 14:15:30 -01:00
Morten Christensen 381157ac5d Initial implementation of the EntityRepository and Service, which will be used to retrieve a basic object with a minimum set of propreties for the models that have their base in the umbracoNode table.
The intention is to use this for loading trees in the backoffice for faster loading.
2013-03-17 16:25:21 -01:00
Shannon Deminick f993e96547 Seals a bunch of classes that need to be 2013-03-16 09:03:26 +06:00
Shannon Deminick 734f75b3ad Removes completely unnused macro cache key 2013-03-16 08:53:27 +06:00
Shannon Deminick 7ef066f396 Removed erroneous cache flushing for tabs since there is no cache for tabs 2013-03-16 08:51:25 +06:00
Shannon Deminick 23bb0e3ac3 Fixes: #U4-1930, #U4-1928, #U4-1929 - addes ContentTypeCacheRefresher to ensure that content type cache is cleared
in load balanced scenarios. Cleans up a bit of code too.
2013-03-16 08:47:55 +06:00
Shannon Deminick 2dea4a1d70 updates more cache handling, fixes syntax error in examineindex.release.config, fixes the DefaultServerMessenger ctor
to be lazy since the db context isn't initialized yet (will speed up start a bit too), ensures that the macro/xslt caching
clearing is only done on the single server instead or re-posing another distributed call.
2013-03-16 01:37:05 +06:00
Shannon Deminick 07bdd138cc Merge with 6.0.3 2013-03-15 11:31:54 +06:00
Shannon Deminick ee9f91b5cf Merge with 4.11.6 2013-03-15 11:31:34 +06:00
Shannon Deminick 2b750843c5 Fixed up base web test, removes RequiresDbSetup in place of new database behavior - NoDatabasePerFixture.
Fixed issue with another test... no idea how it didn't show up failing before.
Fixes issue with string extensions and an infinite loop when the string to strip is empty/null.
2013-03-15 11:28:05 +06:00
Shannon Deminick bd81507ecb Merge with 6.0.3 2013-03-15 08:29:22 +04:00
Shannon Deminick 033692d7ee had some strange issues with unit tests, added error checks. 2013-03-15 08:26:49 +04:00
Shannon Deminick 23146cb12a Merge with 4.11.6 2013-03-15 08:06:26 +04:00
Shannon Deminick ea7fb32fb9 Merge with 6.0.3 2013-03-15 06:23:54 +04:00
leekelleher 2cd64dd540 Missed a few TinyMCE GUID references, (due to their string format). 2013-03-14 22:15:39 +00:00
leekelleher 2a058cdbcc Fixed a conflict-references between Constants (in Umbraco.Web.Mvc and Umbraco.Core) 2013-03-14 22:01:09 +00:00
leekelleher 37860b4015 Replaced all hard-coded GUID references to use the new Constants. 2013-03-14 22:00:37 +00:00
leekelleher 0f056b1702 Updated GUID references in editorControls and uQuery to use the new Constants. 2013-03-14 21:58:31 +00:00
leekelleher aa5588bbd3 Added Constants (static class).
Included all GUIDs for PropertyEditors and ObjectTypes.
2013-03-14 21:55:46 +00:00
Shannon Deminick 33c5c41a31 Added better support for clearing the db schema for test. Added more support for different db behaviors for tests, now to update
the behaviors where necessary as this will speed things up quite a lot.
2013-03-14 02:43:17 +04:00
Morten Christensen c4aa9095f2 Fixes U4-1858 by ensuring that the text field is reset before setting or removing a value 2013-03-13 20:24:21 -01:00
Shannon Deminick 8d3c798c6c Changed tests to clear out the current database instead of trying to delete/re-create it. Fixes up
other test inconsistencies and more error checking on the ApplicationContext.Dispose.
2013-03-14 01:07:54 +04:00
Morten Christensen 79ce586c8b Fixes U4-1808 by removing the database lookup from an id that was resolved from the media url 2013-03-13 19:26:22 -01:00
Morten Christensen 8fba03c05d Fixes U4-1863 and U4-1908 by ensuring that content and media are loaded in the same manner through the new api 2013-03-13 18:55:25 -01:00
Shannon Deminick 245591c31f Fixed up another test inconsistency 2013-03-13 18:52:15 +04:00
Shannon Deminick 8fb8fc00b4 Fixes up inheritance structure of BaseTableByTableTests 2013-03-13 18:41:24 +04:00
Shannon Deminick 50b05d25f5 Added BaseUmbracoApplicationTests and fixed up dispose on the ApplicationContext to ensure the db object is disposed and doesn't
reset the PluginManager (as this shouldn't really need to be done). Cleaned up all unit tests so they follow the same structure and
uses this base class where necessary and eliminates a lot of duplicate code.
2013-03-13 18:31:07 +04:00
Shannon Deminick c04ee7bdc7 Removes type check caching from TypeHelper... is actually much slower. 2013-03-13 01:40:34 +04:00
Shannon Deminick 75d218d2e3 Updated how mappers for persistence work with the MapperFor attribute and have made BaseMapper public but have
kept all properties, etc.. internal just so that they can be found so we don't have to register them.
Updates unit test to ensure the plugin manager is init'd properly with the 'false' override. Ensures that the base
db test also initializes the plugin manager properly.
2013-03-13 01:09:29 +04:00
Shannon Deminick 4efa2c9f57 teeny bit of code cleanup 2013-03-12 23:51:53 +04:00
Shannon Deminick 630a44358f ensures cache clearing by search is done with case insensitivity 2013-03-12 23:30:43 +04:00
Shannon Deminick f7015d521b Merge 2013-03-12 22:58:53 +04:00
Shannon Deminick 860c8c1002 Fixes: #U4-482, #U4-549. Macro cache streamlining - ensures it is cleared based on event handling instead of inline everywhere
in code. Unit tests for CacheHelper, unit tests for umbraco.macro, updates to
ObjectExtensions.TryConvertTo + unit tests, enhanced disposable method of ApplicationContext.
2013-03-12 22:58:21 +04:00
Stephan a2120d1c6b Web.Routing - improve domains management 2013-03-12 16:12:38 -01:00
Stephan fc3f9dfeae Web.Routing - hide new wildcard domains from public APIs
only way to get them is through internal methods
+ improve / fix domains handling
+ fix failing tests
2013-03-12 15:16:12 -01:00
Shannon Deminick cf64c0243c MacroCacheRefresher also implements ICacheRefresher<macro> 2013-03-12 17:08:31 +04:00
Stephan ca9f53738b Web.UI - AssignDomain2 dialog (U4-19) 2013-03-12 12:00:34 -01:00
Shannon Deminick 8d2e466e34 Changes MediaCacheRefresher to be ICacheRefresher<T> and updates MacroCacheRefresher to use correct
macro object.
2013-03-12 03:11:35 +04:00
Shannon Deminick ec46d65bb4 Streamlines how macro cache is handled 2013-03-12 03:00:42 +04:00
Shannon Deminick 164f22aa50 Makes ApplicationContext disposable so that 3rd party devs are able to reset their applications (or unit tests), updated
resolution and created a ResolverCollection to track all resolvers created so it's super easy to reset all of them at once
(which is what happens on ApplicationContext.Dispose. ApplicationContext.Dispose is also implicitly implemented as to not
show in intellisense that the Dispose method exists... must be cast to IDisposable to work.
2013-03-12 01:50:56 +04:00
Shannon Deminick cc50003e3e Fixup merge issues 2013-03-12 00:40:37 +04:00
Shannon Deminick 8698deb469 Merge with 6.0.3 2013-03-12 00:21:10 +04:00
Shannon Deminick 738e4f5c46 Merge 2013-03-12 00:20:12 +04:00
Shannon Deminick 2fdcb9164a Fix merge issues 2013-03-12 00:19:06 +04:00
Shannon Deminick 7404a1f93d Merge with 4.11.6 2013-03-12 00:14:50 +04:00
Shannon Deminick c8b8b28e9b applies patch for #U4-1890 2013-03-12 00:10:59 +04:00
Sebastiaan Janssen c854ea8a35 .transformed files are auto-generated and shouldn't be under source control 2013-03-11 17:11:59 -01:00
Shannon Deminick 9bd865d259 Fixes: #U4-1890 - allows access to the UmbracoContext during application startup. 2013-03-11 23:46:47 +06:00
Shannon Deminick 2d55dda662 Merge with 6.0.3 2013-03-11 22:04:29 +06:00
Shannon Deminick 63192f3a65 Merge 2013-03-11 22:04:06 +06:00
Shannon Deminick 29b2458ef3 Merge 2013-03-11 22:01:54 +06:00
Shannon Deminick 1e6de161e6 Merge with 6.0.3 2013-03-11 22:01:40 +06:00
Shannon Deminick 508886b1ad transormed file changed.... 2013-03-11 22:00:59 +06:00
Stephan 3ab0879a99 Core.Strings - refactor ToSafeFileName 2013-03-11 14:58:07 -01:00
Shannon Deminick 4baecfe833 Merge with 6.0.3 2013-03-11 21:56:47 +06:00
Shannon Deminick 727f62d418 Merge with 4.11.6 2013-03-11 21:49:27 +06:00
Shannon Deminick 187af3e361 Fixed merge issue 2013-03-11 21:23:35 +06:00
Shannon Deminick c6f29a50d6 Merge with 4.11.6 2013-03-11 21:17:57 +06:00
Morten Christensen cb0dd70434 Minor change to the SqlSyntaxProvidersResolver in the CoreBootManager as per Shannons review. 2013-03-11 12:44:12 -01:00
Shannon Deminick e5e22f75fc Merge 2013-03-11 18:47:36 +06:00
Morten Christensen 928d92fce4 Making the Sql Syntax Providers public and changing a few names and bits for consistency.
Adding resolver for the syntax providers and wiring it up in the boot manager.
2013-03-09 10:43:34 -01:00
Morten Christensen 3612f18f3f Merge with 6.0.3 2013-03-07 20:22:37 -01:00
Morten Christensen 836b0f39c2 Additional correction of the implementation for U4-1869 2013-03-07 20:19:39 -01:00
Morten Christensen 1b01386673 Changing the initial fix of U4-1869 to use UrlReplacingCharacters 2013-03-07 19:56:59 -01:00
Morten Christensen 2a09f02afb Fixing incorrect sql syntax when the query contains two expressions. 2013-03-07 19:56:10 -01:00
Morten Christensen ee95434cea Implements U4-1869 by adding the 3 characters to the list of reserved characters. 2013-03-07 19:04:25 -01:00
Shannon Deminick 86852f9815 updated server registrar 2013-03-07 23:23:20 +06:00
Shannon Deminick 9aa44c40ce re-instated the upgrade script and put the server rego back on the service context. 2013-03-07 22:57:42 +06:00
Shannon Deminick da331b7408 Changed how model mappers work for persistence objects so we don't have to statically associate the mapper. 2013-03-07 22:27:47 +06:00
Shannon Deminick 0230bedeb6 Reinstated server registration repositories and db table 2013-03-07 21:40:00 +06:00
Shannon Deminick bd6aa51397 Merge with 6.0.3 2013-03-07 21:27:54 +06:00
Shannon Deminick 9b85bc0e64 Added installer step to choose rendering engine but have left it disabled, might make a dashboard instead for that. 2013-03-07 21:25:11 +06:00
Morten Christensen fe08e7fc2f Fixes U4-1865 by excluding trashed items from GetByLevel method for both Content and Media 2013-03-07 13:42:14 -01:00
Morten Christensen 4ad96b49e7 Fixes U4-1862 2013-03-07 13:35:17 -01:00
Morten Christensen 9a1bb4a2dd Adding unit test to assert issue with issue with creation of property types outside a property type group.
Fixes U4-1861.
2013-03-07 13:33:22 -01:00
Shannon Deminick 2044d1b5db manually merged in installer changes from 6.0.3 2013-03-07 04:06:30 +06:00
Shannon Deminick 2c05eda899 Merge with 6.0.3 2013-03-07 04:01:04 +06:00
Sebastiaan Janssen c39f902ed5 And one more fix for U4-1845 to make upgrades succeed as well 2013-03-06 14:30:09 -01:00
Sebastiaan Janssen b7dc052cb2 Additional fixes for U4-1845 to maintain compatibility for people using the
wrong connection string
2013-03-06 14:09:01 -01:00
Morten Christensen 0c77114cd5 Fixes U4-1845 by correcting the sql ce connectionstring 2013-03-06 13:36:03 -01:00
Morten Christensen 222a5237b0 Version updated to 6.0.3 2013-03-06 12:03:01 -01:00
Morten Christensen de55cb8392 Correcting fix for U4-1835 2013-03-06 08:32:05 -01:00
Morten Christensen df164ee618 Fixes U4-1835 by checking if the value is null before running the regex validation against the value. 2013-03-06 08:02:09 -01:00
Morten Christensen 21b0687a57 Fixes U4-1837 by syncing tree after saveing DataTypeDefinition 2013-03-06 07:57:00 -01:00
Morten Christensen 9310efa280 Fixes U4-1831 by catching exception if there is no current logged in user. 2013-03-06 07:54:09 -01:00
Morten Christensen a41b55a9e6 Fixes U4-1846 2013-03-06 07:50:20 -01:00
Morten Christensen af2d8a4755 Fix related to U4-1407 but for Media. We already committed this fix for Content. 2013-03-06 07:49:29 -01:00
Shannon Deminick 0852200861 Merge with 6.0.3 2013-03-06 04:12:58 +06:00
Shannon Deminick d48e339b81 Fixes: #U4-1844, #U4-1730, #U4-1843 2013-03-06 04:12:28 +06:00
Shannon Deminick f955955ad8 Merge with 6.0.3 2013-03-06 03:18:11 +06:00
Shannon Deminick 9b6d498cf7 Merge with 4.11.6 2013-03-06 03:17:47 +06:00
Shannon Deminick 9042a23de7 Fixes: #U4-1614, #U4-793 - preview working properly in mvc 2013-03-06 03:12:04 +06:00
Shannon Deminick b9eaaa0f29 Merge with 6.0.3 2013-03-05 23:55:41 +06:00
Shannon Deminick 04bf011fcd Merge with 4.11.6 2013-03-05 23:55:09 +06:00
Shannon Deminick 5d62902684 Fixes up the double event for MakeNew on document (#U4-1737) 2013-03-05 22:34:31 +06:00
Shannon Deminick f79d046a87 Merge with 6.0.3 2013-03-05 22:19:31 +06:00
Shannon Deminick 82d645a0f7 Merge with 4.11.6 2013-03-05 22:18:53 +06:00
Shannon Deminick a8936de638 Fixes: #U4-1834 2013-03-05 21:52:22 +06:00
Shannon Deminick 737d7d6712 merge issue 2013-03-05 09:13:24 +06:00
Shannon Deminick 4d8ed22206 Merge with 6.0.3 2013-03-05 08:42:43 +06:00
Shannon Deminick 6b691eb461 Merge with 4.11.6 2013-03-05 08:34:14 +06:00
Shannon Deminick 06dc76496d Merge with 6.0.3 2013-03-05 06:08:02 +06:00
Shannon Deminick 452688b2bb Merge with 4.11.6 2013-03-05 05:57:35 +06:00
Sebastiaan Janssen a2251fe062 Created branch 6.0.3 2013-03-04 10:19:22 -01:00
Sebastiaan Janssen 3d0684eac0 Closing branch 6.0.2 2013-03-04 10:18:18 -01:00
Sebastiaan Janssen a8fafaa194 Added tag Release-6.0.2 for changeset b247b35d8211 2013-03-04 10:18:08 -01:00
Morten Christensen 2b8a6e532e Fixing U4-1820 2013-03-03 11:25:48 -01:00
Morten Christensen d497659f1f Fixes U4-1814 for Document and Media by adding both legacy Before/After Move events 2013-03-03 11:19:15 -01:00
Morten Christensen 0cafeac6eb Fixes U4-1818 2013-03-03 11:11:51 -01:00
Morten Christensen 4516305f3c Fixes U4-1816 2013-03-03 10:34:39 -01:00
Morten Christensen 04c8390a4f Fixes sorting of ContentTypes and Content related to U4-1816.
Updating upgrade code for PropertyTypes / PropertyTypeGroups.
2013-03-02 08:11:47 -01:00
Shannon Deminick 2877b7bda4 Fixes: #U4-1819 2013-03-02 05:46:00 +06:00
Hendy fc94d92b37 Merge 2013-03-01 23:26:00 +00:00
Hendy 84171c6b98 Added Media and Member support to XPath CheckBoxList 2013-03-01 22:53:14 +00:00
Shannon Deminick c137854e01 Merge with 6.0.2 2013-03-02 03:45:06 +06:00
Shannon Deminick 3ff88bc4fa Fixing strange merge issues. 2013-03-02 03:44:43 +06:00
Shannon Deminick fe9f5b224a Fixing really strange merge issues! 2013-03-02 03:34:37 +06:00
Shannon Deminick 45f2cc9a20 Merge with 6.0.2 2013-03-02 02:52:25 +06:00
Shannon Deminick 4b54edf660 Merge 2013-03-02 02:51:05 +06:00
Shannon Deminick f1c680c7e2 Merge with 6.0.2 2013-03-02 02:50:17 +06:00
Shannon Deminick 36108df4d0 Merge with 6.0.2 2013-03-02 02:49:24 +06:00
Shannon Deminick 1bc9d1d9c3 Merge with 4.11.6 2013-03-02 02:45:19 +06:00
Shannon Deminick b5cbe63a4e Back merged from 6.1 the changes required for #U4-1822 and #U4-1797 2013-03-02 02:43:22 +06:00
Shannon Deminick 51ad21302a Merge 2013-03-02 01:03:07 +06:00
Shannon Deminick 010893a73a Fixes: #U4-1822, #U4-1797 - Is helpers and indexes on result collections using IPublishedContent or DynamicPublishedContent were incorrect,
added unit tests to support issues and fixes.
2013-03-02 01:02:38 +06:00
Morten Christensen cb03178d99 Updating version 2013-03-01 15:39:24 -01:00
Morten Christensen 361fa8836b Merge 2013-03-01 15:37:06 -01:00
Morten Christensen 194ebb57b9 Updating migration 2013-03-01 15:36:53 -01:00
Hendy 5effe5015e Added Media and Member support to XPath DropDownList 2013-03-01 15:28:03 +00:00
Stephan 97f3f13aaa Core. and Web.Configuration - go public
UmbracoSettings now public, only static For<> method is not internal, though
2013-03-01 13:56:12 -01:00
Stephan 32e6604cf7 Web.Routing - add InternalRedirectPreservesTemplate setting (U4-1222...) 2013-03-01 13:56:12 -01:00
Stephan b2cedf6380 Web.BaseRest - use new settings & config interface 2013-03-01 13:56:12 -01:00
Stephan 9fc5ee897f Web.Routing - implement UrlProviderMode 2013-03-01 13:56:11 -01:00
Stephan e8e8053063 Web.Configuration - migrate TryIisCustomErrors 2013-03-01 13:56:11 -01:00
Stephan c635ec67d0 Web.Configuration - import WebRouting infrastructure 2013-03-01 13:56:11 -01:00
Stephan 750370d148 Core.Configuration, Tests - refactor settings management 2013-03-12 12:02:04 -01:00
Stephan 2c6daa2918 Core.Configuration - cleanup 2013-03-01 13:56:11 -01:00
Stephan e33c877605 Core.Strings - fix tests 2013-03-01 11:47:02 -01:00
Sebastiaan Janssen a3b03988b3 Created branch 6.0.2 2013-03-01 06:55:54 -01:00
Sebastiaan Janssen cab21e9d48 Merge with 6.0.1 2013-03-01 06:51:38 -01:00
Sebastiaan Janssen a7bd0d97a7 Closing branch 4.11.5 2013-03-01 06:51:01 -01:00
Sebastiaan Janssen 5943c87fc6 Added tag Release-4.11.5 for changeset 74cfea3262f4 2013-03-01 06:50:28 -01:00
Sebastiaan Janssen 2e7c26fcc0 Closing branch 6.0.1 2013-03-01 06:49:59 -01:00
Sebastiaan Janssen 0f6c41679c Added tag Release-6.0.1 for changeset 92410e141d9c 2013-03-01 06:49:45 -01:00
Stephan 85e73df3c8 Web.Routing - refactor & resharp 2013-02-28 20:20:40 -01:00
Shannon Deminick a17a11d50b Fixed: #U4-1810, pretty much finished the examine management dashboard. 2013-03-01 03:04:29 +06:00
Sebastiaan Janssen 6d5f7c4293 Checking the filepath correctly this time 2013-02-28 16:23:43 -01:00
Morten Christensen cc32e73235 Merge 2013-02-28 16:00:49 -01:00
Morten Christensen 92ef4d8055 Adds migration execute method for code, so it'll run in the process method of the migration runner. 2013-02-28 16:00:35 -01:00
Sebastiaan Janssen e57e2f5b5f Migrations should be sorted by version number as well 2013-02-28 15:38:07 -01:00
Sebastiaan Janssen 0b4efe4eeb Merge with 4.11.5 2013-02-28 15:10:31 -01:00
Morten Christensen 6eeae52333 Adding the actually migration class 2013-02-28 15:01:50 -01:00
Morten Christensen c38c18fed8 Adding migration for updating PropertyGroups and PropertyTypes 2013-02-28 14:54:42 -01:00
Sebastiaan Janssen 0af47963c6 Merge 2013-02-28 09:56:19 -01:00
Sebastiaan Janssen 916e442ee4 Fix errors in log caused by no prevalues beind selected. 2013-02-28 09:53:57 -01:00
Morten Christensen ecae9c47b7 Fixes U4-1798 by adding the current user's id when saving Media, MediaTypes and DocumentTypes. 2013-02-28 09:37:33 -01:00
Morten Christensen 836a99128f Fixes moving PropertyTypes between Tabs/PropertyGroups from inherited doc types.
Adds method to move a PropertyType to another PropertyGroup.
2013-02-28 09:07:15 -01:00
Shannon Deminick 6ead98a51d updated latest examine patch dll. added indexing actions to the dashboard. have optimize working great all
with the new umbraco api framework.
2013-02-28 05:05:06 +06:00
Morten Christensen abefbc7581 Merge 2013-02-27 17:02:10 -01:00
Morten Christensen 365addedf4 Fixes deleting tabs and having the property types move to Generic Properties 2013-02-27 17:01:53 -01:00
Shannon Deminick 7cc12211e1 Fixed unit tests 2013-02-27 23:34:55 +06:00
Shannon Deminick f9b7e1b7fa Merge with 6.0.1 2013-02-27 23:20:34 +06:00
Shannon Deminick 44f5439a2c Merge with 4.11.5 2013-02-27 23:14:50 +06:00
Shannon Deminick ae0991bc67 Fixed unit tests now that we have default values stored in GlobalSettings. 2013-02-27 23:02:12 +06:00
Shannon Deminick 0caaaa500c Merge with 4.11.5 2013-02-27 22:38:46 +06:00
Shannon Deminick 33c5f3fcc7 updating examine dash 2013-02-27 22:21:58 +06:00
Shannon Deminick 47f6924ac3 Fixes: #U4-1790 for 6.1 (slightly different fix than 6.0.1) 2013-02-27 21:59:21 +06:00
Sebastiaan Janssen a14baeb111 Merge 2013-02-27 14:58:47 -01:00
Sebastiaan Janssen 5b4d8ed6f3 U4-1793 YSOD when moving a node back to root 2013-02-27 14:57:42 -01:00
Morten Christensen 25ea4003f9 Merge 2013-02-27 14:42:43 -01:00
Morten Christensen 30cef671dc Removing unused code 2013-02-27 14:42:17 -01:00
Morten Christensen 250e627b1d Fixes saving of RegEx in DocTypes.
Fixes loading and saving of properties on inherited tabs.
Adjusts logic around the creation of tabs/property groups
2013-02-27 14:39:11 -01:00
Shannon Deminick 45b8daa18c Merge with 6.0.1 2013-02-27 21:38:45 +06:00
Sebastiaan Janssen 5b00501d21 trySkipIisCustomErrors was defined twice in the Release config 2013-02-27 14:38:15 -01:00
Shannon Deminick 06e5350c43 Fixes: #U4-1790 - Examine indexing non-published items for indexers that are not supporting non-published items. 2013-02-27 21:35:36 +06:00
Shannon Deminick 484afccf89 Merge with 4.11.5 2013-02-27 20:46:29 +06:00
Shannon Deminick 2589ec8367 Merge 2013-02-27 20:45:25 +06:00
Shannon Deminick a6aeada197 Merge with 4.11.5 2013-02-27 20:44:56 +06:00
Shannon Deminick 2a9e32e8fd Fixes: U4-1788 - ensures internal reserved paths and urls (that cannot be modified) are stored staticly in code 2013-02-27 20:13:15 +06:00
Sebastiaan Janssen 603724ddd6 Merge 2013-02-27 12:47:21 -01:00
Sebastiaan Janssen 902cfc5a22 Merge with 4.11.5 2013-02-27 12:43:52 -01:00
Morten Christensen db7aa99b85 Fixes PerformGetByQuery related to U4-1783. The query does not need to be version specific. 2013-02-27 11:19:53 -01:00
Morten Christensen 031ceccf5d Removing need to load a Property from within FileHandlerData.
This means that newly created properties based on the upload field can be properly saved.
2013-02-27 11:02:27 -01:00
Morten Christensen 7127706c43 Merge 2013-02-27 10:29:26 -01:00
Morten Christensen d078ef8f5e Minor adjustment to property tracking 2013-02-27 10:28:40 -01:00
Morten Christensen 289b9743c5 Fixes regression issue with installing document types using legacy api. 2013-02-27 10:23:48 -01:00
Sebastiaan Janssen eda9ba07f4 Wrongly doing an append where I meant to just replace the html 2013-02-27 09:53:45 -01:00
Shannon Deminick 1157c11d89 added searcher properties 2013-02-27 06:53:18 +06:00
Shannon Deminick 6815092b62 Changed default api routes to support multiple actions, not strict REST only methods. updated more examine mgmt. 2013-02-27 06:50:26 +06:00
Shannon Deminick 876753cb54 Merge 2013-02-27 05:25:21 +06:00
Shannon Deminick b374dcf2c2 fixed issue with test project's invalid references (for web api). Added UmbracoAuthorizedApiController, change the
examine mgmt tools to use web api, got the dashboard displaying all relavent properties for indexers.
2013-02-27 05:24:45 +06:00
Shannon Deminick f7cfa507d7 fixed bug with attributes 2013-02-27 00:41:24 +06:00
Shannon Deminick 5df0013406 Merge with 6.0.1 2013-02-27 00:37:24 +06:00
Shannon Deminick 30d08bfae1 missing proj file update 2013-02-27 00:34:08 +06:00
Shannon Deminick b0ae03b220 publicly exposes the UmbracoAuthorizeAttribute for MVC and creates one for web api too. 2013-02-27 00:33:59 +06:00
Shannon Deminick ffb9849745 Merge 2013-02-27 00:20:50 +06:00
Shannon Deminick cc55107da3 Added method to WebSecurity to validate members, updated routes for umbraco api controllers 2013-02-27 00:19:48 +06:00
Stephan 6c4ee40b96 Core.Configuration - import infrastructure 2013-02-26 16:52:44 -01:00
Stephan c637c517b8 Web.Routing - better PublishedContentRequest support for redirect & status 2013-02-26 16:52:42 -01:00
Stephan cdf6249a41 Core - add some TypeExtensions 2013-02-28 20:10:47 -01:00
Stephan d9540bcfc5 Core - cleanup UriExtensions, create unit tests, make it public 2013-02-26 16:52:27 -01:00
Stephan 6948d70b75 U4-1779 - Web.BaseRest supports rest extensions over multiple classes 2013-02-26 16:52:06 -01:00
Sebastiaan Janssen 3f9b022ae4 Merge with 4.11.5 2013-02-26 17:30:50 -01:00
Stephan aeb417d3d8 U4-1779 - Web.BaseRest supports rest extensions over multiple classes 2013-02-26 16:52:06 -01:00
Shannon Deminick bcfc7b2507 Adds UrlHelper extensions to get the url of any umbraco web api controller. Updates proj dependencies. 2013-02-26 23:13:32 +06:00
Sebastiaan Janssen 990ab7f87f Merge 2013-02-26 15:52:48 -01:00
Sebastiaan Janssen 861198eec9 Merge with 4.11.5 2013-02-26 15:50:11 -01:00
Shannon Deminick 7c32365bd3 moved web api controllers to namespace Umbraco.Web.WebApi and created web api member authorize attribute 2013-02-26 22:14:32 +06:00
Morten Christensen b5aefdce04 Merge 2013-02-26 14:53:41 -01:00
Morten Christensen adfb7cfaa4 Fixes U4-1756 by ordering the DocumentTypes prior to deleting them 2013-02-26 14:52:55 -01:00
Morten Christensen 0a88ba05c8 Corrected an issue related to the upload field when a Document without any files uploaded was deleted 2013-02-26 14:52:33 -01:00
Shannon Deminick bf6ba727a4 Merge with 6.0.1 2013-02-26 21:42:55 +06:00
Shannon Deminick 9ee295d49e Merge with 4.11.5 2013-02-26 21:35:55 +06:00
Shannon Deminick 7173b44b4f Merge with 4.11.5 2013-02-26 21:18:17 +06:00
Shannon Deminick 69f6edadb3 Merge 2013-02-26 21:17:57 +06:00
Morten Christensen bb2f3a1732 Fixes U4-1784 2013-02-26 14:11:24 -01:00
Shannon Deminick 4b29d7ba2e Merge with 4.11.5 2013-02-26 21:11:20 +06:00
Morten Christensen b409740da5 Merge 2013-02-26 13:35:52 -01:00
Morten Christensen a888e0564c Calling save when creating a DataTypeDefinition related to U4-1781 2013-02-26 13:32:02 -01:00
Morten Christensen fef96e8b43 Fixes issue related to moving PropertyTypes between tabs.
Ensures that the right tabs with the right ids are loaded in the dropdown.
2013-02-26 13:31:29 -01:00
Sebastiaan Janssen 429522a0bc U4-1775 Copying nodes results in same name under sort and in MNTP 2013-02-26 13:08:31 -01:00
Morten Christensen e9b2261aab Fixes the moving of a PropertyType from a named tab to generic properties 2013-02-26 11:30:19 -01:00
Morten Christensen 02adb6e112 Removing the creation of Properties that doesn't exist from within the Content class, as it could cause other issues.
Refactoring how Properties are loaded to ensure that new properties are created for newly added PropertyTypes.
Corrected the saving of PropertyTypes not within a PropertyGroup.
Changed the loading of Content/Document to use the new API to ensure that properties are properly loaded.
2013-02-26 10:57:40 -01:00
Morten Christensen 00d408e6bc Merge 2013-02-26 09:13:34 -01:00
Morten Christensen 0498161367 Fixes U4-1630 by ensuring that PropertyTypes with a changed name or alias aren't deleted from the db upon comparison.
Ensures cache is cleared for updated PropertyTypes.
2013-02-26 09:13:05 -01:00
Shannon Deminick 63159702e3 Implemented UmbracoApiController as a plugin and is auto routed 2013-02-26 03:45:39 +06:00
Shannon Deminick 545a873af2 added code comments 2013-02-26 02:28:22 +06:00
Shannon Deminick db268c6805 renamed to MemberAuthorizeAttribute and changed it to inherit from a AuthorizeAttribute as this happens much further up the chain than
the filter attribute and also contains the correct logic to ensure authorization always happens regardless of if the page is cached. Cleaned
up our other authorize attibutes.
2013-02-26 02:21:51 +06:00
Shannon Deminick 2967075c1f Merge 2013-02-26 01:27:48 +06:00
Shannon Deminick 4761e4bd43 Installs web api (nuget) 2013-02-26 01:23:58 +06:00
Shannon Deminick a27dccd0d9 Fix merge issue 2013-02-26 01:17:57 +06:00
Shannon Deminick 6b8bfc2e2d Manually applies fix for U4-1776 SafeAlias culture problem since the files/class structure has changed in 6.1 2013-02-26 01:13:31 +06:00
Shannon Deminick 5b15218174 Merge with 6.0.1 2013-02-26 01:05:36 +06:00
Shannon Deminick 0d3d4693b4 Merge with 4.11.5 2013-02-26 01:00:44 +06:00
Shannon Deminick f0a53ea9c0 Merge 2013-02-26 00:58:24 +06:00
Shannon Deminick fbcabc94f2 Merge with 4.11.5 2013-02-26 00:50:58 +06:00
Morten Christensen d494b061f3 Merge 2013-02-25 15:00:55 -01:00
Morten Christensen ebc8443e70 Removing unnecessary save from MediaType 2013-02-25 14:58:04 -01:00
Morten Christensen 48ee59b94e Adding check related to U4-1757 2013-02-25 14:57:43 -01:00
Sebastiaan Janssen 560dcad90a Updates for MySQL: Check for case-sensitivity 2013-02-25 14:42:07 -01:00
Morten Christensen 7498b2f994 Merge 2013-02-25 14:37:14 -01:00
Morten Christensen df4f92197a Fixes U4-1764 by reducing the number of times a DocumentType is saved from 3 to 1.
Instead of having the Allowed Templates saved in the EditNodeTypeNew control its now done via a callback.
2013-02-25 14:34:29 -01:00
Sebastiaan Janssen 13b1191aad Additional fixes for U4-1776 SafeAlias culture problem 2013-02-25 13:44:31 -01:00
Sebastiaan Janssen adaec42982 Merge with 4.11.5 2013-02-25 13:35:39 -01:00
Shannon Deminick e9f2546c2a Merge 2013-02-25 20:17:18 +06:00
Shannon Deminick 007c4d5862 Fixes: #U4-1773 2013-02-25 20:17:04 +06:00
Sebastiaan Janssen f3621aa743 MySQL: Check for case-sensitivity 2013-02-25 13:14:26 -01:00
Morten Christensen 46cf4398a0 Fixes issue with the Member editor throwing a YSOD because new API was used in the ContentControl.
The new API is now only used if available, which is the case for Content and Media, but currently not for Members.
2013-02-25 13:13:10 -01:00
Morten Christensen 1599f493fa Fixes U4-1696 2013-02-25 13:11:58 -01:00
Shannon Deminick 894cfb2e85 update to examine details 2013-02-25 20:00:11 +06:00
Morten Christensen b5d79ebb74 Fixes U4-1690 with a proper implementation for removing ContentTypes from a composition. 2013-02-25 11:15:56 -01:00
Morten Christensen 1cc8367fa9 Merge 2013-02-25 10:32:01 -01:00
Morten Christensen 7e5087ae7d Fixing issues related to DocTypes 2013-02-25 10:31:38 -01:00
Sebastiaan Janssen d6f9909bec Merge with 4.11.5 2013-02-25 08:46:22 -01:00
Shannon Deminick 7deae8ea37 Update to latest examine (bug fixed), started Examine Management dashboard FF project. 2013-02-23 23:00:31 +06:00
Shannon Deminick 03aa7fd06b Fixes umbraco content service 2013-02-23 22:11:38 +06:00
Shannon Deminick 54ba547c8c Converted ~/Umbraco/MasterPages/Default.Master to use correct web forms code behind structure. 2013-02-23 03:20:05 +06:00
Shannon Deminick c1172b6823 Fixes issue with UmbracoContentService when getting all user property names 2013-02-23 01:59:21 +06:00
Shannon Deminick a91d531db2 Fixes very strange issue of FirstOrDefault not actually returning 'null' when it is actually null, never seen anything like it and
PropertyType is not a value type so should be null. real strange.
2013-02-23 01:50:04 +06:00
Shannon Deminick dd0d4e872f Merge with 6.0.1 2013-02-23 00:24:38 +06:00
Shannon Deminick 9b4da4c8f8 Merge with 4.11.5 2013-02-23 00:21:52 +06:00
Shannon Deminick cfc81d0e84 Merge 2013-02-23 00:21:44 +06:00
Shannon Deminick 265fd6b91c Merge with 6.0.1 2013-02-23 00:19:05 +06:00
Morten Christensen 00e10deecb Merge 2013-02-22 16:42:17 -01:00
Morten Christensen 46e67e4a92 Skipping PropertyTypes that doesn't belong to the current ContentType 2013-02-22 16:42:06 -01:00
Morten Christensen 520a7f238d Refactoring ContentTypeControlNew and ContentControl 2013-02-22 16:25:45 -01:00
Shannon Deminick 3c41871e59 Fixes: #U4-1748 2013-02-22 21:42:38 +06:00
Shannon Deminick 038b4300ba Ensures plugin cache is cleared on install 2013-02-22 21:29:48 +06:00
Shannon Deminick 958d7940f2 Manually applies changes from 6.0.1 to installer files from revisions 8033aae62d4a, fdeca60cb2c1 2013-02-22 21:02:24 +06:00
Shannon Deminick a3f7ef7002 Merge with 6.0.1 2013-02-22 20:04:57 +06:00
Shannon Deminick e2d806f5d9 Merge with 4.11.5 2013-02-22 20:00:10 +06:00
Sebastiaan Janssen 596c4ac329 Fixes: U4-1721 V6: Publish of a page ends in YSOD when using legacy schema 2013-02-22 12:36:24 -01:00
Sebastiaan Janssen 8ad8a3239a Make sure that the installer doesn't crash if dbSettings are null 2013-02-22 12:01:47 -01:00
Morten Christensen c0fa011cc3 Merge 2013-02-22 11:50:00 -01:00
Sebastiaan Janssen 2df05da7fc Fixes U4-1746 Duplicate image source (src) when inserting resized image in tiny
mce (richtext editor)
2013-02-22 11:41:01 -01:00
Shannon Deminick 36eb340c11 Merge 2013-02-22 10:49:15 +06:00
Shannon Deminick aa929e8091 Merge with 6.0.1 2013-02-22 10:45:04 +06:00
Shannon Deminick e00c0fc447 Another update to examine to fix another issue: 10362 2013-02-22 10:41:42 +06:00
Shannon Deminick 2ebfbd5d08 Fixed one test with merging 2013-02-22 10:34:43 +06:00
Shannon Deminick 567be2aecf Fixed up merge issues 2013-02-22 07:08:45 +06:00
Shannon Deminick 6a6ac99c34 Merge with 6.0.1 2013-02-22 06:58:44 +06:00
Shannon Deminick 7137c57ac9 merge issue with mediaxml file 2013-02-22 06:49:02 +06:00
Shannon Deminick d68b4d97f6 Fixing merge issues 2013-02-22 06:43:52 +06:00
Shannon Deminick 96a62b57fb Merge with 4.11.5 2013-02-22 06:21:12 +06:00
Stephan 03fc0c868c Core.Strings - fix more unit tests (resolvers init issues) 2013-02-21 16:53:25 -01:00
Morten Christensen 46687429fb Merge 2013-02-21 16:52:13 -01:00
Morten Christensen ce7aa43aa7 Refactoring ContentTypeControlNew to better work with the new api.
Adding a few helper methods to ContentTypeBase, which should make it easier to work with PropertyTypes and Groups.
2013-02-21 16:48:19 -01:00
Shannon Deminick dced287c1c Merge with 6.0.1 2013-02-21 23:08:14 +06:00
Shannon Deminick 76e5304233 Merge with 4.11.5 2013-02-21 23:07:59 +06:00
Shannon Deminick bcd426092c Merge with 6.0.1 2013-02-21 22:52:49 +06:00
Shannon Deminick 387398b044 Merge 2013-02-21 22:52:29 +06:00
Shannon Deminick 62ed7e0a53 Merge with 6.0.1 2013-02-21 22:48:45 +06:00
Shannon Deminick 635b8bd82e Removes all need of UmbracoSettings.UseLegacyXmlSchema = false; in unit tests since the default is false. 2013-02-21 22:46:50 +06:00
Shannon Deminick f2071379fc Merge with 4.11.5 2013-02-21 22:40:24 +06:00
Shannon Deminick 566986201f Changes ContentFinderByNiceUrlTests to not require a database by having an overloaded ctor param on
ContentFinderByNiceUrl to not require a domain lookup (up-ported from 6.0.x and 4.x logic). Changes
ContentFinderByAliasTests to not require a database by splitting the two tests, now there is also a
ContentFinderByAliasWithDomainsTests.
2013-02-21 22:32:44 +06:00
Shannon Deminick a9947cda48 Merge with 6.0.1 2013-02-21 22:22:23 +06:00
Shannon Deminick eb8875066c Reverts LookupByNiceUrlTests to not require a database setup 2013-02-21 22:12:30 +06:00
Sebastiaan Janssen 2a47b384d2 Merge 2013-02-21 15:08:43 -01:00
Sebastiaan Janssen 29e5872a0f Merge with 4.11.5 2013-02-21 15:07:17 -01:00
Shannon Deminick 5f28f279e0 Merge with 4.11.5 2013-02-21 22:03:42 +06:00
Shannon Deminick 1d9e445a42 Merge 2013-02-21 21:34:30 +06:00
Shannon Deminick 271b0691e2 Fixed up merge 2013-02-21 21:33:21 +06:00
Shannon Deminick cf46df441a Merge with 6.0.1 2013-02-21 21:17:47 +06:00
Shannon Deminick 1aa137e9da merge fix 2013-02-21 21:13:21 +06:00
Shannon Deminick 042eb47c17 Merge with 4.11.5 2013-02-21 21:02:11 +06:00
Sebastiaan Janssen a6556d0195 Merge 2013-02-21 14:01:28 -01:00
Sebastiaan Janssen 807b32fb0d Fixed: U4-1676 Renamed node has old name on sort 2013-02-21 14:00:10 -01:00
Shannon Deminick aec017e933 Merge with 6.0.1 2013-02-21 20:07:18 +06:00
Shannon Deminick bda3fbc698 Merge with 4.11.5 2013-02-21 20:07:05 +06:00
Sebastiaan Janssen c744e47665 Fixes U4-1668 4.11.4 NiceUrl property on dynamicnode does not work until a
property has been requested from the dynamic node
2013-02-21 08:52:23 -01:00
Shannon Deminick 3727ef54aa Commented out migration tests for 6.1 since we don't have any now that the servers stuff is commented out. 2013-02-21 08:19:07 +06:00
Shannon Deminick 5615f9590b Merge with 6.0.1 2013-02-21 06:18:45 +06:00
Shannon Deminick 9a7894df76 Merge with 4.11.5 2013-02-21 06:18:30 +06:00
Shannon Deminick e084ddeb41 Fixed up some merge issues. 2013-02-21 06:14:01 +06:00
Shannon Deminick f8760b34b8 Merge with 6.0.1 2013-02-21 06:10:25 +06:00
Shannon Deminick 6734420c6f merge issue, had 2 declarations in the proj for SettingsForTests 2013-02-21 06:03:56 +06:00
Shannon Deminick fd795e14c6 Merge with 4.11.5 2013-02-21 05:52:42 +06:00
Shannon Deminick 9d95c04ab6 Fixed #U4-814 and got all possible unit tests that were not working for DynamicNode but were working for
DynamicPublishedContent working.
2013-02-21 05:13:08 +06:00
Shannon Deminick d622f76393 Fixed #U4-814 and got all possible unit tests that were not working for DynamicNode but were working for
DynamicPublishedContent working.
2013-02-21 05:02:06 +06:00
Shannon Deminick c93193c5c8 Changed logging in unit tests to filter out things we don't need to see 2013-02-21 03:13:16 +06:00
Shannon Deminick 62c4713593 Changed logging in unit tests to filter out things we don't need to see 2013-02-21 03:13:16 +06:00
Sebastiaan Janssen d4fc82dae1 Calculate the hash of the WebPI package so it's not such a manual process. 2013-02-20 18:28:07 -01:00
Sebastiaan Janssen d4058bd81f Merge 2013-02-20 15:57:16 -01:00
Sebastiaan Janssen bc824ba66a Updates for WebPI testers: Check if SQL CE file exists when connectionstring is
filled in, make sure the connection string exists in web.config and if it has
empty values, run the installer instead of trying to start the site.
Also never claim the database is configure when the providername is empty.
2013-02-20 15:55:39 -01:00
Shannon Deminick e3ef3dfb32 Fixes events test 2013-02-20 22:27:58 +06:00
Sebastiaan Janssen 4201286038 Don't check for database.windows.net to determine SQL Azure as WebPI sets a
custom server name
2013-02-20 15:03:43 -01:00
Shannon Deminick 7509724e35 Comments out Server registration and db classes for now, we'll revisit this again soon for automatic
distributed cache without the need for xml. This code is nearly there to work in most classic implementations
of a load balanced site where each node has an internal DNS/Hostname entry. Needs some fine tuning but we'll release
this in a later version.
2013-02-20 21:55:02 +06:00
Stephan e333ad2b23 Tests.Routing - fix tests 2013-02-20 14:38:28 -01:00
Sebastiaan Janssen a8eeabb73d Merge 2013-02-20 14:34:49 -01:00
Sebastiaan Janssen b06620f56e Make the SQL Azure connection string support custom domains and all kinds of
ways of entering it.
2013-02-20 14:34:18 -01:00
Shannon Deminick a41e32c068 un-commented out the sort order test for examine 2013-02-20 21:32:57 +06:00
Shannon Deminick 3baf326498 Merge 2013-02-20 21:31:33 +06:00
Shannon Deminick 8ea9627d51 Updated to Examine 1.45, Updated FixedDisplayModes to 1.0.1 2013-02-20 21:29:56 +06:00
Stephan 957feefb2e Tests.Routing - fix tests 2013-02-20 14:23:29 -01:00
Morten Christensen e8524963dd Fixes U4-1716 2013-02-20 11:20:06 -01:00
Sebastiaan Janssen 5d931d1146 Merge 2013-02-20 08:52:06 -01:00
Stephan 40b7659078 Tests.Routing, Web.Routing - more tests + fix wildcard domains 2013-02-20 08:51:41 -01:00
Stephan 0427ecc7f4 Tests.Routing - add tests for wildcard domains 2013-02-20 08:12:48 -01:00
Stephan 11560a5451 Test.Routing - more umbracoUrlAlias test 2013-02-20 06:47:07 -01:00
Shannon Deminick 879c77c68d Applies same try/catch logic for setup/teardown because I'm still experiencing issues with the SQLCE
db file being locked which mucks up the rest of the setup/teardowns and tests fail.
2013-02-20 07:07:57 +06:00
Shannon Deminick e71dd3008d Merge 2013-02-20 06:39:09 +06:00
Shannon Deminick 597c888d36 Merge 2013-02-20 06:36:21 +06:00
Shannon Deminick 5bef77c0fb Merge 2013-02-20 06:30:39 +06:00
Shannon Deminick 89b85bcf4b Fixed Render route handler tests. 2013-02-20 06:30:06 +06:00
Shannon Deminick 694d252ce5 Fixed base test classes to ensure that if/when an issue goes wrong removing the database file that the class can
continue to TearDown (or force a teardown if it is starting up)
2013-02-20 05:54:41 +06:00
Shannon Deminick 7efc06429c Fixes up index set extensions and now have the Sorting test working. PDF indexer tests working. 2013-02-20 05:01:40 +06:00
Sebastiaan Janssen ef4c02f759 Merge 2013-02-19 20:58:00 -01:00
Sebastiaan Janssen 452a0a43b0 Fixes U4-1561 V6.0 RC - Member Profile property saving doesn't work 2013-02-19 20:57:20 -01:00
Shannon Deminick ad188fab70 More tests fixed. 2013-02-20 03:02:44 +06:00
Shannon Deminick b47f9e87f1 Fixed up merging and unit test structures so taht BaseWebTest uses BaseDatabaseFactoryTests.
Fixed up Examine unit test issues
2013-02-20 02:50:08 +06:00
Shannon Deminick dddc308167 Merge with 6.0.1 2013-02-20 00:44:04 +06:00
Shannon Deminick 0751aff31f Fixes more of #U4-1706 and adds another unit test. Ensures we never return items from the recycle bin even if the indexes exist. Updated logic to ensure
items don't get indexed even if they are saved and currently exist in the recycle bin and ensures that indexes are removed on both trashed
and deleted.
2013-02-20 00:13:35 +06:00
Shannon Deminick a2ea20de70 un-ignores PublishedMedia tests. Streamlines BaseWebTest so now we only have one place for database init logic (will
enhance this more today). Changed ExamineEvents to not delete indexes on trashed and changed PublishedMediaStore to ignore
nodes in the recycle bin path... and now to write unit tests for that.
2013-02-19 22:46:44 +06:00
Shannon Deminick 5919dca5d5 Merge with 6.0.1 2013-02-19 22:15:16 +06:00
Shannon Deminick 3bfa1be60c Patch applied for #U4-1636 2013-02-19 22:14:08 +06:00
Shannon Deminick 8d38cf3c44 Applying patch for #U4-1636 2013-02-19 22:11:55 +06:00
Shannon Deminick a3a9ab069a Applying patch for #U4-1636 2013-02-19 22:09:55 +06:00
Morten Christensen da908501e5 Merge 2013-02-19 14:58:12 -01:00
Morten Christensen 995ed22401 Comments related to U4-1714 2013-02-19 14:58:02 -01:00
Sebastiaan Janssen c9cd4c721c Merge 2013-02-19 14:52:34 -01:00
Sebastiaan Janssen c059c14d7a Fixes U4-1706 DynamicMedia pulls content from Recyling Bin 2013-02-19 14:51:51 -01:00
Stephan 7493426e25 Core.Strings - fix unit tests 2013-02-19 14:00:17 -01:00
Stephan 04c9771978 U4-1611 - bugfix 2013-02-19 13:58:16 -01:00
Stephan 9c8b5cd97e U4-1441 - fix, fix and fix! 2013-02-19 17:49:49 -01:00
Stephan 8bb447065c Tests - cleanup settings handling for more reliable tests 2013-02-19 17:45:22 -01:00
Morten Christensen 5b8beceea8 Merge 2013-02-19 13:46:45 -01:00
Morten Christensen e4568520a9 Improves performance when working with DocumentTypes in the backoffice - related to U4-1714 2013-02-19 13:45:57 -01:00
Shannon Deminick 1733e876c4 Merge with 6.0.1 2013-02-19 20:19:43 +06:00
Shannon Deminick cbba628eaf Merge with 4.11.5 2013-02-19 20:18:15 +06:00
Shannon Deminick c958422317 Merge 2013-02-19 20:17:48 +06:00
Shannon Deminick e096890400 Fixes: #U4-1537 2013-02-19 20:12:13 +06:00
Shannon Deminick 6a9277a712 Fixes: #U4-1537 2013-02-19 20:04:50 +06:00
Morten Christensen ec4b1c8f70 Fixes U4-1689 and U4-1719.
Refactoring UmbracoImageMediaFactory so it uses the extension method for uploading/setting images, so its a bit more DRY.
2013-02-19 11:06:00 -01:00
Stephan 2d336fde73 Tests - cleanup settings handling for more reliable tests 2013-02-19 10:07:22 -01:00
Morten Christensen 1af904435a Merge 2013-02-19 08:47:04 -01:00
Stephan ac3bec5d9e Web.Routing - refactor domains management 2013-02-19 06:37:25 -01:00
Stephan 7da60e9937 Web.Routing - sanitize DomainAndUri 2013-02-26 16:52:43 -01:00
Stephan eba5fc84c0 Web.Routing - refactor wildcard domains 2013-02-26 16:52:43 -01:00
Stephan 71d8736e7e Web.Routing - refactor & resharp 2013-02-19 06:37:25 -01:00
Stephan ae1ff4c39a Web.Routing - cleanup resolvers 2013-02-19 06:37:24 -01:00
Stephan f9f998e823 Core.Strings - refactor cms.helper.Casing 2013-02-26 18:12:22 -01:00
Stephan e10fc26729 Core.Strings - add arguments checks 2013-02-19 06:34:06 -01:00
Stephan 0d6999292c Core.Strings, Web.UI - refactor UI aliases management (3) 2013-02-19 06:30:19 -01:00
Stephan 3e7681d4d2 Core.Strings, Web.UI - refactor UI aliases management (2) 2013-02-19 06:29:59 -01:00
Stephan c838b8a381 Core.Strings - resharp 2013-02-19 06:27:13 -01:00
Stephan 96a279499b Core.Strings - supports allowUnderscoreInTerm in new DefaultShortStringHelper 2013-02-19 06:27:13 -01:00
Stephan a3f0b7a37f Core.Strings, Web.UI - refactor UI aliases management (1) 2013-02-19 06:26:58 -01:00
Shannon Deminick ec87b951d5 Fixes up merge issue. 2013-02-19 07:45:01 +06:00
Shannon Deminick 2e033b3bb6 Merge 2013-02-19 07:32:57 +06:00
Shannon Deminick d8721197b7 Fixes up pull request so that there is no breaking changes. We now type check for a new base class called
UmbracoControllerFactory to get the controller type. Adds SurfaceRouteHandler to ensure that UmbracoMvcHandler is used for all SurfaceControllers, and updates
all routes accordingly. Streamlines the RenderRouteHandler to then just look up surface routes in the route table
for posted values. This now ensures that UmbracoMvcHandler is used even with plugin surface controllers.
2013-02-19 07:30:46 +06:00
Shannon Deminick 4a05b0ea31 Merge with 6.0.1 2013-02-19 06:20:48 +06:00
Shannon Deminick 7b2f03ba50 Merge with 4.11.5 2013-02-19 06:20:12 +06:00
Shannon Deminick 137b0754d6 Removes area routing for local surface controllers and BeginUmbracoForm, adds strongly typed Html.Action<T>
method for rendering SurfaceController child actions regardless of area (so you don't have to specify).
All relates to #U4-1727
2013-02-19 06:11:58 +06:00
Shannon Deminick 7d1e9cfd72 Fixes: #U4-1727 2013-02-19 06:11:17 +06:00
Shannon Deminick 663fc4f954 Removes area routing for local surface controllers and BeginUmbracoForm, adds strongly typed Html.Action<T>
method for rendering SurfaceController child actions regardless of area (so you don't have to specify).
All relates to #U4-1727
2013-02-19 06:00:40 +06:00
Shannon Deminick 845595b01b Fixes: #U4-1727 2013-02-19 05:39:38 +06:00
Shannon Deminick 2fca8f3444 Fixes more examine initialization checks if the umbraco app is not ready/installed. 2013-02-19 05:06:54 +06:00
Shannon Deminick 9324ab8e0e Merge with 6.0.1 2013-02-19 04:11:30 +06:00
Shannon Deminick d01a39e0c6 Fixes merge issue 2013-02-19 04:10:01 +06:00
Shannon Deminick 73bd0137e3 Merge with 4.11.5 2013-02-19 03:57:24 +06:00
Shannon Deminick e6faf73f4f Fixes: #U4-552 2013-02-19 03:43:37 +06:00
Shannon Deminick 7a38726b26 Fixes: #U4-552 2013-02-19 03:40:36 +06:00
Shannon Deminick 36cadf39e9 Fixes: #U4-1695 2013-02-19 02:22:00 +06:00
Shannon Deminick 9f301f8cc6 updates some code docs 2013-02-19 02:20:15 +06:00
Shannon Deminick e7c5d1f4f3 Fixes: #U4-1695 2013-02-19 02:19:53 +06:00
Shannon Deminick b45f6e0393 Fixes: #U4-1732 2013-02-19 00:53:20 +06:00
Shannon Deminick 91ee948b4e Obsolete's requestModule and Singleton 2013-02-19 00:50:38 +06:00
Shannon Deminick c1ed910a51 Fixes: #U4-1732 2013-02-19 00:50:22 +06:00
Morten Christensen b99ff6c981 Merge 2013-02-18 15:48:02 -01:00
Morten Christensen 81021f5821 Part of the fix for U4-1689
Adds an alternative to the naming of the media subfolders instead of using the PropertyId.
2013-02-18 15:46:18 -01:00
Sebastiaan Janssen 29724b352b Fixes U4-1451 2013-02-18 13:22:12 -01:00
Sebastiaan Janssen 1f7651d0e3 Set version to 6.0.1 2013-02-18 10:16:24 -01:00
Stephan 7414b3596e Core.Strings - fix some tests 2013-02-18 08:31:00 -01:00
Stephan a995c9557c Core.Strings - new IUrlSegmentProvider 2013-02-18 08:31:00 -01:00
Floris Robbemont 55f06a7ca6 Fixed issue: #U4-1726 2013-02-16 16:00:28 -01:00
Shannon Deminick e921dca9d6 Fixed up more unit tests and issue with publishing logic. 2013-02-15 20:53:44 +06:00
Shannon Deminick 9ad813d990 Fixes a couple issues with some routing tests. 2013-02-15 19:38:33 +06:00
Shannon Deminick 9fba3fa673 Fixes some resetting being done in test init... should only be done in teardown. 2013-02-15 19:23:16 +06:00
Shannon Deminick d73dd47e7b Merge 2013-02-15 18:56:24 +06:00
Shannon Deminick a00278892a Merge 2013-02-15 18:54:53 +06:00
Shannon Deminick 196357f6c3 WIP - getting sorting search test going. 2013-02-15 18:54:37 +06:00
Stephan 7a736344f9 Core.Strings - reorg StringExtensions (no change to code) 2013-02-15 08:42:08 -01:00
Stephan a36824e796 U4-1441 - fix, fix and fix! 2013-02-19 17:43:13 -01:00
Stephan 6e2dc64001 U4-1611 - bugfix 2013-02-19 13:58:16 -01:00
Shannon Deminick 68d5acbe48 Fix merge issue 2013-02-14 23:55:39 +06:00
Shannon Deminick a6b9ceef7b Merge with 6.0.1 2013-02-14 23:38:59 +06:00
Shannon Deminick c21b232a33 Merge with 4.11.5 2013-02-14 23:34:58 +06:00
Shannon Deminick dfb2a31f26 Fixes up examine config for internal indexes: #U4-1710 2013-02-14 23:29:11 +06:00
Stephan be98425956 U4-1611 - fix xpath special chars escaping issues in published content store 2013-02-14 16:23:56 -01:00
Stephan 61d1f87611 U4-1441 - bugfix 2013-02-14 16:34:17 -01:00
Stephan 8de579083c U4-1611 - fix xpath special chars escaping issues in published content store 2013-02-14 16:23:56 -01:00
Stephan 6a6b82d1e8 U4-1441 - bugfix 2013-02-14 16:22:42 -01:00
Shannon Deminick 598d66ac7f Imports patch to fix: #U4-1718 2013-02-14 23:14:43 +06:00
Shannon Deminick ac090c05ae WIP - updating UmbracoExamine to fix sort order sorting. 2013-02-14 23:06:28 +06:00
Shannon Deminick 527ef10cda Fixes: #U4-1718 2013-02-14 23:05:58 +06:00
Sebastiaan Janssen 7640908781 Need to wrap the login javascript in a placeholder for Concorde 2013-02-14 09:06:15 -01:00
Shannon Deminick 766cf56a3f updated some copy is all and started creating a search test but need more info. 2013-02-14 06:33:48 +06:00
Shannon Deminick 73714c7cef Put legacy examine classes back in. 2013-02-14 06:06:54 +06:00
Shannon Deminick 0485c20331 Updated Examine.dll version with a few more fixes/updates. 2013-02-14 06:02:38 +06:00
Shannon Deminick d104ea1b57 Merge with 6.0.1 2013-02-14 02:37:23 +06:00
Shannon Deminick 41c952a2fa missing change 2013-02-14 02:36:56 +06:00
Shannon Deminick 6c09a58baf temp code 2013-02-14 02:36:32 +06:00
Morten Christensen b101e25e7a Correcting a check related to U4-1690.
Fixes a typo in an internal class and private method.
2013-02-13 08:05:04 -01:00
Shannon Deminick 8d2c5029af Merge 2013-02-13 06:14:04 +06:00
Shannon Deminick 8c97e367a2 Adds DatabaseServerRegistrar and ServerRegistrationEventHandler, we can now ensure that all server add themselves to the
database table automatically.
2013-02-13 06:12:43 +06:00
Shannon Deminick 6423914f01 Creates ServerRegistrationService 2013-02-13 04:22:46 +06:00
Shannon Deminick 3b25214433 Adds new database table + migration + unit test + fixes up unit tests to ensure PluginManager.Current = null; is done on teardown.
Created new ServerRegistrationRepository + unit tests + models
2013-02-13 03:29:32 +06:00
Morten Christensen 35a8c5e980 Merge 2013-02-12 12:49:00 -01:00
Morten Christensen 64031777d8 Corrects sorting in migrations 2013-02-12 12:48:47 -01:00
Shannon Deminick 102bf058bc Fixes failing unit tests due to adding check for if the application is configured and un-ignores a couple. 2013-02-12 18:59:07 +06:00
Shannon Deminick 7f51e01be7 Created strongly typed ICacheRefresher<T> so that now we can have cache refreshers execute against a
real instance object like IContent, this will dramatically increase performance for bulk publishing when not
in a load balanced environment. Updated methods on DistributedCache to refresh many instances at one time, this also
means we're not re-looking it back up again. Need to update media, users, templates, members and macros to use this new feature too.
2013-02-12 07:35:47 +06:00
Shannon Deminick cb3ac17f43 Ensures tree is synced on bulk publish, fixes Dimming on the content node. Starts adding ability to
make distributed calls that are strongly typed and can do more than one at a time.
2013-02-12 04:47:36 +06:00
Shannon Deminick 8dc5092763 Fixes: #U4-1697 - streamlines user cache invalidation/adds new UserCacheRefresher. 2013-02-12 04:13:29 +06:00
Shannon Deminick 4e6bdd1fc7 Fixed some med trust issues with UmbracoExamine. Created new framework for distributed cache providers with unit tests. Still uses the
old ICacheRefresher but now we can plugin 2 new providers - one for resolving a list of servers and the other to notify the servers of changes.
By default we have the configuration based providers which uses the umbracoSettings.
2013-02-12 03:46:27 +06:00
Shannon Deminick f741861014 WIP - refactored some of the lastest changes with publishing based on Morten's feedback. 2013-02-11 20:07:23 +06:00
Shannon Deminick 5e4a23ea84 Replaces all calls of Document.Publish to the lesser obsoleted method Document.SaveAndPublish which is what Publish was calling anyways. 2013-02-11 05:53:44 +06:00
Shannon Deminick ea54997bb7 Updates Document class to ensure that omitCacheRefresh is false for all unpublish operations. Removes all calls in the codebase
to library.UnPublishSingleNode as the logic will be automatically handled by events when un-publishing an item.
Obsoletes library calls - UnPublishSingleNode, UpdateDocumentCache since they are no longer needed to be called
explicitly, cache refreshing will happen automatically with event subscription.
2013-02-11 05:47:25 +06:00
Shannon Deminick da4f51fe2c Reviews all calls to library.RefreshContent(), adds notes where required and streamlines all library calls for
DistributedCache.Instance.RefreshAllPageCache();
2013-02-11 05:32:52 +06:00
Shannon Deminick fc9aa1d231 ensures all publishing occuring in Document class has 'false' set for omitcacherefresh. 2013-02-11 05:01:00 +06:00
Shannon Deminick ac43b40f33 Removes all remaining calls to library.UpdateDocumentCache ... this is handled automatically by events whenever a document is published. 2013-02-11 04:56:34 +06:00
Shannon Deminick 77201f3805 Fix merg issues. 2013-02-11 04:28:18 +06:00
Shannon Deminick 81f7754a45 Merge with 6.0.1 2013-02-11 04:18:33 +06:00
Shannon Deminick 2f9360ac08 Merge 2013-02-11 03:56:58 +06:00
Shannon Deminick c23be1fd96 Fixes #U4-414, #U4-1669 - publish dialog now uses new apis and ensures documents are validated during publishing. This also
enhances many other things in the publishing API including giving a status result for each item, ensuring that child items
do not try to get published when the parent item fails (based on a subset of rules)
2013-02-11 03:55:58 +06:00
Morten Christensen 1c7bb623f1 Implements the retrieval of ancestors, children, descendats and parent IMedia in the MediaService and as extensions to IMedia.
Corresponds to the IMedia implementation of U4-1638.
2013-02-09 11:12:51 -01:00
Morten Christensen 75de4e4e67 Implements the retrieval of ancestors, children, descendats and parent IContent in the ContentService and as extensions to IContent.
Corresponds to the IContent implementation of U4-1638.
2013-02-09 10:58:21 -01:00
Shannon Deminick ded940a757 Updates publishing strategy to allow for validating documents on publishing and reporting on that. Also depending on the
rules set, will not continue publishing it's children either. #U4-414
2013-02-09 06:23:51 +06:00
Shannon Deminick b80415b34e Fixes PublishingStrategy - It will still check if it's expired even if the event isn't cancelled. It now adheres
to some rules about publishing the children if a parent's publishing has failed or was cancelled. Have written unit
tests for these too.
2013-02-09 06:05:35 +06:00
Shannon Deminick 2ecc978591 Got publish strategy working to allow for publishing only descendants that have been previously published, or all descendants.
Added unit tests to support. Changed ServiceContext to accept a BasePublishingStrategy object as default and obsoleted the other
contructor... at least that interface should be easy to obsolete in favor of a base class.
2013-02-09 04:33:56 +06:00
Shannon Deminick de13f7e361 WIP ... Fixes: #U4-1666, Updates documentService to not have to manually
refresh content cache (and fix the unpublishing too since that logic wasn't correct)
Adds DebuggerDisplay support to ContentBase and Entity for better debugging info.
Adds new internal publishing methods to support publishing all children or only children previously published. This also adds new support
for getting a published result back even with bulk publishing.
Updates the publish dialog with new code and to use the new API based on issue #U4-1669.
Adds UmbracoUser property to AuthenticatedUmbracoController, Adds all common properties to the abstract UmbracoController.
Changes the legacy Document to allow content cache to be automatically refreshed (based on events)
2013-02-09 04:05:01 +06:00
Morten Christensen 319f257ee5 Minor change related to U4-1672 2013-02-08 18:54:18 -01:00
Morten Christensen 14d40697b2 Fixes U4-1662 2013-02-08 18:40:52 -01:00
Morten Christensen 6e6b1beffd Fixes U4-1664 2013-02-08 18:37:59 -01:00
Morten Christensen e22de5c9a0 Fixes U4-1666 2013-02-08 18:34:47 -01:00
Morten Christensen 1eea4dab33 Fixes U4-1661 2013-02-08 18:29:59 -01:00
abutland 0af4b3da82 Updated project file 2013-02-08 15:38:52 -01:00
abutland def651d98e Implemented an attribute for surface controllers to provide the restrictions to certain members as available in base. 2013-02-08 15:01:00 -01:00
Morten Christensen 83518de981 Adding no guard for testing purposes 2013-02-08 11:37:50 -01:00
Stephan 2da18d4500 U4-1441 - improve logging 2013-02-08 07:54:16 -01:00
Stephan a03f5420fa U4-1441 - change trySkipIisCustomError config key 2013-02-08 07:36:35 -01:00
Stephan d50396ce68 U4-1441 - change trySkipIisCustomError config key 2013-02-08 07:36:35 -01:00
Stephan f7d4080472 U4-1441 - make trySkipIisCustomError value a setting 2013-02-08 07:51:22 -01:00
Shannon Deminick 4ab14484ba Fixes: #U4-1664, #U4-1661, #U4-1662, #U4-1660
WIP - Updates much logic between editContent and ContentControl to ensure that the above issues are fixed and that we are not
double saving documents each time it is published. This also ensures that the Document.BeforeSave event is not double fired
when saving a document. Have changed over Document.SaveAndPublish to ensure that the cache does get refreshed automatically
when this is called - but now need to go through the rest of the codebase to make sure it's not being double refreshed. once that is
done then we will have streamlined the cache invalidation for content too.
Adds useful properties to the old BasePage like ApplicationContext, Services, etc...
2013-02-08 04:25:31 +06:00
Morten Christensen e24ff1b92b Updating the CreateDatabaseSchema method, so it can't be used if Umbraco is configured. Just to ensure that Richard doesn't accidentally break anything. 2013-02-07 13:56:00 -01:00
Morten Christensen 0c05cbc9db Updating the EmptyRecycleBin method in the services to account for a deleted structure.
Optimizing the CallTheGarbageMan method because it was sooo easy, and it would be stupid not to.
2013-02-07 13:31:39 -01:00
Stephan a0f662c114 Core.Strings - refactor + new IShortStringHelper 2013-02-07 13:30:50 -01:00
Shannon Deminick 975d84f3d0 Started on streamlining Content cache invalidation. 2013-02-07 06:43:49 +06:00
Shannon Deminick c0b708b1f4 Streamlines how Media cache gets invalidated - ensures Save() is called on media where it was needed,
cache now gets invalidated on events.
2013-02-07 05:53:59 +06:00
Shannon Deminick d93ca26181 Streamlines how Template cache gets invalidated - ensures Save() is called on templates where it was needed,
cache now gets invalidated on events.
2013-02-07 05:26:53 +06:00
Shannon Deminick cf8a0728d8 Streamlines how Member cache data gets invalidated 2013-02-07 04:57:44 +06:00
Shannon Deminick ea24e43c90 Changed cache invalidation for macros to be done via events not inline in the editor. 2013-02-07 04:45:05 +06:00
Shannon Deminick 75e747a2d2 Simplifies clearing cache for macro's all is done via the DistributedCache.Instance - hopefully all cache will be invalidated
via this method so that all cache types are simply invalidated with ICacheRefreshers and ApplicationEventHandlers. Currently we
have calls to clear cache in zillions of places and its near impossible to tell where/when it currently happens.
2013-02-07 04:26:48 +06:00
Shannon Deminick be398a4616 Adds a constant id for the macro distributed cache object,
adds extension method to DistrubutedCache to refresh the macro cache,
Changes all distrubuted cache calls for macro to use extension method.
2013-02-07 04:04:51 +06:00
Shannon Deminick 84bd89f00b Adds a constant id for the media distributed cache object,
adds extension method to DistrubutedCache to refresh the media cache,
Changes all distrubuted cache calls for media to use extension method.
2013-02-07 04:01:50 +06:00
Shannon Deminick a1c2352dca Adds a constant id for the member distributed cache object,
adds extension method to DistrubutedCache to refresh the member cache,
Changes all distrubuted cache calls for members to use extension method.
2013-02-07 03:58:47 +06:00
Shannon Deminick b6ec42334b Adds a constant id for the page distributed cache object, adds extension method to DistrubutedCache to refresh the page cache,
Changes all distrubuted cache calls for pages to use extension method.
2013-02-07 03:55:14 +06:00
Shannon Deminick 56fb570267 Adds a constant id for the template distributed cache object, adds extension method to DistrubutedCache to refresh the template cache,
Changes all distrubuted cache calls for templates to use extension method.
2013-02-07 03:49:45 +06:00
Shannon Deminick 510d8b9dda Ensures that all calls to 'dispatcher' are replaced with the new DistributedCache.Instance object. 2013-02-07 03:29:47 +06:00
Shannon Deminick d8e4895daa Moved legacy classes into single file LegacyClasses.cs 2013-02-07 03:24:32 +06:00
Shannon Deminick c20cd907b0 Migrated CacheRefresher and dispatcher to proper namespaces and cleaned up a bit. 2013-02-07 03:22:38 +06:00
Shannon Deminick c72b4f40bd Ensures Examine events is listening to the Trashed of content too with the new API. 2013-02-07 02:23:40 +06:00
Shannon Deminick f8d09a9ac3 Adds patch fixes for #U4-1653 2013-02-07 02:19:51 +06:00
Shannon Deminick 860ef73fab Merge 2013-02-07 02:07:43 +06:00
Shannon Deminick ec6158792a Adds patch fixes for #U4-1653 2013-02-07 02:07:07 +06:00
Morten Christensen a399a8766d Correcting the order of calls in the test SetUp of StronglyTypedQueryTests 2013-02-06 12:53:47 -01:00
Morten Christensen 7f103724f3 Refactoring PetaPoco uses of ExecuteNon, ExecuteScalar and ExecuteReader to use the new WithRetry extension methods 2013-02-06 12:53:08 -01:00
Shannon Deminick 97536086c0 Patches installer issue. 2013-02-06 19:14:34 +06:00
Morten Christensen 98ecf0e824 Adding package config file for umbraco.webservices proj 2013-02-06 10:37:32 -01:00
Morten Christensen 5fb11a77e7 Adding Mvc 4 as a nuget reference in the umbraco.webservices proj to get it to build. 2013-02-06 10:35:59 -01:00
Morten Christensen d7c72dc279 Merge with 6.0.1 2013-02-06 09:52:28 -01:00
Morten Christensen 0853f8da85 Fixes U4-1619 so MediaTypes are deleted the same way as DocumentTypes using the legacy api/backoffice. 2013-02-06 09:43:53 -01:00
Morten Christensen 32d36d66c9 Removing unused media events 2013-02-06 09:12:38 -01:00
Morten Christensen 2aef75a70a Fixing SaveAndPublish method related to U4-1624 2013-02-06 09:10:08 -01:00
Morten Christensen fc21d10192 Updating cleanup script 2013-02-06 09:04:56 -01:00
Morten Christensen c6bd94532d Fixing issue U4-1648 caused by incorrect sql statement 2013-02-06 09:04:46 -01:00
Morten Christensen 2c8c88e4b8 Merge 2013-02-06 07:31:44 -01:00
Shannon Deminick 9f7347a4f5 Updated LazyManyObjectsResolverBase to support removal. Moves cache refreshers to proper namespace and obsoletes old ones. Obsoletes
a couple of library cache clearing methods and moves them to CacheHelperExtensions. Fixes #U4-1653 for 6.1 and updates ExamineEvents to
ensure that Examine re-indexes media on all of the correct events (including Trashed). Changes for Caching are being done to begin work with
CD-148
2013-02-06 09:53:13 +06:00
Shannon Deminick 13e5590efa Obsoleted methods in old Casing class and redirects to use StringExtensions. Removes eroneous webforms files not needed in the Umbraco.Web prject
(didn't convert the related UI project ones to have code behinds though... one thing at a time and there's a lot of them to do... over time)
2013-02-06 05:56:49 +06:00
Shannon Deminick 77bffa69fd Couple more changes to DynamicXml 2013-02-06 03:58:53 +06:00
Shannon Deminick 763f8796e0 Merge 2013-02-06 03:37:38 +06:00
Shannon Deminick 3be13f57cf un-breaks #U4-1636 - now we have some different ways to return the raw xml values. will post on the issue. 2013-02-06 03:37:28 +06:00
Stephan c8e08b8ef8 U4-1441 - fix issue with IIS taking over custom errors 2013-02-05 16:29:10 -01:00
Stephan 683d793460 U4-1441 - refactor (fix) legacy NotFoundHandler support 2013-02-06 12:46:54 -01:00
Morten Christensen d430efa7ab Updating logging in DatabaseContext 2013-02-05 14:38:58 -01:00
Morten Christensen 31a5363387 Adding fault handling extensions for IDbCommand.
Adding unit tests to verify retry strategies.
Adding a RetryPolicy factory for our standard configuration.
2013-02-05 14:31:55 -01:00
Morten Christensen ef20f228ec Correcting issue related to MediaXmlTest, which was fixed in v6. 2013-02-05 09:13:21 -01:00
Morten Christensen c828c6ede3 Updating schema result to account for foreign tables when determining the current schema. 2013-02-05 08:41:10 -01:00
Morten Christensen bc08feaa08 Merge 2013-02-05 07:25:41 -01:00
Stephan ef9ce720b2 Web.PublishedCache - create, migrate 2013-02-05 06:31:13 -01:00
Stephan 4c3d2c10ac Web.Routing - clear convoluted .RoutingContext.UmbracoContext.RoutingContext 2013-03-19 17:38:18 -01:00
Stephan 0db781b59f Web.Routing - fix configuration default 2013-03-19 17:37:35 -01:00
Stephan c94eb4328f Core.Xml - document + public XPathVariable 2013-03-19 17:34:28 -01:00
Shannon Deminick 47ab187780 Obsoletes base pages - umbraco.BasePage, etc... which is superceded by Umbraco.Web.UI.Pages classes 2013-02-05 06:05:57 +06:00
Shannon Deminick 020cc54da7 Obsoleted old ping.aspx class, changed the ping.aspx page to not actually have an inherited class. 2013-02-05 06:01:41 +06:00
Shannon Deminick dd0a18cf5b Removed ~/Umbraco/test.aspx - this literally didn't do anything, was never referenced anywhere and threw YSODs when the button was clicked. 2013-02-05 05:51:51 +06:00
Shannon Deminick f726ec740a Converted Umbraco.aspx, TreeInit.aspx to have proper web forms classes and obsoletes old ones.
Obsoletes umbWindow class as its not used in the codebase whatsoever.
2013-02-05 05:43:38 +06:00
Shannon Deminick db79b95d22 Fixes a bunch more unit tests due to resolution issues. 2013-02-05 05:08:43 +06:00
Shannon Deminick bac2b7643f Moves UmbracoUserControl to it's correct home and obsoletes the old one (even though its really new)
Publicizes UmbracoControl.
2013-02-05 05:00:16 +06:00
Shannon Deminick 11449688ba Fixes: #U4-1636 - We still use DynamicXml but we don't make a call to StripDashesInElementOrAttributeNames before creating the DynamicXml object, instead the
DynamicXml object itself will test whether the stripped values match or not. Have updated/created unit tests to confirm this functionality.
2013-02-05 04:29:01 +06:00
Shannon Deminick b080ebf697 Fixes failing unit tests due to not resetting Resolution before resetting the actual resolver classes. Now it is automatically impllied that
when you Reset a resolver class, Resolution is un-frozen.
2013-02-05 03:10:01 +06:00
Stephan 0b0784d40c U4-1441 - fix NotFoundHandler assembly loading 2013-02-04 16:10:43 -01:00
Stephan bfb36cac7c U4-1441 - fix issue with IIS taking over custom errors 2013-02-04 16:10:43 -01:00
Morten Christensen dd2a1207f4 Merge 2013-02-04 13:37:44 -01:00
Shannon Deminick 58b3ce749e Fixed Skinning step to point to correct user control 2013-02-04 20:23:57 +06:00
Morten Christensen 6c693ff7b1 Adding fault handling for sql connections, so we have a retry strategy in place. 2013-02-04 13:21:46 -01:00
Morten Christensen f64d4c9272 Updating the get media in recycle bin query as the parent is not necessarily -21 2013-02-04 08:00:31 -01:00
Morten Christensen b2f6620d80 Merge 2013-02-04 07:57:36 -01:00
Morten Christensen 812d38878c Updating the get content in recycle bin query as the parent is not necessarily -20 2013-02-04 07:47:05 -01:00
Stephan 95df864d01 U4-1441 - refactor (fix) legacy NotFoundHandler support 2013-02-03 14:34:04 -01:00
Stephan eaa36a248c datalayer - remove mess introduced in f312bd7ee03b 2013-02-05 14:36:56 -01:00
Shannon Deminick ca7fe6854b Moved all old installer legacy classes into single files called LegacyFiles... much less clutter in the old legacy folders. 2013-02-03 05:16:42 +06:00
Shannon Deminick 1be3af1e31 Working on #U4-1358 - moving Base page classes to their correct location/assembly. Migrated all installation webforms files and associated helper files to
their correct locations/namespaces/assemblies and obsoleted all of the old ones and ensure the old webforms files don't exist where the obsoleted ones were.
Fixes a security issue with the installer ajax service (used to be p.aspx, now is InstallerRestService.aspx)
2013-02-03 05:06:11 +06:00
Stephan b8bcb3820a Web.Routing - if setting template fails, keep the previous one 2013-02-02 13:29:02 -01:00
Stephan 571849f211 Tests.Routing - fix RenderRouteHandlerTests 2013-02-07 20:27:46 -01:00
Stephan c8bcbdb3e1 U4-1441 - improve logging 2013-02-07 19:24:33 -01:00
Stephan 32c187f023 U4-1441 - make trySkipIisCustomError value a setting 2013-02-07 13:30:06 -01:00
Stephan dda9519e5e Core.Models - fix typo in Template 2013-02-06 13:33:04 -01:00
Stephan 91ff702cf2 Core.IO - add 'verify' methods to complement 'validate' methods 2013-02-06 13:25:27 -01:00
Stephan f7f269aa79 Core.Resolution - minor doc + renaming (being picky...) 2013-02-06 13:03:44 -01:00
Sebastiaan Janssen 71ddaf04b9 Put in an explicit comment to not disable useAspNetMasterPages when switching to
MVC as the default render engine
2013-02-02 09:49:21 -01:00
Shannon Deminick 0d34b203d5 Merge 2013-02-02 07:06:51 +06:00
Shannon Deminick 34975183d2 Changed PublishedContentHelper to use 6.0 APIs instead of relying on the WebBootManager hack to set a delegate.
Fixed up a heap of failing unit tests.
2013-02-02 07:06:27 +06:00
Shannon Deminick 545a156942 Got most of #U4-1503 - External UmbracoExamine libraries built separately from the web app with the Build.bat command. Now
just need to get the output zipped up and then create some Nuget packages with dependencies.
2013-02-02 06:08:14 +06:00
Paul@PaulSony f9d5b28372 Updates to WPI XML paramters and manifest, handles connectionStrings 2013-02-02 06:21:20 +08:00
Shannon Deminick 8df7812165 Adds Examine xslt extensions to config by default. 2013-02-02 03:49:16 +06:00
Shannon Deminick d1ac2f11d1 Fixed naming conventions: TypedContentAtRoot and TypedMediaAtRoot instead of TypedContentsAtRoot and TypedMediasAtRoot. 2013-02-02 03:22:30 +06:00
Shannon Deminick 5d681c18fe Converted UmbracoExamine UmbracoContentService to use new data APIs and added a unit test for one of the converted methods. 2013-02-02 03:21:06 +06:00
Shannon Deminick a66d651c07 Converted over other IApplicationEventHandlers to use the simpler ApplicationEventHandler 2013-02-02 02:43:02 +06:00
Shannon Deminick e541995e01 Fixes: #U4-1623 and changes over ExamineEvents to use ApplicationEventHandler instead of IApplicationEventHandler. 2013-02-02 02:38:39 +06:00
Shannon Deminick 6ee17dad03 Updated configs to ensure that the correct (non-obsoleted) config section definition is used for Examine.
Updates Examine index configs to be simplified, don't need all of that config there!
Updates UmbracoExamine indexers to not initialize if the app/database is not ready.
Updates Examine event binders to not bind if the app/database is not ready.
Updates Examine events to use new 6.0+ events and removes binding entirely to the old api events (where we could)
2013-02-02 02:16:44 +06:00
Shannon Deminick e8d924cd2c Merge with 6.0.1 2013-02-01 19:43:10 +06:00
Shannon Deminick 6e1316cb95 Fixes up some merge issues. 2013-02-01 19:41:23 +06:00
Shannon Deminick bfb8912518 Merge with 4.11.4 2013-02-01 19:23:56 +06:00
Stephan fa2ea78bda Fix build after merge 2013-02-01 10:47:53 -01:00
Morten Christensen 39d45ba4b0 Fixes U4-1618 2013-02-01 08:21:44 -01:00
Stephan 1989a44d4f Web.UmbracoHelper - add ContentAtRoot, MediaAtRoot methods 2013-02-01 06:28:54 -01:00
Shannon Deminick 6b3de00e08 Merge with 6.0.1 2013-02-01 06:52:27 +06:00
Shannon Deminick 3179b2794b Merge with 4.11.4 2013-02-01 06:46:00 +06:00
Shannon Deminick bea6031de1 Removes UpgradeScripts stuff from 4.11.4 ... now to go remove it from there too since I've moved the script to a package. 2013-02-01 06:34:28 +06:00
Shannon Deminick 3608242b25 Merge with 4.11.4 2013-02-01 06:22:28 +06:00
Shannon Deminick 5602701645 Fixes uGoLive id and changes dashboard ascx to use CDF to load scripts/styles and using the knockout version shipped in the core.
Removes duplicate tree from the config.
2013-02-01 06:05:39 +06:00
Sebastiaan Janssen 6e0af6827e Fix weird merge issues 2013-01-31 14:35:18 -01:00
Sebastiaan Janssen 51ff861e44 Merge with 6.0.0 2013-01-31 14:09:24 -01:00
Sebastiaan Janssen 777d397ae7 Merge with 6.0.0 2013-01-31 14:07:05 -01:00
Sebastiaan Janssen aa092ab3f3 Closing 6.0.0 2013-01-31 11:41:34 -01:00
Sebastiaan Janssen aaaace8dd3 Added tag Release-6.0.0 for changeset 1719fbd857f2 2013-01-31 11:32:05 -01:00
Morten Christensen 44012398bf Merge 2013-01-31 11:23:19 -01:00
Morten Christensen f18c557fb4 Fixes bug related to U4-1460 - template was incorrectly updated when sorting nodes. 2013-01-31 11:22:54 -01:00
Morten Christensen 1249761ecd Fixes U4-1610 2013-01-31 11:22:15 -01:00
Sebastiaan Janssen db6da95421 Move script back up, there was no need to move it down :) 2013-01-31 10:50:56 -01:00
NielsHartvig@UMBRACORATI.localdomain 8473601f03 Fixes issue with db detection in install logger 2013-01-31 10:39:30 -01:00
Stephan 8b00e72bf6 Web.Routing - refactor url providing (U4-1321...) + new IUrlProvider 2013-01-31 10:06:25 -01:00
Sebastiaan Janssen ac2c3ff321 Move the install stats call down in the page so it doesn't block page load 2013-01-31 09:16:49 -01:00
Sebastiaan Janssen 7300686f34 Update to WebPI parameters 2013-01-31 08:53:55 -01:00
Sebastiaan Janssen 7e288f657b Pull in the latest translations 2013-01-31 08:29:55 -01:00
Sebastiaan Janssen ca44094a37 Remove RC from the version number 2013-01-31 08:23:58 -01:00
Morten Christensen c72b6d7ae5 Minor Typo 2013-01-31 08:04:20 -01:00
Morten Christensen 99c880a4c9 Added additional logging to migration runner. 2013-01-31 07:27:13 -01:00
NielsHartvig@UMBRACORATI.localdomain 00cf20a8d0 Adds support for install statistics 2013-01-30 19:41:36 -01:00
Morten Christensen b20bb7a5a2 Fixes unit tests using the ContentService.Save method. Because we are using .ToXml in the save method to save preview xml we need to setup the DataTypesResolver in the test setup. 2013-01-30 16:23:33 -01:00
Stephan 56281d64b0 Tests.Routing - fix tests that were failing
due to Models.ITemplate, Resolution, database constraints...
2013-01-30 14:46:38 -01:00
Stephan 024a4ed8d0 Tests.Resolvers - add tests to ManyResolver 2013-02-02 10:34:20 -01:00
Stephan 789927a043 Web.Routing - fix resolvers naming 2013-02-02 10:22:19 -01:00
Stephan cc0ad0b089 Web.Routing - PublishedContentRequest template naming 2013-02-05 06:37:36 -01:00
Stephan a94f3b6211 Web - RoutesCache belongs to RoutingContext 2013-01-30 14:45:13 -01:00
Stephan 1340cc0b2e Web.Routing - published content request Is404 visibility 2013-01-30 14:45:11 -01:00
Stephan c8aedb381b Core.ObjectsResolution - add insert at beginning of list in many resolver 2013-01-30 14:45:08 -01:00
Morten Christensen a82c5c332a Merge 2013-01-30 14:22:53 -01:00
Morten Christensen 19869e6d5f Possible fix for U4-1539 Removing SaveXmlPreview from the Document class save methods.
The Save and SaveAndPublish methods in the ContentService now handle the saving of preview xml to the database.
2013-01-30 14:22:07 -01:00
Shannon Deminick 861d4a1b22 Merge 2013-01-30 19:16:18 +06:00
Shannon Deminick b722bce2ed Fixes: #U4-1593 - ensures that the content tree checks for the Published property not HasPublishedVersion() 2013-01-30 19:15:16 +06:00
Morten Christensen 0c19307fa3 Making a few optimizations based on the findings in v.4.11.4. 2013-01-30 12:11:10 -01:00
Morten Christensen bd12cb3ae5 Merge 2013-01-30 11:19:49 -01:00
netaddicts ceb561c113 Makes sure preview is not using cached versions of any macro 2013-01-30 09:41:00 -01:00
Morten Christensen 14c0e9e149 Fixes U4-1584 so property types and related property data is deleted in a way that works for both Document, Media and Member. 2013-01-30 09:33:17 -01:00
Sebastiaan Janssen 1d6587bb6b Fixing U4-359 Previewing new nested pages doesn't work 2013-01-30 09:21:43 -01:00
Morten Christensen a2a925fd7a Fixes U4-1590 so members with a Date picker will save without errors.
Improves the saving of date values.
2013-01-30 08:43:23 -01:00
Morten Christensen 29ef529c57 Fixes U4-1592 so its possible to clear values when saving 2013-01-30 08:42:26 -01:00
Shannon Deminick 30fe0ecaf4 Fixes unit tests and logic for Umbraco_Route_User_Defined_Controller_Action 2013-01-30 05:55:40 +06:00
Stephan 64692e0041 Fix build after merge 2013-01-29 19:10:58 -01:00
Stephan f1039a18e4 Merge with 6.0.1 2013-01-29 18:51:58 -01:00
Stephan ea805a7af8 Merge with 6.0.0 2013-01-29 18:49:05 -01:00
Shannon Deminick 350bea7798 Merge 2013-01-29 21:26:36 +06:00
Shannon Deminick f9977a9fd8 Fixes: #U4-1170 - template with hyphen or dash 2013-01-29 21:19:16 +06:00
Morten Christensen ea4f89701c Merge 2013-01-29 12:59:14 -01:00
Morten Christensen f3bfe0177d Implementing the Media part of U4-1568 2013-01-29 12:58:02 -01:00
Sebastiaan@SEBVIRTUAL.SSG5-Serial 5dc80c55b2 Fixed some issues with the mysql syntax provider 2013-01-29 12:55:55 -01:00
Morten Christensen 14d5c9bee5 An extra fail safe check in the database step. We verify whether its an install or upgrade when a connectionstring is present. 2013-01-29 12:49:15 -01:00
Morten Christensen 1c08921f55 Implements U4-1568 so raising events for save methods is optional. 2013-01-29 12:45:42 -01:00
Morten Christensen 01bd247831 Correcting HasIdentity check for implementors of File, as the previous check only applies to Script and Stylesheet and not Template. 2013-01-29 12:16:13 -01:00
Morten Christensen a1c39171a5 Fixed CoreBootManagerTests to not initialize all resolvers for this specific test. 2013-01-29 12:15:21 -01:00
Sebastiaan Janssen bb430ddacd Fix MySQL connectionstring detection and rewrite 2013-01-29 11:30:20 -01:00
Sebastiaan Janssen 2fdb485203 Fix spelling error in membertype speechbubble 2013-01-29 10:50:54 -01:00
Morten Christensen 1e8b82f5df Fixes U4-1576. Ensures that structure is kept when moving content and media to and from the recycle bin.
Path and Level are updated accordingly.
2013-01-29 10:26:18 -01:00
Stephan 23b6cf1c24 fix build after merge 2013-01-29 08:27:03 -01:00
Morten Christensen c63f8bc3bd Fixes U4-1578 2013-01-29 08:04:27 -01:00
Shannon Deminick c9d55a4a5e Merge with 6.0.0 - Ensures 6.1 is in sync with 6.0 too 2013-01-29 10:15:49 +06:00
Shannon Deminick 9ae962492a Imports patch for PublishWithResult not being thread safe, removes the giant unnused SQL constants (we have them in history) 2013-01-29 10:11:06 +06:00
Shannon Deminick d404970c74 Fixes up minor merge issues, removes the unused giant SQL constants (we have them in our history) 2013-01-29 10:07:30 +06:00
Shannon Deminick 66bf667100 Merge with 4.11.4 2013-01-29 09:58:47 +06:00
Shannon Deminick 65980e8c76 Fixes: #U4-1546 - Moves IApplicationEventHandler to Umbraco.Core and creates UmbracoApplicationBase object in the Core. Changes
signatures of IApplicationEventHandler methods to accept an UmbracoApplicationBase object instead of UmbracoApplication. This allows
us to execute all IApplicationEventHandler's outside of the web context. Added unit test to support booting the application outside of the
web context.
2013-01-29 09:45:12 +06:00
Shannon Deminick a2b5b13432 Fixes missing 'using' reference 2013-01-29 08:38:34 +06:00
Shannon Deminick 7ffb3cfb7f Fixes: #U4-1458 - due to a null check on PublishedContentRequest on UmbracoContext 2013-01-29 08:35:09 +06:00
Shannon Deminick df1cfaba28 Applies patch for #U4-1536 2013-01-29 07:50:55 +06:00
Stephan 09f50da821 Web.Routing - migrate to Models.ITemplate, cleanup template logic 2013-01-28 18:36:58 -01:00
leekelleher 93bdfc8915 Fixed U4-1562 YSOD saving a Slider property editor set to DB type Nvarchar.
If the Int DbType isn't selected, the DataType will save as string/Nvarchar.
2013-01-28 17:13:18 +00:00
Morten Christensen d91019c9fe Merge 2013-01-28 15:38:27 -01:00
Morten Christensen bc99a6f6c0 Possible fix for U4-1466 which surfaced with the Standard MVC Starterkit package. 2013-01-28 15:37:18 -01:00
Sebastiaan Janssen 463c3cf1d5 Improve variable name and make it use camel case. 2013-01-28 15:03:05 -01:00
Sebastiaan Janssen 1e1d7ce1cd Fixes U4-1566 6.0.0-RC Exception when assigning HttpPostedFileBase type posted
file object to a property
2013-01-28 14:54:51 -01:00
Sebastiaan Janssen dfaebd8f5c Merge 2013-01-28 14:42:43 -01:00
Sebastiaan Janssen 0dfe8c08b9 Add App_Code, App_Data and App_Plugins folders to be created during app startup 2013-01-28 14:41:36 -01:00
Morten Christensen 0dbebaf12e Fixes U4-1557 so the name of a Media item is properly saved.
This has also be tested and verified for content.
2013-01-28 14:31:40 -01:00
Morten Christensen 72097c3ebc Merge 2013-01-28 14:03:52 -01:00
Morten Christensen 5d0aced9a7 Giving the install/upgrade a bit of TLC.
Fixes U4-1520
2013-01-28 14:01:38 -01:00
Shannon Deminick 2f00fa0791 Fixes: #U4-1547 - duplicate trees on upgrade in rare cases. 2013-01-28 19:36:06 +06:00
Sebastiaan Janssen 0689b928c2 Fixes U4-1510 Missing content in Umbraco 6 beta after publish 2013-01-28 11:15:30 -01:00
Morten Christensen 3907ea435a Merge 2013-01-28 08:14:51 -01:00
Stephan 09c19512d9 fix build 2013-01-27 13:32:04 -01:00
Stephan 212b86d8f6 merge from 4.11.4 2013-01-27 12:59:41 -01:00
Stephan a86b831735 Create 6.0.1 branch 2013-01-27 12:39:59 -01:00
Sebastiaan Janssen a11d924736 Fixes U4-1553 - YSOD when umbracoUrlName value is null 2013-01-26 15:50:53 -01:00
Sebastiaan Janssen 59c844eb8f Upgrade to MySQL connector 6.6.4.0 to fix U4-1519 2013-01-26 15:10:02 -01:00
Morten Christensen d0c5357625 Adding initialize call to the legacy conn.string being reconfigured. 2013-01-25 15:17:05 -01:00
Morten Christensen 7aabf459ea Adding schema validation to the DatabaseSchemaCreation class.
Helps determine if valid database exists and which version it corresponds to.
On startup the legacy connectionstring is used if one exists, so its not ignore but rather reconfigured.
Relates to U4-1520.
2013-01-25 15:05:42 -01:00
Morten Christensen 309f337461 Fixes U4-1549 2013-01-25 08:58:21 -01:00
Morten Christensen a17759f759 Fixes U4-1542 2013-01-25 07:50:22 -01:00
Morten Christensen 2374a7a167 Merge 2013-01-25 07:30:40 -01:00
Morten Christensen 086a0811cb Refactoring GetCreator/WriterProfile extension methods to use the service rather then repository, as it seems to cause threading issues per our threading test. 2013-01-25 07:30:25 -01:00
Shannon Deminick 427fff0c53 Fixes: #U4-1527 - imports patch rom 4.11.4 2013-01-25 06:13:47 +03:00
Shannon Deminick 4351bd8b50 updated test proj file to re-include MediaXmlTest - but this is failing due to recent
changes.
2013-01-24 23:34:04 +03:00
Shannon Deminick da8dc72908 Merge 2013-01-24 23:31:17 +03:00
Shannon Deminick 2c96188775 Added missing MediaXmlTest 2013-01-24 23:31:07 +03:00
Morten Christensen d3f9e13eae Adding ncrunch ignore 2013-01-24 14:59:58 -01:00
Morten Christensen 82455136bb Missing files 2013-01-24 14:59:03 -01:00
Morten Christensen f6e354314b Minor optimization to SaveAndPublish method in ContentService. 2013-01-24 14:47:44 -01:00
Morten Christensen b7fedb664b Refactoring DatabaseSchemaCreation to allow for schema validation. 2013-01-24 14:47:24 -01:00
Morten Christensen 25f91cc0da Fixes U4-1534 so documents containing the tag datatype is properly copied.
Copying a document with a Tags datatype on it would only work if a new TagRelationship is created.
2013-01-24 13:49:41 -01:00
Morten Christensen 23141e1e8c Fixing broken media tests after having added ToXml and saving of xml to ContentXml table in the MediaService 2013-01-24 12:25:48 -01:00
Morten Christensen b17dcd2b56 Fixes U4-1516 by ensuring that referenced templates are deleted prior to deleting the actual template.
Removing uncommented code from the Media class as well as from the ContentExtension class.
Added saving of Media Xml to MediaService upon saving.
Removing referenced media test from csproj as cs file was missing.
2013-01-24 09:50:27 -01:00
Stephan 5110e0ec0e Web.Routing - go public 2013-01-24 08:51:27 -01:00
Stephan edb84b3c97 Core.Strings - go public 2013-02-19 06:37:24 -01:00
Stephan 197ab6357f Web.Routing - expose PublishedContentRequest.Template as a string 2013-01-24 08:51:27 -01:00
Morten Christensen e485c471cb Merge 2013-01-24 08:36:08 -01:00
Morten Christensen f00e8b4efc Adding update statement to template repository, so templates can be properly removed. 2013-01-24 08:18:22 -01:00
Shannon Deminick d45ba48b37 Removes unused directives for ExamineEvents. 2013-01-24 06:19:21 +03:00
Shannon Deminick c8807c3798 Fixes: #U4-1530. Backports ContentExtension changes from 6.1 required for Examine and media. Added unit tests to support and enhanced old unit test for ToXml for content
to test for more values to ensure nothing is broken. Updates ExamineEvents to ensure that no event binding occurs until the application is configured and the
database is ready. Updates ExamineEvents to ensure that data is indexed using the new 6.0 APIs, though this is a temporary fix and a better one will be implemented
in 6.1 since UmbracoExamine is in the source.
2013-01-24 06:16:44 +03:00
Stephan b3e3855931 Core.ObjectsResolution - cleanup 2013-01-23 16:44:38 -01:00
Stephan f466bc7cfb Web.Routing - cleanup PublishedContentRequest 2013-01-23 14:08:17 -01:00
Stephan b77521cbc5 Web.Routing - cleanup template / rendering engine lookup 2013-01-23 14:08:15 -01:00
Stephan 58b91fe6a0 Web.Routing - reorganize finders for better backward compat. with pre-4.10 2013-01-23 14:08:14 -01:00
Stephan a95fbff597 Core.ObjectsResolution - create temp. dirty access to resolution for legacy code 2013-01-23 14:08:13 -01:00
Stephan 80ee18ee95 Core.ObjectsResolution - add unit tests 2013-01-23 14:07:02 -01:00
Stephan 6146a0576c Core.ObjectsResolution - add unit tests, fix some bugs 2013-01-23 09:41:01 -01:00
Stephan 73df3ec0de Tests.Routing - get all tests to pass 2013-01-23 09:41:00 -01:00
Stephan d24e4834aa datalayer - bugfix SqlCE dababase clear & initialize 2013-01-23 09:41:00 -01:00
Stephan 38593ea36c Tests.Routing - rename some tests 2013-01-23 09:41:00 -01:00
Morten Christensen a95c129116 Refactoring a few methods in the ContentService, so the omitCacheRefresh parameter isn't exposed in the new api, as its only relevant to the old api.
Correcting the calls from Document to the internal methods in the ContentService, which ensures that the cache isn't refreshed as its handled elsewhere.
Correcting broken unit test after having changed the GetDescendents method.
2013-01-22 11:23:33 -01:00
Morten Christensen 72ff03f142 Fixes U4-1512 by using the same safe alias method as in the legacy code base.
This should ensure that published content aliases has the same format as in v4.
2013-01-22 08:44:06 -01:00
Sebastiaan Janssen f4574b6014 Merge 2013-01-21 15:42:08 -01:00
Morten Christensen 2dde71abb3 Moving the sql ce binaries from the UmbracoCms.Core to UmbracoCms package as Lee K. has a point.
The Sql Ce binaries located in the Content/bin folder are only relevant when setting up a site.
2013-01-21 15:35:39 -01:00
Morten Christensen e55593fc34 Merge 2013-01-21 15:27:42 -01:00
Sebastiaan Janssen 1c6346233e Added tag Release-6.0.0-RC for changeset 56015ac26f5a 2013-01-21 15:27:38 -01:00
Morten Christensen 00e316b5bd Minor update to AssemblyInfo 2013-01-21 15:27:22 -01:00
Sebastiaan Janssen 652abe3838 Usercontrols defined in v4 didn't work as they're saved without the tilde 2013-01-21 15:26:56 -01:00
Morten Christensen 9c8c1d405b Merge 2013-01-21 14:52:27 -01:00
Morten Christensen 4bf9cf270d Fixes Move when parent is unpublished. 2013-01-21 14:50:58 -01:00
Sebastiaan Janssen f547e21f0b Fixes U4-1482 Regression - RTE unable to edit hyperlink on image 2013-01-21 14:21:29 -01:00
Sebastiaan Janssen 675cc0b850 Show Allow At Root on a seperate pane 2013-01-21 13:02:51 -01:00
Sebastiaan Janssen 07a8b1de79 Fixes double qoutes in navigation.cshtml razor template 2013-01-21 12:52:31 -01:00
Sebastiaan Janssen d3bdb8b743 log4net.xml doesn't exist, so don't include it 2013-01-21 12:45:33 -01:00
Sebastiaan Janssen 04d1bf3604 Include any version comments in the about dialog 2013-01-21 12:45:18 -01:00
Sebastiaan Janssen 46a83e553b Include any version comments in the about dialog 2013-01-21 12:41:37 -01:00
Sebastiaan Janssen 801eb2c3d3 Change version to RC 2013-01-21 12:34:56 -01:00
Sebastiaan Janssen cac1c4a296 Merge in language changes 2013-01-21 12:24:34 -01:00
Sebastiaan Janssen 84e4727ef5 Revert to explicit list of migrations. Migrations were enumerated multiple times
so added ToList() to them.
2013-01-21 10:01:14 -01:00
Shannon Deminick e2b86cf2df Fixes: #U4-1504 - insert macro syntax for views issue. 2013-01-19 06:50:22 +03:00
Shannon Deminick 362e98ebe7 Merge 2013-01-19 06:43:13 +03:00
Shannon Deminick 3e28376ae7 Fixes: #U4-1472 - XmlHelper.
Fixes: #U4-1488 - partial view macro engine issues.
2013-01-19 06:38:02 +03:00
Stephan 1b232f3214 Web.Routing - remove some unused legacy code 2013-01-18 16:08:01 -01:00
Stephan aa1ded5f1a Web.Routing - backward compatibility with legacy NotFoundHandler 2013-01-18 14:03:11 -01:00
Morten Christensen e1902a54f0 Merge 2013-01-18 13:53:09 -01:00
Morten Christensen 5cb865f4c4 Updating the MigrationContext to take the PetaPoco database via the ctor, so it can be used to fetch entries during migration.
Changing the MoveMasterContentTypeData migration to use the fluent Update statement with dynamic entries from the database.
Adding IfDatabase condition for Update.
Updating a few tests, which were using the MigrationContext.
2013-01-18 13:51:40 -01:00
Stephan e5a20f0c1b Web.Routing - rename things 2013-01-18 13:20:08 -01:00
Stephan 9d701cabf6 Web.Routing - sanitize PublishedContentRequest & pipeline 2013-01-18 13:13:06 -01:00
NielsHartvig@UMBRACORATI.localdomain 480bd39687 Fixes U4-1437 Contact form in business starter kit doesn't work 2013-01-18 12:56:30 -01:00
Morten Christensen 1bd4cbdb99 Adds If-condition to Execute Sql migrations.
Updates MoveMasterContentTypeData migration to have a Sql Server specific sql statement.
2013-01-18 12:50:34 -01:00
Morten Christensen efba265730 Merge 2013-01-18 12:06:34 -01:00
Morten Christensen f6ceb937a1 Changes the CoreBootManager to resolve migrations through the use of the PluginManager instead of having the migration types hardcoded. 2013-01-18 12:05:00 -01:00
Morten Christensen 62bd1ce4fa Updates namespace for v6 migrations.
Adds update parentId migration for MasterContentType.
2013-01-18 12:00:29 -01:00
NielsHartvig@UMBRACORATI.localdomain caea28afd0 Implements U4-1500 Make sure doctype import/export and packager can set root doctypes 2013-01-18 11:54:55 -01:00
Sebastiaan Janssen 035a09afba Merge 2013-01-18 11:45:42 -01:00
Sebastiaan Janssen e8361c2ab5 Allow specified content types to be created at the root level 2013-01-18 11:45:01 -01:00
Morten Christensen 0292ca9bf3 Fixes issue with duplicated tags on inherited doc types. 2013-01-18 11:18:19 -01:00
Morten Christensen 9ef07ed2eb Fixes U4-1214 and U4-1484 for both Content and Media 2013-01-18 10:56:14 -01:00
Sebastiaan Janssen 307a7fa77b NuGet too: U4-1495 Include Umbraco assemblies' XML files to make use of comments 2013-01-18 09:15:21 -01:00
NielsHartvig@UMBRACORATI.localdomain 53ddda9f59 Fixes U4-1480 ContentBase.SetPropertyValue has no override for long datatype 2013-01-18 09:03:58 -01:00
Morten Christensen 98b8db7e3d Merge 2013-01-18 09:01:10 -01:00
Morten Christensen b5a140945a Fixes U4-1479 by adding .ToList() to allowed templates, which ensures that the list is fetched from the database while the connection is still open.
Fixing typo in usage of LogHelper in PhysicalFileSystem.
Ensures connection is closed after using TableExists for MySql.
Adds logging to UmbracoDatabase.
2013-01-18 09:00:18 -01:00
Sebastiaan Janssen f5ce9dc9d0 U4-1496 Remove Boot() method from WebBootManager - Applying 024896ba7bcf to v6 2013-01-18 08:54:53 -01:00
Sebastiaan Janssen 1304a9d791 Fixed U4-1495 Include Umbraco assemblies' XML files to make use of comments 2013-01-18 08:44:39 -01:00
Shannon Deminick 9106438317 Merge with 4.11.4 2013-01-18 02:35:59 +03:00
Sebastiaan Janssen ad62cf0123 Fix merge issue, sorry 2013-01-17 14:53:55 -01:00
Sebastiaan Janssen d64bdc089d Merge with 4.11.4 2013-01-17 14:29:11 -01:00
Sebastiaan Janssen 88e2690717 Fixed U4-1414 SplitButtons in template editor aren't working 2013-01-17 10:50:51 -01:00
NielsHartvig@UMBRACORATI.localdomain 5f1e327e4a Fixes U4-1485 Booting.aspx has potential Open Redirect flaw 2013-01-17 08:38:09 -01:00
Sebastiaan Janssen 816afe5abc Condition for version number was slightly malformed, fixed. 2013-01-17 06:32:00 -01:00
Sebastiaan Janssen 7e460005da Added MySQL dataprovider in the wrong way, corrected now 2013-01-17 06:26:51 -01:00
Sebastiaan Janssen 03a9e5507f Forgot to ignore 1 more test 2013-01-16 17:31:15 -01:00
Sebastiaan Janssen f947d05582 Use the NUnit workaround, like for v4 and ignore test that have been failing for
a long time now
2013-01-16 17:11:13 -01:00
Stephan c6c522da04 Web.Routing - begin sanitizing PublishedContentRequest 2013-01-16 15:01:43 -01:00
Stephan 2251f39fcf Web.Routing - naming & cleanup, prepare for going public 2013-01-16 14:45:04 -01:00
Stephan 01b4e8d59c Core.ObjectsResolution - refactor, cleanup, sanitize, ensure we properly freeze 2013-01-16 13:31:04 -01:00
Stephan bfd8e96f71 Core.ObjectsResolution - cleanup + start making things public 2013-01-16 13:10:34 -01:00
Stephan e7b84b1637 Merge with 6.0.1 2013-01-29 06:46:07 -01:00
Stephan b8ac74a05d fix merges 2013-01-28 09:02:28 -01:00
Stephan 38624b1e59 fix build 2013-01-27 18:34:16 -01:00
Stephan a699d9e1de merge from 6.0.1 2013-01-27 16:02:59 -01:00
Shannon Deminick cda7a66ec8 updated 6.1 with the correct ExamineEvents class ... issue after up-merging from 6.0 2013-01-25 06:32:00 +03:00
Shannon Deminick 36a5313336 Merge with 6.0.0 2013-01-25 06:19:14 +03:00
Shannon Deminick fedcdcfcd5 Manually re-merged latest changes to ContentExtensions from 6.0 branch to include changes to check for
UseLegacyXmlSchema
2013-01-23 19:00:28 +03:00
Shannon Deminick 11964401c8 Merge 2013-01-23 18:54:42 +03:00
Shannon Deminick 48202cfa09 Merge with 6.0.0 2013-01-23 18:50:44 +03:00
Stephan 8cac3e9c5c merge with 6.0.0 2013-01-23 09:37:40 -01:00
Stephan 25c481b3ca merge with 6.0.0 2013-01-23 09:33:26 -01:00
Adam Nelson 41258104f6 U4-497 - Razor errors should be completely silent when UmbracoDebug=false.
Modified implementation to have a single global setting in UmbracoSettings.config
which can now be overridden when the umbraco.macro.Error event is handled on a
per-macro basis if desired.
2013-01-16 00:45:18 -11:00
Morten Christensen 03070c3882 Merge 2013-01-15 14:31:01 -01:00
Morten Christensen 6293af2654 Fixes U4-1415 - MySql needs to update admin user's id to zero so the foreign keys can be added. 2013-01-15 14:30:02 -01:00
Sebastiaan Janssen 468af78d38 Merge 2013-01-15 14:19:52 -01:00
Sebastiaan Janssen c103f93004 Possible fix for U4-1452 Umbraco 6 beta / MySQL: Unable to find the requested
.Net Framework Data Provider.
2013-01-15 14:19:31 -01:00
NielsHartvig@UMBRACORATI.localdomain 3403b168f2 Fixes: U4-1459 Textstring Datatypes stores values in NText field when used on Membertype 2013-01-15 14:15:50 -01:00
NielsHartvig@UMBRACORATI.localdomain 8cf8503d56 Merge 2013-01-15 13:19:13 -01:00
NielsHartvig@UMBRACORATI.localdomain cbebe0141f Fixed U4-1439 4.11.2 DataEditorSetting not working for UserControl wrapper. 2013-01-15 13:18:37 -01:00
Sebastiaan Janssen 371b539058 Make sure the filename gets set correctly if we're building the release locally 2013-01-15 13:09:05 -01:00
Morten Christensen fc3681a930 Fixes U4-1476 so null values are handled before the overload is determined. 2013-01-15 11:56:25 -01:00
Morten Christensen 35052c626a Reordering properties in the ContentBase constructor 2013-01-15 10:21:24 -01:00
Morten Christensen ef9b0b6433 Fixes U4-1429 - A name is now required for creating Content and Media. 2013-01-15 10:12:23 -01:00
Morten Christensen e29c48d2ef Merge 2013-01-15 09:22:29 -01:00
Morten Christensen d3c10d6033 Fixes U4-1372 by changing the Upload field workaround to use the legacy getProperty instead of the underlying IContentBase object. 2013-01-15 09:22:11 -01:00
Sebastiaan Janssen 84635631cb Fix U4-1470 UmbracoVersion.Current.ToString(3) - Version string portion was too
short or too long.
2013-01-15 09:13:48 -01:00
Sebastiaan Janssen 6efb15fef8 Merge 2013-01-15 08:35:21 -01:00
Sebastiaan Janssen 32ae861662 Would have to update the test for the current version with each version, ignored
as that doesn't make much sense going forward
2013-01-15 08:34:14 -01:00
Shannon Deminick 04f351b287 Fixes: #U4-1156 - IFileSystem, etc... now public. 2013-01-15 01:19:51 +03:00
Shannon Deminick d0cccb5be6 Adds some more error checking to PhysicalFileSystem ctor. Fixing issues with Script/Style repo tests. 2013-01-15 01:15:08 +03:00
Shannon Deminick dfb6953792 Merge 2013-01-15 00:59:37 +03:00
pcw@pcw-PC.shout.local f32b8e31a2 Added null check just in case 2013-01-14 21:20:34 +00:00
pcw@pcw-PC.shout.local a75fe0ed7a Fixed issue where query string parameters were not being URL encoded correctly, causing problems if a dictionary value contains a = or & symbol 2013-01-14 21:08:57 +00:00
pcw@pcw-PC.shout.local e738ec9437 Refactored to use existing umbraco extension methods 2013-01-14 21:08:06 +00:00
pcw@pcw-PC.shout.local 864d840d41 Removed fix for http://issues.umbraco.org/issue/U4-1455 due to encryption max length issue with FormsAuthentication.Encrypt hack. See comments on issue. 2013-01-14 20:59:04 +00:00
Sebastiaan Janssen a3338a5e22 Remove non-existing files from project.. 2013-01-14 16:56:19 -01:00
Sebastiaan Janssen 7cf0bd670e Merge 2013-01-14 16:30:00 -01:00
Morten Christensen 81adf3f746 Fxies U4-1466 2013-01-14 15:27:22 -01:00
Sebastiaan Janssen d922b0dc90 Fixes U4-1463 Unable to create an ISqlHelper from another connectionstring since 2013-01-14 15:06:23 -01:00
Sebastiaan Janssen bfa9cdd9e6 Merge 2013-01-14 14:23:36 -01:00
Sebastiaan Janssen ac35d6ccbf Merge with 4.11.4 2013-01-14 14:14:58 -01:00
Morten Christensen fb66d87ae8 Adds updating of SortOrder upon moving a media item.
Related to U4-1461
2013-01-14 14:07:32 -01:00
Morten Christensen bc23495632 Adds updating of SortOrder upon moving a document.
Related to U4-1461
2013-01-14 14:04:40 -01:00
Morten Christensen 886678786b Fixes U4-1461 by overridding the Move method on Document and Media, so it uses the new API. 2013-01-14 13:55:41 -01:00
Morten Christensen 014bebd38f Fixes U4-1465 by ensuring that a ContentType alias does not contain invalid characters nor spaces. 2013-01-14 13:27:40 -01:00
Morten Christensen afc41b4e70 Merge 2013-01-14 13:20:25 -01:00
Morten Christensen 4ec192d2dd Fixes U4-1443 by ensuring that the User Id is passed along to the Save method. 2013-01-14 13:18:29 -01:00
Morten Christensen 0466a8ce13 Fixes U4-1394 2013-01-14 13:13:23 -01:00
Morten Christensen 537a9c0ad2 Fixes U4-1460 2013-01-14 12:37:13 -01:00
Sebastiaan Janssen ac0f304680 Merge 2013-01-14 12:18:11 -01:00
Sebastiaan Janssen fa862e9a33 Improve build so that you can't forget to set the version number, the version in
UmbracoVersion.cs will be updated with the version configured in build.bat
2013-01-14 12:16:55 -01:00
Morten Christensen 03e3b37272 Changing use of .Query to .Fetch as it was unnecessary to use the Query method in these instances.
Related to U4-1389
2013-01-14 11:16:53 -01:00
Morten Christensen 749a872fec Fixes U4-1444 so HttpPostedFiles are now properly accepted through the SetValue method.
Corrects an issue with the RootUrl in the PhysicalFileSystem.
2013-01-14 11:02:12 -01:00
Adam Nelson 08a8e6b816 U4-497 : Razor errors should be completely silent when UmbracoDebug=false.
Optionally requires macroErrors.config to define macro error behaviour.
See http://issues.umbraco.org/issue/U4-497.
2013-01-14 00:48:54 -11:00
Shannon Deminick 98a171266e Fixes PhysicalFileSystem to use IOHelper instead of HostingEnvironment. Removes all references to new IFileSystem's that canont be supported currently, leaving only the media file system.
Updates all code to use PhysicalFileSystem in place of what 'could' eventually be an abstracted IFileSystem. Updates unit tests
accordingly.
2013-01-14 03:04:09 +03:00
pcw@pcw-PC.shout.local 9ddf5dbbb8 Implemented U4-1455 SurfaceController additionalRouteVal parameters should be encrypted
Fixed U4-1454SurfaceController additionalRouteVal parameters do not handle equals sign correctly
Fixed U4-1453SurfaceController additionalRouteVal parameters not passed to controller action
2013-01-13 21:48:06 +00:00
Shannon Deminick 880cafb0a9 Fixes: #U4-1451 2013-01-13 23:24:02 +03:00
Shannon Deminick c00f0b9811 Fixes: #U4-1405 - Added DynamicXmlConverter's 2013-01-13 23:18:10 +03:00
Shannon Deminick 67f9f14e83 Fixes: #U4-1450 - extension method sigs for IPublishedContent. 2013-01-13 22:36:21 +03:00
Sebastiaan Janssen c96891ad62 Merge with default 2013-01-12 17:33:41 -01:00
Sebastiaan Janssen fc2d801a3a Merge 2013-01-12 16:32:19 -01:00
Sebastiaan Janssen 64c05cb50e Merge with 4.11.3 2013-01-12 14:52:14 -01:00
Stephan 2f482bdf53 U4-1017 - more explicit error message on internal cache errors 2013-01-12 10:40:42 -01:00
Sebastiaan Janssen 7fa0c91faf Added tag Release-6.0.0-beta for changeset ff3bb24ea0c9 2013-01-11 11:22:44 -01:00
Sebastiaan Janssen 64cd25e18a Update NuSpec to include ClientDependency.Core.Mvc.dll 2013-01-11 11:22:26 -01:00
Sebastiaan Janssen 6ef7d4740b Merge 2013-01-11 11:11:16 -01:00
Sebastiaan Janssen 3d65c6ddab Fix U4-1438 Uploading media via the insert media dialog in RTE doesn't work and U4-1436 When scaling images in RTE, they're not resized 2013-01-11 11:05:02 -01:00
Morten Christensen 6a6a95f7dc Correcting MediaService so it also moves any children to the recycle bin when trashing an item. 2013-01-11 10:38:32 -01:00
Sebastiaan Janssen f42352d255 Make nuget package automation better 2013-01-11 09:26:23 -01:00
Morten Christensen 6772fee406 Merge 2013-01-11 08:53:04 -01:00
Morten Christensen b6141189cf Fixes regression bug after having updated the expression helpers yesterday 2013-01-11 08:52:38 -01:00
Sebastiaan Janssen ba1a2c1520 Add Beta to the version 2013-01-11 08:18:00 -01:00
Sebastiaan Janssen 5e2a86bba7 Fixes U4-1432 4.11.2 - Tinymce strips 'src' attribute from images 2013-01-11 08:09:55 -01:00
Sebastiaan Janssen e306bc15bf Merge 2013-01-10 15:28:42 -01:00
Sebastiaan Janssen 10c60c2cdb Generated query was very very wrong :) 2013-01-10 15:28:17 -01:00
Morten Christensen 8e723b1336 Reordering in Document class 2013-01-10 14:58:35 -01:00
Morten Christensen b562dc787b Merge 2013-01-10 14:07:23 -01:00
Morten Christensen ca2942fdd9 Refactoring ChangePublishedState to use an enum instead of a boolean. 2013-01-10 14:07:07 -01:00
Sebastiaan Janssen 6187af76c0 Revert my c1722c82aa28 changes to published version checking (which were wrong!) 2013-01-10 13:55:42 -01:00
Sebastiaan Janssen ac608f7b3e Keep umbracoDbDSN in the appSettings in the released version to prevent people
from deleting it during merge.. it will delete itself after install anyway
2013-01-10 12:05:03 -01:00
Morten Christensen 9974e9b312 Possible fix for U4-1372 2013-01-10 11:50:47 -01:00
Morten Christensen 8c6292fda4 Merge 2013-01-10 11:47:36 -01:00
Morten Christensen e3a8aa8345 Possible fix for U4-1420 2013-01-10 11:47:04 -01:00
Morten Christensen 24814da78d Possible fix for U4-1420 2013-01-10 11:46:26 -01:00
Sebastiaan Janssen c3132dab4d Merge 2013-01-10 11:29:07 -01:00
Sebastiaan Janssen a1cc58408f Include the new translation files in the project so they get in the build too 2013-01-10 11:22:42 -01:00
Sebastiaan Janssen c4e6da52d3 Merge with default 2013-01-10 11:13:40 -01:00
Morten Christensen 8694253442 Merge 2013-01-10 08:28:46 -01:00
Morten Christensen 6d62bae0fa Fixes U4-1400 so rollback works. 2013-01-10 08:27:57 -01:00
Sebastiaan Janssen 46b1501ef5 Get latest translations in 2013-01-10 08:20:05 -01:00
Sebastiaan Janssen 04d85573fa Merge with 4.11.2 2013-01-10 07:44:28 -01:00
Shannon Deminick 0c00f1e3b1 Fixes: #U4-1414 - split buttons not working in template editor 2013-01-10 06:18:12 +03:00
Shannon Deminick 8ed1d76bc7 cleans up a bit of code relating to U4-1412 2013-01-10 05:55:55 +03:00
Shannon Deminick 08859c3b32 Fixes: #U4-1412 - inserting macro with zero params causes JS error. 2013-01-10 05:48:03 +03:00
Shannon Deminick 89332bf3f5 updated all editors using the new html 5 doc type to declare the content area below the ASP.Net page declarations
(I didn't even know asp.net allowed having controls listed above)
2013-01-10 05:08:52 +03:00
Shannon Deminick b8f455e50b Removed PluginManagerExtensions for finding IMigrations since we are manually initializing the resolver instead of type finding. Updated
unit tests to use resolvers and are passing.
2013-01-10 04:49:12 +03:00
Shannon Deminick 4532c1b5b9 Updated IMigrations to use the proper plugin format using resolvers, updated unit tests and are passing. 2013-01-10 04:33:30 +03:00
Shannon Deminick c83db77980 Merge 2013-01-10 04:01:44 +03:00
Shannon Deminick 51c1c5c717 added more HttpRequestExtensions, cleaned up some code in legacyAjaxCalls, adds UmbracoRequestId to UmbracoContext
(for future use)
2013-01-10 03:59:11 +03:00
Morten Christensen 9c792a7a5e Fixes U4-1423 so PropertyTypes not in a group are also included in the list of a Content/MediaTypes PropertyTypes. 2013-01-09 18:48:44 -01:00
Morten Christensen dc158fee2e Fixes U4-1393 so Tabs shows as expected on both Content- and MediaTypes.
Corrected malformed query for PropertyGroups.
2013-01-09 14:37:54 -01:00
Morten Christensen 03e7a5a80b A bit of tidy up related to the content typoe trees.
The PropertyFactory contained an issue for MediaTypes similar to the one that existed for ContentTypes.
2013-01-09 13:29:32 -01:00
Morten Christensen 0c7473717c Fixes U4-1386 structure problem where the same DocType would show up multiple times.
Re-wired the tree to use the new api as its simply used for loading availab doc types.
2013-01-09 12:32:40 -01:00
Morten Christensen 4f455c5532 Merge 2013-01-09 11:45:31 -01:00
Morten Christensen db971bb0b9 Fixes U4-1418 caused by a size issue in PetaPoco when inserting a string larger then 4000 characters. 2013-01-09 11:44:30 -01:00
Sebastiaan Janssen 8a5e61bb26 Check if the _dataHelperTypeName is null 2013-01-09 10:43:12 -01:00
Morten Christensen 87017d75be Adding sorting to other usages of PetaPoco relators.
Fixing Mapper test after having renamed a few properties yesterday.
2013-01-09 10:11:23 -01:00
Morten Christensen ad2a82cc65 Possible fix for U4-1407 and related to the install problems for uBlogsy.
Ensures that PropertyGroups are sorted so they are properly mapped.
2013-01-09 09:57:01 -01:00
Morten Christensen b7ff6ae375 Merge 2013-01-09 07:31:36 -01:00
Morten Christensen 65dd21fafc Test and possible fix for U4-1392 2013-01-09 07:30:57 -01:00
Sebastiaan Janssen b8d5d67abd Additional fix for U4-1394 - DocumentType "Allowed Templates" will not update 2013-01-09 05:51:01 -01:00
Sebastiaan Janssen 4553fcedeb Remove comments/courier from dev dashboard config 2013-01-09 05:40:52 -01:00
Sebastiaan Janssen e0ba903974 Revert ordering of schema creation it only worked once by fluke and killed sqlce 2013-01-09 05:18:10 -01:00
Sebastiaan Janssen d6121ebab2 Connectionstrings section used to be after mailsettings, makes merges easier
for people who are upgrading
2013-01-09 05:15:28 -01:00
Sebastiaan Janssen 1b5970b446 D'oh! Forgot to seperate out the connectionstring 2013-01-09 05:08:05 -01:00
Sebastiaan Janssen daf5fb5dcf Fixes U4-1415 v6 Installing on MySQL gives error 2013-01-08 17:52:03 -01:00
Sebastiaan Janssen c9ba61e103 Merge 2013-01-08 16:47:30 -01:00
Sebastiaan Janssen a24d202efe Make sure MySql gets loaded with old AND new connectionstring 2013-01-08 16:46:56 -01:00
Stephan 03b1b34be7 U4-1411 - fix post-4.9 regression in NotFoundHandler url 2013-01-08 16:41:31 -01:00
Sebastiaan Janssen becf73bba1 Change word deprecated to obsolete 2013-01-08 13:51:57 -01:00
Sebastiaan Janssen 937fc423ad Change word deprecated to obsolete 2013-01-08 13:27:16 -01:00
Sebastiaan Janssen 7b4ccf73c6 Merge 2013-01-08 11:48:04 -01:00
Sebastiaan Janssen ef67aae9d3 Fresh installs don't have a version number so this step cannot be complete yet 2013-01-08 11:46:59 -01:00
Sebastiaan Janssen 312288d459 Some properties may be corrupt, so ignore those 2013-01-08 11:42:23 -01:00
Sebastiaan Janssen c9697a519e The check for IsDefault can't be performed on contenttypes that do not live in
the contenttype table
2013-01-08 11:41:54 -01:00
Morten Christensen afb251d5b7 Fixes U4-1394 so the DefaultTemplate is not completely removed from the list of allowed templates when changed. 2013-01-08 11:38:35 -01:00
Morten Christensen dd61432d9f More work on U4-1402 in order to clear cache in all the right places. 2013-01-08 10:58:06 -01:00
Sebastiaan Janssen 08c0da0226 MasterContentType column should not be in DTO, it gives errors querying
non-existing column in the database
2013-01-08 10:42:36 -01:00
Sebastiaan Janssen a3be3d0060 Temporary workaround for TypeFinder not finding migrations. Rename FourEight to
FourNine because that's what it should be.
2013-01-08 10:42:02 -01:00
Sebastiaan Janssen 8935f5c678 Check if masterpage file exists before populating it (could've been deleted from disk) 2013-01-08 10:40:38 -01:00
Morten Christensen c6feb2a27a Correcting an issue in the ContentTypeBaseRepository where removing a PropertyType would cause an error if a Property was referencing that PropertyType.
Correcting an issue in the ContentRepository that would occur if a new PropertyType had been added after Content is being used.
Fixes U4-1402
2013-01-08 09:49:13 -01:00
Morten Christensen 7e060d665b Renamed a few properties on the PropertyType object, as the original naming was confusing. 2013-01-08 07:38:54 -01:00
Shannon Deminick 9c5def35ee Merge 2013-01-08 02:00:16 +03:00
Shannon Deminick 3570ba4b95 Un-comments LegacyUploadFieldWorkaround with changes that make use of the MediaFileSystem. 2013-01-08 01:43:01 +03:00
Shannon Deminick e49bb2dd51 Adds a null check to set the label values, if the content item wasn't loaded then no properties were filled and thsu
no need to update the labels. Cleans up a tiny bit more code.
2013-01-08 00:58:22 +03:00
Shannon Deminick 147867a7a8 Fixes the requirement for LegacyUploadFieldWorkaround, cleans up some of the code in ContentControl and various other (legacy) places, improves performance slightly too. 2013-01-07 23:24:29 +03:00
Sebastiaan Janssen 3f5e20ca0e Replaced a little bit too much in the compilation section 2013-01-07 15:19:53 -01:00
Sebastiaan Janssen 7d0fecb078 Update uGoLive to v1.3.0 (has better reporting of which folders have incorrect permissions) 2013-01-07 14:06:07 -01:00
Sebastiaan Janssen a11a1a51c7 Set compilation debug=false explicitly for release version (for uGoLive) 2013-01-07 13:36:43 -01:00
Shannon Deminick 6b254e1a20 Merge with 6.0.0 2013-01-07 16:42:27 +03:00
Shannon Deminick ca4c8dcf4f Merge 2013-01-07 16:42:01 +03:00
Shannon Deminick 06db2408ec Fixes: #U4-1048 - custom installer doesn't throw an exception on post back even after package file cleanup. 2013-01-07 16:40:16 +03:00
Sebastiaan Janssen af4fbba8e8 Database upgrade check was backwards &some more failsafes for upgrader/installer 2013-01-07 09:39:39 -01:00
Sebastiaan Janssen 759773deee Correct mistake in config transform 2013-01-07 08:55:43 -01:00
Sebastiaan Janssen 9822dded09 Merge 2013-01-07 07:47:43 -01:00
Sebastiaan Janssen 7e489af4c5 Fix an error during development where the razor version was ambiguous 2013-01-07 07:46:59 -01:00
Shannon Deminick a00ceb24e1 Merge with 6.0.0 2013-01-07 04:46:34 +03:00
Shannon Deminick c587632ea0 Adds UmbracoExamine.PDF.Azure library 2013-01-07 04:45:23 +03:00
Shannon Deminick 8f2c662f27 Adds Examine.Azure and required nuget dependencies. 2013-01-07 03:06:33 +03:00
leekelleher 162fbcd4a4 Changed the PropertyEditorValueConverterTests to use TestCase attributes instead of an array.
(Finally followed this up since chatting with Shannon)
2013-01-06 22:22:14 +00:00
Shannon Deminick dc06e303fc Updated to new Examine version on MyGet, should fix build errors 2013-01-06 02:46:19 +03:00
Shannon Deminick dbf38fbeb8 Changed BaseWebTest to use same logic as BaseDatabaseFactoryTests since we need the ServiceContext now. Fixed a bunch of failing tests... still have some more to fix though. 2013-01-05 23:36:38 +03:00
Shannon Deminick 97ffed5ee7 Changes the web.config template over to use the correct (non-obsoleted) examine classes. These have been obsolete for quite some time
and no longer exist in the new UmbracoExamine codebase. This is a 'breaking' change however it only requres a config file update when upgrading.
2013-01-05 22:48:45 +03:00
Shannon Deminick 8b49d2d377 Removes all MyGet dependencies for UmbracoExamine (since it is in the core now).
Converts UmbracoContextService and UmbracoMediaService for UmbracoExamine to use the new data api's
to extract latest data. Currently had to hack a bit with a new class called LegacyLibrary because at the moment
we'll have a circular dependency with Umbraco.Web which needs to be fixed. Moves all Examine event management to
Umbraco.Web (again mainly because of circular dependencies, but makes sense to have it there). Fixes the ExamineEvents
to implement IApplicationEventHandler instead of IApplicationStartupHandler to ensure that all resolvers have been
initialized before attempting to initialize examine indexes. Updates Examine ILogService to use the LogHelper.
Adds some new ContentExtensions for IMedia since currently Examine needs xml structures, but have kept it internal.
2013-01-05 22:46:50 +03:00
Sebastiaan Janssen 98b153c808 Merge 2013-01-05 14:55:11 -01:00
Sebastiaan Janssen e3a8a08e2f Add some logging to SQLHelper setup for debugging purposes 2013-01-05 14:54:30 -01:00
Shannon Deminick 6513097d38 Added UmbracoExamine.PDF library and unit tests. 2013-01-05 04:43:15 +03:00
Shannon Deminick d1bf2c0ad7 More unit tests ported over for UmbracoExamine 2013-01-05 04:20:25 +03:00
Shannon Deminick 59152cbe80 Started migrating over unit tests for UmbracoExamine 2013-01-05 03:28:47 +03:00
Shannon Deminick 027f76af96 Working on #U4-1356 - Moving UmbracoExamine to core 2013-01-05 03:01:29 +03:00
Morten Christensen d5554308d3 Adding UrlHelper to UmbracoUserControl 2013-01-04 11:03:54 -01:00
Morten Christensen ad36595b96 Refactoring remaining repositories using the standard sql builder to use stronly typed queries for generating sql.
This completes U4-1224
2013-01-04 11:01:20 -01:00
Morten Christensen f534a671df Refactoring MediaTypeRepository to use strongly typed query for generating sql. 2013-01-04 10:48:49 -01:00
Morten Christensen 46fb8fca81 Refactoring ContentTypeRepository, MediaRepository and DataTypeDefinitionRepository to use strongly typed queries for generating sql.
Adding a few unit tests to ensure the correctness of the generated sql.
2013-01-04 10:42:29 -01:00
Morten Christensen 73530b10ae Refactoring ContentRepository to use strongly typed query for generating sql. 2013-01-04 09:23:20 -01:00
Shannon Deminick eece4c194a Creating 6.1.0 branch 2013-01-04 05:50:00 +03:00
Shannon Deminick b5635d5b25 Finished: #U4-1303 - adds 'create macro' checkbox for the Partial View Macros tree. 2013-01-04 02:57:40 +03:00
Shannon Deminick a9de1f216a Merge 2013-01-04 01:47:28 +03:00
Shannon Deminick a7c089bf01 Fixes: #U4-814 - DynamicNode now has proper instance level caching for returning properties and children. 2013-01-04 01:45:06 +03:00
Sebastiaan Janssen 70ebd7e129 U4-335 Fixed out of memory exception in cropper (checks in CropImage method) 2013-01-03 15:20:13 -01:00
Morten Christensen 3fa684d741 Merge 2013-01-03 15:16:56 -01:00
Morten Christensen 9520f2d570 Fixes how PropertyTypes are removed from a DocumentType or MediaType when using the backoffice. 2013-01-03 15:16:17 -01:00
Sebastiaan Janssen 0353edbfab Merge 2013-01-03 13:58:00 -01:00
Sebastiaan Janssen ef43dec675 Merge 2013-01-03 13:57:48 -01:00
Sebastiaan Janssen a421999ef8 Fix missing connection string during upgrades 2013-01-03 13:56:53 -01:00
Morten Christensen 7bebb78bfc Merge 2013-01-03 13:20:43 -01:00
Morten Christensen 78d6cac14a Cleaning up how MasterContentTypes are used to load inherited propertytypes in the backoffice.
Fixing the loading of tabs on DocumentTypes in backoffice.
Adding check for saving boolean property values in the Integer db column.
2013-01-03 13:19:41 -01:00
Shannon Deminick 22c7f0d6cc Merge 2013-01-03 17:13:08 +03:00
Shannon Deminick a6fa5508a8 Completes: #U4-1303 - UI integration for MVC views, partial views and partial view macros including ability to insert
macros in the view editor.
2013-01-03 17:11:59 +03:00
Sebastiaan Janssen d990b4318f Merge 2013-01-03 11:22:29 -01:00
Sebastiaan Janssen 5994783644 Remove deleted images from the solution as well 2013-01-03 11:21:23 -01:00
Morten Christensen f70f72f3e0 Merge 2013-01-03 10:13:40 -01:00
Morten Christensen ec221d76e7 Document Cache needs to be updated here as the PublishWithResult has been changed to omit the cache refresh. 2013-01-03 10:10:19 -01:00
Morten Christensen 4639be974b Fixes U4-1367 so media recycle bin shows trashed media and is actually able to empty it by permanantly deleting the items. 2013-01-03 09:59:26 -01:00
Sebastiaan Janssen 867f2a6c4a Merge 2013-01-03 09:49:22 -01:00
Sebastiaan Janssen 4166cd9f5d Extra checks for empty strings and non-existing paths, use PhysicalFileSystem 2013-01-03 09:48:29 -01:00
Morten Christensen fe75a09afa Updates Publish to call new SaveAndPublish method as per discussion in U4-1363
Publish will now also save the document before publishing it.
2013-01-03 09:43:47 -01:00
Morten Christensen 85f81537c5 Fixes U4-1371 so that media can be created through the RTE again. 2013-01-03 09:33:25 -01:00
Morten Christensen 0ca91c9229 Removing dependency no MediaFileSytem and UmbracoFile in the UploadField workaround, as it was causing problems when setting an image path thats not within the /media folder. 2013-01-03 08:59:44 -01:00
Morten Christensen 4365b0a208 Merge 2013-01-03 08:37:45 -01:00
Morten Christensen c7e8143128 Adds IUmbracoEntity to the structure of interfaces for ContentBase, ContentTypeBase and DataTypeDefinition. 2013-01-03 08:30:38 -01:00
Sebastiaan Janssen 044776fc5a Check if the propertyNode.FirstChild.Value is in content.Properties before trying to get it 2013-01-03 08:19:04 -01:00
Morten Christensen 96bcc74742 Adding UmbracoUserControl, which exposes the various contexts and the umbraco helper similar to the PluginController. 2013-01-03 08:04:19 -01:00
Sebastiaan Janssen 35c16097af Changed all editor to use the HTML5 doctype to make CodeMirror work better 2013-01-03 07:20:04 -01:00
Shannon Deminick 872c163999 Updated EditMacro.js to support inserting different syntax depending on rendering engine. Just need to get it to insert the params for MVC now.
Added HttpRequestExtenions with a method GetItemAsString which obsoletes/supercedes the old 'umbraco.helper.Request' method.
2013-01-03 06:21:55 +03:00
Shannon Deminick e0550a9a57 Fixes: #U4-1381 - LogHelper is public. Obsoletes 'Custm' log type and ensures that they are written to the log4net log too (though
they will continue to write to the audit trail until it is removed)
2013-01-03 02:08:29 +03:00
Shannon Deminick 184b00b3fa Changed html doc type declaration back to transitional until we can properly test. 2013-01-03 02:01:43 +03:00
Morten Christensen 84c564dbc5 Merge 2013-01-02 14:28:40 -01:00
Morten Christensen 169db0c15f Fixes U4-1368 so the FileHandlerData doesn't handle setting properties for Document and Media.
Properties using the UploadField will have its value as well as related values updated in a BeforeSave event.
2013-01-02 14:28:15 -01:00
Sebastiaan Janssen 55dbce3a93 Okay, really fixed the getdate() problem now. Maybe.. I should.. You know.. build my code first before I test it! D'oh. 2013-01-02 11:49:57 -01:00
Sebastiaan Janssen ecd3f3c54d Merge 2013-01-02 11:34:07 -01:00
Sebastiaan Janssen 01fa4bdc78 Fix badly formated "getdate()" default value (CE didn't like it) 2013-01-02 11:33:56 -01:00
Morten Christensen 0312caa166 Ensuring closed connections in unit tests using either the legacy or PetaPoco datalayer. 2013-01-02 10:44:28 -01:00
Sebastiaan Janssen 56bcb2f804 Remove version number from login / about page images and removed some old images 2013-01-02 09:02:13 -01:00
Sebastiaan Janssen a47f566fb0 Move assemblyversion to UmbracoVersion, where it belongs 2013-01-02 08:57:40 -01:00
Sebastiaan Janssen f391029a2a Fixed U4-1378 "About" dialog is broken 2013-01-02 07:36:33 -01:00
Sebastiaan Janssen 253d6b0387 Merge 2013-01-02 07:21:43 -01:00
Sebastiaan Janssen 2e5ba0b1e4 Set the providername as well when updating the connection string 2013-01-02 07:21:08 -01:00
Sebastiaan Janssen 212fd47237 U4-1376 Better formatting of the CE connectionstring and fixing the installer 2013-01-02 07:08:02 -01:00
Shannon Deminick fdbf254e7a Changed over master pages to use Html5 DocType. Updated EditMacro to use correct JS classes and correct CSS instead of inline. Also updated
it to use knockoutjs for all UI handling and cleaned up a bit of the code (though it could still do with even more overhaul but at least its legible now).
Ensures that knockoutjs is included in all pages and dialog pages.
Now just need to update the EditMacro page to check for MVC vs Webforms to insert the correct macro syntax for MVC.
2013-01-02 07:20:01 +03:00
Shannon Deminick a8f808f488 Converted EditMacro.aspx over to use the correct webforms inheritance. 2013-01-01 03:28:09 +03:00
Shannon Deminick 72898dc154 Updates RenderMacro syntax for inserting a macro in mvc views that have no params 2013-01-01 02:52:25 +03:00
Shannon Deminick e88dce59fe Added create dialog to partial view macros files, now need to update that dialog to support creating
macros at the same time like with xslt, etc... but at least you can create/edit/delete them now.
2013-01-01 01:00:33 +03:00
Shannon Deminick e9f581bb51 Fixes #U4-1366 - conflict with partial view macro engine. 2013-01-01 00:42:20 +03:00
Sebastiaan Janssen 77df8cff07 U4-1376 Remove appSetting conn.string from release web.config 2012-12-31 14:53:13 -01:00
Sebastiaan Janssen 1e961860c3 U4-1376 Use the umbracoDbDsn everywhere 2012-12-31 14:52:49 -01:00
Shannon Deminick 503f62b4d6 Merge 2012-12-31 18:40:29 +03:00
Shannon Deminick b292cb3ab3 Crated InsertMacroSplitButton webforms control instead of the hacky js code used to insert the split button in the template editor.
Have implemented it now in the EditView (will transition over its use in editTemplate soon but is low priority).
Have got the js callbacks working now for inserting a macro for the mvc editor but need to implement the correct syntax. Also need
to migrate and update the editMacro dialog screen to check if we are rendering for MVC or not and if it is MVC then use the correct
syntax.
2012-12-31 18:39:36 +03:00
Sebastiaan Janssen 1d42dc02c4 Fix failing tests due to new ApplicationTrees for Child Action Macros 2012-12-31 14:08:32 -01:00
Sebastiaan Janssen 173d5552c0 U4-1376 Remove internal dependencies on GlobalSettings.DbDsn 2012-12-31 13:57:29 -01:00
Sebastiaan Janssen f251017c5d U4-1376 fix the GlobalSettings.DbDsn setter for backwards compatibility 2012-12-31 12:28:38 -01:00
Sebastiaan Janssen 2b532f72c3 U4-1376 Remove redundant connectionstring 2012-12-31 12:15:46 -01:00
Shannon Deminick eeabee22bd Merge 2012-12-31 02:51:55 +03:00
Shannon Deminick 3ad793c4c5 Got partial view tree and partial view macros tree done. Need to get the custom create dialogs done now. 2012-12-31 02:51:30 +03:00
Morten Christensen f4706fcfb7 Fixes U4-1370 for ContentTypes thats loading using new api meaning that the fix only applies to Content and Media, but currently not Members.
For Members there is still an issue with MasterContentTypes, as the full structure is not loaded. Need to make the sql lookup recursive-
2012-12-30 18:26:08 -01:00
Morten Christensen f794730118 Merge 2012-12-30 07:17:48 -01:00
Morten Christensen b3b23e736b Restructering strategies in folders 2012-12-30 07:17:04 -01:00
Shannon Deminick 746c2b960b Merge 2012-12-30 03:11:42 +03:00
Shannon Deminick a7834b45da Created UmbracoAuthorizeAttribute, UmbracoAuthorizedController for all base MVC controllers that required a back office user to be logged in.
Converted over the SaveTemplate and SavePartialView methods of the codeEditorSave legacy web service to use MVC services and marked them obsolete.
Created a generic route to route all controllers found in the namespace Umbraco.Web.WebServices. Added a 'Url' property on the BasePage webforms class
to expose a UrlHelper for use in views. Created UrlHelper extensions to easily get the base url path of the REST MVC web services.
Converted the EditView page and JavaScript to use the new REST services with jQuery instead of crappy MS ajax.
2012-12-30 03:11:21 +03:00
Shannon Deminick dbe9c6a2a9 Fixes: #U4-1360 - full names of tree types in config.
Updates: #U4-1303 - basic UI support for partial view macros.
2012-12-30 00:59:25 +03:00
Morten Christensen 782c23588c Adding a simplified implementation of PetaPoco's IMapper, which is used to correct an issue with inserting nullable dates in the db. 2012-12-29 18:53:13 -01:00
Morten Christensen 602e9c6d7e Adding trailing slash to failing routing tests.
The issue with these tests might again be because of the UmbracoSettings file, which has the trailing slash setting. But with the settings being reset after teardown the tests were still failing, so made these minor corrections which shoudl correspond to the default setting.
2012-12-29 18:22:51 -01:00
Morten Christensen 655964f11b Fixing up a few path issues after having changed FullpathToRoot in GlobalSettings.
Corrected the path concat of path + web.config file.
2012-12-29 18:18:49 -01:00
Morten Christensen bcccc37f93 Changing t.GetAllProperties back to original t.GetProperties to avoid the use of binding flags, which is no longer necessary after having refactored the querying. 2012-12-29 18:17:16 -01:00
Morten Christensen 8999db6362 Refactoring ExpressionHelpers and querying to seperate the mapping used for our Database DTOs and Public Model.
Adding a MediaTypeMapper similar to the ContentTypeMapper, but type specific.
The PetaPoco IMapper implementation is removed as its no longer needed.
Updating a few unit tests, as the Where clause is now correctly formatted.
Adding unit tests for the new ExpressionHelper and MappingResolver classes.
2012-12-29 17:34:42 -01:00
Morten Christensen 3955f78966 Removing the camel case enforcement on the Alias of ContentTypes and MediaTypes in the new api. 2012-12-29 11:12:29 -01:00
Morten Christensen 56e2a89199 Adding a few new test cases to verify that AllowedChildContentTypes are saved correctly on ContentTypes and MediaTypes. 2012-12-29 11:11:09 -01:00
Morten Christensen 3e47d38a71 Adding missing directory seperator in FullpathToRoot.
Changing Umbraco.Core to use the SqlCe assemblies from the nuget package instead of those in the GAC, as that could cause problems for the build of the Umbraco.Core.dll.
2012-12-28 20:51:08 -01:00
Morten Christensen c98d906f36 Correcting a few formatting issues after importing patch. 2012-12-28 19:08:01 -01:00
Morten Christensen e198f76356 Committing changes from randy.mccluer's pull request 2012-12-28 19:03:15 -01:00
Morten Christensen 34c90e6e72 Removing redundent EventArgs class. 2012-12-28 17:55:00 -01:00
Shannon Deminick 6a84b6dc7a Merge 2012-12-28 19:36:05 +03:00
Shannon Deminick e9af1cb865 Fixes #U4-1048 - package installer cleanup, etc... 2012-12-28 19:34:57 +03:00
Morten Christensen fe595093f0 Merge 2012-12-28 14:48:21 -01:00
Morten Christensen 5dbcfa57a8 Implements the new publish and unpublish events in the PublishingStrategy.
Making the PublishStrategy public, so that its possible to subscribe to the events.
Removing the old PublishingEventArgs, which is no longer used.
Correcting a few comments.
2012-12-28 14:47:09 -01:00
Shannon Deminick 6c325f565d Merge 2012-12-28 18:32:26 +03:00
Shannon Deminick 020fa577f0 Fixes: #U4-1357 - more properties to expose context objects on SurfaceController and RenderMvcController base classes. 2012-12-28 18:31:10 +03:00
Morten Christensen 194d241b02 Adding Publish and UnPublish EventArgs 2012-12-28 14:15:12 -01:00
Morten Christensen 3ae5aa7195 Refactoring nodeSorter to utilize the changes made to the legacy/new api refactor.
Making a few of the public properties on CMSNode virtual, so we can override them in the Document and Media classes, which allow us to use the new api for saving changes to these properties instead of having them saved directly to the database.
2012-12-28 13:40:35 -01:00
Morten Christensen 8338102944 Reverting use of DateTime.UtcNow to DateTime.Now in the new api. 2012-12-28 10:43:34 -01:00
Sebastiaan Janssen 8ef6ca73f6 Merge with 4.11.2 2012-12-28 09:02:45 -01:00
Sebastiaan Janssen ac9d6431f4 Close 6.0.0-LegacyApi-Refactor branch 2012-12-28 08:56:41 -01:00
Sebastiaan Janssen 1e4361ed2f Merge with 6.0.0-LegacyApi-Refactor 2012-12-28 08:45:40 -01:00
Morten Christensen e4e5982349 Removing sql server/ce specific brackets from repository queries as it was causing problems with MySql.
Fixes regression bug from removing brackets from PrimaryKey columns. Columns are now passed and syntax specific brackets are added.
Moving the MySql special case for updating User Id from one to zero.
2012-12-27 19:53:01 -01:00
Morten Christensen 0d4de7d585 Merge 2012-12-27 18:52:59 -01:00
Morten Christensen 64af0a610b Refactoring migrations by adding an abstract class to all expressions that allow for processing prior to returning an sql statement.
Refactoring the current sql syntax providers to better work with sql ce, sql server and mysql.
Adding migrations for v4.8 and v6.0.
Adding test cases for upgrading from 4.7 to 6.0 for the 3 database providers - sql ce, sql server and mysql.
Adding product name to the MigrationAttribute, which adds more flexibility to the MigrationRunner.
Fixing schema creation for mysql, which broke during a previous refactor task.
2012-12-27 18:52:47 -01:00
Sebastiaan Janssen bf78334290 Realized I was doing the added Save in the wrong place 2012-12-27 17:53:23 -01:00
Sebastiaan Janssen c97085f9bb Fix errors and wrong display of subnodes under and unpublished node showing as
published. Also fixes error message where it says on the subnode:
This document is published but is not visible because the parent '???' is unpublished
2012-12-27 17:29:54 -01:00
Sebastiaan Janssen e10cb56502 Previous fix didn't work if you don't Save() the document +don't publish copies. 2012-12-27 16:08:24 -01:00
Sebastiaan Janssen 140c1db66a Fixing umbEnsureUniqueName not being ran for a document copy 2012-12-27 15:39:37 -01:00
Sebastiaan Janssen 9b6677c7c7 Clean up this code a little bit 2012-12-27 14:42:49 -01:00
Sebastiaan Janssen 77f279eb53 Make move from recycle bin work again, pretty hacky 2012-12-27 13:42:31 -01:00
Shannon Deminick 116a87f5c5 Updated an error logging call in the Log class. Changed the redirected logging to use the lazy overload in case Info isn't enabled in the config. 2012-12-27 17:22:08 +03:00
Sebastiaan Janssen c508a2e4a8 Clean up this ugly code a little bit 2012-12-27 12:14:08 -01:00
Sebastiaan Janssen 2f8ac81fab Fix a typo 2012-12-27 12:04:00 -01:00
Sebastiaan Janssen ef32ed50c4 Fix sorting 2012-12-27 12:03:51 -01:00
Sebastiaan Janssen 5e4c4ae57c Fixes U4-1347 Can't enter backoffice of V6 with IE9 2012-12-27 11:21:38 -01:00
Sebastiaan Janssen dbb03b79e4 Merge 2012-12-26 15:25:43 -01:00
Sebastiaan Janssen c4103baaf8 Clean up Log class a bit 2012-12-26 15:22:28 -01:00
Sebastiaan Janssen 23c8348ab9 U-7 Only Audit Logs should go to UmbracoLog, the rest goes to LogHelper 2012-12-26 15:17:30 -01:00
Morten Christensen 5b1ce5fe67 Merge 2012-12-26 14:45:10 -01:00
Morten Christensen dbce36b7a5 Adding migrations for v6 upgrades.
Updating and testing migrations.
2012-12-26 14:44:42 -01:00
Sebastiaan Janssen fae949145e Remove more non-audit logtypes for U4-7 2012-12-26 14:39:27 -01:00
Sebastiaan Janssen 16289b8f2d U4-7 - Finish logging refactor 2012-12-26 11:59:51 -01:00
Shannon Deminick e867f89ba2 Fixes PetaPoco to support Medium trust. 2012-12-26 04:16:49 +03:00
Shannon Deminick 4cdd454461 Merge 2012-12-22 01:43:30 +03:00
Shannon Deminick 3a622e6241 Fixes: #U4-1215, #U4-1287 2012-12-22 01:40:33 +03:00
Morten Christensen 39e2314102 Correcting merge issues.
Fixing reset of published state in ContentRepository.
Correcting Querying tests after spacing has changed a bit.
2012-12-21 09:45:34 -01:00
Morten Christensen d816ac1125 Merge with 6.0.0 2012-12-21 08:38:43 -01:00
Morten Christensen a6b16b4878 Closing branch after having merged the changes to events to the main 6.0.0 branch. 2012-12-21 08:29:45 -01:00
Morten Christensen a8bbefc6f1 Merge with 6.0.0-Repository-Resolvers-refactor 2012-12-21 08:26:20 -01:00
Shannon Deminick 446ff0591b Adds Deleting/Deleted events to the EmptyRecycleBin methods of Content/Media services. 2012-12-21 07:42:37 +05:00
Shannon Deminick 2644c069ae Removed collection saving/deleting events from ContentTypeService in place of one standard saving/deleting events
handlers containing args with enumerables (like content and media services)
2012-12-21 07:24:12 +05:00
Shannon Deminick 9f9afe2ee6 Converted over SendToPublishEventArgs to new events. 2012-12-21 07:20:39 +05:00
Shannon Deminick d0769cef0f Removed SavedCollection/SavingCollection events and just changed the SaveEventArgs and DeleteEventArgs to have enumerables.
Changed the base CancellableObjectEventArgs to have a protected property so inheritors can just expose the 'T' object as their own
better name.
2012-12-21 07:17:27 +05:00
Shannon Deminick 9cf86d7677 Manually fixed merge with MediaService. 2012-12-21 06:59:30 +05:00
Shannon Deminick 91a8fd7369 Manually fixed merge with ContentService and new events. 2012-12-21 04:59:51 +05:00
Shannon Deminick 18814d8dc6 Merge with 6.0.0 2012-12-21 04:42:22 +05:00
Sebastiaan Janssen 2d68f3547a Merge 2012-12-20 16:24:10 -01:00
Sebastiaan Janssen 9334f55fa6 When trying to query the umbracoApp table, check if it exists first
In the package installer, after creating a docType, also save it (now required)
In DocumentType, use the whole contentType to new-up a docType and check if the
allowedtemplate isn't null
Properties can have empty strings as values, can't convert those to int/datetime
Seperator character in ExpressionHelper was string.Empty, got malformed queries
2012-12-20 16:20:56 -01:00
Morten Christensen 5fa03b7f52 Adding PersistDeletedItem overload to MediaRepository to ensure that files saved in the Upload control are deleted.
Adding missing Delete statement to MediaTypeRepository.
2012-12-20 14:38:22 -01:00
Morten Christensen 8b5a85d98f Removing comments and old code from DocumentType class. 2012-12-20 14:33:45 -01:00
Morten Christensen 9f2d41286c Fixing MasterContentType for DocumentTypes.
Adding ParentId "listener" to the repositories that uses ParentId, so we can ensure that the path is updated correctly.
Fixing how AllowedTemplates are saved upon creation of a new DocumentType.
Ensuring DocumentType.Save is called when creting a new DocumentType.
Fixing Publish/RePublish of Content with previously published children.
Removing UpdateDocumentCache in the save event of editContent.aspx.cs as its now handled in the new api.
Rewiring template methods on DocumentType class to use the new api.
2012-12-20 14:29:08 -01:00
Sebastiaan Janssen 21667cb278 Merge 2012-12-20 11:57:50 -01:00
Morten Christensen 3fd1732cb0 Merge 2012-12-20 11:39:10 -01:00
Morten Christensen c1695c2f7f Updating expressions to output sql for use with the fluent migrations, so it can be used for db upgrades. 2012-12-20 11:36:20 -01:00
Sebastiaan Janssen 6a05c4d968 Merge with 6.0.0 2012-12-20 09:49:39 -01:00
Sebastiaan Janssen ea35ac570e Merge with 4.11.2 2012-12-20 09:43:09 -01:00
Morten Christensen 9d55fed6e7 Adding method to DataTypeService, which allows the retrievel of PreValues for a specific DataTypeDefinition.
Updaitng ContentExtension to use configured thumbnail sizes for Upload-DataTypes.
2012-12-20 09:06:08 -01:00
Morten Christensen b368debfb4 Adding extension to IContent and IMedia that allows you to set a HttpPostedFile, HttpPostedFileBase or HttpPostedFileWrapper as the value for a property. 2012-12-20 08:53:28 -01:00
Morten Christensen 977326def1 Removing unused/old db model definitions. 2012-12-19 15:29:10 -01:00
Morten Christensen 2ea3fe624f Refactoring SqlSyntaProvider to use the new common definitions. 2012-12-19 15:23:05 -01:00
Morten Christensen 1b465ca709 Merge with 6.0.0 2012-12-19 12:15:34 -01:00
Morten Christensen 9af1f5842c Updating ApplicationTreeRegistrar to check for table before looping through it.
Updating schema creation to not include the umbracoApp and umbracoAppTree tables.
2012-12-19 12:14:49 -01:00
Morten Christensen 271794ca40 Updates the Database step in the installer to not use the legacy sql install utility. 2012-12-19 10:35:01 -01:00
Sebastiaan Janssen 97f759b658 Forgot to add the new image file, oops! 2012-12-19 10:34:06 -01:00
Morten Christensen 2952990ad4 Refactoring the legacy base ContentType class to better allow the usage of both new and old api.
A few of the shared properties are now saved by the new api for DocumentType and MediaType, whereas the MemberType still uses the old style.
2012-12-19 10:13:56 -01:00
Morten Christensen 3742a0b731 Refactoring legacy MediaType class to use new public api.
Adding remove Template method to new ContenType class.
2012-12-19 08:50:35 -01:00
Morten Christensen 2535438978 Starting refactor of DocumentType, MediaType and the base ContentType class. 2012-12-18 14:50:26 -01:00
Morten Christensen d8da990080 Refactoring legacy Media to use new Public API. 2012-12-18 13:55:19 -01:00
Morten Christensen bae4352e77 Refactoring the saving of properties, so that its consistent for Content, Media and Member that all use the ContentControl.
Adding a clear cache call in the MediaType and DocumentType Save method to ensure the correct loading of properties/propertytypes.
Adding IsPublishable method to ContentService, so we have a way to check if a content can be published depending on the state of the ancestors.
2012-12-18 11:46:05 -01:00
Emil Christiansen a87304a55d Fixed so the css paths is relative 2012-12-17 18:11:08 -01:00
Morten Christensen 806c2a7ea4 Refactoring legacy Content, Property and propertytype though still a WIP. 2012-12-17 15:07:08 -01:00
Morten Christensen 9420a858c8 Merge with 6.0.0 2012-12-17 14:03:42 -01:00
Morten Christensen d9881a5530 Adding stubs for membership classes - keeping it internal for now as implementation will come at a later stage. 2012-12-17 14:01:29 -01:00
Morten Christensen 9bf45d6031 Updating MediaRepository to not create versions for Media, and ensuring that properties are properly updated. 2012-12-17 14:00:46 -01:00
Morten Christensen 4d5d556e64 Refactoring ContentRepository and MediaRepository to have a common base for getting and deleting versions.
Adding VersionableRepositoryBase implementation.
2012-12-17 13:37:36 -01:00
Morten Christensen 30d7381ee3 Correcting all usages of getProperties to GenericProperties since its marked as Obsolete and shouldn't be used anymore.
Starting refactor of legacy Content class.
Refactoring DefaultData to use new datalayer.
Updating usages of the ServiceContext after as its no longer a singleton.
Correcting a few merge issues.
2012-12-17 11:16:09 -01:00
Emil Christiansen 8c9aa8f3e8 Changed editContent.aspx.cs so the 'access-denied' error messages look more Umbraco'ish
Added access-denied.png picture
Updated Umbraco.Web.UI.csproj so it includes the picture
2012-12-17 10:00:36 -01:00
Morten Christensen 32ea6e0bc0 Correcting wrong placement of uow.commit in SaveAndPublish method. 2012-12-19 07:19:04 -01:00
Morten Christensen 262e3440ce Merge with 6.0.0 2012-12-17 07:21:59 -01:00
Shannon Deminick 9255df99ad Commented out RefreshContentEventArgs as it is not used anywhere. 2012-12-16 07:52:16 +05:00
Shannon Deminick 5749e4cab3 Converted RollbackEventArgs to use new event system. 2012-12-16 07:46:19 +05:00
Shannon Deminick 30f3704a1b Changed over DeletedEventArgs to support new event system and all Services that use it. Created new
DeleteRevisionsEventArgs for when content removes revisions.
2012-12-16 07:43:03 +05:00
Shannon Deminick 89be8c3f41 Changed over CopyEventArgs to support new event structure and all services that use it, also added
another propery to the args 'Copy' so users can have access to the copied and original entity when consuming
the event.
NOTE: Noticed that the MediaService doesn't support copy?
2012-12-16 06:44:46 +05:00
Shannon Deminick af5a01caed Fixes MediaService to have the correct RecycleBin id = -21 (not -20 like Content). Converted
MoveEventArgs and all services that use it to use the new event structure.
2012-12-16 06:37:27 +05:00
Shannon Deminick dad5326281 re-added parameter check to ensure parent id is not 0. If adding hierarichal data, then use the
other overload accepting an entity. Converts over the Created/Creating events to the new structure for
ContentService and MediaService
2012-12-16 06:28:43 +05:00
Shannon Deminick 5e941a1c3a Changed CollectionSaved event naming to be consistent so is renamed SavedCollection (etc).
Now we have no more IEnumerable<Lazy<T>> collections, we can easily strongly type the event args instead of
just IEnumerable, they are now IEnumerable<T>.
2012-12-16 04:10:39 +05:00
Shannon Deminick 0615bf64dc Updated unit test name 2012-12-16 04:03:56 +05:00
Shannon Deminick b765dffea7 Removed the need for the services to have IEnumerable<Lazy<T>> parameters for bulk inserting, instead we enable the ability
to pass in an entity reference as a parent to the object if we want to lazily create heirarchy. This has been changed for the
ContentService and ContentTypeService as well as the entities for Media, Content, ContentType, MediaType and more unit tests written for it.
2012-12-16 04:02:29 +05:00
Shannon Deminick 94f69d5007 Removed ICancellableObjectEventArgs and instead just have a base class without the strongly typed object...
CancellableEventArgs.
2012-12-15 21:41:09 +05:00
Shannon Deminick b144e27d10 Merge 2012-12-15 21:28:05 +05:00
Shannon Deminick 5fadb715c1 Changed all bulk operations to use one transaction unless it is a Lazy collection (this was mostly the case before)
Fixed EventExtensions handling cancellations.
2012-12-15 21:27:15 +05:00
Shannon Deminick a925b092e7 Created new event structure (currently only implemented for Saving/Saved) and new events CollectionSaving, CollectionSaved.
Created new way to raise events and handle their cancellations. Everything is strongly typed so should make
working with events much nicer for end users. Also ensures that the Sender is the object raising the event.
2012-12-15 21:04:17 +05:00
Morten Christensen c20387496b Correcting an issue with the repository cache as it would never be able to retrieve the cached item, because get by and save by Ids were different. 2012-12-15 11:30:48 -01:00
Morten Christensen fabe5f83a7 Rearranging using statements in MediaService to ensure events are fired before after using, and that the AuditTrail writes after the uow has been disposed.
Adding GetById overload in MediaService to allow lookup by UniqueId guid.
2012-12-15 11:17:32 -01:00
Morten Christensen fcda8cc7ca Reordering using statements in ContentService to ensure that Events and Audit Trails exists outside the using. 2012-12-15 11:04:03 -01:00
Morten Christensen 5334ec3ff8 Minor adjustment to the ctor's of DefaultDatabaseFactory and PetaPocoUnitOfWorkProvider that clarifies the use of either ConnectionStringName or a custom ConnectionString+ProviderName. 2012-12-15 10:12:17 -01:00
Shannon Deminick 41e3471f2e Moves event args classes to separate files 2012-12-15 10:44:09 +05:00
Shannon Deminick 2035f2d77f Moved Event Args, etc... for persistence/services to Umbraco.Core.Events namespace 2012-12-15 10:43:03 +05:00
Shannon Deminick 1d259b711c Changed IsAllRepublished on PublishingEventArgs to be readonly (pretty sure it supposed to be like that) 2012-12-15 10:38:57 +05:00
Shannon Deminick b73efd16dc Fixes ServiceContext to ensure the repo's are lazy instantiated because their ctor's rely on the
RepositoryResolver.Current being initialized which normally doesn't occur until after the ServiceContext
is constructed. Adds instance level caching for the GetRecursiveValue method in case this is called more than
one time for a property in one view. Reverts PetaPocoUnitOfWork to allow more than one call to Commit().. this
isn't 'best practices' per se but it is more for performance reasons because otherwise we'd have to create a new
repo object + uow for any bulk saving operations... The end result is the same, bulk operations in the Services
cannot be processed in one transaction. Fixing up the ContentServiceTests by ensuring that the shared and always open sqlce
connection with the legacy SqlCeContextGuardian is closed on TearDown.
2012-12-15 10:33:29 +05:00
Shannon Deminick ad7aa66b0b Changes PetaPocoUnitOfWorkFactory to accept an IDatabaseFactory as ctor. Changes PetaPocoUnitOfWork to not dispose of the Database since
it will be shared with the current thread in order to support nested transactions and changes how the Transaction object is created
and used and then disposed of. Changes PetaPocoUnitOfWorkFactory to ensure that the UOW is
created with the shared Database instance. Fixes a method in UserService to ensure that the UOW is disposed since it wasn't using a repository.
2012-12-15 08:41:46 +05:00
Morten Christensen f5bfb90b64 Manually merging a few changes to the ContentService, ContentFactory, ContentRepository and ContentExtensions to avoid a merge hell when pushing latest to the legacy refactor branch.
Current checkin has a few new failing tests due to recent changes, but a few should be resolved by adding a DataTypesResolver setup in the ContentServiceTests fixture.
2012-12-14 15:19:54 -01:00
Morten Christensen 89399ad4c8 Closing repository refactor branch as its now been merged into the main 6.0.0 branch. 2012-12-14 14:00:57 -01:00
Morten Christensen 6bc5ba2b4c Merge with 6.0.0-Repository-Resolvers-refactor 2012-12-14 13:50:56 -01:00
Morten Christensen 3d68106f47 Correcting a few unit tests that needed to have the ApplicationContext set in the SetUp of the fixture. 2012-12-14 13:49:20 -01:00
Morten Christensen 4c256986da Adding a few constructor options to the services to ease use when newing the services instead of using the ServiceContext. 2012-12-14 13:27:10 -01:00
Morten Christensen 3d2ca1f823 Refactoring MacroService and UserService to use the new and clean uow/repo approach. 2012-12-14 13:15:33 -01:00
Morten Christensen 0bf061751e Refactoring LocalizationService to use the new and clean uow/repo approach. 2012-12-14 13:06:58 -01:00
Morten Christensen 2956bdcc06 Refactoring FileService to use the new and clean uow/repo approach. 2012-12-14 12:59:47 -01:00
Morten Christensen 431e346622 Refactoring DataTypeService to use the new and clean uow/repo approach. 2012-12-14 12:43:05 -01:00
Morten Christensen c711ed8542 Updating ContentTypeService to new uow/repo approach.
Removing ServiceFactory as it won't be used.
Correcting constructors on ContentService for consistency.
2012-12-14 12:33:14 -01:00
Morten Christensen f9cffdd910 Merge with 6.0.0 2012-12-14 11:51:03 -01:00
Morten Christensen 0cce4a1a9e Updating DefaultData and ContentControl to better support saving through the new api.
DataTypes doesn't save directly to the db, but keeps the value in-memory so the save can be handled by the new api.
Correcting the usage of versioning in the ContentRepository.
2012-12-14 11:43:16 -01:00
Morten Christensen 22c15bc0ba Merge with 6.0.0 2012-12-14 07:27:42 -01:00
Shannon Deminick 547dab0761 Fixes: #U4-1274, U4-1304 2012-12-14 10:40:11 +05:00
Shannon Deminick 5fba1a775e Fixes: #U4-1300 2012-12-14 09:22:28 +05:00
Shannon Deminick e34b0cc6fe Fixes: #U4-1272 which now enables the hidden feature of razor macros (this feature also works
in MVC)
2012-12-14 09:11:53 +05:00
Shannon Deminick 81b28bd0ce Changed over remaining services to accept the RepositoryFactory as a ctor argument. 2012-12-14 08:22:42 +05:00
Shannon Deminick 1a5285dfa0 Merge with 6.0.0 2012-12-14 08:07:39 +05:00
Shannon Deminick a37abbe622 Merge 2012-12-14 08:06:45 +05:00
Shannon Deminick a9cb337a96 Changes ApplicationContext to expect arguments of DatabaseContext and ServiceContext for it to be
constructed. Changes DatabaseContext to not be a singleton. Changes ServiceContext not to be a singleton.
Removed ServicesFactory. Updated unit tests to support new changes.
2012-12-14 08:06:32 +05:00
Sebastiaan Janssen a41e0323df Merge 2012-12-13 16:11:56 -01:00
Stephan 3a93da6256 U4-1212, U4-1312 - fix Document.PathPublished 2012-12-13 15:48:46 -01:00
Sebastiaan Janssen b1091f91dc Fixes U4-1320 - Dictionary delete query isn't paremterized 2012-12-13 15:48:18 -01:00
Morten Christensen 207c651743 Refactoring the Document class for publishing and unpublishing.
Bumped into an issue with nullable datetime and petapoco, which now has a workaround in our IMapper.
Fix a few issues around the Published state on previous versions.
2012-12-13 13:05:23 -01:00
Sebastiaan Janssen a5775e5a27 Also add FixedDisplayModes package as NuGet dependency 2012-12-13 10:44:21 -01:00
Sebastiaan Janssen e2eee711d8 Fixes U4-483 - Replace illegal characters in media with a dash, not underscore
Also removing multiple repeating dashes, leaving only one in place.
2012-12-13 09:26:34 -01:00
Morten Christensen fa80356a49 Implements two subscribers for the PublishingStrategy for updating cache after publish and unpublish.
With this in place it should only be necessary to call Publish in the ContentService, and not worry about refreshing the cache.
2012-12-12 19:47:28 -01:00
Morten Christensen 0cdb7af3eb Adding internal constructor overloads to Document, Content and CMSNode for better setup of legacy objects using new objects. 2012-12-12 18:44:55 -01:00
Morten Christensen 029824c8bc Reverting internal methods to public methods in RepositoryFactory 2012-12-12 17:37:13 -01:00
Morten Christensen 6dd63aa0b3 Adding comment 2012-12-12 15:26:28 -01:00
Morten Christensen c386aa491b Merge with 6.0.0 2012-12-12 15:18:31 -01:00
Morten Christensen 3f35f1df00 Refactoring Document class to use new public api.
Adding Obsolete attributes to methods in Document class that has been updated.
Updating the PublishingStrategy to fire final event after content and xml has been properly updated in the db.
Adding a few new methods to the ContentService.
2012-12-12 15:17:48 -01:00
Shannon Deminick e5ddcc756c Changed boot managers to public 2012-12-12 20:10:50 +05:00
Sebastiaan Janssen 21ead72d48 Add en_us files in VS project file so they'll actually be in the built zip file 2012-12-12 12:40:18 -01:00
Sebastiaan Janssen c3c3c3856f Update unit tests to reflect removal of cachebrowser trees 2012-12-12 12:26:28 -01:00
Morten Christensen 877c38b8bc Moving RepositoryFactory to constructor to avoid hard dependency on the RepositoryResolver in the services. 2012-12-12 10:47:14 -01:00
Sebastiaan Janssen 23fff9be8c Remove the legacy Cache Browser 2012-12-12 10:25:34 -01:00
Morten Christensen 29762e227a Refactoring the usage of Copy in the ContentService, so that it could be implemented in the Document class. 2012-12-12 10:22:58 -01:00
Sebastiaan Janssen 849a9892c5 #U4-1246 Increase the version number in ClientDependency.config after install 2012-12-12 09:07:06 -01:00
Morten Christensen 6c7484a1bf Merge with 6.0.0 2012-12-12 09:01:26 -01:00
Morten Christensen f800744e4f Merge with 6.0.0 2012-12-12 09:00:25 -01:00
Morten Christensen e71a5fd5eb Fixing an issue with the MediaService.
Making the two UOW Providers public, so they can be used for newing up services.
Adding a few constructor options to the PP UOW Provider to avoid config lookup.
2012-12-12 09:00:00 -01:00
Sebastiaan Janssen 5f93e20fab Merge 2012-12-12 07:21:17 -01:00
Sebastiaan Janssen 094fbf2e6b Putting ClienntDependency.Mvc back now that we have assembly redirects 2012-12-12 07:20:58 -01:00
Shannon Deminick 41403c13a9 Fixes a ContentService 'using' of the repo. Updated the MediaService to use the correct logic for UOWs. 2012-12-12 06:40:38 +05:00
Shannon Deminick 1e41db6d69 Removed any manual instantiation of PetaPocoUnitOfWork as this should generally always
be done by the PetaPocoUnitOfWorkProvider to ensure that for a UOW it always uses a new database
instance, not a shared one.
2012-12-12 06:08:03 +05:00
Shannon Deminick a3938edde2 Changed the PetaPocoUnitOfWorkProvider to ensure that a new Database object is used for each new
unit of work (transaction). When the UOW is diposed, the database instance will also be disposed.
2012-12-12 05:57:52 +05:00
Shannon Deminick 1132547c24 Changed required Database references to UmbracoDatabase 2012-12-12 05:48:18 +05:00
Shannon Deminick a0e4492a35 New implementation of IDatabaseFactory, allows setting the DatabaseContext.Current at runtime
with a custom IDatabaseFactory (mostly for testing).
Changes AuditTrail to internal so the public way is just with the 'Audit' class.
Fixed ThreadSafetyServiceTests which was failing with the new AuditTrail stuff because of the
Database instances, this is not solved with the new PerThreadDatabaseFactory for the unit test.
Created new 'UmbracoDatabase' object which inherits from the PetaPoco one so that we can future proof
the implementation as we might want some custom logic on there. Now the IDatabaseFactory returns
an UmbracoDatabase instead of just Database.
2012-12-12 03:47:04 +05:00
Shannon Deminick 6ac2db9497 removed database factory, changed audit trail stuff to internal, not sure it needs to be public. 2012-12-12 00:17:59 +05:00
Shannon Deminick aa574ac32f Merged with 6.0 and fixed a couple merge issues 2012-12-11 23:19:07 +05:00
Shannon Deminick cfa8fc2bba Removed the uow ctor from the SaveEventArgs for testing as the test will still prove that
multi-threading works with the services without proving access to a single uow, the db will error first anyways.
2012-12-11 22:56:34 +05:00
Sebastiaan Janssen 73d541ad80 Preserve existing whitespace in web.config file to make upgrades a LITTLE easier 2012-12-11 16:23:15 -01:00
timothy.beutels@bluecherry.be 7d26ae520e U4-580 Fixes an issue introduced by the bugfix for U4-580 in fdec8c2f6a62
The preview button got pushed out of view when the rte toolbar was loaded.
2012-12-11 15:10:16 -01:00
Morten Christensen 1eaa117883 Adding HasChildren check to ContentService and ContentTypeService.
Correcting an issue with loading of template ids in DocumentType class.
2012-12-11 14:27:18 -01:00
Morten Christensen 64b91ae1e4 Refactoring DocumentType class to use new public api in the following methods:
MakeNew
setupNode
GetByAlias
GetAllAsList
2012-12-11 13:34:00 -01:00
Morten Christensen 170293da41 Adding a few new methods to the ContentService and refactoring a few quirks.
Refactoring following methods in the Document class:
setupNode
MakeNew
GetRootDocuments
GetDocumentsOfDocumentType
GetDocumentsForExpiration
GetDocumentsForRelease
Rollback
GetVersions
GetPublishedVersion
GetDescendants
MoveToTrash
2012-12-11 12:15:37 -01:00
Morten Christensen 6516041617 Merge with 6.0.0 2012-12-11 08:55:45 -01:00
Morten Christensen 3a9e66b442 Merge 2012-12-11 08:44:50 -01:00
Sebastiaan Janssen 155a98a3dc Ammending commit 94f54db3ef7e, VirtualPathUtility didn't work, found that we
have a lovely new Umbraco.Core.IO.IOHelper for the thing we're trying to do here
2012-12-11 08:34:50 -01:00
Morten Christensen 01baef6bc2 Removing unused files 2012-12-11 08:00:23 -01:00
Morten Christensen 614ef15f8a Removing infrastructure setting, as its not needed any more 2012-12-11 08:00:06 -01:00
Shannon Deminick 43e74fa7a4 Merge 2012-12-11 12:06:25 +05:00
Shannon Deminick feff68ada8 Refactor new Services for thread safety, plus unit tests. Not all services are updated to be correct, only the
ContentService, the rest need to be updated as well.
2012-12-11 12:03:36 +05:00
Morten Christensen 15c78b539d Merge 2012-12-10 15:00:54 -01:00
Morten Christensen f114b06531 Adding events to MacroService 2012-12-10 14:59:33 -01:00
Morten Christensen 0613a422fb Adding events and audit trail for LocalizationService 2012-12-10 14:53:36 -01:00
Shannon Deminick aeab577627 Ensures that our view engines inherit from FixedRazorViewEngine as per #U4-1305 2012-12-10 20:48:04 +05:00
Morten Christensen 190cdaacb5 Adding events and audit trail to MediaService 2012-12-10 14:28:46 -01:00
Morten Christensen 3f846e188a Adding events and audit trail to FileService - templates, scripts and stylesheets. 2012-12-10 13:49:20 -01:00
Morten Christensen 7e728af93c Adding events and audit trail to DataTypeService 2012-12-10 13:04:18 -01:00
Morten Christensen fc188b6c8a Adding events and audit trail to ContentTypeService 2012-12-10 12:47:36 -01:00
Sebastiaan Janssen 1674b440ee Make sure to always use only the Web.Template.Config when transforming during build.bat 2012-12-10 12:12:32 -01:00
Sebastiaan Janssen dc72907c33 Correcting indentation of xml file to VS default (tabs) 2012-12-10 11:51:04 -01:00
Sebastiaan Janssen 7e3faf3810 Add FixedDisplayModes package, as per issue #U4-1305 2012-12-10 11:45:36 -01:00
Sebastiaan Janssen 400648d5bc Not sure how the Test.cs reference got back in App_Code 2012-12-10 11:39:31 -01:00
Sebastiaan Janssen fc78a34bd1 Use Excludes instead of deletes for SQL CE dependencies 2012-12-10 11:35:31 -01:00
Morten Christensen 5472e979a0 Adding audit trail to methods in the ContentService 2012-12-10 10:57:51 -01:00
pgregorynz 51b6311c43 Merge 2012-12-10 00:38:15 -10:00
pgregorynz f6b3f02dd2 Fixes U4-580 Send To Publish permission ignored on Content Editor Screen 2012-12-10 00:36:00 -10:00
Morten Christensen 4f5c5cfc7c Making minor correct to ServiceContext as per Shannons recommendation.
Adding resolver reset to publishing test tear down.
2012-12-10 08:44:17 -01:00
Morten Christensen 9165bd5d57 Close branch 2012-12-10 07:54:00 -01:00
Morten Christensen fbe1ec1035 Merge with 6.0.0-Repository-Resolvers-refactor 2012-12-10 07:49:56 -01:00
Shannon Deminick 56b70ad229 Updated a ton of Error logging calls to use the new LogHelper but there are still plenty more to go; #u4-7 2012-12-10 05:03:28 +05:00
Shannon Deminick 1e19c4b65b Converted much of the old logging to use the new logging. All calls for log types: Login, Logout,
LoginFailure, Debug. There's still a bunch to convert though. #U4-7
2012-12-10 04:22:29 +05:00
Shannon Deminick 153cfeefb7 Have obsoleted LogTypes that are not part of the audit trail 2012-12-10 03:49:53 +05:00
Shannon Deminick b1f0e00287 Adds performance benefits for PublishedContentBase 2012-12-10 03:40:50 +05:00
Shannon Deminick e6f50c2fa4 removed comments 2012-12-10 03:15:12 +05:00
Shannon Deminick c9f40a74de Changed all data services to create one repository type in the constructor instead of resolving
them in each method since they are only supposed to be using their single unit of work anyways (resolving
will return the same repository anyways, but in some cases it might have been with a different UOW)
Removed SetUnitOfWork method on IRepository as this is not needed.
Removed the old implementation of RepositoryResolver and replaces it with the RepositoryInstanceResolver (but
maintained the name of RepositoryResolver)
2012-12-10 02:58:23 +05:00
Shannon Deminick f55d639514 Simplifies the ResolveByType so that it only requires the one interface, this is done by adding a new non-generic
IRepository interface.
2012-12-09 09:21:26 +05:00
Shannon Deminick c3c62f916c Added SetRepositoryInstanceFactory method so that in the future devs could set their own RepositoryInstanceFactory on startup. 2012-12-09 09:07:50 +05:00
Shannon Deminick e0a7be7237 Created RepositoryInstanceResolver/Factory to replace the configuration based instantiation of Repo's.
Added unit tests to support resoling each instance, fixed CodeFirstTests to ensure that the base.TearDown() method is
called. Changed the BaseMapper's to internal.
2012-12-09 09:01:00 +05:00
Shannon Deminick 0c29704d09 Fixes TypeFinder to not scan for types when the assembly IsDynamic (created using reflection Emit).
This fixes the RenderRouteHandlerTests which were failing due to a sequence of events when the new PetaPoco classes
were created using Reflection and then the TypeFinder tries to enumerate on them.
2012-12-09 04:13:09 +05:00
Shannon Deminick e251ccf456 Obsoletes the NiceUrl() and NiceUrlWithDomain() methods on IPublishedContent in favor of Url() and UrlWithDomain() 2012-12-09 03:53:16 +05:00
Shannon Deminick 6267e2e340 Adds support for NiceUrl() for media. 2012-12-09 03:51:02 +05:00
Shannon Deminick 43560a04d3 added some comments. 2012-12-09 03:45:55 +05:00
Shannon Deminick 1de43347d5 Added Url support for media when the IPublishedContent item inherits from PublishedContentBase 2012-12-09 03:27:19 +05:00
Shannon Deminick 44ccfc0262 Adds 'Url', 'ItemType' and the Indexed property alias to IPublishedContent.
Changes Properties to ICollection instead of Collection for IPublishedContent.
Creates PublishedContentBase object which handles the Url and Indexed property on IPublishedContent automatically so implementors should use this base
class instead. Moves GetPropertyValue extensions to the Umbraco.Web project instead of the
Umbraco.Core project because this method needs to parse internal links if the value is a string. We require the UmbracoContext
to do this so they must exist in the Web project.
2012-12-09 03:22:11 +05:00
Shannon Deminick 084e2ee37f Updated EditMacro to use CSS instead of hard coded styles throughout. 2012-12-09 01:22:53 +05:00
Shannon Deminick 2e5618b778 Merge 2012-12-09 00:51:09 +05:00
Shannon Deminick 5870452cc9 Updated assembly binding for MVC(4, and really any other MVC version that requires assembly binding if
old libraries are built against old MVC versions).
Fixes a check for the ScriptingFile in for Partial View macros.
2012-12-09 00:50:58 +05:00
Morten Christensen 9111f811be Implementing the new DefinitionFactory, which makes use of the newer database model definitions. This is done to streamline the usage of the database model definitions between db creation and migration. 2012-12-07 14:52:54 -01:00
Shannon Deminick 66fe539d1c Fixes class reference issues 2012-12-07 20:08:06 +05:00
Shannon Deminick 73414f4504 Merge with default 2012-12-07 19:56:40 +05:00
Morten Christensen 736fbc6659 Moving database definition models, so they are shared and can be used in the sql syntax provider. 2012-12-07 13:48:38 -01:00
Morten Christensen f9403f2bc6 Implementing fluent Delete, Rename and Update syntax for migrations. 2012-12-07 13:46:11 -01:00
Morten Christensen 9935abd1a2 Implementing Insert-builder with fluent syntax 2012-12-07 12:23:03 -01:00
Morten Christensen 97509316ba Was missing initial wire up of the Create builder's fluent syntax 2012-12-07 12:02:56 -01:00
Morten Christensen e9d1747504 Adding Fluent Create-builders for Column, Table, Index and ForeignKey. 2012-12-07 11:55:41 -01:00
Morten Christensen 77588252a6 Merge with 6.0.0 2012-12-07 09:30:48 -01:00
Morten Christensen 6a6302335d Setting trust level to full for the time being 2012-12-07 09:28:40 -01:00
Morten Christensen e1896319ec Initial refactoring of the Document class to use the new public api.
And some experiments with medium trust and dynamic method.
2012-12-07 08:48:46 -01:00
Sebastiaan Janssen db2d73dc88 Alter the web.config template for mvc4 support 2012-12-06 14:27:41 -01:00
Sebastiaan Janssen cd2711957f Additional update for MVC4 support, nuget dependency updated, errors due to
web.config file in Views folder fixed
2012-12-06 11:33:17 -01:00
Sebastiaan Janssen 323af078ca Upgrade to MVC4 2012-12-06 10:31:54 -01:00
Sebastiaan Janssen 9da62aa965 Correct wrongly committed urlrewriting/xsltextensions configs 2012-12-06 10:30:52 -01:00
bpowell@LAWRENCE.network.bitmapped.net d30791b8e0 Adding en_us language option. Modified existing en language name to clarify it is UK. 2012-12-06 01:21:58 +05:00
Sebastiaan Janssen f077646bf0 Ignore built zip files with version number in them as well 2012-12-05 14:45:24 -01:00
Sebastiaan Janssen 66f030a0d6 Batch to generate both the complete build AND the NuGet builds at same time 2012-12-05 14:44:30 -01:00
Sebastiaan Janssen 6a92b400b8 Open connection before checking if table exists 2012-12-05 14:43:37 -01:00
Morten Christensen 8210666d30 Refactoring identity inserts in db creation phase to support mysql 2012-12-05 14:18:08 -01:00
Morten Christensen e31fc6e86a Merge 2012-12-05 12:47:53 -01:00
Morten Christensen 8a9cbd0524 Cleaning out old transaction commit code 2012-12-05 12:47:28 -01:00
Morten Christensen 628800c14a Committing configs with correct spacing 2012-12-05 12:37:21 -01:00
Morten Christensen 89bcbdb0f3 Moving db transaction up one level to improve installation, which failed for sql azure. 2012-12-05 12:37:00 -01:00
Sebastiaan Janssen 5518b901cc Only place to set the nuget version is now in the nuget batch file
Saves editing in 3 places
2012-12-05 11:44:34 -01:00
Morten Christensen 602e3260fa Fixing foreignkey issues 2012-12-05 08:39:31 -01:00
Morten Christensen e73f80d78c Merge 2012-12-05 07:50:38 -01:00
Morten Christensen fc43247a9e Adding clustered index to the UserLoginDto 2012-12-05 07:50:05 -01:00
Sebastiaan Janssen 73dc2d7f05 Ignore capitalized versions of content folders as wel as lower-cased ones 2012-12-04 10:37:34 -01:00
Morten Christensen 28d9784c1b Reverting changes to DTOs to re-enable foreign key constraints.
Adding temporary condition to executing database schema creation code to skip foreign key constraints for sql ce.
2012-12-04 08:16:10 -01:00
Morten Christensen 952e4914c5 Merge 2012-12-04 07:37:10 -01:00
Morten Christensen 2c2177fcc7 Creating a new DefinitionFactory for refactoring the database definitions used by the syntax provider. 2012-12-04 07:36:51 -01:00
Sebastiaan Janssen f1f8759bde Change string parsing to VirtualPathUtility.ToAppRelative 2012-12-03 16:53:47 -01:00
Sebastiaan Janssen 71410f0f12 Merge changes from default into 6.0.0 2012-12-03 16:05:32 -01:00
Sebastiaan Janssen 97639040f0 New way of transforming web.config file that should work in both VS2010 and 2012
Moved transform responsibility to Umbraco.Web.UI (mainly because circular
dependency has been solved already a few months ago)
Managed to clean up build.proj significantly in the process
2012-12-03 15:53:06 -01:00
Sebastiaan Janssen b02ad9e698 Remove foreign keys that never used to be in 4.x.
Fix the datacreation of CmsTaskTypeData
2012-12-03 13:22:23 -01:00
Sebastiaan Janssen 4f373541ac Accidentally added TWO RequiredDbSetup properties 2012-12-03 11:57:28 -01:00
Morten Christensen 213451e442 Implementing the MigrationRunner, which will be used for database upgrades.
Refactoring a few bits in the syntax of the migration models.
Adding an extension of the PluginManager to find migrations by Type and Attribute.
2012-11-30 18:48:20 -01:00
Morten Christensen d05a8e0390 Creating DbTypeMap for formatting type in expression 2012-11-30 17:56:02 -01:00
Morten Christensen a7a030bad2 Adding a few known assembly types to the ignore list in the TypeFinder.
Changing Migration test to use the Type and Attribute resolver.
2012-11-30 17:47:48 -01:00
Morten Christensen c4565df255 Adding TearDown to a few tests 2012-11-30 15:06:31 -01:00
Morten Christensen f59f57fd6a Initial work on fluent database migrations 2012-11-30 15:01:52 -01:00
Stephan 7aa2064322 fix xpath syntax error with legacy XML schema 2012-11-30 13:33:24 -01:00
Stephan d3f6fe5269 U4-1212 - bugfix Document.PathPublished 2012-12-11 17:37:33 -01:00
Morten Christensen a5344b4087 Ensure UmbracoSettings are reset between tests 2012-11-30 10:06:17 -01:00
Morten Christensen 4a14095a6e Correcting conditions for test 2012-11-30 09:49:05 -01:00
Morten Christensen cc597dca15 Merge 2012-11-30 09:35:40 -01:00
Morten Christensen 152c8e810d Working with unit tests and making a few corrections around ContentTypes. 2012-11-30 09:34:09 -01:00
Sebastiaan Janssen bbd88be00b LookupByAliasTests didn't require a DB after all 2012-11-30 08:00:04 -01:00
Sebastiaan Janssen 40e7b9bc0a Fix the DB creation and population (tested only on SQL CE so far) 2012-12-03 11:49:09 -01:00
Shannon Deminick 41acb091eb Updated the Umbraco_Client folder casing in the UI project. All folders are now properly cased in the UI proj. 2012-12-03 05:58:27 +05:00
Shannon Deminick 24dc6abcc0 Fixed folder casing in the UI project for all folders (except the Umbraco_Client one which will be in the
next commit). Now, VS thinks that all folders in the UI project are properly cased even though on the file system
they are not. This means that any webforms classes that are created in the UI project will automatically have the
correct namespace casing.
2012-12-03 05:43:31 +05:00
Shannon Deminick ca62b3aedb adds umb favicon to installer and back office. This also ensures it doesn't get overridden by package files (some do that). 2012-12-03 03:21:07 +05:00
Sebastiaan Janssen fbd8884944 Fix routing tests, we DO need a database for these 2012-11-29 17:10:41 -01:00
Sebastiaan Janssen 2cc8ac74d6 Fix SQL regressions (I expected them) 2012-11-29 17:07:38 -01:00
Sebastiaan Janssen 14ee934fd5 Ignoring dictionary tests as code comment cleary says they don't work anyway 2012-11-29 15:44:00 -01:00
Sebastiaan Janssen 20d1498eb9 Merge 2012-11-29 15:40:15 -01:00
Sebastiaan Janssen c3f9a2ae12 Reimplement the changed DB schema and adjust the code to work with it 2012-11-29 15:38:04 -01:00
Morten Christensen 2f83e5ba31 Fixing a few broken unit tests 2012-11-29 13:05:51 -01:00
Morten Christensen 357a5d1638 Merge 2012-11-29 12:41:36 -01:00
Morten Christensen acb909c706 Refactoring installer to use the DatabaseContext for installing the umbraco db schema and default data.
Minimizing the use of the json/ajax calls during installation.
2012-11-29 12:40:48 -01:00
Sebastiaan Janssen dac1a8e9dc Checking to see why the test file doesn't get deleted on the build server 2012-11-29 11:56:33 -01:00
Sebastiaan Janssen 4817cf8310 That didn't actually fix the dictionary tests, shame. 2012-11-29 11:19:44 -01:00
Sebastiaan Janssen 2b3e535f83 Make dictionary tests work 2012-11-29 10:31:49 -01:00
Sebastiaan Janssen c6c5839373 Move directory creation to TestHelper and reference from a few places 2012-11-29 09:07:14 -01:00
Sebastiaan Janssen 4d008f1755 No need to delete the directories, just the data in them 2012-11-29 08:27:59 -01:00
Sebastiaan Janssen 079d6e49e9 Creating and deleting required folders automatically for tests 2012-11-29 07:52:12 -01:00
Morten Christensen d8d131be93 Merge 2012-11-29 06:48:55 -01:00
Sebastiaan Janssen c8387d58f5 Fix (expected!) merge problem. 2012-11-28 14:39:11 -01:00
Sebastiaan Janssen f6e8cbf6de Merge with default 2012-11-28 14:34:55 -01:00
Morten Christensen 6edea4a8ee Adding some of the database changes that is part of v6 - just renaming a few columns so far.
Refactoring the installer, which is not working 100% yet.
2012-11-27 15:07:53 -01:00
Morten Christensen d98bd97c5f Merge 2012-11-27 11:39:27 -01:00
Morten Christensen 5233dff63f Workaround for database setup in the installer, cause medium trust won't play nice. 2012-11-27 11:38:09 -01:00
Morten Christensen d6c9f1f991 Reverting SolutionInfo.
Updating DatabaseContext for installer although not fully working because of medium trust issue with refreshing connectionstrings.
2012-11-27 10:05:26 -01:00
Shannon Deminick d5e184b133 Adds logging to the package installer for debugging. Updates DisposableTimer to pass delegates for logging for tracing/info.
Fixes PluginManager cache file handling. Ensures cache file is written with the correct TypeResolutionKind. Have added a check to
ensure the file is replaced if a legacy file is found. Added a check to the PluginManager to load from scanning if the cache item is
not found in the file, this fixes all install issues with the type finding in 4.11.
Added new batch file to reset an umbraco install to vanilla (not 100% complete yet)
2012-11-27 10:42:22 +05:00
Shannon Deminick e9c154f0a2 removed other non used legacy test files. 2012-11-27 07:04:18 +05:00
Shannon Deminick 5973c20b24 Removed old test runner configs for the legacy tests project which is not loaded into the sln at the moment.
We will migrate many of these tests over in time.
2012-11-27 07:03:32 +05:00
Shannon Deminick 060ebe2c4f reverts last minute changes in 4.11 to get trees displaying on install so that we can determine the real cause.
Fixes naming conventions on MasterpageHelper.
2012-11-27 06:58:58 +05:00
leekelleher 4796cdd803 MySQL: Corrected a typo in the "DropDow" data-type definition. 2012-11-26 22:04:44 +00:00
Morten Christensen 7641bafd17 Refactoring installer 2012-11-26 17:58:42 -01:00
Morten Christensen e5ec9eb06f Reducing the usage of the DatabaseFactory 2012-11-26 17:20:58 -01:00
Sebastiaan Janssen df8b4351c1 Merge 2012-11-26 17:11:56 -01:00
Sebastiaan Janssen 9d5b1e178a Move all the lib files to NuGet/MyGet and remove legacy folders 2012-11-26 17:11:13 -01:00
Morten Christensen 7140922e7a Refactoring installer to use the new datalayer for installation. 2012-11-26 15:57:03 -01:00
Morten Christensen 92913389b8 Fixing an issue I had introduced in ExpressionHelper 2012-11-26 14:13:50 -01:00
Morten Christensen 00f2458edd Adding a few unit tests to verify the outcome of the generated sql syntax for the Content- and ContentType repositories. 2012-11-26 12:28:59 -01:00
Sebastiaan Janssen a5db5a3e0b Don't generate documentation file in release mode 2012-11-26 12:07:16 -01:00
Morten Christensen ca69ef7810 Merge 2012-11-26 11:29:53 -01:00
Morten Christensen 8ee0fffb84 Content repo sql tests 2012-11-26 11:29:20 -01:00
Sebastiaan Janssen 9f9f754d15 Update log4net references to use the medtrust version 2012-11-26 11:27:56 -01:00
Morten Christensen c98d3a8a1f Merge 2012-11-26 11:18:56 -01:00
Morten Christensen 0ae707fe78 Refactoring the umbraco version from GlobalSettings to be a seperate class that simply wraps the version from the assembly.
Since the version will come from the assembly there is no need to have it as part of the GlobalSetting, which is internal and needs a makeover of its own.
2012-11-26 11:18:06 -01:00
Sebastiaan Janssen f9fadf9d80 Merge 2012-11-26 10:13:29 -01:00
Sebastiaan Janssen 59c452d2ea Updated log4net to get the medium trust supported version from myget 2012-11-26 10:12:50 -01:00
Morten Christensen 34ac97442d Merge 2012-11-26 10:08:49 -01:00
Morten Christensen 4cc20efa08 Refactoring usages of CurrentVersion to use Version in GlobalSettings.
Completes U4-1160
2012-11-26 10:07:08 -01:00
leekelleher 6cbb536dea Set the correct 'Source' path for the TransformXml in 'umbraco.presentation.targets'. 2012-11-26 11:05:17 +00:00
Morten Christensen d522ca9fdd Refactoring usages of VersionMajor, VersionMinor and VersionPatch in umbraco.GlobalSettings.
Its now using Umbraco.Core.Configuration.GlobalSettings.Version instead.
Fixes U4-1160
2012-11-26 10:00:47 -01:00
Morten Christensen 3fe1975514 Refactoring usages of umbraco.GlobalSettings.CurrentVersion to use the new Umbraco.Core.Configuration.GlobalSettings.Version 2012-11-26 09:57:05 -01:00
Morten Christensen e07fc8c2ba Adding language column to cmsContentVersion 2012-11-26 09:02:49 -01:00
Morten Christensen 78b05eb44c Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies 2012-11-26 07:46:29 -01:00
Morten Christensen 5d3fdde39d Adding ServiceStack as nuget package dependency instead of shipping the assembly. 2012-11-26 07:19:34 -01:00
Morten Christensen 1dd9b6c4d5 Removing nuget packages from repo as we are using package restore 2012-11-26 07:16:48 -01:00
Morten Christensen 4d351ad8ae Making all Macro related classes internal, as the new macro stuff won't be utilized in 6.0. 2012-11-26 07:06:18 -01:00
Morten Christensen ce12bfa80e Adding numeric attribute for testing.
Adding type test for composition implementation.
2012-11-25 19:19:10 -01:00
Morten Christensen 599fb5a12d Merge 2012-11-25 17:56:52 -01:00
Morten Christensen e16c92a197 Starting with composition via code first test. 2012-11-25 17:56:08 -01:00
Sebastiaan Janssen b9ee9d551e Ammending previous commit - removes files from inclusion in csproj file as well 2012-11-25 08:25:34 -01:00
Sebastiaan Janssen 72eb1a573d Machine specific config files are no longer necessary. Upon first build, you get
a new web.config file thats never commited to the repo, edit this one all you
want. It gets some values overwritten by the web.Template.Debug.config because
they should be used by everybody deving on the core (currently only MedTrust).
2012-11-25 08:22:07 -01:00
Morten Christensen 97ebf8d51b Merge 2012-11-24 19:08:45 -01:00
Morten Christensen ff89383386 Removing usage of IProfile on DataTypeDefinition.
Giving the Code First POC an extra kick in the conventions, so the default PropertyType convention can be overridden.
If a Definition doesn't exist for the selected DataType one will be created - with backing unit test.
2012-11-24 19:07:06 -01:00
Stephan 2512bf3c6b bugfix hgignore 2012-11-24 14:57:49 -01:00
Stephan 0513d6012c merge 2012-11-24 14:56:23 -01:00
Morten Christensen e32880f215 Final Merge with 4.11.0 2012-11-23 19:59:28 -01:00
Morten Christensen 1053492a29 Freedom Friday POC of native code first - limited to test project.
Making a few corrections to the serialization attributes after having tested ContentType Serialization.
Enabling bulk saving of new ContentTypes with Parent/Composition dependencies.
2012-11-23 19:58:19 -01:00
Stephan 9f0ab6c297 U4-1245 - make it possible to create more than 1 wildcard domain 2012-11-23 15:23:39 -01:00
Morten Christensen c7693386a2 Correcting a few unit tests after conditions have changed. 2012-11-23 08:35:58 -01:00
Morten Christensen 99820bf5e1 Merge with 4.11.0 2012-11-23 07:53:22 -01:00
Morten Christensen f11dc7f3cd Correcting a few methods in the DataTypeService.
Adding publish = false in save methods, to ensure that Published isn't set to true.
2012-11-21 17:38:54 -01:00
Morten Christensen 6ce93ac5c6 Removing proj reference to umbraco.config as its not part of source control. 2012-11-17 14:49:13 -01:00
Morten Christensen f9328af55f Merge with 4.11.0 2012-11-17 14:41:54 -01:00
Shannon Deminick 6abca67fc4 Close 4.10.1 branch 2012-11-14 21:19:00 +05:00
Morten Christensen 52d65106f5 Correcting issues after running unit tests 2012-11-14 13:27:34 -01:00
Morten Christensen 9cb12fa3c0 Adding events to the ContentService 2012-11-14 11:20:21 -01:00
Morten Christensen be1e98fda2 Making a few more corrections to allow setting the Key-guid value for ContentType, MediaType and Media. 2012-11-14 07:24:07 -01:00
Morten Christensen 46ce70f4a7 Minor adding to guid Key unit test. 2012-11-13 19:10:08 -01:00
Morten Christensen 5540959e71 Correcting ability to set guid Key, as it was overwritten when saving.
Adding unit tests to verify get/set Key.
Adding unit tests to verify GetById with guid Key.
Adding overload to GetById with guid Key to supplement the int Id.
2012-11-13 19:07:43 -01:00
Søren Reinke@Windows-7 0ce9878c59 Removed call to obsolete 'speechBubble' 2012-11-13 18:20:14 -01:00
Morten Christensen f7b7b90bed Correcting a new issues after merge 2012-11-13 15:13:06 -01:00
Morten Christensen 59630b99b4 Merge with 4.11.0 2012-11-13 14:33:28 -01:00
Morten Christensen c9c160bc29 Adding unit test for saving bulk content, and adding lazy collection save overload.
Adding AuditTrail class and test case.
2012-11-13 14:30:05 -01:00
Morten Christensen 50dc9f2b7b Resolving UserService usage in ContentService to set Creator/Writer.
Adding audit class for future implementation.
2012-11-12 08:39:29 -01:00
Morten Christensen 00e3f16d30 A few corrections after running the unit tests 2012-11-12 08:00:51 -01:00
Morten Christensen a4d4411cca Moving services from Web proj to Core proj. 2012-11-12 07:40:11 -01:00
Morten Christensen d1db48eb72 Moving PublishingStrategy to Core proj. 2012-11-12 07:33:22 -01:00
Morten Christensen 4dd5c72659 Ensuring that possible notifications and permissions are removed when deleting a template. 2012-11-12 07:22:09 -01:00
Morten Christensen 8fc942d3b0 Adding internal constructor for testing with predefined IFileSystems. 2012-11-12 07:19:10 -01:00
Morten Christensen d0c79052e8 Adding SetDefaultTemplate on ContentType.
Correcting UOW for FileService, which needs two providers - one for files and one for data.
2012-11-12 07:16:54 -01:00
Morten Christensen 4be2207f50 Correcting condition for inserting allowed templates. Thank you valuable unit tests. 2012-11-11 19:11:36 -01:00
Morten Christensen 61afe225be Adding Template to ContentType and Content objects and updating repositories accordingly.
Removing templates from the mocks for the time being.
2012-11-11 19:02:45 -01:00
Morten Christensen 13c980c14b Dedicated to Matt <3 2012-11-11 18:07:52 -01:00
Morten Christensen 689c229846 Adding methods to delete specific versions from content by version id or date. 2012-11-11 14:55:48 -01:00
Morten Christensen 564d370392 Extending PetaPoco's sql builder with strong types plus added a few unit tests to verify output. 2012-11-11 13:52:28 -01:00
Morten Christensen eb4fc26e1f Implementing last methods in TemplateRepository plus added a TemplateFactory for mapping dtos-entities.
Removing old FileOnly-repo version of the TemplateRepository.
Refactoring FileService to use new repository.
2012-11-11 12:20:14 -01:00
Morten Christensen dffc6ca1a0 Refactoring entities with Users to only add Id to minimize the object graph.
Moved getting an IProfile to an extension method, as its not commonly used.
Removing dependencies in ContentService, so the Services and context can be moved to Core proj.
Implementing Template repository to use both filesystem and db.
2012-11-11 06:53:02 -01:00
Morten Christensen e832da5bfc Refactoring a few repositories to use the UserRepository for getting an IProfile for a Creator/Writer 2012-11-09 20:26:47 -01:00
Morten Christensen 270d75ecd1 Implements User- and UserTypeRepository.
Implements User- and UserTypeMapper/Factory.
Update ContentRepository tests to use RepositoryResolver.
2012-11-09 19:54:10 -01:00
Morten Christensen e3d5fa766d Starting implementation of the UserRepository.
Fixing unit tests.
2012-11-09 14:45:28 -01:00
Morten Christensen fadac469e9 Adding unit tests for Script- and StylesheetRepository. 2012-11-09 11:56:59 -01:00
Morten Christensen e93d7d3f5d Creating unit test 2012-11-09 09:57:46 -01:00
Morten Christensen c93fcfd482 Correcting two failing unit tests 2012-11-09 09:51:53 -01:00
Morten Christensen 9049b079c8 Adding unit tests for RelationRepository.
Correcting delete clauses for Content to ensure relations are also deleted.
2012-11-09 09:40:06 -01:00
Morten Christensen 4dfb4df952 Adding unit tests for RelationTypeRepository.
Correcting a few mappers and adding identityseed for RelationType plus adding default data.
2012-11-09 08:49:48 -01:00
Morten Christensen e35f61b10c Adding AspNet Mvc dependency in nuspec. 2012-11-09 07:28:29 -01:00
Morten Christensen 21ca6fbc96 Adding content retrieval performance test 2012-11-08 19:23:25 -01:00
Morten Christensen ac9ab759e9 Adding missing reset of resolver in a two unit tests. 2012-11-08 18:37:40 -01:00
Morten Christensen c5d86e9525 Merge with 4.10.0 2012-11-08 18:29:07 -01:00
Morten Christensen 54df4855bc Fixing issue with deserializing macros and adding some more macro related tests. 2012-11-08 18:27:22 -01:00
Morten Christensen 705fed7a5e Adding unit tests for DictionaryRepository. 2012-11-08 15:55:44 -01:00
Morten Christensen 439098e3d7 Adding unit tests for LanguageRepository 2012-11-08 12:21:40 -01:00
Morten Christensen 4afbd1c38e Adding unit tests for DataTypeDefinitionRepository 2012-11-08 11:55:36 -01:00
Morten Christensen ac693134bb Adding unit tests for MediaRepository 2012-11-08 09:43:35 -01:00
sitereactor d4e6dd9711 Correcting merge error by removing file ref. 2012-11-08 08:04:12 -01:00
sitereactor 5541ba8a30 Merge with 4.10.0 2012-11-08 08:00:20 -01:00
sitereactor 8e4b9ed743 Adding test class for MediaRepository pending implementation 2012-11-07 14:51:12 -01:00
sitereactor a130642b02 Correcting .Append to .Where in repositories for base queries.
Adding unit tests for MediaTypeRepository.
2012-11-07 14:41:28 -01:00
sitereactor bfdc204d08 A bit of refactoring and moving the services back and forth 2012-11-07 13:56:52 -01:00
sitereactor 372f7a7725 Refactoring UpdateContentCache strategy for generating xml cache upon publishing indepedent of the legacy umbraco.content.Instance class. 2012-11-06 20:03:36 -01:00
sitereactor 9b77eefb4c Adding stragies plus tests for publishing and updating the xml cache. 2012-11-06 15:17:58 -01:00
sitereactor 0b29a08d1d Adding proper identity check to File entity. 2012-11-06 13:12:33 -01:00
sitereactor fba2ce8a7a Refactoring the FileRepository to implement IUnitOfWorkRepository, so the files use the same transaction approach as database entities. 2012-11-06 13:07:18 -01:00
sitereactor ff51d81540 Merge with 4.10.0 2012-11-06 12:44:20 -01:00
sitereactor 4234bb1cd9 Moving content xml test to seperate test class for easier teardown of test.
Adding test to account for UserService using httpcontext for looking up current backoffice user.
2012-11-06 12:42:59 -01:00
sitereactor ec9880968f Moving interfaces for services to Umbraco.Core.
Adding xml extensions for Content to generate xml for the xml cache.
Adding test for xml generation.
2012-11-06 10:47:14 -01:00
sitereactor f438ad16e0 Merge with 4.10.0 2012-11-06 07:28:14 -01:00
sitereactor 60146e31c7 Adding a note on test to add and correcting usage of CreateContent method with explicit use of a user id to avoid userservice/httpcontext. 2012-11-05 14:53:36 -01:00
sitereactor 5f6c4cdf92 Renaming User to Creator on Content - makes more sense. 2012-11-05 14:43:51 -01:00
sitereactor de9c373626 Adding some initial work for Membership related classes and interfaces, but only using IProfile and Profile as the rest are not part of the roadmap.
Adding a UserService, which should be fully implemented in a later release.
Refactoring usage of the ServiceContext, which is now loosely tied to the HttpContext as its used by the UserService.
Refactoring User/Writer on the Content class and interface.
Simplifying events and delegates in the publishing strategy.
2012-11-05 14:42:21 -01:00
sitereactor fe6bbdf005 Refactoring usage of UOW in File-, Localization- and MediaService. 2012-11-05 10:12:17 -01:00
sitereactor 480801e10b Refactoring usage of UOW in the DataTypeService.
Adding an internal extension method to get an IDataType for a PropertyType.
2012-11-05 09:47:07 -01:00
sitereactor b77beb386a Adding unit tests for the two repository-backing cache providers 2012-11-05 09:29:29 -01:00
sitereactor cec2de6a2f Adding unit tests for ContentTypeRepository 2012-11-05 09:21:25 -01:00
sitereactor 1ea65ee27b Dummy files ... really need to change this, so the folders are created in the test setup instead of having these dummy files. 2012-11-05 09:06:59 -01:00
sitereactor 278d3087a4 Removing Service- and DatabaseContexts from UmbracoContext as its not the proper place to have them.
Adding extension method to ApplicationContext to attach the two contexts here instead.
Refactoring BaseWhereClause as there were problems formatting the sql.
Adding unit tests for MacroRepository and ContentRepository.
2012-11-05 09:03:48 -01:00
sitereactor edc80a12ab Adding DbProviderFactories sqlce config setting to web.config template. 2012-11-02 12:32:36 -01:00
sitereactor a897f51511 Merge with 4.10.0 2012-11-02 12:29:17 -01:00
sitereactor 98ef3f96f8 Correcting issue with RepositoryResolver not setting the unit of work when resolving. 2012-11-02 11:54:42 -01:00
sitereactor 2ba506e598 Adding SqlCe to DbProviderFactories config setting to avoid issue with provider not being found.
Correct error in RepositorySettingsTests after having changed config.
2012-11-02 10:18:07 -01:00
sitereactor ccb1734a04 Removing dependency on DbProviderFactories in DatabaseFactory.
Refactoring mocked content used by ContentTests.
Refactoring dirty-usage.
2012-11-02 09:11:23 -01:00
sitereactor 49c2be3c4a Removing DbProviderFactories dependency in DatabaseContext 2012-11-02 07:34:41 -01:00
sitereactor a98fddbd58 Fixing event subscription which caused a series of unit tests to fail 2012-11-01 15:06:35 -01:00
sitereactor 3d7376824d Adding more unit tests to cover different scenarios for publishing logic 2012-11-01 13:48:03 -01:00
sitereactor b1240abf0b Unit tests covering the ContentService.
Adding new configurations to the release configs.
Refactoring the publishing strategy and a few of the services.
2012-11-01 10:59:32 -01:00
sitereactor 053e26b34c Updating nuspec files for v6-alpha 2012-11-01 07:52:49 -01:00
sitereactor 6e8add79ac Merge 2012-11-01 07:25:40 -01:00
sitereactor 42d233239a Adding dummy files, so unit tests doesn't fail in TC 2012-11-01 07:25:02 -01:00
Sebastiaan Janssen 9184a12056 Merge 2012-10-31 15:32:35 -01:00
Sebastiaan Janssen d2788f202a NuGet Package restore problem seems related to version of nuget.exe, updated
See: http://nuget.codeplex.com/discussions/398910
2012-10-31 15:31:52 -01:00
sitereactor a4a4ab433d Merge with 4.10.0 2012-10-31 15:17:20 -01:00
sitereactor 8225950cac Merge 2012-10-31 15:15:32 -01:00
sitereactor 4e2bcee35b Adding more tests to cover the ContentService and refactoring. 2012-10-31 15:15:02 -01:00
Sebastiaan Janssen e781bac935 And another update to the nuget path to hopefully get it correct for TeamCity 2012-10-31 14:55:06 -01:00
Sebastiaan Janssen 235527a5a6 SolutionDir path is not correct when there are spaces in it (TeamCity has that) 2012-10-31 14:53:18 -01:00
Sebastiaan Janssen 4cec26c71b New NuGet targets file, might fix pacakge restore problem in TeamCity 2012-10-31 08:32:56 -01:00
sitereactor b86bfdd87b Refactoring usage of UOW in ContentService 2012-10-31 08:20:45 -01:00
sitereactor e30cf6bc65 Adding unit tests for the ContentRepository and starting refactoring of the UOW usages in the services. 2012-10-30 20:01:09 -01:00
sitereactor d3655fd726 Making BaseDatabaseFactoryTest single threaded.
Refactoring while testing ContentService.
2012-10-30 19:27:47 -01:00
sitereactor 16bb9df623 Refactoring usage of the DatabaseContext 2012-10-30 15:20:54 -01:00
sitereactor 137a54b193 Refactoring DTOs for Identity seed, which is used by Sql Ce.
Updating unit tests and Contexts to include the ServiceContext and DatabaseContext.
2012-10-30 15:03:58 -01:00
sitereactor 347bf3fabf Implements a basic version of the MacroService for U4-940
Adding a static ServiceFactory class for easy access to the various services in a non-singleton way.
Adding a Resolver for MacroPropertyTypes.
Updating the CoreBootManager and PluginManager to include the MacroPropertyTypeResolver.
2012-10-30 09:25:28 -01:00
sitereactor 9306fd0b5c Missing log4net reference 2012-10-30 07:58:29 -01:00
sitereactor 9673f60948 Updating nuspec files for 4.10.0 beta release 2012-10-30 07:40:42 -01:00
sitereactor 81aedbd9dd Merge with 4.10.0 2012-10-29 14:40:02 -01:00
sitereactor 17a70b4e05 Updating repositories 2012-10-29 14:39:24 -01:00
sitereactor 0c4c429b68 Implements U4-943 to the extent its currently possible.
Refactoring publishing methods in the ContentService.
Adding tests for the QueryBuilder.
2012-10-29 14:28:16 -01:00
sitereactor c20072c01d Merge with 4.10.0 2012-10-29 09:55:33 -01:00
sitereactor 960ae22271 Adding convention to column naming for table creation.
Adding DatabaseContext hooked up to UmbracoContext and initialized through the CoreBootManager.
Adding constant for ConnectionString name in GlobalSettings.
2012-10-29 09:49:31 -01:00
sitereactor 3e6c56a394 Merge with 4.10.0 2012-10-25 18:39:33 -02:00
sitereactor 9fd23a4bc3 Merge 2012-10-25 18:39:11 -02:00
sitereactor 07b5f6983f Refactoring the creation of database schema and base/default data creation.
Adding extension method to get all properties for interfaces in PetaPoco used for mapping.
Creating ServiceContext and adding it to the UmbracoContext to provide access to the various services.
Adding UmbracoContext to BaseDatabaseFactory test.
2012-10-25 18:38:23 -02:00
niels.kuhnel 40c6b53b9e Merge 2012-10-25 08:23:58 -02:00
niels.kuhnel 632d9f171e Support for running Umbraco from a network drive. 2012-10-25 08:14:10 -02:00
sitereactor 79488a43da Fixing some naming conflicts after merge 2012-10-24 12:41:37 -02:00
sitereactor cf7e63ad04 Merge with 4.10.0 2012-10-24 12:39:56 -02:00
sitereactor c5da0bd017 Fixing a few unit tests 2012-10-24 12:38:13 -02:00
sitereactor a9bc0addfb Implements ILocalizationService for U4-1075
Refactoring DictionaryItem, DictionaryTranslation and Language to use the same interface implementations as the rest of the db driven repos and services.
2012-10-24 12:22:52 -02:00
sitereactor da0ab7b76a Implements IFileService for U4-939
Updates TemplateRepository to treat the passed in string as an alias for a template that could be a master or a view.
2012-10-24 11:29:51 -02:00
sitereactor d82e9848da Implements IDataTypeService for U4-938
Refactoring base ContentType Repository and its implementations to allow for queries against PropertyType - still needs testing though.
Adding mappers for PropertyGroup and PropertyType models, so they are usable for queries.
2012-10-24 10:49:08 -02:00
sitereactor ce6aeb2a21 Implements MediaService for U4-941
Minor update to the ContentType/MediaType repositories to insure that CT references are removed when deleting.
Updates Media- and ContentMappers to map ContentTypeId.
Updates Media to have internal Trash-method.
2012-10-24 08:36:45 -02:00
sitereactor 2185da597f Implements IContentTypeService U4-937
Adding an IService marker interface.
Adding extension methods to UmbracoContext to expose the services.
2012-10-24 07:25:37 -02:00
sitereactor 3ef0e302c3 Implements the Property method on the Stylesheet class, so it can be used from the backoffice.
Completes U4-934
2012-10-24 06:42:04 -02:00
sitereactor 013513b439 Creating IContentTypeService interface as the foundation for U4-937 2012-10-23 12:49:48 -02:00
sitereactor 987e0a8efc Unit tests covering Mapper implementations for U4-978 2012-10-23 12:17:23 -02:00
sitereactor a53dde8a20 Adding two missing properties to ContentTypeBase.
Creating mappers for the few types that supports "db queries" through the repository U4-978
2012-10-23 11:29:16 -02:00
sitereactor ee96ced595 Adding missing code comments/documentation 2012-10-23 08:09:01 -02:00
sitereactor bfff317a96 Adding class to create base data using the internal DTOs 2012-10-23 07:30:00 -02:00
sitereactor 2545de57e0 Refactoring usage of DatabaseType - more convention based.
Limiting the use of the DatabaseType, so its only used for NText and NChar.
Adding LengthAttribute for fixed sized columns.
2012-10-22 12:52:29 -02:00
sitereactor b3d8b4c53c Refactoring syntax providers for db creation.
Adding tests for sql, sql ce and mysql to ensure the creaion of tables and their dependencies/references.
2012-10-19 19:07:17 -02:00
sitereactor c1909eccf5 Refactoring database creation, adding sql syntax provider to account for differences in syntax between sql, ce and mysql.
Adding MySql unit test.
2012-10-19 13:20:57 -02:00
sitereactor 2738f45d14 Closing feature branch 2012-10-18 12:25:46 -02:00
Morten@Thinkpad-X220 e34298c9f3 Changing the BaseDatabaseTest to be provider agnostic, so we can use it to test against all 3 providers. 2012-10-18 12:08:51 -02:00
Morten@Thinkpad-X220 e745f9ef08 Merge with 6.0.0-PetaPocoExtension 2012-10-18 11:56:03 -02:00
Morten@Thinkpad-X220 1576c7135f Package restore in datalayer project 2012-10-18 11:55:53 -02:00
Morten@Thinkpad-X220 0c34b1a4ef Merge with 4.10.0 2012-10-18 11:54:32 -02:00
Morten@Thinkpad-X220 9918ca9696 Decorating remaining DTOs for db table creation 2012-10-18 11:49:44 -02:00
Morten@Thinkpad-X220.ab-nat1.dk 5bd2059cd7 Removing attributes for migrations as a library that does this already exists.
Updating a few DTOs for programmatic creation.
2012-10-17 10:12:30 -02:00
Morten@Thinkpad-X220.ab-nat1.dk 2523781fc1 Refactoring PetaPoco extensions for table creation. Adding a few conventions, but still a few on the todo list. 2012-10-14 12:56:02 -02:00
Morten@Thinkpad-X220.ab-nat1.dk 10f87b3c82 Missing a few renamings of cmsTab 2012-10-14 12:03:23 -02:00
Morten@Thinkpad-X220.ab-nat1.dk 46a54d0bc3 Changing abstract migration classes to be a bit more intuitive and actually use the class instead of the decorations.
Added unit test for sample add and drop column changes.
2012-10-13 09:57:45 -02:00
Morten@Thinkpad-X220 ba45e0d365 Code from freedom friday project extending petapoco with a bunch of annotations used to decorate strongly typed models for table creation 2012-10-12 12:37:55 -02:00
Morten@Thinkpad-X220 a9c40a7f72 Merge with 4.10.0 2012-10-12 05:43:10 -02:00
Morten@Thinkpad-X220 089b51cdbc Not sure where these language files came from, but looks like they are needed. 2012-10-12 05:40:39 -02:00
Morten@Thinkpad-X220 7bc775c9e6 Adds ncrunch files to hgignore 2012-10-11 13:15:28 -02:00
Morten@Thinkpad-X220 361d3e91f6 Merge with 4.10.0 2012-10-11 13:13:38 -02:00
Morten@Thinkpad-X220 3f3362e23d Refactoring around the RepositoryResolver to allow the configuration of repositories and cache providers for each repository.
Added implementation of an infrastructure configuration section.
Added unit tests for the RepositoryResolver to verify that it can resolve all repository types and their configured cache provider.
2012-10-11 13:11:17 -02:00
Morten@Thinkpad-X220 f0e8ba063e Merge with 4.10.0 2012-10-10 13:21:00 -02:00
Morten@Thinkpad-X220 a02c3481d9 Removing files before merging 2012-10-10 13:20:37 -02:00
Morten@Thinkpad-X220 5161fa98ff Dummy files 2012-10-10 13:18:24 -02:00
Morten@Thinkpad-X220 3047d04f02 Some improvements around validation of content/media properties 2012-10-10 13:18:14 -02:00
Morten@Thinkpad-X220 4e19127dcf Adding unit tests for Content along with some test helpers.
Implements ContentService U4-936
2012-10-10 12:13:23 -02:00
Morten@Thinkpad-X220 858e549d4a Renaming a PetaPoco relator for consistency after db schema updates 2012-10-10 08:56:25 -02:00
Morten@Thinkpad-X220 e830660be3 Missing files in solution-workaround. 2012-10-10 08:43:38 -02:00
Morten@Thinkpad-X220 74ecbac7d7 Refactoring Content/Media and ContentTypes/MediaTypes so the two are as close as possible. By doing this Media and Content are practically the same witht the except of a few properties.
This implements U4-10
2012-10-10 08:42:54 -02:00
Morten@Thinkpad-X220 90108e344f Refactoring database changes from 4.10.0.
Implementing the contnet type composition as part of U4-956.
2012-10-10 07:15:51 -02:00
Morten@Thinkpad-X220.ab-nat1.dk 0cceac97fc Merge with 4.10.0 2012-10-09 16:08:13 -02:00
Morten@Thinkpad-X220.ab-nat1.dk f69b3e9b97 Refactoring singleton implementation for DatabaseFactory and Repository Cache Providers as per recommendations from http://csharpindepth.com/articles/general/singleton.aspx
Adding unit test for DatabaseFactory.
2012-10-09 16:07:19 -02:00
Morten@Thinkpad-X220 26b67afd33 Merge with 4.10.0 2012-10-09 12:29:39 -02:00
Morten@Thinkpad-X220 2dbc40134c Refactoring TemplateRepository and adding providers to the FileSystemPRoviders.config 2012-10-09 12:27:57 -02:00
Morten@Thinkpad-X220 a9939ac183 Adds MediaFactory implementation U4-985
Adds MediaRepository implementation U4-957
Refactoring ContentType and MediaType to have parent id as constructor dependency.
Refactoring PropertyFactory to work for both Content and Media.
Adding Version property to Media.
2012-10-09 11:53:22 -02:00
Morten@Thinkpad-X220 0d9bb02a9c Adds MediaTypeRepository implementation U4-958 and improving the code structure in the content type repos a bit. 2012-10-09 10:49:43 -02:00
Morten@Thinkpad-X220 87ff6d03e8 Adds MediaTypeRepository implementation U4-958 2012-10-09 10:26:55 -02:00
Morten@Thinkpad-X220 9ca4fbff9d Adds MediaTypeFactory implementation U4-981 2012-10-09 10:10:18 -02:00
Morten@Thinkpad-X220 62c69edf02 Moving public interfaces for a cleaner structure in the .Core project. 2012-10-09 09:49:55 -02:00
Morten@Thinkpad-X220 b8c0969a85 Merge with 4.10.0 2012-10-09 09:14:16 -02:00
Morten@Thinkpad-X220 c6972cf934 Merge with nuget changes 2012-10-09 09:11:39 -02:00
Morten@Thinkpad-X220 3454f4e8fa Adds Stylesheet repository implementation U4-966 2012-10-09 08:49:17 -02:00
Morten@Thinkpad-X220 4eee5cfd5f Adds template repository and an abstract file repository U4-967 2012-10-09 08:45:15 -02:00
Sebastiaan Janssen 9ef25c25e6 Remove NuGet.exe from build folder and refer to the one already in \src\.nuget
One NuGet.exe to rule them all!
2012-10-09 08:44:38 -02:00
Sebastiaan Janssen 66f25159e0 Tweak targts file to make package restore work in standalone mode (outside of VS) 2012-10-09 08:31:57 -02:00
Morten@Thinkpad-X220 0fbf3b2fdc Adds Script repository and some edits to the Script model U4-965
Refactoring RepositoryResolver to use the base repository instead of the Queryable repo.
2012-10-09 08:12:03 -02:00
Sebastiaan Janssen 487ac78660 Don't ignore NuGet repositories.config, TeamCity needs it to do restore. 2012-10-09 07:50:45 -02:00
Morten@Thinkpad-X220 93694daf28 Renaming the base repository interface 2012-10-09 07:17:57 -02:00
Morten@Thinkpad-X220 4abc8075ab Refactoring repository inheritance 2012-10-09 06:59:18 -02:00
Morten@Thinkpad-X220 a459cb95c4 Adds Relation and RelationType repositories U4-962 and U4-963 2012-10-09 06:34:12 -02:00
Morten@Thinkpad-X220 14e827d749 Adds Relation and RelationType factories U4-987 and U4-986 2012-10-09 06:01:04 -02:00
Morten@Thinkpad-X220 1b0c543176 Adds NullCache provider implementation U4-969 2012-10-09 05:46:42 -02:00
Morten@Thinkpad-X220 5944098fe3 Updating Script and Template to use DefaultRenderingEngine enum instead of UmbracoSettings.EnableMvcSupport 2012-10-09 05:43:06 -02:00
Morten@Thinkpad-X220 2705053177 Merge with 4.10.0 2012-10-09 05:36:20 -02:00
Morten@Thinkpad-X220.ab-nat1.dk 8a81bf935a Merge with 4.10.0 2012-10-08 17:23:11 -02:00
Morten@Thinkpad-X220.ab-nat1.dk 3a88c65db4 Implements DictionaryRepository, DictionaryItemFactory and DictionaryTranslationFactory U4-983 and U4-960 2012-10-08 17:20:43 -02:00
Morten@Thinkpad-X220.ab-nat1.dk 351edf52dc Implements LanguageRepository U4-961 and LanguageFactory U4-984 2012-10-08 16:35:46 -02:00
Morten@Thinkpad-X220 69f53b7dc5 Starting implementation of Dictionary and Language repositories and factories 2012-10-08 13:14:59 -02:00
Morten@Thinkpad-X220 60508a2327 Adds ContentType factory implementations U4-980
Adds ContentType repository implementation U4-956
2012-10-08 12:12:41 -02:00
Morten@Thinkpad-X220 eb35d712bb Adds DataTypeDefinition repository implementation for U4-959 2012-10-08 11:11:33 -02:00
Morten@Thinkpad-X220 e42865ef9d Adds Unit of Work for working with files U4-975 2012-10-08 10:16:59 -02:00
Morten@Thinkpad-X220 17d71a9011 Adds MacroRepository implementation U4-964 2012-10-08 10:09:28 -02:00
Morten@Thinkpad-X220 78e0098e09 Nuget package folder cleanup 2012-10-08 09:53:22 -02:00
Morten@Thinkpad-X220 c6c96d3a04 Nuget cleanup 2012-10-08 09:51:45 -02:00
Morten@Thinkpad-X220 51165cf614 Enabling nuget package restore and removing referenced nupkg files from repo U4-997
Implement Serialization framework from v5 U4-968
2012-10-08 09:51:13 -02:00
Morten@Thinkpad-X220 d52c0db0ee Merge with 4.10.0 2012-10-08 08:50:01 -02:00
Morten@Thinkpad-X220 1b92639384 Renaming EntityFactory to ContentFactory 2012-10-08 08:45:36 -02:00
Morten@Thinkpad-X220 660ecfa91b Refactoring Unit Of Work, adding TransactionTypes and a new Repository structure.
Adding new Factory structure.
Related to U4-973, U4-955 and U4-979
2012-10-08 08:42:57 -02:00
Morten@Thinkpad-X220 ca6356170c Adds Repository Resolver and backing config section implementation U4-988
Will need a bit of refactoring because of the way UnitOfWork is currently implemented.
2012-10-05 12:59:59 -02:00
Morten@Thinkpad-X220 590bc23ef6 Minor refactorings - Using GlobalSettings for database connectionstring. 2012-10-05 12:36:59 -02:00
Morten@Thinkpad-X220 7d74304c1f Merge with 4.10.0 2012-10-05 11:04:06 -02:00
Morten@Thinkpad-X220 dc1689bdf2 Removing PropertyValues-method from Content and Media and making it an extension method instead.
Adding the PropertyEditor model as internal to slowly adopt it using a slightly different model approach then in v5.
Minor refactoring of IEntity/Entity.
2012-10-05 11:03:08 -02:00
Morten@Thinkpad-X220.ab-nat1.dk fe7d57ce12 Refactoring Unit of Work and its dependency on the datastore.
Removing legacy test project from solution.
2012-10-04 18:19:46 -02:00
Morten@Thinkpad-X220 145cddbcb6 Adds the foundation for the repository implementation with abstract Repository, Unit Of Work and Cache provider.
Adding the Query object implementation.
Adds the ModelDtoMapper, which is still a WIP.
Adds the initial implementation of the IContentRepository with dependencies.
2012-10-04 13:44:02 -02:00
Morten@Thinkpad-X220 75e11b2ba8 Updating the model where serialization attributes where missing and adding a few comments.
Fixes U4-48
2012-10-04 13:05:31 -02:00
Morten@Thinkpad-X220 9e37e1674d Adds Media implementation U4-931
Adding some notes and small change to IContentBase, PropertyValues and the ability to set property values with an anonymous object is shared for Content and Media.
2012-10-04 12:38:43 -02:00
Morten@Thinkpad-X220 59c5a8920e Adds abstract File, Script, Stylesheet and Template model implementations for U4-933 U4-934 U4-935
Added a CssParser which is used internally by the Stylesheet class, but still needs a bit of work - primarily testing.
Resolves a couple of naming conflicts for Template.
2012-10-04 11:44:31 -02:00
Morten@Thinkpad-X220 083f2a99bc Adds Relation and RelationType U4-932 2012-10-04 08:10:36 -02:00
Morten@Thinkpad-X220 3321cb4eb1 Added code comments and serialization attributes. 2012-10-04 07:20:13 -02:00
Morten@Thinkpad-X220 612d57c00a Adds Dictionary and Language implementations for U4-929 and U4-930 2012-10-04 07:06:01 -02:00
Morten@Thinkpad-X220 e77d5bbbe5 Fixing a reference caused by a naming conflict. 2012-10-04 05:40:03 -02:00
Morten@Thinkpad-X220 cdb8af3812 Merge with 4.10.0 2012-10-04 05:18:12 -02:00
Morten@Thinkpad-X220 726aa962af Adding some notes about how to implement a publishing strategy that doesn't depend on the Document API. 2012-10-04 05:16:34 -02:00
Morten@Thinkpad-X220 6326772ec5 Included web.config instead of csproj, so updates to csproj was missing. 2012-10-03 12:57:52 -02:00
Morten@Thinkpad-X220 ce1de7d8c8 Adds stubs for ContentService implementation U4-936.
Adds initial implementation of a simple publishing strategy U4-943.
2012-10-03 12:51:32 -02:00
Morten@Thinkpad-X220 42be2492b5 Implements the 16 MacroPropertyTypes from the database U4-946 2012-10-03 12:24:50 -02:00
Morten@Thinkpad-X220 bd180fd6ba Adds IMacro, IMacroProperty and IMacroPropertyType interfaces.
Adds Macro and MacroProperty implementations U4-928.
Adds enums used for MacroTypes and MacroPropertyTypeBaseTypes
2012-10-03 11:59:49 -02:00
Morten@Thinkpad-X220 d6b4307c8d Undoing the private set on Parent Id as it should be possible to change 2012-10-03 10:27:43 -02:00
Morten@Thinkpad-X220 3d99cec04c Adds Content, ContentStatus and ContentType implementations U4-922 and U4-923.
Hiding language property untill its fully implemented.
Making set on Parent Id private.
Resolves a naming conflict in DocumentExtensions and DefaultPublishedMediaStore.
2012-10-03 10:26:50 -02:00
Morten@Thinkpad-X220 2c39e4251f Adds interfaces for IContent, IMedia, IContentBase.
Adds interfaces for IContentTypeBase, IContentTypeComposition, IContentType and IMediaType.
This includes the inheritance structure for Content and Media, as well as ContentType and MediaType which is basically the same except for Templates and Compositions.
2012-10-03 08:24:23 -02:00
Morten@Thinkpad-X220 aa288877be Renaming IDocumentProperty to IPublishedContentProperty 2012-10-03 08:12:04 -02:00
Morten@Thinkpad-X220 58ee5b4d55 Adding Property and PropertyCollection classes U4-924.
Adding PropertyGroup and PropertyGroupCollection classes U4-926.
Adding PropertyType and PropertyTypeCollection classes U4-925.
Adding DataTypeDefinition and DataTypeDatabaseType U4-927.
Had to update the Property ref. on page and DynamicDocumentExtensions because of a conflict with the new Property class.
2012-10-03 08:03:45 -02:00
Morten@Thinkpad-X220 cb87a6db73 Adding DTOs for the 4.9.0 database schema - related to first task under U4-945 2012-10-03 06:57:58 -02:00
Morten@Thinkpad-X220 2d80baca70 Adding PetaPoco v4.0.3 in a slightly modified version, as we need to keep the DTOs internal PetaPoco should be able to reflect these DTOs.
Because of this modification we aren't using the nuget package.
2012-10-03 06:47:07 -02:00
Morten@Thinkpad-X220 676592a0da Updating umbraco version in GlobalSettings to 6.0.0 2012-10-03 06:40:41 -02:00
Morten@Thinkpad-X220 0b9bd3be50 Adding base model U4-921 and creating new branch. 2012-10-03 06:38:31 -02:00
sebastiaan 34bbf95146 Closing branch 2012-09-10 07:53:20 -02:00
sebastiaan ecd6c42924 Closing branch 2012-09-10 07:53:03 -02:00
sebastiaan 03e34cde87 Closing branch 2012-09-10 07:52:35 -02:00
sebastiaan 7d69e859f9 Closing branch 2012-09-10 07:52:15 -02:00
sebastiaan 661e92218a Closing branch 2012-09-10 07:51:28 -02:00
sebastiaan 3a2ac6c4d3 Closing old branch 2012-09-10 07:19:22 -02:00
shannon@ShandemVaio.home f62b8a604e Close 4.8-solutioncleanup-wip branch 2012-06-27 23:33:10 +04:00
5325 changed files with 501817 additions and 226973 deletions
+130
View File
@@ -0,0 +1,130 @@
*.obj
*.pdb
*.user
*.aps
*.pch
*.vspscc
.DS_Store
._.DS_Store
[Bb]in
[Db]ebug*/
obj/
[Rr]elease*/
_ReSharper*/
_NCrunch_*/
*.ncrunchsolution
*.ncrunchsolution.user
*.ncrunchproject
*.crunchsolution.cache
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
*.[Pp]ublish.xml
*.suo
[sS]ource
[sS]andbox
umbraco.config
*.vs10x
App_Data/TEMP/*
[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
[Uu]mbraco/[Pp]resentation/[Ff]onts/*
[Uu]mbraco/[Pp]resentation/[Cc]ss/*
src/Umbraco.Web.UI/[Cc]ss/*
src/Umbraco.Web.UI/App_Code/*
src/Umbraco.Web.UI/App_Data/*
src/Umbraco.Tests/App_Data/*
src/Umbraco.Web.UI/[Mm]edia/*
src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
src/Umbraco.Web.UI/[Xx]slt/*
src/Umbraco.Web.UI/[Ii]mages/*
src/Umbraco.Web.UI/[Ss]cripts/*
src/Umbraco.Web.UI/Web.*.config.transformed
umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
_BuildOutput/*
*.ncrunchsolution
build/UmbracoCms.AllBinaries*zip
build/UmbracoCms.WebPI*zip
build/UmbracoCms*zip
build/UmbracoExamine.PDF*zip
build/*.nupkg
src/Umbraco.Tests/config/applications.config
src/Umbraco.Tests/config/trees.config
src/Umbraco.Web.UI/web.config
*.orig
src/Umbraco.Tests/config/404handlers.config
src/Umbraco.Web.UI/[Vv]iews/*.cshtml
src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
src/Umbraco.Web.UI/[Vv]iews/*
src/packages/
src/packages/repositories.config
src/Umbraco.Web.UI/[Ww]eb.config
*.transformed
webpihash.txt
node_modules
src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.panel.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.palettes.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.loader.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.front.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.config.js
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
src/Umbraco.Web.UI.Client/[Bb]uild/*
src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
build/_BuildOutput/
src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
tools/NDepend/
src/Umbraco.Web.UI/App_Plugins/*
src/*.psess
src/*.vspx
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
NDependOut/*
*.ndproj
QueryResult.htm
*.ndproj
src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
src/Umbraco.Web.UI/umbraco/plugins/*
src/Umbraco.Web.UI/umbraco/js/init.js
build/ApiDocs/*
build/ApiDocs/Output/*
src/Umbraco.Web.UI.Client/bower_components/*
/src/Umbraco.Web.UI/Umbraco/preview
#Ignore Rule for output of generated documentation files from Grunt docserve
src/Umbraco.Web.UI.Client/docs/api
src/*.boltdata/
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.loader.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.palettes.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.panel.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.config.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
src/umbraco.sln.ide/*
-63
View File
@@ -1,63 +0,0 @@
# use glob syntax
syntax: glob
*.obj
*.pdb
*.user
*.aps
*.pch
*.vspscc
[Bb]in
[Db]ebug*/
obj/
[Rr]elease*/
_ReSharper*/
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
*.[Pp]ublish.xml
*.suo
[sS]ource
[sS]andbox
umbraco.config
*.vs10x
App_Data\TEMP\*
umbraco\presentation\umbraco\plugins\*
umbraco\presentation\usercontrols\*
umbraco\presentation\scripts\*
umbraco\presentation\fonts\*
umbraco\presentation\css\*
src\Umbraco.Web.UI\css\*
src\Umbraco.Web.UI\App_Code\*
src\Umbraco.Web.UI\App_Data\*
src\Umbraco.Tests\App_Data\*
src\Umbraco.Web.UI\media\*
src\Umbraco.Web.UI\masterpages\*
src\Umbraco.Web.UI\macroScripts\*
src\Umbraco.Web.UI\xslt\*
src\Umbraco.Web.UI\images\*
src\Umbraco.Web.UI\scripts\*
src\Umbraco.Web.UI\Web.*.config.transformed
umbraco\presentation\umbraco\plugins\uComponents\uComponentsInstaller.ascx
umbraco\presentation\packages\uComponents\MultiNodePicker\CustomTreeService.asmx
_BuildOutput/*
*.ncrunchsolution
build/UmbracoCms.AllBinaries.zip
build/UmbracoCms.WebPI.zip
build/UmbracoCms.zip
build/*.nupkg
src/Umbraco.Tests/config/applications.config
src/Umbraco.Tests/config/trees.config
src/Umbraco.Web.UI/web.config
*.orig
src/Umbraco.Tests/config/404handlers.config
src/Umbraco.Web.UI/Views/*.cshtml
src/Umbraco.Web.UI/Views/*.vbhtml
src/Umbraco.Tests/config/umbracoSettings.config
src/Umbraco.Web.UI/App_Plugins/*
src/Umbraco.Web.UI/Views/*
src\Umbraco.Web.UI\[W]eb.config
src/packages/
build/*.zip
-31
View File
@@ -1,31 +0,0 @@
d0aba247db91d1b70c39c6397b965ca370a67497 Sprint-Juno-A
0b8f67be2ca8faf008151d87f232c698de69e735 Release-4.5.0
5960c073250926d202861a09472f5f334da6e283 Sprint-Juno-B
f15d4ff81a8368e9d42788f7e0ae726f7a70a3b1 Release-4.0.3
283065df4d3c27245267709dd2644a479c4f62a5 Release-4.0.4.2
ffc34b23e1a03785e4098afa4290d8c03cf10115 Release-4.5.2
d03fcffb8834a9583a56813bb44b6abbd9f042cc Release-4.6.0
1809f7b2593270c192cd47bdcfdb392100686f79 4.7.2
488779dec0ceb1d2874bcef906241b919325c904 4.8.0-beta
096f20bb0575d6199f20fcb3147b63554e765a74 Release-4.8.0
8f8a203857886b373148af29edd57460a42940be Release-4.8.1
de73e687ddf6086ed52b6554676c1632865d07f2 Release-4.9.0
8d7d8609e2e4b971da99cd97f72132ce85ce3333 Release-4.9.1
f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0
20e4dff821d8ac2527a5353618fa1a23ea1d8b34 Release-4.11.0
7f827760cb49d749616859f528d19dde64807947 Release-4.11.1
7f827760cb49d749616859f528d19dde64807947 Release-4.11.1
6eb5f2fb5a88aa29ea544499df9160a1b31b5638 Release-4.11.1
73711b806a4044dbf0d7d7c095ddfdda23b09932 4.11.2
73711b806a4044dbf0d7d7c095ddfdda23b09932 4.11.2
0000000000000000000000000000000000000000 4.11.2
73711b806a4044dbf0d7d7c095ddfdda23b09932 Release-4.11.2
77db220b89e166b3c0736ed321ecfd6416cddbcd Release-4.11.2.1
54cde33b809dcb3a1f7e7ae0d5375f6dd0d89c8d Release-4.11.2.2
baa44b79cf90a60631e38e11f771c200b08a4583 Release-4.11.3
e4d0c7e740555d8707ba71f55a623a3f96da8e65 Release-4.11.3.1
e4d0c7e740555d8707ba71f55a623a3f96da8e65 Release-4.11.3.1
0000000000000000000000000000000000000000 Release-4.11.3.1
e02f5aebb87e3f07d27376647756caa9762931d8 Release-4.11.4
14338b0ab1738fbd8987677ecdb9a73d79fc229d release-4.11.6
ce47176bc6b9298741783e20f1fe2672c811f744 release-4.11.7
+9
View File
@@ -0,0 +1,9 @@
# The MIT License (MIT) #
Copyright (c) 2013 Umbraco
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+40
View File
@@ -0,0 +1,40 @@
Umbraco CMS
===========
Umbraco is a free open source Content Management System built on the ASP.NET platform.
## Building Umbraco from source ##
The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `grunt dev` in `src\Umbraco.Web.UI.Client`.
If you're interested in making changes to Belle make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). Note that you can always [download a nightly build](http://nightly.umbraco.org/umbraco%207.0.0/) so you don't have to build the code yourself.
## Watch a five minute introduction video ##
[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
**More than 177,000 sites trust Umbraco**
For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developers dream and your users will love it too.
Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales.
To view more examples please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
## Downloading ##
The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).
## Forums ##
We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org).
## Contribute to Umbraco ##
If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute).
## Found a bug? ##
Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [online guide for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
To view existing issues please visit [http://issues.umbraco.org](http://issues.umbraco.org)
+170
View File
@@ -0,0 +1,170 @@
/* File : TOC.css
// Author : Eric Woodruff (Eric@EWoodruff.us)
// Updated : 09/07/2007
//
// Stylesheet for the table of content
*/
*
{
margin: 0px 0px 0px 0px;
padding: 0px 0px 0px 0px;
}
body
{
font-family: Segoe UI, Arial, Verdana, Helvetica, sans-serif;
font-size: 0.9em;
background-color: white;
color: White;
overflow: hidden;
}
input
{
padding:5px;
margin: 3px 0px 3px 0px
}
img
{
border: 0;
margin-left: 5px;
margin-right: 2px;
}
img.TreeNodeImg
{
cursor: pointer;
}
img.TOCLink
{
cursor: pointer;
margin-left: 0;
margin-right: 0;
}
a.SelectedNode, a.UnselectedNode
{
color: #333;
text-decoration: none;
padding: 1px 3px 1px 3px;
white-space: nowrap;
}
a.SelectedNode
{
background-color: #ffffff;
border: solid 1px #999999;
padding: 0px 2px 0px 2px;
}
a.UnselectedNode:hover, a.SelectedNode:hover
{
background-color: #cccccc;
border: solid 1px #999999;
padding: 0px 2px 0px 2px;
}
.Visible
{
display: block;
margin-left: 2em;
}
.Hidden
{
display: none;
}
.Tree
{
background-color: #fff;
color: #333;
width: 300px;
overflow: auto;
}
.TreeNode, .TreeItem
{
white-space: nowrap;
margin: 2px 2px 2px 2px;
}
.TOCDiv
{
position: relative;
float: left;
width: 300px;
height: 100%;
}
.TOCSizer
{
clear: none;
float: left;
width: 10px;
height: 100%;
background-image: url("Splitter.gif");
background-position:center center;
background-repeat:no-repeat;
position: relative;
cursor: w-resize;
border-left: solid 1px #CCC;
}
.TopicContent
{
position: relative;
float: right;
background-color: white;
height: 100%;
}
.SearchOpts
{
padding: 5px 5px 10px 5px;
color: black;
width: 300px;
border-bottom: solid lightgrey 1px;
height: 110px !important;
}
.NavOpts
{
padding: 5px 5px 6px 5px;
color: black;
width: 300px;
border-bottom: solid lightgrey 1px;
}
.NavOpts img {
display:inline-block;
margin: 0px 5px 0px 5px;
}
.IndexOpts
{
padding: 5px 5px 6px 5px;
color: black;
width: 300px;
border-bottom: solid lightgrey 1px;
}
.IndexItem
{
white-space: nowrap;
margin: 2px 2px 2px 2px;
}
.IndexSubItem
{
white-space: nowrap;
margin: 2px 2px 2px 12px;
}
.PaddedText
{
margin: 10px 10px 10px 10px;
}
+172
View File
@@ -0,0 +1,172 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<!-- The configuration and platform will be used to determine which
assemblies to include from solution and project documentation
sources -->
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{cb4d85f1-7390-40ee-b41f-a724bb8fddea}</ProjectGuid>
<SHFBSchemaVersion>1.9.5.0</SHFBSchemaVersion>
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
Studio adds them anyway -->
<AssemblyName>Documentation</AssemblyName>
<RootNamespace>Documentation</RootNamespace>
<Name>Documentation</Name>
<!-- SHFB properties -->
<FrameworkVersion>.NET Framework 4.5</FrameworkVersion>
<OutputPath>.\Output\</OutputPath>
<HtmlHelpName>UmbracoClassLibrary</HtmlHelpName>
<Language>en-US</Language>
<BuildAssemblerVerbosity>OnlyErrors</BuildAssemblerVerbosity>
<BuildLogFile>csharp-api-docs.log</BuildLogFile>
<HelpFileFormat>Website</HelpFileFormat>
<IndentHtml>True</IndentHtml>
<KeepLogFile>False</KeepLogFile>
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
<CppCommentsFixup>False</CppCommentsFixup>
<CleanIntermediates>True</CleanIntermediates>
<SyntaxFilters>CSharp</SyntaxFilters>
<SdkLinkTarget>Blank</SdkLinkTarget>
<RootNamespaceContainer>False</RootNamespaceContainer>
<PresentationStyle>VS2010</PresentationStyle>
<Preliminary>False</Preliminary>
<NamingMethod>Guid</NamingMethod>
<HelpTitle>Umbraco .Net Class Library</HelpTitle>
<ContentPlacement>AboveNamespaces</ContentPlacement>
<VisibleItems>Attributes, InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected</VisibleItems>
<ComponentConfigurations />
<DocumentationSources>
<DocumentationSource sourceFile="..\..\src\Umbraco.Core\Umbraco.Core.csproj" />
<DocumentationSource sourceFile="..\..\src\Umbraco.Core\bin\Release\Umbraco.Core.xml" />
<DocumentationSource sourceFile="..\..\src\Umbraco.Web\Umbraco.Web.csproj" />
<DocumentationSource sourceFile="..\..\src\Umbraco.Web\bin\Release\umbraco.xml" /></DocumentationSources>
<WebsiteSdkLinkType>None</WebsiteSdkLinkType>
<HtmlSdkLinkType>None</HtmlSdkLinkType>
<IncludeFavorites>False</IncludeFavorites>
<BinaryTOC>True</BinaryTOC>
<MissingTags>Summary, AutoDocumentCtors, AutoDocumentDispose</MissingTags>
<TransformComponentArguments>
<Argument Key="logoFile" Value="" />
<Argument Key="logoHeight" Value="" />
<Argument Key="logoWidth" Value="" />
<Argument Key="logoAltText" Value="" />
<Argument Key="logoPlacement" Value="left" />
<Argument Key="logoAlignment" Value="left" />
</TransformComponentArguments>
<ApiFilter>
<Filter entryType="Namespace" fullName="CookComputing.Blogger" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="CookComputing.MetaWeblog" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="dashboardUtilities" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="presentation.umbraco.webservices" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco" isExposed="False" xmlns="">
<Filter entryType="Class" fullName="umbraco.content" filterName="content" isExposed="True" />
<Filter entryType="Delegate" fullName="umbraco.content.ContentCacheDatabaseLoadXmlStringEventHandler" filterName="content.ContentCacheDatabaseLoadXmlStringEventHandler" isExposed="False" />
<Filter entryType="Delegate" fullName="umbraco.content.ContentCacheLoadNodeEventHandler" filterName="content.ContentCacheLoadNodeEventHandler" isExposed="False" />
<Filter entryType="Delegate" fullName="umbraco.content.DocumentCacheEventHandler" filterName="content.DocumentCacheEventHandler" isExposed="False" />
<Filter entryType="Delegate" fullName="umbraco.content.RefreshContentEventHandler" filterName="content.RefreshContentEventHandler" isExposed="False" />
<Filter entryType="Class" fullName="umbraco.ContentExtensions" filterName="ContentExtensions" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.ContentTypeExtensions" filterName="ContentTypeExtensions" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.item" filterName="item" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.library" filterName="library" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.macro" filterName="macro" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.MacroCacheContent" filterName="MacroCacheContent" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.MacroRenderingEventArgs" filterName="MacroRenderingEventArgs" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.MediaExtensions" filterName="MediaExtensions" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.MemberExtensions" filterName="MemberExtensions" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.page" filterName="page" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.PreValueExtensions" filterName="PreValueExtensions" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.RelationTypeExtensions" filterName="RelationTypeExtensions" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.template" filterName="template" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.UmbracoObjectTypeExtensions" filterName="UmbracoObjectTypeExtensions" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.uQuery" filterName="uQuery" isExposed="True" />
<Filter entryType="Interface" fullName="umbraco.uQuery.IGetProperty" filterName="uQuery.IGetProperty" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.uQuery.Members" filterName="uQuery.Members" isExposed="True" />
<Filter entryType="Enumeration" fullName="umbraco.uQuery.UmbracoObjectType" filterName="uQuery.UmbracoObjectType" isExposed="True" />
</Filter>
<Filter entryType="Namespace" fullName="umbraco.cms.presentation" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.cms.presentation.create.controls" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.cms.presentation.developer" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.cms.presentation.developer.RelationTypes" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.cms.presentation.developer.RelationTypes.TreeMenu" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.cms.presentation.members" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings.modal" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings.scripts" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.cms.presentation.settings.stylesheet" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.cms.presentation.user" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.controls" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.controls.GenericProperties" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.controls.Images" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.controls.Tree" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.developer" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.dialogs" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.js" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.layoutControls" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.NodeFactory" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.actions" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.channels" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.channels.businesslogic" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.create" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.developer.packages" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.dialogs" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.masterpages" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.members" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.nodeFactory" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.org.umbraco.update" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.plugins.tinymce3" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.preview" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.Search" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.settings" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.templateControls" isExposed="False" xmlns="">
<Filter entryType="Class" fullName="umbraco.presentation.templateControls.Item" filterName="Item" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.presentation.templateControls.ItemRenderer" filterName="ItemRenderer" isExposed="True" />
<Filter entryType="Class" fullName="umbraco.presentation.templateControls.Macro" filterName="Macro" isExposed="True" />
<Filter entryType="Enumeration" fullName="umbraco.presentation.templateControls.Macro.RenderEvents" filterName="Macro.RenderEvents" isExposed="False" />
</Filter>
<Filter entryType="Namespace" fullName="umbraco.presentation.tinymce3" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.translation" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.channels" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.controls" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.create" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.developer.Xslt" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.dialogs" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.masterpages" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.members" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.plugins.tinymce3" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.Search" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.translation" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco.webservices" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.urlRewriter" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.Web.UI" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.presentation.webservices" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.scripting" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.settings" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="Umbraco.Web.org.umbraco.our" isExposed="False" xmlns="" />
<Filter entryType="Namespace" fullName="umbraco.webservices" isExposed="False" xmlns="" /></ApiFilter>
</PropertyGroup>
<!-- There are no properties for these groups. AnyCPU needs to appear in
order for Visual Studio to perform the build. The others are optional
common platform types that may appear. -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
</PropertyGroup>
<!-- Import the SHFB build targets -->
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
</Project>
+75 -25
View File
@@ -1,25 +1,75 @@
@ECHO OFF
set version=4.11.9
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%version%
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\macroScripts\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\xslt\dummy.txt
NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
if ERRORLEVEL 1 goto :showerror
goto :EOF
:showerror
pause
@ECHO OFF
IF NOT EXIST UmbracoVersion.txt (
ECHO UmbracoVersion.txt missing!
GOTO :showerror
)
REM Get the version and comment from UmbracoVersion.txt lines 2 and 3
SET "release="
SET "comment="
FOR /F "skip=1 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED release SET "release=%%i"
FOR /F "skip=2 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED comment SET "comment=%%i"
REM If there's arguments on the command line overrule UmbracoVersion.txt and use that as the version
IF [%1] NEQ [] (SET release=%1)
IF [%2] NEQ [] (SET comment=%2) ELSE (IF [%1] NEQ [] (SET "comment="))
SET version=%release%
IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
ECHO Building Umbraco %version%
ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%
ECHO Installing the Microsoft.Bcl.Build package before anything else, otherwise you'd have to run build.cmd twice
SET nuGetFolder=%CD%\..\src\packages\
..\src\.nuget\NuGet.exe sources Remove -Name MyGetUmbracoCore
..\src\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder%
..\src\.nuget\NuGet.exe install ..\src\umbraco.businesslogic\packages.config -OutputDirectory %nuGetFolder%
..\src\.nuget\NuGet.exe install ..\src\Umbraco.Core\packages.config -OutputDirectory %nuGetFolder%
ECHO Removing the belle build folder to make sure everything is clean as a whistle
RD ..\src\Umbraco.Web.UI.Client\build /Q /S
ECHO Removing existing built files to make sure everything is clean as a whistle
RMDIR /Q /S _BuildOutput
DEL /F /Q UmbracoCms.*.zip
DEL /F /Q UmbracoExamine.*.zip
DEL /F /Q UmbracoCms.*.nupkg
DEL /F /Q webpihash.txt
ECHO Making sure Git is in the path so that the build can succeed
CALL InstallGit.cmd
ECHO Performing MSBuild and producing Umbraco binaries zip files
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
ECHO Adding dummy files to include in the NuGet package so that empty folders actually get created
SET dummytext=This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete.
ECHO %dummytext% > .\_BuildOutput\WebApp\App_Code\dummy.txt
ECHO %dummytext% > .\_BuildOutput\WebApp\App_Data\dummy.txt
ECHO %dummytext% > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
ECHO %dummytext% > .\_BuildOutput\WebApp\css\dummy.txt
ECHO %dummytext% > .\_BuildOutput\WebApp\masterpages\dummy.txt
ECHO %dummytext% > .\_BuildOutput\WebApp\media\dummy.txt
ECHO %dummytext% > .\_BuildOutput\WebApp\scripts\dummy.txt
ECHO %dummytext% > .\_BuildOutput\WebApp\usercontrols\dummy.txt
ECHO %dummytext% > .\_BuildOutput\WebApp\Views\Partials\dummy.txt
ECHO %dummytext% > .\_BuildOutput\WebApp\Views\MacroPartials\dummy.txt
ECHO Adding Web.config transform files to the NuGet package
REN .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform
REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform
ECHO Packing the NuGet release files
..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version%
..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoExamine.PDF.nuspec
IF ERRORLEVEL 1 GOTO :showerror
GOTO :EOF
:showerror
PAUSE
+298 -182
View File
@@ -1,222 +1,338 @@
<Project InitialTargets="Build" DefaultTargets="AfterBuild" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
****************************************************
INCLUDES
*****************************************************
-->
<PropertyGroup>
<MSBuildCommunityTasksPath>..\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
<UmbracoMSBuildTasksPath>..\UmbracoMSBuildTasks</UmbracoMSBuildTasksPath>
</PropertyGroup>
<Import Project="..\tools\UmbracoMSBuildTasks\Umbraco.MSBuild.Tasks.Targets" />
<Import Project="..\tools\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
<PropertyGroup>
<MSBuildCommunityTasksPath>..\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
<UmbracoMSBuildTasksPath>..\UmbracoMSBuildTasks</UmbracoMSBuildTasksPath>
</PropertyGroup>
<!--
<Import Project="..\tools\UmbracoMSBuildTasks\Umbraco.MSBuild.Tasks.Targets" />
<Import Project="..\tools\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
<UsingTask TaskName="GenerateHash" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<InputFiles ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
<OutputFile ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Using Namespace="System.IO" />
<Using Namespace="System.Linq" />
<Using Namespace="System.Security.Cryptography" />
<Code Type="Fragment" Language="cs">
<![CDATA[
using (var ms = new MemoryStream())
{
foreach (var item in InputFiles)
{
string path = item.ItemSpec;
using (FileStream stream = new FileStream(path, FileMode.Open))
{
using (var cryptoProvider = new SHA1CryptoServiceProvider())
{
var fileHash = cryptoProvider.ComputeHash(stream);
using (TextWriter w = new StreamWriter(OutputFile, false))
{
w.WriteLine(string.Join("", fileHash.Select(b => b.ToString("x2"))));
}
}
}
}
}
]]>
</Code>
</Task>
</UsingTask>
<!--
****************************************************
VARIABLES
*****************************************************
-->
<!-- NB: BUILD_NUMBER is passed in by the build server -->
<PropertyGroup Condition="'$(BUILD_NUMBER)'!=''">
<DECIMAL_BUILD_NUMBER>.$(BUILD_NUMBER)</DECIMAL_BUILD_NUMBER>
</PropertyGroup>
<PropertyGroup Condition="'$(BUILD_RELEASE)'!=''">
<DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)</DECIMAL_BUILD_NUMBER>
</PropertyGroup>
<PropertyGroup>
<BuildConfiguration>Release</BuildConfiguration>
<BuildFolder>_BuildOutput\</BuildFolder>
<BuildZipFileName>UmbracoCms$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileName>
<BuildZipFileNameBin>UmbracoCms.AllBinaries$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameBin>
<BuildZipFileNameWebPi>UmbracoCms.WebPI$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameWebPi>
<IncludeSymbols>False</IncludeSymbols>
<BuildFolderRelativeToProjects>..\..\build\$(BuildFolder)</BuildFolderRelativeToProjects>
<BuildFolderAbsolutePath>$(MSBuildProjectDirectory)\$(BuildFolder)</BuildFolderAbsolutePath>
<SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
<WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
<WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
<SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
<SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)bin\</SolutionBinFolderAbsolutePath>
<WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
<WebAppFolderAbsolutePath>$(BuildFolderAbsolutePath)WebApp\</WebAppFolderAbsolutePath>
<WebPiFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebPi\</WebPiFolderRelativeToProjects>
<WebPiFolderAbsolutePath>$(BuildFolderAbsolutePath)WebPi\</WebPiFolderAbsolutePath>
</PropertyGroup>
<!-- NB: BUILD_NUMBER is passed in by the build server -->
<PropertyGroup Condition="'$(BUILD_NUMBER)'!=''">
<DECIMAL_BUILD_NUMBER>.$(BUILD_NUMBER)</DECIMAL_BUILD_NUMBER>
</PropertyGroup>
<PropertyGroup Condition="'$(BUILD_RELEASE)'!=''">
<DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)</DECIMAL_BUILD_NUMBER>
</PropertyGroup>
<PropertyGroup Condition="'$(BUILD_RELEASE)'!='' AND '$(BUILD_COMMENT)'!=''">
<DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)-$(BUILD_COMMENT)</DECIMAL_BUILD_NUMBER>
</PropertyGroup>
<ItemGroup>
<SystemFolders Include="$(WebAppFolder)App_Plugins" />
<SystemFolders Include="$(WebAppFolder)App_Code" />
<SystemFolders Include="$(WebAppFolder)App_Data" />
<SystemFolders Include="$(WebAppFolder)media" />
<SystemFolders Include="$(WebAppFolder)masterpages" />
<SystemFolders Include="$(WebAppFolder)scripts" />
<SystemFolders Include="$(WebAppFolder)css" />
<SystemFolders Include="$(WebAppFolder)macroScripts" />
<SystemFolders Include="$(WebAppFolder)xslt" />
<SystemFolders Include="$(WebAppFolder)usercontrols" />
</ItemGroup>
<PropertyGroup>
<BuildConfiguration>Release</BuildConfiguration>
<BuildFolder>_BuildOutput\</BuildFolder>
<BuildZipFileName>UmbracoCms$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileName>
<BuildZipFileNameBin>UmbracoCms.AllBinaries$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameBin>
<BuildZipFileNameWebPi>UmbracoCms.WebPI$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameWebPi>
<BuildZipExaminePDFName>UmbracoExamine.PDF.0.6.0.zip</BuildZipExaminePDFName>
<IncludeSymbols>False</IncludeSymbols>
<BuildFolderRelativeToProjects>..\..\build\$(BuildFolder)</BuildFolderRelativeToProjects>
<BuildFolderAbsolutePath>$(MSBuildProjectDirectory)\$(BuildFolder)</BuildFolderAbsolutePath>
<SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
<WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
<WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
<ConfigsFolder>$(BuildFolder)Configs\</ConfigsFolder>
<SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
<SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)bin\</SolutionBinFolderAbsolutePath>
<WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
<WebAppFolderAbsolutePath>$(BuildFolderAbsolutePath)WebApp\</WebAppFolderAbsolutePath>
<WebPiFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebPi\</WebPiFolderRelativeToProjects>
<WebPiFolderAbsolutePath>$(BuildFolderAbsolutePath)WebPi\</WebPiFolderAbsolutePath>
<ExaminePDFPath>$(BuildFolderAbsolutePath)UmbracoExamine.PDF\</ExaminePDFPath>
<ExamineAzurePath>$(BuildFolderAbsolutePath)UmbracoExamine.Azure\</ExamineAzurePath>
<ExaminePDFAzurePath>$(BuildFolderAbsolutePath)UmbracoExamine.PDF.Azure\</ExaminePDFAzurePath>
</PropertyGroup>
<!--
<ItemGroup>
<SystemFolders Include="$(WebAppFolder)App_Plugins" />
<SystemFolders Include="$(WebAppFolder)App_Code" />
<SystemFolders Include="$(WebAppFolder)App_Data" />
<SystemFolders Include="$(WebAppFolder)Media" />
<SystemFolders Include="$(WebAppFolder)Masterpages" />
<SystemFolders Include="$(WebAppFolder)Scripts" />
<SystemFolders Include="$(WebAppFolder)Css" />
<SystemFolders Include="$(WebAppFolder)Xslt" />
<SystemFolders Include="$(WebAppFolder)UserControls" />
<SystemFolders Include="$(WebAppFolder)Views" />
</ItemGroup>
<!--
****************************************************
TARGETS
*****************************************************
-->
<Target Name="Build" DependsOnTargets="ZipWebPiApp">
<Message Text="Build finished" />
<Target Name="Build" DependsOnTargets="GenerateWebPiHash">
<Message Text="Build finished" />
</Target>
<Target Name="CleanUp" DependsOnTargets="ZipWebPiApp">
<Message Text="Deleting $(BuildFolder)" Importance="high" />
<RemoveDir Directories="$(BuildFolder)" />
<Message Text="Finished deleting $(BuildFolder)" Importance="high" />
</Target>
<Target Name="ZipWebPiApp" DependsOnTargets="ZipWebApp" >
<!-- Clean folders -->
<RemoveDir Directories="$(WebPiFolder)" />
<MakeDir Directories="$(WebPiFolder)" />
<MakeDir Directories="$(WebPiFolder)umbraco" />
<!-- Copy fresh built umbraco files -->
<Exec Command="xcopy %22$(WebAppFolderAbsolutePath)*%22 %22$(WebPiFolderAbsolutePath)umbraco%22 /S /E /Y /I" />
<!--<ItemGroup>
<WebAppFiles Include="$(WebAppFolder)\**\*.*" />
</ItemGroup>
<Copy SourceFiles="@(WebAppFiles)"
DestinationFiles="@(WebAppFiles->'$(WebPiFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />-->
<!-- Copy Web Pi template files -->
<Target Name="GenerateWebPiHash" DependsOnTargets="ZipWebPiApp">
<ItemGroup>
<WebPiFiles Include="..\src\WebPi\**\*.*" />
<WebPiFile Include="$(BuildZipFileNameWebPi)" />
</ItemGroup>
<Message Text="Calculating hash for $(BuildZipFileNameWebPi)" />
<GenerateHash InputFiles="@(WebPiFile)" OutputFile="webpihash.txt" />
</Target>
<Copy SourceFiles="@(WebPiFiles)"
DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />
<Target Name="CleanUp" DependsOnTargets="ZipWebPiApp">
<Message Text="Deleting $(BuildFolder)" Importance="high" />
<RemoveDir Directories="$(BuildFolder)" />
<Message Text="Finished deleting $(BuildFolder)" Importance="high" />
</Target>
<!-- Zip the files -->
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22" />
<Target Name="ZipWebPiApp" DependsOnTargets="ZipWebApp" >
<!-- Clean folders -->
<RemoveDir Directories="$(WebPiFolder)" />
<MakeDir Directories="$(WebPiFolder)" />
<MakeDir Directories="$(WebPiFolder)umbraco" />
<!-- Copy fresh built umbraco files -->
<Exec Command="xcopy %22$(WebAppFolderAbsolutePath)*%22 %22$(WebPiFolderAbsolutePath)umbraco%22 /S /E /Y /I" />
<!-- Copy Web Pi template files -->
<ItemGroup>
<WebPiFiles Include="..\src\WebPi\**\*.*" />
</ItemGroup>
<Copy SourceFiles="@(WebPiFiles)"
DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />
<!-- Zip the files -->
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22" />
</Target>
<Target Name="ZipWebApp" DependsOnTargets="ZipUmbracoExaminePDF" >
<Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22" />
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22" />
<Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
</Target>
<Target Name="ZipUmbracoExaminePDF" DependsOnTargets="CreateSystemFolders" >
<Message Text="Starting to zip to $(buildDate)-$(BuildZipExaminePDFName)" Importance="high" />
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipExaminePDFName)%22 %22$(ExaminePDFPath)*%22" />
<Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipExaminePDFName)" Importance="high" />
</Target>
<Target Name="CreateSystemFolders" DependsOnTargets="CopyBelleBuild" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
<MakeDir Directories="@(SystemFolders)" />
</Target>
<Target Name="CopyBelleBuild" DependsOnTargets="CopyLibraries" >
<ItemGroup>
<BelleFiles Include="..\src\Umbraco.Web.UI.Client\build\belle\**\*.*" Exclude="..\src\Umbraco.Web.UI.Client\build\belle\index.html" />
</ItemGroup>
<Copy SourceFiles="@(BelleFiles)"
DestinationFiles="@(BelleFiles->'$(WebAppFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
</Target>
<Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >
<!-- Copy SQL CE -->
<ItemGroup>
<SQLCE4Files
Include="..\src\packages\SqlServerCE.4.0.0.0\**\*.*"
Exclude="..\src\packages\SqlServerCE.4.0.0.0\lib\**\*;..\src\packages\SqlServerCE.4.0.0.0\**\*.nu*"
/>
</ItemGroup>
<Copy SourceFiles="@(SQLCE4Files)"
DestinationFiles="@(SQLCE4Files->'$(SolutionBinFolder)%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
<Copy SourceFiles="@(SQLCE4Files)"
DestinationFiles="@(SQLCE4Files->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
</Target>
<!-- Offset the modified timestamps on all umbraco dlls, as WebResources break if date is in the future, which, due to timezone offsets can happen. -->
<Target Name="OffsetTimestamps" DependsOnTargets="CopyTransformedWebConfig">
<CreateItem Include="$(BuildFolder)**\umbraco.*.dll">
<Output TaskParameter="Include" ItemName="FilesToOffsetTimestamp" />
</CreateItem>
<Message Text="Starting to offset timestamps" Importance="high" />
<Umbraco.MSBuild.Tasks.TimestampOffset Files="@(FilesToOffsetTimestamp)" Offset="-11" />
<Message Text="Finished offsetting timestamps" Importance="high" />
</Target>
<!-- Copy the transformed web.config file to the root -->
<Target Name="CopyTransformedWebConfig" DependsOnTargets="CopyTransformedConfig">
<ItemGroup>
<WebConfigFile Include="..\src\Umbraco.Web.UI\web.$(BuildConfiguration).Config.transformed" />
</ItemGroup>
<Copy SourceFiles="@(WebConfigFile)"
DestinationFiles="$(WebAppFolder)Web.config"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
</Target>
<Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
<Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22" />
<Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22" />
<Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
</Target>
<Target Name="CreateSystemFolders" DependsOnTargets="CopyLibraries" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
<MakeDir Directories="@(SystemFolders)" />
</Target>
<Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >
<!-- Copy SQL CE -->
<ItemGroup>
<SQLCE4Files Include="..\lib\SQLCE4\**\*.*" />
<!-- Copy the config files and rename them to *.config.transform -->
<Target Name="CopyTransformedConfig" DependsOnTargets="CopyXmlDocumentation">
<ItemGroup>
<ConfigFiles Include="$(WebAppFolder)config\*.config;$(WebAppFolder)config\*.js" />
<WebConfigTransformFile Include="$(WebAppFolder)Web.config" />
</ItemGroup>
<Copy SourceFiles="@(SQLCE4Files)"
DestinationFiles="@(SQLCE4Files->'$(SolutionBinFolder)%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
<Copy SourceFiles="@(SQLCE4Files)"
DestinationFiles="@(SQLCE4Files->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
<Copy SourceFiles="@(ConfigFiles)"
DestinationFiles="@(ConfigFiles->'$(ConfigsFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
<Copy SourceFiles="@(WebConfigTransformFile)"
DestinationFiles="$(ConfigsFolder)Web.config.transform"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
</Target>
<!-- Copy WebPages -->
<ItemGroup>
<WebPageFiles Include="..\lib\WebPages\*.dll" />
</ItemGroup>
<!-- Copy the xml documentation to the bin folder -->
<Target Name="CopyXmlDocumentation" DependsOnTargets="CleanupPresentation">
<ItemGroup>
<XmlDocumentationFiles Include="$(SolutionBinFolder)*.xml" />
</ItemGroup>
<Copy SourceFiles="@(WebPageFiles)"
DestinationFiles="@(WebPageFiles->'$(SolutionBinFolder)%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
<Copy SourceFiles="@(WebPageFiles)"
DestinationFiles="@(WebPageFiles->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
</Target>
<Copy SourceFiles="@(XmlDocumentationFiles)"
DestinationFiles="@(XmlDocumentationFiles->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
<Message Text="CopyXmlDocumentation" />
</Target>
<!-- Offset the modified timestamps on all umbraco dlls, as WebResources break if date is in the future, which, due to timezone offsets can happen. -->
<Target Name="OffsetTimestamps" DependsOnTargets="CompileProjects">
<CreateItem Include="$(BuildFolder)**\umbraco.*.dll">
<Output TaskParameter="Include" ItemName="FilesToOffsetTimestamp" />
</CreateItem>
<Message Text="Starting to offset timestamps" Importance="high" />
<Umbraco.MSBuild.Tasks.TimestampOffset Files="@(FilesToOffsetTimestamp)" Offset="-11" />
<Message Text="Finished offsetting timestamps" Importance="high" />
</Target>
<Target Name="CompileProjects" DependsOnTargets="SetVersionNumber">
<!-- Unlike 2010, the VS2012 build targets file doesn't clean up the umbraco.presentation dir, do it manually -->
<Target Name="CleanupPresentation" DependsOnTargets="CompileProjects">
<ItemGroup>
<PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
</ItemGroup>
<RemoveDir Directories="@(PresentationFolderToDelete)" />
</Target>
<Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
<!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
<MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
</MSBuild>
<Target Name="CompileProjects" DependsOnTargets="CompileExternalExamineProjects">
<Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
<!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
<!-- Build the Umbraco.Web.UI project -->
<MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath)" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
</MSBuild>
<!-- DONE -->
<Message Text="Finished compiling projects" Importance="high" />
</Target>
<!--
Now, because of all the circular dependencies we need to build those projects and have them dump their DLLs/assets out to the same folder. Really wish this wasn't the case!
These are: umbraco.editorControls umbraco.MacroEngines
Each of these projects has a post build to put their stuff in the correct location based on the solution and unfortunately for us each
of these projects references the web application! So if we specify an OutDir parameter it will also trigger a web deploy and chuck another
website output in bin/_PublishedWebSites folder. we cannot disable this: http://social.msdn.microsoft.com/forums/en-US/tfsbuild/thread/3ec642ad-2e6d-424c-891a-62f6409da62a/
so we need to just build the project 'in-place' then copy its output to the SolutionBinFolder
-->
<Target Name="CompileExternalExamineProjects" DependsOnTargets="SetVersionNumber">
<Message Text="Building externally shipped examine projects" Importance="high" />
<!-- MACRO ENGINES -->
<Message Text="Compiling MacroEngines project" Importance="high" />
<MSBuild Projects="..\src\umbraco.MacroEngines\umbraco.MacroEngines.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
</MSBuild>
<ItemGroup>
<MacroEngineDll Include="..\src\umbraco.MacroEngines\bin\$(BuildConfiguration)\umbraco.MacroEngines.dll"/>
</ItemGroup>
<Copy SourceFiles="@(MacroEngineDll)"
DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
<Copy SourceFiles="@(MacroEngineDll)"
DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
<!-- First remove old files from the examine builds -->
<ItemGroup>
<FilesToDeleteBeforeBuild Include="$(ExaminePDFPath)*;$(ExamineAzurePath)*"/>
</ItemGroup>
<Delete Files="@(FilesToDeleteBeforeBuild)" />
<!--
Build the UmbracoExamine.PDF.Azure library ... this builds the 3 projects that we want to bundle separately so no need to build each one separately .
We'll just build this one and then manually copy the DLLs to where we want them.
-->
<MSBuild Projects="..\src\UmbracoExamine.PDF.Azure\UmbracoExamine.PDF.Azure.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);PipelineDependsOnBuild=False;OutDir=$(ExaminePDFAzurePath);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
</MSBuild>
<ItemGroup>
<ExaminePDFFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.pdf;$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.xml;$(ExaminePDFAzurePath)**\itextsharp.dll" />
<ExamineAzureFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.pdb;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.xml" />
<ExaminePDFAzureFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.pdb;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.xml" />
</ItemGroup>
<!-- Now copy the built files to their correct deployment folders-->
<Copy SourceFiles="@(ExaminePDFFiles)"
DestinationFolder="$(ExaminePDFPath)"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
<Copy SourceFiles="@(ExamineAzureFiles)"
DestinationFolder="$(ExamineAzurePath)"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false" />
<!-- Then just delete the files we don't want to ship in the UmbracoExamine.Azure.PDF folder -->
<ItemGroup>
<FilesToDeleteAfterBuild Include="$(ExaminePDFAzurePath)*" Exclude="$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.dll;$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.pdb;$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.xml"/>
</ItemGroup>
<Delete Files="@(FilesToDeleteAfterBuild)" />
</Target>
<!-- EDITOR CONTROLS -->
<Message Text="Compiling editorControls project" Importance="high" />
<MSBuild Projects="..\src\umbraco.editorControls\umbraco.editorControls.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
</MSBuild>
<ItemGroup>
<EditorControlsDll Include="..\src\umbraco.editorControls\bin\$(BuildConfiguration)\umbraco.editorControls.dll"/>
</ItemGroup>
<Copy SourceFiles="@(EditorControlsDll)"
DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
<Copy SourceFiles="@(EditorControlsDll)"
DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
<!-- DONE -->
<Message Text="Finished compiling projects" Importance="high" />
</Target>
<Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
<!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
<FileUpdate Files="..\src\Umbraco.Core\Configuration\GlobalSettings.cs"
Regex="(\d+)\.(\d+)\.(\d+)(.(\d+))?(-([a-zA-Z]+))?"
<Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
<PropertyGroup>
<NewVersion>$(BUILD_RELEASE)</NewVersion>
<NewVersion Condition="'$(BUILD_COMMENT)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)</NewVersion>
</PropertyGroup>
<!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
<FileUpdate
Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
Regex="(\d+)\.(\d+)\.(\d+)(.(\d+))?"
ReplacementText="$(BUILD_RELEASE)"/>
</Target>
<Target Name="AfterBuild">
<Message Text="Hi" />
</Target>
<FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
Regex="CurrentComment { get { return &quot;([a-zA-Z]+)?&quot;"
ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)&quot;"/>
<XmlPoke XmlInputPath=".\NuSpecs\build\UmbracoCms.props"
Namespaces="&lt;Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/msbuild/2003' /&gt;"
Query="//x:UmbracoVersion"
Value="$(NewVersion)" />
</Target>
</Project>
+36
View File
@@ -0,0 +1,36 @@
@ECHO OFF
SET release=%1
ECHO Installing Npm NuGet Package
SET nuGetFolder=%CD%\..\src\packages\
ECHO Configured packages folder: %nuGetFolder%
ECHO Current folder: %CD%
%CD%\..\src\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%
for /f "delims=" %%A in ('dir %nuGetFolder%node.js.* /b') do set "nodePath=%nuGetFolder%%%A\"
for /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') do set "npmPath=%nuGetFolder%%%A\tools\"
ECHO Temporarily adding Npm and Node to path
SET oldPath=%PATH%
path=%npmPath%;%nodePath%;%PATH%
ECHO %path%
SET buildFolder=%CD%
ECHO Change directory to %CD%\..\src\Umbraco.Web.UI.Client\
CD %CD%\..\src\Umbraco.Web.UI.Client\
ECHO Do npm install and the grunt build of Belle
call npm install
call npm install -g grunt-cli
call npm install -g bower
call grunt build --buildversion=%release%
ECHO Reset path to what it was before
path=%oldPath%
ECHO Move back to the build folder
CD %buildFolder%
+27
View File
@@ -0,0 +1,27 @@
##We cannot continue if sandcastle is not installed determined by env variable: SHFBROOT
if (-not (Test-Path Env:\SHFBROOT))
{
throw "The docs cannot be build, install Sandcastle help file builder"
}
$PSScriptFilePath = (Get-Item $MyInvocation.MyCommand.Path).FullName
$BuildRoot = Split-Path -Path $PSScriptFilePath -Parent
$OutputPath = Join-Path -Path $BuildRoot -ChildPath "ApiDocs\Output"
$ProjFile = Join-Path -Path $BuildRoot -ChildPath "ApiDocs\csharp-api-docs.shfbproj"
"Building docs with project file: $ProjFile"
$MSBuild = "$Env:SYSTEMROOT\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
# build it!
& $MSBuild "$ProjFile"
# remove files left over
Remove-Item $BuildRoot\* -include csharp-api-docs.shfbproj_*
# copy our custom styles in
Copy-Item $BuildRoot\ApiDocs\TOC.css $OutputPath\TOC.css
""
"Done!"
+33
View File
@@ -0,0 +1,33 @@
@ECHO OFF
SET oldPath=%PATH%
git.exe 2> NUL
if %ERRORLEVEL%==9009 GOTO :trydefaultpath
GOTO :EOF
:trydefaultpath
path=C:\Program Files (x86)\Git\cmd;%PATH%
git.exe 2> NUL
if %ERRORLEVEL%==9009 GOTO :showerror
GOTO :EOF
:showerror
path=%oldPath%
ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\bin
set /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
if %install%==y (
GOTO :installgit
) else (
GOTO :cantcontinue
)
:cantcontinue
ECHO Can't complete the build without Git being in the path. Please add it to be able to continue.
GOTO :EOF
:installgit
ECHO Installing Chocolatey first
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
ECHO Installing Git through Chocolatey
choco install git
path=C:\Program Files (x86)\Git\cmd;%path%
BIN
View File
Binary file not shown.
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>UmbracoCms.Core.AllBinaries</id>
<version>6.1.2</version>
<title>Umbraco Cms Core All Binaries</title>
<authors>Morten Christensen</authors>
<owners>Umbraco HQ</owners>
<licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
<projectUrl>http://umbraco.com/</projectUrl>
<iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Contains the core assemblies and all of the dependant assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
<summary>Contains the core assemblies and all of the dependant assemblies needed to run Umbraco Cms</summary>
<language>en-US</language>
<tags>umbraco</tags>
</metadata>
<files>
<file src="..\_BuildOutput\bin\businesslogic.dll" target="lib\businesslogic.dll" />
<file src="..\_BuildOutput\bin\AutoMapper.dll" target="lib\AutoMapper.dll" />
<file src="..\_BuildOutput\bin\AutoMapper.Net4.dll" target="lib\AutoMapper.Net4.dll" />
<file src="..\_BuildOutput\bin\businesslogic.dll" target="lib\businesslogic.dll" />
<file src="..\_BuildOutput\bin\ClientDependency.Core.dll" target="lib\ClientDependency.Core.dll" />
<file src="..\_BuildOutput\bin\ClientDependency.Core.Mvc.dll" target="lib\ClientDependency.Core.Mvc.dll" />
<file src="..\_BuildOutput\bin\cms.dll" target="lib\cms.dll" />
<file src="..\_BuildOutput\bin\controls.dll" target="lib\controls.dll" />
<file src="..\_BuildOutput\bin\CookComputing.XmlRpcV2.dll" target="lib\CookComputing.XmlRpcV2.dll" />
<file src="..\_BuildOutput\bin\Examine.dll" target="lib\Examine.dll" />
<file src="..\_BuildOutput\bin\HtmlAgilityPack.dll" target="lib\HtmlAgilityPack.dll" />
<file src="..\_BuildOutput\bin\ICSharpCode.SharpZipLib.dll" target="lib\ICSharpCode.SharpZipLib.dll" />
<file src="..\_BuildOutput\bin\ImageProcessor.dll" target="lib\ImageProcessor.dll" />
<file src="..\_BuildOutput\bin\ImageProcessor.Web.dll" target="lib\ImageProcessor.Web.dll" />
<file src="..\_BuildOutput\bin\interfaces.dll" target="lib\interfaces.dll" />
<file src="..\_BuildOutput\bin\log4net.dll" target="lib\log4net.dll" />
<file src="..\_BuildOutput\bin\Lucene.Net.dll" target="lib\Lucene.Net.dll" />
<file src="..\_BuildOutput\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
<file src="..\_BuildOutput\bin\Microsoft.Threading.Tasks.dll" target="lib\Microsoft.Threading.Tasks.dll" />
<file src="..\_BuildOutput\bin\Microsoft.Threading.Tasks.Extensions.dll" target="lib\Microsoft.Threading.Tasks.Extensions.dll" />
<file src="..\_BuildOutput\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
<file src="..\_BuildOutput\bin\Microsoft.Web.Infrastructure.dll" target="lib\Microsoft.Web.Infrastructure.dll" />
<file src="..\_BuildOutput\bin\Microsoft.Web.Mvc.FixedDisplayModes.dll" target="lib\Microsoft.Web.Mvc.FixedDisplayModes.dll" />
<file src="..\_BuildOutput\bin\MiniProfiler.dll" target="lib\MiniProfiler.dll" />
<file src="..\_BuildOutput\bin\MySql.Data.dll" target="lib\MySql.Data.dll" />
<file src="..\_BuildOutput\bin\Newtonsoft.Json.dll" target="lib\Newtonsoft.Json.dll" />
<file src="..\_BuildOutput\bin\NuGet.Core.dll" target="lib\NuGet.Core.dll" />
<file src="..\_BuildOutput\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
<file src="..\_BuildOutput\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
<file src="..\_BuildOutput\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
<file src="..\_BuildOutput\bin\System.Net.Http.dll" target="lib\System.Net.Http.dll" />
<file src="..\_BuildOutput\bin\System.Net.Http.Extensions.dll" target="lib\System.Net.Http.Extensions.dll" />
<file src="..\_BuildOutput\bin\System.Net.Http.Formatting.dll" target="lib\System.Net.Http.Formatting.dll" />
<file src="..\_BuildOutput\bin\System.Net.Http.Primitives.dll" target="lib\System.Net.Http.Primitives.dll" />
<file src="..\_BuildOutput\bin\System.Net.Http.WebRequest.dll" target="lib\System.Net.Http.WebRequest.dll" />
<file src="..\_BuildOutput\bin\System.Web.Helpers.dll" target="lib\System.Web.Helpers.dll" />
<file src="..\_BuildOutput\bin\System.Web.Http.dll" target="lib\System.Web.Http.dll" />
<file src="..\_BuildOutput\bin\System.Web.Http.WebHost.dll" target="lib\System.Web.Http.WebHost.dll" />
<file src="..\_BuildOutput\bin\System.Web.Mvc.dll" target="lib\System.Web.Mvc.dll" />
<file src="..\_BuildOutput\bin\System.Web.Razor.dll" target="lib\System.Web.Razor.dll" />
<file src="..\_BuildOutput\bin\System.Web.WebPages.Administration.dll" target="lib\System.Web.WebPages.Administration.dll" />
<file src="..\_BuildOutput\bin\System.Web.WebPages.Deployment.dll" target="lib\System.Web.WebPages.Deployment.dll" />
<file src="..\_BuildOutput\bin\System.Web.WebPages.dll" target="lib\System.Web.WebPages.dll" />
<file src="..\_BuildOutput\bin\System.Web.WebPages.Razor.dll" target="lib\System.Web.WebPages.Razor.dll" />
<file src="..\_BuildOutput\bin\TidyNet.dll" target="lib\TidyNet.dll" />
<file src="..\_BuildOutput\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
<file src="..\_BuildOutput\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
<file src="..\_BuildOutput\bin\umbraco.dll" target="lib\umbraco.dll" />
<file src="..\_BuildOutput\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
<file src="..\_BuildOutput\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
<file src="..\_BuildOutput\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
<file src="..\_BuildOutput\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
<file src="..\_BuildOutput\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
<file src="..\_BuildOutput\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
</files>
</package>
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>UmbracoCms.Core</id>
<version>7.0.0</version>
<title>Umbraco Cms Core Binaries</title>
<authors>Umbraco HQ</authors>
<owners>Umbraco HQ</owners>
<licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
<projectUrl>http://umbraco.com/</projectUrl>
<iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
<summary>Contains the core assemblies needed to run Umbraco Cms</summary>
<language>en-US</language>
<tags>umbraco</tags>
</metadata>
<files>
<file src="..\..\src\SQLCE4Umbraco\obj\Debug\SQLCE4Umbraco.dll" target="lib" />
<file src="..\..\src\SQLCE4Umbraco\obj\Debug\SQLCE4Umbraco.pdb" target="lib" />
<file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
<file src="..\..\src\umbraco.businesslogic\obj\Debug\businesslogic.dll" target="lib" />
<file src="..\..\src\umbraco.businesslogic\obj\Debug\businesslogic.pdb" target="lib" />
<file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
<file src="..\..\src\umbraco.cms\obj\Debug\cms.dll" target="lib" />
<file src="..\..\src\umbraco.cms\obj\Debug\cms.pdb" target="lib" />
<file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
<file src="..\..\src\umbraco.controls\obj\Debug\controls.dll" target="lib" />
<file src="..\..\src\umbraco.controls\obj\Debug\controls.pdb" target="lib" />
<file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
<file src="..\..\src\umbraco.interfaces\obj\Debug\interfaces.dll" target="lib" />
<file src="..\..\src\umbraco.interfaces\obj\Debug\interfaces.pdb" target="lib" />
<file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
<file src="..\..\src\Umbraco.Core\obj\Debug\Umbraco.Core.dll" target="lib" />
<file src="..\..\src\Umbraco.Core\obj\Debug\Umbraco.Core.pdb" target="lib" />
<file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
<file src="..\..\src\umbraco.datalayer\obj\Debug\umbraco.DataLayer.dll" target="lib" />
<file src="..\..\src\umbraco.datalayer\obj\Debug\umbraco.DataLayer.pdb" target="lib" />
<file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
<file src="..\..\src\umbraco.editorControls\obj\Debug\umbraco.editorControls.dll" target="lib" />
<file src="..\..\src\umbraco.editorControls\obj\Debug\umbraco.editorControls.pdb" target="lib" />
<file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
<file src="..\..\src\umbraco.MacroEngines\obj\Debug\umbraco.MacroEngines.dll" target="lib" />
<file src="..\..\src\umbraco.MacroEngines\obj\Debug\umbraco.MacroEngines.pdb" target="lib" />
<file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
<file src="..\..\src\umbraco.providers\obj\Debug\umbraco.providers.dll" target="lib" />
<file src="..\..\src\umbraco.providers\obj\Debug\umbraco.providers.pdb" target="lib" />
<file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
<file src="..\..\src\Umbraco.Web\obj\Debug\umbraco.dll" target="lib" />
<file src="..\..\src\Umbraco.Web\obj\Debug\umbraco.pdb" target="lib" />
<file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
<file src="..\..\src\bin\Debug\Umbraco.Web.UI.dll" target="lib" />
<file src="..\..\src\bin\Debug\Umbraco.Web.UI.pdb" target="lib" />
<file src="..\..\src\Umbraco.Web.UI\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
<file src="..\..\src\UmbracoExamine\obj\Debug\UmbracoExamine.dll" target="lib" />
<file src="..\..\src\UmbracoExamine\obj\Debug\UmbracoExamine.pdb" target="lib" />
<file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />
</files>
</package>
+59 -45
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-16"?>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>UmbracoCms.Core</id>
<version>$version$</version>
<version>7.0.0</version>
<title>Umbraco Cms Core Binaries</title>
<authors>Morten Christensen</authors>
<authors>Umbraco HQ</authors>
<owners>Umbraco HQ</owners>
<licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
<projectUrl>http://umbraco.com/</projectUrl>
@@ -14,47 +14,61 @@
<summary>Contains the core assemblies needed to run Umbraco Cms</summary>
<language>en-US</language>
<tags>umbraco</tags>
<dependencies>
<dependency id="Microsoft.AspNet.Mvc" version="[4.0.30506.0,5.0.0)" />
<dependency id="Microsoft.AspNet.WebApi" version="[4.0.30506,5.0.0)" />
<dependency id="Microsoft.AspNet.WebApi.WebHost" version="[4.0.30506, 5.0.0)" />
<dependency id="Microsoft.AspNet.WebApi.Core" version="[4.0.30506, 5.0.0)" />
<dependency id="Microsoft.AspNet.WebApi.Client" version="[4.0.30506, 5.0.0)" />
<dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" />
<dependency id="Microsoft.Net.Http" version="[2.0.20710.0, 3.0.0)" />
<dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
<dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
<dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
<dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
<dependency id="MySql.Data" version="[6.6.5]" />
<dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
<dependency id="ClientDependency" version="[1.8.0, 2.0.0)" />
<dependency id="ClientDependency-Mvc" version="[1.8.0, 2.0.0)" />
<dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
<dependency id="Newtonsoft.Json" version="[6.0.5, 7.0.0)" />
<dependency id="Examine" version="[0.1.57, 1.0.0)" />
<dependency id="ImageProcessor" version="[1.9.5, 3.0.0)" />
<dependency id="ImageProcessor.Web" version="[3.3.1, 5.0.0)" />
<dependency id="dotless" version="[1.4.1, 2.0.0)" />
</dependencies>
</metadata>
<files>
<file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
<file src="..\_BuildOutput\WebApp\bin\ClientDependency.Core.dll" target="lib\ClientDependency.Core.dll" />
<file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
<file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
<file src="..\_BuildOutput\WebApp\bin\CookComputing.XmlRpcV2.dll" target="lib\CookComputing.XmlRpcV2.dll" />
<file src="..\_BuildOutput\WebApp\bin\Examine.dll" target="lib\Examine.dll" />
<file src="..\_BuildOutput\WebApp\bin\HtmlAgilityPack.dll" target="lib\HtmlAgilityPack.dll" />
<file src="..\_BuildOutput\WebApp\bin\ICSharpCode.SharpZipLib.dll" target="lib\ICSharpCode.SharpZipLib.dll" />
<file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
<file src="..\_BuildOutput\WebApp\bin\Lucene.Net.dll" target="lib\Lucene.Net.dll" />
<file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
<file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
<file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
<file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Infrastructure.dll" target="lib\Microsoft.Web.Infrastructure.dll" />
<file src="..\_BuildOutput\WebApp\bin\MySql.Data.dll" target="lib\MySql.Data.dll" />
<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.47x.dll" target="lib\Our.Umbraco.uGoLive.47x.dll" />
<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.Checks.dll" target="lib\Our.Umbraco.uGoLive.Checks.dll" />
<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.dll" target="lib\Our.Umbraco.uGoLive.dll" />
<file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
<file src="..\_BuildOutput\WebApp\bin\System.Web.Helpers.dll" target="lib\System.Web.Helpers.dll" />
<file src="..\_BuildOutput\WebApp\bin\System.Web.Razor.dll" target="lib\System.Web.Razor.dll" />
<file src="..\_BuildOutput\WebApp\bin\System.Web.WebPages.Deployment.dll" target="lib\System.Web.WebPages.Deployment.dll" />
<file src="..\_BuildOutput\WebApp\bin\System.Web.WebPages.dll" target="lib\System.Web.WebPages.dll" />
<file src="..\_BuildOutput\WebApp\bin\System.Web.WebPages.Razor.dll" target="lib\System.Web.WebPages.Razor.dll" />
<file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.dll" target="lib\umbraco.macroRenderings.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.XmlSerializers.dll" target="lib\umbraco.XmlSerializers.dll" />
<file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
<file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="Content\bin\amd64" />
<file src="..\_BuildOutput\WebApp\bin\x86\**" target="Content\bin\x86" />
</files>
<files>
<file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
<file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\businesslogic.xml" />
<file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
<file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\cms.xml" />
<file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
<file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\controls.xml" />
<file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
<file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\interfaces.xml" />
<file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
<file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
<file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
<file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
<file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\umbraco.DataLayer.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\umbraco.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
<file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
<file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
<file src="tools\install.core.ps1" target="tools\install.ps1" />
</files>
</package>
+22 -17
View File
@@ -1,46 +1,51 @@
<?xml version="1.0" encoding="utf-16"?>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<metadata minClientVersion="2.8">
<id>UmbracoCms</id>
<version>$version$</version>
<version>7.0.0</version>
<title>Umbraco Cms</title>
<authors>Morten Christensen</authors>
<authors>Umbraco HQ</authors>
<owners>Umbraco HQ</owners>
<licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
<projectUrl>http://umbraco.com/</projectUrl>
<iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Installs Umbraco Cms in your Visual Studio ASP.NET Webforms project</description>
<summary>Installs Umbraco Cms in your Visual Studio ASP.NET Webforms project</summary>
<description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
<summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
<language>en-US</language>
<tags>umbraco</tags>
<dependencies>
<dependency id="UmbracoCms.Core" version="[$version$]" />
<dependency id="Newtonsoft.Json" version="[6.0.5, 7.0.0)" />
</dependencies>
</metadata>
<files>
<file src="..\_BuildOutput\WebApp\config\*.config" target="Content\config" />
<file src="..\_BuildOutput\Configs\**" target="Content\config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
<file src="..\_BuildOutput\WebApp\css\**" target="Content\css" />
<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" />
<file src="..\_BuildOutput\WebApp\masterpages\**" target="Content\masterpages" />
<file src="..\_BuildOutput\WebApp\media\**" target="Content\media" />
<file src="..\_BuildOutput\WebApp\scripts\**" target="Content\scripts" />
<file src="..\_BuildOutput\WebApp\usercontrols\**" target="Content\usercontrols" />
<file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" exclude="..\_BuildOutput\WebApp\Views\Web.config" />
<file src="..\_BuildOutput\WebApp\xslt\**" target="Content\xslt" />
<file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" />
<file src="..\_BuildOutput\WebApp\default.aspx" target="Content\default.aspx" />
<file src="..\_BuildOutput\WebApp\Web.config" target="Content\Web.config" />
<file src="..\_BuildOutput\WebApp\Global.asax" target="Content\Global.asax" />
<file src="..\_BuildOutput\WebApp\Web.config" target="UmbracoFiles\Web.config" />
<file src="..\_BuildOutput\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
<file src="..\_BuildOutput\WebApp\App_Code\**" target="UmbracoFiles\App_Code" />
<file src="..\_BuildOutput\WebApp\App_Data\**" target="UmbracoFiles\App_Data" />
<file src="..\_BuildOutput\WebApp\App_Plugins\**" target="UmbracoFiles\App_Plugins" />
<file src="..\_BuildOutput\WebApp\config\**" target="UmbracoFiles\config" />
<file src="..\_BuildOutput\WebApp\install\**" target="UmbracoFiles\install" />
<file src="..\_BuildOutput\WebApp\App_Plugins\**" target="UmbracoFiles\App_Plugins" />
<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
<file src="..\_BuildOutput\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
<file src="..\_BuildOutput\WebApp\config\splashes\**" target="UmbracoFiles\config\splashes" />
<file src="..\_BuildOutput\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
<file src="..\_BuildOutput\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
<file src="..\_BuildOutput\WebApp\Web.config" target="UmbracoFiles\Web.config" />
<file src="..\_BuildOutput\WebApp\Global.asax" target="UmbracoFiles\Global.asax" />
<file src="tools\install.ps1" target="tools\install.ps1" />
<file src="tools\Readme.txt" target="tools\Readme.txt" />
<file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
<file src="tools\applications.config.install.xdt" target="Content\config\applications.config.install.xdt" />
<file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
<file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
<file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
<file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
<file src="build\**" target="build" />
</files>
</package>
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>UmbracoExamine.PDF</id>
<version>0.7.0</version>
<authors>Umbraco HQ</authors>
<owners>Umbraco HQ</owners>
<licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
<projectUrl>http://umbraco.com/</projectUrl>
<iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>UmbracoExmine.PDF</description>
<tags>umbraco</tags>
<dependencies>
<dependency id="UmbracoCms.Core" version="[7.0.0, 8.0.0)" />
<dependency id="iTextSharp" version="[5.5.3, 6.0.0)" />
</dependencies>
</metadata>
<files>
<file src="..\_BuildOutput\UmbracoExamine.PDF\UmbracoExamine.PDF.dll" target="lib\UmbracoExamine.PDF.dll" />
<file src="..\_BuildOutput\UmbracoExamine.PDF\UmbracoExamine.PDF.XML" target="lib\UmbracoExamine.PDF.XML" />
</files>
</package>
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CopyAllFilesToSingleFolderForPackageDependsOn>
AddUmbracoFilesToOutput;
$(CopyAllFilesToSingleFolderForPackageDependsOn);
</CopyAllFilesToSingleFolderForPackageDependsOn>
<CopyAllFilesToSingleFolderForMsdeployDependsOn>
AddUmbracoFilesToOutput;
$(CopyAllFilesToSingleFolderForPackageDependsOn);
</CopyAllFilesToSingleFolderForMsdeployDependsOn>
</PropertyGroup>
</Project>
+50
View File
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
<PropertyGroup>
<UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
</PropertyGroup>
<ItemGroup>
<UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
</ItemGroup>
<Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<Target Name="AddUmbracoFilesToOutput">
<!-- With help from: http://blog.samstephens.co.nz/2010-10-18/msbuild-including-extra-files-multiple-builds/ -->
<ItemGroup>
<CustomFilesToInclude Include=".\App_Browsers\**\*">
<Dir>App_Browsers</Dir>
</CustomFilesToInclude>
<CustomFilesToInclude Include=".\App_Code\**\*">
<Dir>App_Code</Dir>
</CustomFilesToInclude>
<CustomFilesToInclude Include=".\App_Plugins\**\*">
<Dir>App_Plugins</Dir>
</CustomFilesToInclude>
<CustomFilesToInclude Include=".\bin\amd64\**\*">
<Dir>bin\amd64</Dir>
</CustomFilesToInclude>
<CustomFilesToInclude Include=".\bin\x86\**\*">
<Dir>bin\x86</Dir>
</CustomFilesToInclude>
<CustomFilesToInclude Include=".\Config\Splashes\**\*">
<Dir>Config\Splashes</Dir>
</CustomFilesToInclude>
<CustomFilesToInclude Include=".\data\**\*">
<Dir>data</Dir>
</CustomFilesToInclude>
<CustomFilesToInclude Include=".\umbraco\**\*">
<Dir>umbraco</Dir>
</CustomFilesToInclude>
<CustomFilesToInclude Include=".\umbraco_client\**\*">
<Dir>umbraco_client</Dir>
</CustomFilesToInclude>
<CustomFilesToInclude Include=".\Global.asax">
<Dir>.</Dir>
</CustomFilesToInclude>
<FilesForPackagingFromProject Include="@(CustomFilesToInclude)">
<DestinationRelativePath>%(CustomFilesToInclude.Dir)\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
</ItemGroup>
</Target>
</Project>
@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<clientDependency xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<fileRegistration>
<providers>
<add name="CanvasProvider" xdt:Locator="Match(name)" xdt:Transform="Remove" />
</providers>
</fileRegistration>
</clientDependency>
@@ -0,0 +1,78 @@
<?xml version="1.0"?>
<dashBoard xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)">
<tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
<tab caption="Welcome" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
<control showOnce="true" addPanel="true" panelCaption="" xdt:Transform="InsertIfMissing">
views/dashboard/settings/settingsdashboardintro.html
</control>
</tab>
</section>
<section alias="StartupFormsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
<areas>
<area>forms</area>
</areas>
<tab caption="Install Umbraco Forms">
<control showOnce="true" addPanel="true" panelCaption="">
views/dashboard/forms/formsdashboardintro.html
</control>
</tab>
</section>
<section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)">
<tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Replace">
<control showOnce="true" addPanel="true" panelCaption="">
views/dashboard/developer/developerdashboardvideos.html
</control>
</tab>
<tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
<control>
views/dashboard/developer/examinemanagement.html
</control>
</tab>
</section>
<section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)">
<tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
<tab caption="Content" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing" />
<tab caption="Content" xdt:Locator="Match(caption)" xdt:Transform="Replace">
<control showOnce="false" addPanel="false" panelCaption="">
views/dashboard/media/mediafolderbrowser.html
</control>
</tab>
</section>
<section alias="StartupDashboardSection" xdt:Locator="Match(alias)">
<tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
<tab caption="Get Started" xdt:Transform="Insert">
<access>
<grant>admin</grant>
</access>
<control showOnce="true" addPanel="true" panelCaption="">
views/dashboard/default/startupdashboardintro.html
</control>
</tab>
<tab caption="Change password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
<tab caption="Change Password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
<tab caption="Change Password" xdt:Transform="Insert">
<control showOnce="false" addPanel="false" panelCaption="">
views/dashboard/ChangePassword.html
</control>
</tab>
<tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
</section>
<section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)">
<tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
<tab caption="Get Started" xdt:Transform="Insert">
<control showOnce="true" addPanel="true" panelCaption="">
views/dashboard/members/membersdashboardvideos.html
</control>
</tab>
</section>
<section alias="uGoLiveDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
<section alias="ExamineManagement" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
</dashBoard>
+21 -9
View File
@@ -1,15 +1,27 @@
A note about running Umbraco from Visual Studio.
When upgrading your website using nuget a backup of config files and web.config will be created and the files will
be overwritten with those from the current release. This means that you'll have to merge the files if you made any
changes to the previous config files.
Don't forget to build!
It's not possible to create a deploy package from Visual Studio, which contains everything out of the box. This is
due to a number of files and folders that are not added to the Visual Studio project. These folders include:
install, umbraco and umbraco_client.
A custom deploy script will be added in a later release.
BETA Notice: We've done our best to transform your config files, we are testing this in 7.2 beta and would love to
hear back if it didn't work so we can improve this feature. We'd love to see your before and after config files
(make sure to delete sensitive data like passwords and API keys) in the issue tracker at http://issues.umbraco.org/
Remember, we backed up your files in App_Data\NuGetBackup so you can find the original file before it was transformed.
Please read the release notes on Codeplex:
http://umbraco.codeplex.com/releases
When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config
file (and config files in the config folder).
We've overwritten all the files in the Umbraco and Umbraco_Client folder, these have been backed up in
App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or a package
might have added. Only the existing files were overwritten. If you customized anything then make sure to do a compare
and merge with the NuGetBackup folder.
This nuget package includes build targets that extends the creation of a deploy package, which is generated by
Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
Publish this won't affect you.
These things will now be automatically included when creating a deploy package or publishing to the file system:
umbraco, umbraco_client, config\splashes and global.asax.
Please read the release notes on our.umbraco.org:
http://our.umbraco.org/contribute/releases
- Umbraco
+180
View File
@@ -0,0 +1,180 @@
<?xml version="1.0"?>
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<configSections xdt:Transform="InsertIfMissing" />
<configSections>
<section name="BaseRestExtensions" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<section name="ExamineLuceneIndexSets" type="Examine.LuceneEngine.Config.IndexSets, Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
<sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
<section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
</sectionGroup>
<sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
<section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
<section name="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
<section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
<section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
</sectionGroup>
</configSections>
<appSettings xdt:Transform="InsertIfMissing" />
<appSettings>
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
</appSettings>
<umbracoConfiguration xdt:Transform="InsertIfMissing">
<settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
<BaseRestExtensions configSource="config\BaseRestExtensions.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
<FileSystemProviders configSource="config\FileSystemProviders.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
<dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
</umbracoConfiguration>
<FileSystemProviders xdt:Transform="Remove" />
<BaseRestExtensions xdt:Transform="Remove" />
<system.data xdt:Transform="InsertIfMissing">
<DbProviderFactories xdt:Transform="InsertIfMissing">
<remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
<add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
<remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
</DbProviderFactories>
</system.data>
<clientDependency xdt:Transform="RemoveAttributes(version)" />
<system.web xdt:Transform="InsertIfMissing" />
<system.web>
<siteMap xdt:Transform="Remove" />
<membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
<roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
<profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
<sessionState customProvider="DefaultSessionProvider" xdt:Locator="Match(customProvider)" xdt:Transform="Remove"/>
<compilation xdt:Transform="InsertIfMissing" />
<compilation>
<assemblies xdt:Transform="InsertIfMissing" />
<assemblies>
<add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)"
xdt:Transform="InsertIfMissing" />
<add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
<add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
<add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
<add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
<add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
<add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
<add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
<add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
</assemblies>
</compilation>
<compilation>
<assemblies>
<remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
<remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
</assemblies>
</compilation>
<xhtmlConformance xdt:Transform="Remove" />
<httpModules xdt:Transform="InsertIfMissing" />
<httpModules>
<add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
</httpModules>
<httpHandlers xdt:Transform="InsertIfMissing" />
<httpHandlers>
<add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove" />
</httpHandlers>
</system.web>
<system.webServer xdt:Transform="InsertIfMissing" />
<system.webServer>
<modules xdt:Transform="InsertIfMissing" />
<modules runAllManagedModulesForAllRequests="true" xdt:Transform="SetAttributes(runAllManagedModulesForAllRequests)">
<remove name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<remove name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<remove name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<remove name="WebDAVModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<!-- Inserts it as the first element. Also see http://stackoverflow.com/a/19041487/5018 -->
<remove name="WebDAVModule" xdt:Locator="Match(name)" xdt:Transform="Insert" />
<add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
</modules>
<staticContent xdt:Transform="InsertIfMissing" />
<staticContent>
<remove fileExtension=".svg" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
<remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
<remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
<mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
</staticContent>
<handlers>
<remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
<add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
</handlers>
</system.webServer>
<system.codedom xdt:Transform="Remove" />
<runtime xdt:Transform="InsertIfMissing" />
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
</runtime>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
<dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
<dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
</assemblyBinding>
</runtime>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly xdt:Transform="Insert">
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly xdt:Transform="Insert">
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly xdt:Transform="Insert">
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.web.webPages.razor xdt:Transform="Remove" />
<location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
<location path="umbraco" xdt:Locator="Match(path)">
<system.webServer xdt:Transform="InsertIfMissing">
<urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
</system.webServer>
</location>
<location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
<location path="App_Plugins" xdt:Locator="Match(path)">
<system.webServer xdt:Transform="InsertIfMissing">
<urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
</system.webServer>
</location>
</configuration>
@@ -0,0 +1,11 @@
<?xml version="1.0"?>
<applications xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<add alias="content" icon="traycontent" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="media" icon="traymedia" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="settings" icon="traysettings" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="developer" icon="traydeveloper" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="users" icon="trayusers" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="member" icon="traymember" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="forms" name="Forms" icon="icon-umb-contour" sortOrder="6" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing" />
<add alias="translation" icon="traytranslation" sortOrder="7" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon,sortOrder)" />
</applications>
+76
View File
@@ -0,0 +1,76 @@
param($rootPath, $toolsPath, $package, $project)
if ($project) {
$dateTime = Get-Date -Format yyyyMMdd-HHmmss
$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime"
$copyLogsPath = Join-Path $backupPath "CopyLogs"
$projectDestinationPath = Split-Path $project.FullName -Parent
# Create backup folder and logs folder if it doesn't exist yet
New-Item -ItemType Directory -Force -Path $backupPath
New-Item -ItemType Directory -Force -Path $copyLogsPath
# After backing up, remove all umbraco dlls from bin folder in case dll files are included in the VS project
# See: http://issues.umbraco.org/issue/U4-4930
$umbracoBinFolder = Join-Path $projectDestinationPath "bin"
if(Test-Path $umbracoBinFolder) {
$umbracoBinBackupPath = Join-Path $backupPath "bin"
New-Item -ItemType Directory -Force -Path $umbracoBinBackupPath
robocopy $umbracoBinFolder $umbracoBinBackupPath /e /LOG:$copyLogsPath\UmbracoBinBackup.log
# Delete files Umbraco brings in
if(Test-Path $umbracoBinFolder\businesslogic.dll) { Remove-Item $umbracoBinFolder\businesslogic.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\cms.dll) { Remove-Item $umbracoBinFolder\cms.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\controls.dll) { Remove-Item $umbracoBinFolder\controls.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\interfaces.dll) { Remove-Item $umbracoBinFolder\interfaces.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\log4net.dll) { Remove-Item $umbracoBinFolder\log4net.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll) { Remove-Item $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Microsoft.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Helpers.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\SQLCE4Umbraco.dll) { Remove-Item $umbracoBinFolder\SQLCE4Umbraco.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\TidyNet.dll) { Remove-Item $umbracoBinFolder\TidyNet.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\umbraco.dll) { Remove-Item $umbracoBinFolder\umbraco.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Umbraco.Core.dll) { Remove-Item $umbracoBinFolder\Umbraco.Core.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\umbraco.DataLayer.dll) { Remove-Item $umbracoBinFolder\umbraco.DataLayer.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\umbraco.editorControls.dll) { Remove-Item $umbracoBinFolder\umbraco.editorControls.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\umbraco.MacroEngines.dll) { Remove-Item $umbracoBinFolder\umbraco.MacroEngines.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\umbraco.providers.dll) { Remove-Item $umbracoBinFolder\umbraco.providers.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Umbraco.Web.UI.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.UI.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\UmbracoExamine.dll) { Remove-Item $umbracoBinFolder\UmbracoExamine.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\UrlRewritingNet.UrlRewriter.dll) { Remove-Item $umbracoBinFolder\UrlRewritingNet.UrlRewriter.dll -Force -Confirm:$false }
# Delete files Umbraco depends upon
$amd64Folder = Join-Path $projectDestinationPath "bin\amd64"
if(Test-Path $amd64Folder) { Remove-Item $amd64Folder -Force -Recurse -Confirm:$false }
$x86Folder = Join-Path $projectDestinationPath "bin\x86"
if(Test-Path $x86Folder) { Remove-Item $x86Folder -Force -Recurse -Confirm:$false }
if(Test-Path $umbracoBinFolder\AutoMapper.dll) { Remove-Item $umbracoBinFolder\AutoMapper.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\AutoMapper.Net4.dll) { Remove-Item $umbracoBinFolder\AutoMapper.Net4.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\ClientDependency.Core.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\ClientDependency.Core.Mvc.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.Mvc.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\CookComputing.XmlRpcV2.dll) { Remove-Item $umbracoBinFolder\CookComputing.XmlRpcV2.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Examine.dll) { Remove-Item $umbracoBinFolder\Examine.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\HtmlAgilityPack.dll) { Remove-Item $umbracoBinFolder\HtmlAgilityPack.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\ICSharpCode.SharpZipLib.dll) { Remove-Item $umbracoBinFolder\ICSharpCode.SharpZipLib.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\ImageProcessor.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\ImageProcessor.Web.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.Web.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Lucene.Net.dll) { Remove-Item $umbracoBinFolder\Lucene.Net.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Microsoft.Web.Infrastructure.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Infrastructure.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\MiniProfiler.dll) { Remove-Item $umbracoBinFolder\MiniProfiler.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\MySql.Data.dll) { Remove-Item $umbracoBinFolder\MySql.Data.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\Newtonsoft.Json.dll) { Remove-Item $umbracoBinFolder\Newtonsoft.Json.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Net.Http.Formatting.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Formatting.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\System.Web.Helpers.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Web.Http.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Web.Http.WebHost.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.WebHost.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Web.Mvc.dll) { Remove-Item $umbracoBinFolder\System.Web.Mvc.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Web.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.Razor.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Web.WebPages.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Web.WebPages.Deployment.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Deployment.dll -Force -Confirm:$false }
if(Test-Path $umbracoBinFolder\System.Web.WebPages.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Razor.dll -Force -Confirm:$false }
}
}
+149 -19
View File
@@ -1,24 +1,154 @@
param($rootPath, $toolsPath, $package, $project)
if ($project) {
# Create a backup of extisting umbraco config files
$configPath = Join-Path (Split-Path $project.FullName -Parent) "\config"
$backupPath = Join-Path $configPath "\backup"
Get-ChildItem -path $configPath |
Where -filterscript {($_.Name.EndsWith("config"))} | Foreach-Object {
$newFileName = Join-Path $backupPath $_.Name.replace(".config",".config.backup")
New-Item -ItemType File -Path $newFileName -Force
Copy-Item $_.FullName $newFileName -Force
}
# Create a backup of original web.config
if ($project) {
$dateTime = Get-Date -Format yyyyMMdd-HHmmss
$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime"
$copyLogsPath = Join-Path $backupPath "CopyLogs"
$projectDestinationPath = Split-Path $project.FullName -Parent
$webConfigSource = Join-Path $projectDestinationPath "web.config"
$webConfigDestination = Join-Path $projectDestinationPath "web.config.backup"
Copy-Item $webConfigSource $webConfigDestination
# Create backup folder and logs folder if it doesn't exist yet
New-Item -ItemType Directory -Force -Path $backupPath
New-Item -ItemType Directory -Force -Path $copyLogsPath
# Copy umbraco files from package to project folder
$projectDestinationPath = Split-Path $project.FullName -Parent
$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\*"
Copy-Item $umbracoFilesPath $projectDestinationPath -recurse -force
# Create a backup of original web.config
$webConfigSource = Join-Path $projectDestinationPath "Web.config"
Copy-Item $webConfigSource $backupPath -Force
# Backup config files folder
$configFolder = Join-Path $projectDestinationPath "Config"
if(Test-Path $configFolder) {
$umbracoBackupPath = Join-Path $backupPath "Config"
New-Item -ItemType Directory -Force -Path $umbracoBackupPath
robocopy $configFolder $umbracoBackupPath /e /LOG:$copyLogsPath\ConfigBackup.log
}
# Copy umbraco and umbraco_files from package to project folder
# This is only done when these folders already exist because we
# only want to do this for upgrades
$umbracoFolder = Join-Path $projectDestinationPath "Umbraco"
if(Test-Path $umbracoFolder) {
$umbracoFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco"
$umbracoBackupPath = Join-Path $backupPath "Umbraco"
New-Item -ItemType Directory -Force -Path $umbracoBackupPath
robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
}
$umbracoClientFolder = Join-Path $projectDestinationPath "Umbraco_Client"
if(Test-Path $umbracoClientFolder) {
$umbracoClientFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco_Client"
$umbracoClientBackupPath = Join-Path $backupPath "Umbraco_Client"
New-Item -ItemType Directory -Force -Path $umbracoClientBackupPath
robocopy $umbracoClientFolder $umbracoClientBackupPath /e /LOG:$copyLogsPath\UmbracoClientBackup.log
robocopy $umbracoClientFolderSource $umbracoClientFolder /is /it /e /LOG:$copyLogsPath\UmbracoClientCopy.log
}
$copyWebconfig = $false
try
{
# SJ - What can I say: big up for James Newton King for teaching us a hack for detecting if this is a new install vs. an upgrade!
# https://github.com/JamesNK/Newtonsoft.Json/pull/387 - would never have seen this without the controversial pull request..
$dte2 = Get-Interface $dte ([EnvDTE80.DTE2])
if ($dte2.ActiveWindow.Caption -eq "Package Manager Console")
{
# user is installing from VS NuGet console
# get reference to the window, the console host and the input history
# copy web.config if "install-package UmbracoCms" was last input
$consoleWindow = $(Get-VSComponentModel).GetService([NuGetConsole.IPowerConsoleWindow])
$props = $consoleWindow.GetType().GetProperties([System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic)
$prop = $props | ? { $_.Name -eq "ActiveHostInfo" } | select -first 1
if ($prop -eq $null) { return }
$hostInfo = $prop.GetValue($consoleWindow)
if ($hostInfo -eq $null) { return }
$history = $hostInfo.WpfConsole.InputHistory.History
$lastCommand = $history | select -last 1
if ($lastCommand)
{
$lastCommand = $lastCommand.Trim().ToLower()
if ($lastCommand.StartsWith("install-package") -and $lastCommand.Contains("umbracocms"))
{
$copyWebconfig = $true
}
}
}
else
{
# user is installing from VS NuGet dialog
# get reference to the window, then smart output console provider
# copy web.config if messages in buffered console contains "installing...UmbracoCms" in last operation
$instanceField = [NuGet.Dialog.PackageManagerWindow].GetField("CurrentInstance", [System.Reflection.BindingFlags]::Static -bor [System.Reflection.BindingFlags]::NonPublic)
$consoleField = [NuGet.Dialog.PackageManagerWindow].GetField("_smartOutputConsoleProvider", [System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic)
if ($instanceField -eq $null -or $consoleField -eq $null) { return }
$instance = $instanceField.GetValue($null)
if ($instance -eq $null) { return }
$consoleProvider = $consoleField.GetValue($instance)
if ($consoleProvider -eq $null) { return }
$console = $consoleProvider.CreateOutputConsole($false)
$messagesField = $console.GetType().GetField("_messages", [System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic)
if ($messagesField -eq $null) { return }
$messages = $messagesField.GetValue($console)
if ($messages -eq $null) { return }
$operations = $messages -split "=============================="
$lastOperation = $operations | select -last 1
if ($lastOperation)
{
$lastOperation = $lastOperation.ToLower()
$lines = $lastOperation -split "`r`n"
$installMatch = $lines | ? { $_.StartsWith("------- installing...umbracocms ") } | select -first 1
if ($installMatch)
{
$copyWebconfig = $true
}
}
}
}
catch
{
# stop potential errors from bubbling up
$ErrorMessage = $_.Exception.Message
$FailedItem = $_.Exception.ItemName
$installLogFile = Join-Path $projectDestinationPath "NuGetInstallError.log"
$text = "Error occurred: " + $ErrorMessage + " failure: " + $FailedItem
$text | Out-File $installLogFile
}
if($copyWebconfig -eq $true)
{
$packageWebConfigSource = Join-Path $rootPath "UmbracoFiles\Web.config"
$destinationWebConfig = Join-Path $projectDestinationPath "Web.config"
Copy-Item $packageWebConfigSource $destinationWebConfig -Force
}
$installFolder = Join-Path $projectDestinationPath "Install"
if(Test-Path $installFolder) {
Remove-Item $installFolder -Force -Recurse -Confirm:$false
}
# Open readme.txt file
$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
}
@@ -0,0 +1,36 @@
<?xml version="1.0"?>
<trees xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<add initialize="true" sortOrder="0" alias="content" application="content" title="Content" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.ContentTreeController, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add alias="content" xdt:Locator="Match(alias)" xdt:Transform="RemoveAttributes(silent)" />
<add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.ContentRecycleBin, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="settings" alias="templates" title="Templates" type="umbraco.loadTemplates, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add alias="dictionary" xdt:Locator="Match(alias)" xdt:Transform="RemoveAttributes(action)" />
<add application="settings" alias="languages" title="Languages" type="umbraco.loadLanguages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="settings" alias="mediaTypes" title="Media Types" type="umbraco.loadMediaTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="settings" alias="nodeTypes" title="Document Types" type="umbraco.loadNodeTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="7" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add initialize="true" sortOrder="0" alias="datatype" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="users" alias="userTypes" title="User Types" type="umbraco.cms.presentation.Trees.UserTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="users" alias="userPermissions" title="User Permissions" type="umbraco.cms.presentation.Trees.UserPermissions, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="member" alias="memberGroup" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add application="member" alias="memberType" title="Member Types" type="umbraco.loadMemberTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add alias="openTasks" xdt:Locator="Match(alias)" xdt:Transform="RemoveAttributes(action)" />
<add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
<add alias="yourTasks" xdt:Locator="Match(alias)" xdt:Transform="RemoveAttributes(action)" />
<add application="developer" alias="python" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
</trees>
@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<settings xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<content>
<EnableCanvasEditing xdt:Transform="Remove" />
</content>
<webservices xdt:Transform="Remove" />
</settings>
Binary file not shown.
+161
View File
@@ -0,0 +1,161 @@
@ECHO OFF
:choice
set /P c=WARNING! Are you sure you want to continue, this will remove all package files, view files, sqlce database, etc... Press 'Y' to auto-remove all files/folders, 'N' to cancel or 'C' to prompt for each folder removal?
if /I "%c%" EQU "C" goto :prompt
if /I "%c%" EQU "Y" goto :auto
if /I "%c%" EQU "N" goto :exit
goto :choice
:prompt
echo Current folder: %CD%
echo Regenerating SQL CE database
SET buildfolder=%CD%
CD ..\tools\RegenerateUmbracoSQLCEDatabase\
RegenerateUmbracoSQLCEDatabase.exe %CD%\..\..\src\Umbraco.Web.UI
CD %buildfolder%
echo Removing bin files
del ..\src\Umbraco.Web.UI\bin\*.*
echo Building solution
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\umbraco.sln /t:Clean,Build
echo Resetting installedPackages.config
echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
echo Removing plugin cache files
del ..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*
echo Removing cache files and examine index
del ..\src\Umbraco.Web.UI\App_Data\TEMP\*.*
echo Removing log files
del ..\src\Umbraco.Web.UI\App_Data\Logs\*.*
echo Removing packages
del ..\src\Umbraco.Web.UI\App_Data\packages\*.*
echo Removing previews
del ..\src\Umbraco.Web.UI\App_Data\preview\*.*
echo Removing app code files (typically added by starterkits)
del ..\src\Umbraco.Web.UI\App_Code\*.*
echo Removing xslt files
del ..\src\Umbraco.Web.UI\xslt\*.*
echo Removing user control files
del ..\src\Umbraco.Web.UI\UserControls\*.*
echo Removing masterpage files
del ..\src\Umbraco.Web.UI\masterpages\*.*
echo Removing view files
del ..\src\Umbraco.Web.UI\Views\*.*
echo Removing razor files
del ..\src\Umbraco.Web.UI\macroScripts\*.*
echo Removing media files
del ..\src\Umbraco.Web.UI\media\*.*
echo Removing script files
del ..\src\Umbraco.Web.UI\scripts\*.*
echo Removing css files
del ..\src\Umbraco.Web.UI\css\*.*
echo "Umbraco install reverted to clean install"
pause
exit
:auto
echo Current folder: %CD%
echo Regenerating SQL CE database
SET buildfolder=%CD%
CD ..\tools\RegenerateUmbracoSQLCEDatabase\
RegenerateUmbracoSQLCEDatabase.exe %CD%\..\..\src\Umbraco.Web.UI
CD %buildfolder%
echo Removing bin files
FOR %%A IN (..\src\Umbraco.Web.UI\bin\*.*) DO DEL %%A
echo Building solution
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\umbraco.sln /t:Clean,Build
echo Resetting installedPackages.config
echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
echo Removing plugin cache files
FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*) DO DEL %%A
echo Removing cache files and examine index
FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\*.*) DO DEL %%A
echo Removing log files
FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\Logs\*.*) DO DEL %%A
echo Removing packages
FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\packages\*.*) DO DEL %%A
echo Removing previews
FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\preview\*.*) DO DEL %%A
echo Removing app code files (typically added by starterkits)
FOR %%A IN (..\src\Umbraco.Web.UI\App_Code\*.*) DO DEL %%A
echo Removing xslt files
FOR %%A IN (..\src\Umbraco.Web.UI\xslt\*.*) DO DEL %%A
echo Removing masterpage files
FOR %%A IN (..\src\Umbraco.Web.UI\masterpages\*.*) DO DEL %%A
echo Removing user control files
FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A
echo Removing view files
FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A
echo Removing razor files
FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
echo Removing media files
FOR %%A IN (..\src\Umbraco.Web.UI\media\*.*) DO DEL %%A
echo Removing script files
FOR %%A IN (..\src\Umbraco.Web.UI\scripts\*.*) DO DEL %%A
echo Removing css files
FOR %%A IN (..\src\Umbraco.Web.UI\css\*.*) DO DEL %%A
echo Removing Courier files
del ..\src\Umbraco.Web.UI\config\courier.config
del ..\src\Umbraco.Web.UI\umbraco\images\tray\courier.jpg
rmdir "..\src\Umbraco.Web.UI\umbraco\plugins\courier\" /S /Q
echo Removing Contour files
del ..\src\Umbraco.Web.UI\umbraco\images\tray\contour.png
FOR %%A IN (..\src\Umbraco.Web.UI\umbraco\images\umbraco\icon_*.*) DO DEL %%A
rmdir "..\src\Umbraco.Web.UI\umbraco\plugins\umbracoContour\" /S /Q
del ..\src\Umbraco.Web.UI\umbraco\xslt\templates\UmbracoContour*.* /S /Q
rmdir "..\src\Umbraco.Web.UI\usercontrols\umbracoContour\" /S /Q
echo Start with a clean web.config
copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y
echo "Umbraco install reverted to clean install"
pause
exit
:exit
exit
+3
View File
@@ -0,0 +1,3 @@
# Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
7.2.0
RC
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
File diff suppressed because it is too large Load Diff
-7020
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<noInheritable></noInheritable>
<assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.4148" processorArchitecture="amd64" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
<file name="msvcr90.dll" hashalg="SHA1" hash="1b065fdf0cb8516b0553128eae4af39c5f8eeb46"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>Vy8CgQgbu3qH5JHTK0op4kR8114=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="45d3027d87eade77317e92994790598c755b3920"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>QTJu3Gttpt8hhCktGelNeXj4Yp8=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="e77fd69f7c88f34329d8a95c3179f67ead330217"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>1ruqF7/L+m1tqnJVscaOtNRNHIE=</dsig:DigestValue></asmv2:hash></file>
</assembly>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<noInheritable></noInheritable>
<assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.4148" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
<file name="msvcr90.dll" hashalg="SHA1" hash="98e8006e0a4542e69f1a3555b927758bd76ca07d"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>+CXED+6HzJlSphyMNOn27ujadC0=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="3aec3be680024a46813dee891a753bd58b3f3b12"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>MyKED+9DyS+1XcMeaC0Zlw2vFZ0=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="0195dd0896d74b62531e4f3c771904a3d996450e"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>EeyDE7og6WoPd2oBhYbMEnpFHhY=</dsig:DigestValue></asmv2:hash></file>
</assembly>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-636
View File
@@ -1,636 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<doc>
<assembly>
<name>System.Web.Helpers</name>
</assembly>
<members>
<member name="T:System.Web.Helpers.Chart">
<summary>Displays data as a chart image.</summary>
</member>
<member name="M:System.Web.Helpers.Chart.#ctor(System.Int32,System.Int32,System.String,System.String)">
<summary>Initializes a new instance of the <see cref="T:System.Web.Helpers.Chart" /> class.</summary>
<param name="width">The width, in pixels, of the complete chart image.</param>
<param name="height">The height, in pixels, of the complete chart image.</param>
<param name="theme">(Optional) The template (theme) to apply to the chart.</param>
<param name="themePath">(Optional) The template (theme) path and file name to apply to the chart.</param>
</member>
<member name="M:System.Web.Helpers.Chart.AddLegend(System.String,System.String)">
<summary>Adds a legend to the chart.</summary>
<returns>The chart.</returns>
<param name="title">The text of the legend title.</param>
<param name="name">The unique name of the legend.</param>
</member>
<member name="M:System.Web.Helpers.Chart.AddSeries(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Collections.IEnumerable,System.String,System.Collections.IEnumerable,System.String)">
<summary>Provides data points and series attributes for the chart.</summary>
<returns>The chart.</returns>
<param name="name">The unique name of the series.</param>
<param name="chartType">The chart type of a series.</param>
<param name="chartArea">The name of the chart area used to plot the data series.</param>
<param name="axisLabel">The axis label text for the series.</param>
<param name="legend">The name of the series associated with the legend.</param>
<param name="markerStep">A value that determines the granularity to display data point markers.</param>
<param name="xValue">The values to plot along the X-axis.</param>
<param name="xField">The name of the field for X-values.</param>
<param name="yValues">The values to plot along the Y-axis.</param>
<param name="yFields">A comma-separated list of name or names of the field or fields for Y-values.</param>
</member>
<member name="M:System.Web.Helpers.Chart.AddTitle(System.String,System.String)">
<summary>Adds a title to the chart.</summary>
<returns>The chart.</returns>
<param name="text">The title text.</param>
<param name="name">The unique name of the title.</param>
</member>
<member name="M:System.Web.Helpers.Chart.DataBindCrossTable(System.Collections.IEnumerable,System.String,System.String,System.String,System.String,System.String)">
<summary>Databinds a chart to a data table, with one series created per unique value in a column.</summary>
<returns>The chart.</returns>
<param name="dataSource">The chart data source.</param>
<param name="groupByField">The name of the column used to group data into the series.</param>
<param name="xField">The name of the column for X-values.</param>
<param name="yFields">A comma-separated list of names of the columns for Y-values.</param>
<param name="otherFields">Other data point properties that can be bound.</param>
<param name="pointSortOrder">The order in which the series will be sorted. The default is "Ascending".</param>
</member>
<member name="M:System.Web.Helpers.Chart.DataBindTable(System.Collections.IEnumerable,System.String)">
<summary>Creates and binds series data to the specified data table, and optionally populates multiple Y-values.</summary>
<returns>The chart.</returns>
<param name="dataSource">The chart data source.</param>
<param name="xField">The name of the table column used for the series X-values.</param>
</member>
<member name="P:System.Web.Helpers.Chart.FileName">
<summary>Gets or sets the name of the file that contains the chart image.</summary>
<returns>The name of the file.</returns>
</member>
<member name="M:System.Web.Helpers.Chart.GetBytes(System.String)">
<summary>Returns a chart image as a byte array.</summary>
<returns>The chart.</returns>
<param name="format">The image format. The default is "jpeg".</param>
</member>
<member name="M:System.Web.Helpers.Chart.GetFromCache(System.String)">
<summary>Retrieves the specified chart from cache.</summary>
<returns>The chart.</returns>
<param name="key">The identifier of the cache item that contains the chart to retrieve. The key is set when you call the <see cref="M:System.Web.Helpers.Chart.SaveToCache(System.String,System.Int32,System.Boolean)" /> method.</param>
</member>
<member name="P:System.Web.Helpers.Chart.Height">
<summary>Gets or sets the height of the chart image.</summary>
<returns>The chart height.</returns>
</member>
<member name="M:System.Web.Helpers.Chart.Save(System.String,System.String)">
<summary>Saves a chart image to the specified path and file name.</summary>
<returns>The chart.</returns>
<param name="path">The location and name of the image file.</param>
<param name="format">The image file format.</param>
</member>
<member name="M:System.Web.Helpers.Chart.SaveToCache(System.String,System.Int32,System.Boolean)">
<summary>Saves a chart in the system cache.</summary>
<returns>Returns <see cref="T:System.String" />.</returns>
<param name="key">The identifier for the chart in the cache.</param>
<param name="minutesToCache">The number of minutes to keep the chart image in the cache. The default is 20.</param>
<param name="slidingExpiration">true to indicate that the chart cache item's expiration is reset each time the item is accessed, or false to indicate that the expiration is based on an absolute interval since the time that the item was added to the cache. </param>
</member>
<member name="M:System.Web.Helpers.Chart.SaveXml(System.String)">
<summary>Saves a chart as an XML file.</summary>
<returns>The chart.</returns>
<param name="path">The path and filename to save the XML file to.</param>
</member>
<member name="M:System.Web.Helpers.Chart.SetXAxis(System.String,System.Double,System.Double)">
<summary>Sets values for the horizontal axis.</summary>
<returns>The chart.</returns>
<param name="title">The title of the horizontal axis.</param>
<param name="min">The minimum value for the horizontal axis.</param>
<param name="max">The maximum value for the horizontal axis.</param>
</member>
<member name="M:System.Web.Helpers.Chart.SetYAxis(System.String,System.Double,System.Double)">
<summary>Sets values for the vertical axis.</summary>
<returns>The chart.</returns>
<param name="title">The title of the vertical axis.</param>
<param name="min">The minimum value for the vertical axis.</param>
<param name="max">The maximum value for the vertical axis.</param>
</member>
<member name="M:System.Web.Helpers.Chart.ToWebImage(System.String)">
<summary>Creates a <see cref="T:System.Web.Helpers.WebImage" /> object based on the current <see cref="T:System.Web.Helpers.Chart" /> object.</summary>
<returns>The chart.</returns>
<param name="format">The format of the image to save the <see cref="T:System.Web.Helpers.WebImage" /> object as. The default is jpeg.</param>
</member>
<member name="P:System.Web.Helpers.Chart.Width">
<summary>Gets or set the width of the chart image.</summary>
<returns>The chart width.</returns>
</member>
<member name="M:System.Web.Helpers.Chart.Write(System.String)">
<summary>Renders the output of the <see cref="T:System.Web.Helpers.Chart" /> object as an image.</summary>
<returns>The chart.</returns>
<param name="format">The format of the image. The default is "jpeg".</param>
</member>
<member name="M:System.Web.Helpers.Chart.WriteFromCache(System.String,System.String)">
<summary>Renders the output of a <see cref="T:System.Web.Helpers.Chart" /> object that has been cached as an image.</summary>
<returns>The chart.</returns>
<param name="key">The identifier for the chart in the cache.</param>
<param name="format">The format of the image. The default is "jpeg".</param>
</member>
<member name="T:System.Web.Helpers.ChartTheme"></member>
<member name="F:System.Web.Helpers.ChartTheme.Blue"></member>
<member name="F:System.Web.Helpers.ChartTheme.Green"></member>
<member name="F:System.Web.Helpers.ChartTheme.Vanilla"></member>
<member name="F:System.Web.Helpers.ChartTheme.Vanilla3D"></member>
<member name="F:System.Web.Helpers.ChartTheme.Yellow"></member>
<member name="T:System.Web.Helpers.Crypto">
<summary>Provides methods to encrypt passwords or other sensitive data.</summary>
</member>
<member name="M:System.Web.Helpers.Crypto.GenerateSalt(System.Int32)"></member>
<member name="M:System.Web.Helpers.Crypto.Hash(System.Byte[],System.String)">
<summary>Returns a hash value for the specified byte array.</summary>
<returns>The hash value for <paramref name="input" />.</returns>
<param name="input">The data to provide a hash value for.</param>
<param name="algorithm">The algorithm used to generate the hash value. The default is "sha256".</param>
</member>
<member name="M:System.Web.Helpers.Crypto.Hash(System.String,System.String)">
<summary>Returns a hash value for the specified string.</summary>
<returns>The hash value for <paramref name="input" />.</returns>
<param name="input">The data to provide a hash value for.</param>
<param name="algorithm">The algorithm used to generate the hash value. The default is "sha256".</param>
</member>
<member name="M:System.Web.Helpers.Crypto.HashPassword(System.String)">
<summary>Returns a hash value for the specified password.</summary>
<returns>The hash value for <paramref name="password" />.</returns>
<param name="password">The password to generate a hash value for.</param>
</member>
<member name="M:System.Web.Helpers.Crypto.SHA1(System.String)"></member>
<member name="M:System.Web.Helpers.Crypto.SHA256(System.String)"></member>
<member name="M:System.Web.Helpers.Crypto.VerifyHashedPassword(System.String,System.String)"></member>
<member name="T:System.Web.Helpers.DynamicJsonArray"></member>
<member name="M:System.Web.Helpers.DynamicJsonArray.#ctor(System.Object[])"></member>
<member name="M:System.Web.Helpers.DynamicJsonArray.GetEnumerator"></member>
<member name="P:System.Web.Helpers.DynamicJsonArray.Item(System.Int32)"></member>
<member name="P:System.Web.Helpers.DynamicJsonArray.Length"></member>
<member name="M:System.Web.Helpers.DynamicJsonArray.op_Implicit(System.Web.Helpers.DynamicJsonArray)~System.Array"></member>
<member name="M:System.Web.Helpers.DynamicJsonArray.op_Implicit(System.Web.Helpers.DynamicJsonArray)~System.Object[]"></member>
<member name="M:System.Web.Helpers.DynamicJsonArray.System#Collections#Generic#IEnumerable{T}#GetEnumerator"></member>
<member name="M:System.Web.Helpers.DynamicJsonArray.TryConvert(System.Dynamic.ConvertBinder,System.Object@)"></member>
<member name="M:System.Web.Helpers.DynamicJsonArray.TryGetMember(System.Dynamic.GetMemberBinder,System.Object@)"></member>
<member name="T:System.Web.Helpers.DynamicJsonObject"></member>
<member name="M:System.Web.Helpers.DynamicJsonObject.#ctor(System.Collections.Generic.IDictionary{System.String,System.Object})"></member>
<member name="M:System.Web.Helpers.DynamicJsonObject.GetDynamicMemberNames"></member>
<member name="M:System.Web.Helpers.DynamicJsonObject.TryConvert(System.Dynamic.ConvertBinder,System.Object@)"></member>
<member name="M:System.Web.Helpers.DynamicJsonObject.TryGetIndex(System.Dynamic.GetIndexBinder,System.Object[],System.Object@)"></member>
<member name="M:System.Web.Helpers.DynamicJsonObject.TryGetMember(System.Dynamic.GetMemberBinder,System.Object@)"></member>
<member name="M:System.Web.Helpers.DynamicJsonObject.TrySetIndex(System.Dynamic.SetIndexBinder,System.Object[],System.Object)"></member>
<member name="M:System.Web.Helpers.DynamicJsonObject.TrySetMember(System.Dynamic.SetMemberBinder,System.Object)"></member>
<member name="T:System.Web.Helpers.Json">
<summary>Provides methods for working with data in JavaScript Object Notation (JSON) format.</summary>
</member>
<member name="M:System.Web.Helpers.Json.Decode``1(System.String)">
<summary>Converts data in JavaScript Object Notation (JSON) format into the specified strongly typed data list.</summary>
<returns>The JSON-encoded data converted to a strongly typed list.</returns>
<param name="value">The JSON-encoded string to convert.</param>
<typeparam name="T">The type of the strongly typed list to convert JSON data into.</typeparam>
</member>
<member name="M:System.Web.Helpers.Json.Decode(System.String)">
<summary>Converts data in JavaScript Object Notation (JSON) format into a data object.</summary>
<returns>The JSON-encoded data converted to a data object.</returns>
<param name="value">The JSON-encoded string to convert.</param>
</member>
<member name="M:System.Web.Helpers.Json.Decode(System.String,System.Type)">
<summary>Converts data in JavaScript Object Notation (JSON) format into a data object of a specified type.</summary>
<returns>The JSON-encoded data converted to the specified type.</returns>
<param name="value">The JSON-encoded string to convert.</param>
<param name="targetType">The type that the <paramref name="value" /> data should be converted to.</param>
</member>
<member name="M:System.Web.Helpers.Json.Encode(System.Object)">
<summary>Converts a data object to a string that is in the JavaScript Object Notation (JSON) format.</summary>
<returns>Returns a string of data converted to the JSON format.</returns>
<param name="value">The data object to convert.</param>
</member>
<member name="M:System.Web.Helpers.Json.Write(System.Object,System.IO.TextWriter)">
<summary>Converts a data object to a string in JavaScript Object Notation (JSON) format and adds the string to the specified <see cref="T:System.IO.TextWriter" /> object.</summary>
<param name="value">The data object to convert.</param>
<param name="writer">The object that contains the converted JSON data.</param>
</member>
<member name="T:System.Web.Helpers.ObjectInfo">
<summary>Renders the property names and values of the specified object and any subobjects that it references.</summary>
</member>
<member name="M:System.Web.Helpers.ObjectInfo.Print(System.Object,System.Int32,System.Int32)">
<summary>Renders the property names and values of the specified object and any subobjects that it references.</summary>
<returns>For a simple variable, returns the type and the value. For an object that contains multiple items, returns the property name or key, and the value for each property.</returns>
<param name="value">The object to render information for.</param>
<param name="depth">Optional. Specifies the depth of nested subobjects to render information for. The default is 10.</param>
<param name="enumerationLength">Optional. Specifies the maximum number of characters that the method displays for object values. The default is 1000.</param>
<exception cref="T:System.ArgumentOutOfRangeException">
<paramref name="depth" /> is less than zero.</exception>
<exception cref="T:System.ArgumentOutOfRangeException">
<paramref name="enumerationLength" /> is less than or equal to zero.</exception>
</member>
<member name="T:System.Web.Helpers.ServerInfo">
<summary>Displays information about the Web server environment that hosts the current Web page.</summary>
</member>
<member name="M:System.Web.Helpers.ServerInfo.GetHtml">
<summary>Displays information about the Web server environment.</summary>
<returns>A string of name-value pairs that contains information about the Web server. </returns>
</member>
<member name="T:System.Web.Helpers.SortDirection">
<summary>Specifies the direction in which to sort a list of items.</summary>
</member>
<member name="F:System.Web.Helpers.SortDirection.Ascending">
<summary>Sort from smallest to largest. For example, from A to Z.</summary>
</member>
<member name="F:System.Web.Helpers.SortDirection.Descending">
<summary>Sort from largest to smallest. For example, from Z to A.</summary>
</member>
<member name="T:System.Web.Helpers.WebCache">
<summary>Provides a cache to store frequently accessed data.</summary>
</member>
<member name="M:System.Web.Helpers.WebCache.Get(System.String)">
<summary>Retrieves the specified item from the <see cref="T:System.Web.Helpers.WebCache" /> object.</summary>
<returns>The item retrieved from the cache, or null if the item is not found.</returns>
<param name="key">The identifier for the cache item to retrieve.</param>
</member>
<member name="M:System.Web.Helpers.WebCache.Remove(System.String)">
<summary>Removes the specified item from the <see cref="T:System.Web.Helpers.WebCache" /> object.</summary>
<returns>The item removed from the <see cref="T:System.Web.Helpers.WebCache" /> object. If the item is not found, returns null.</returns>
<param name="key">The identifier for the cache item to remove.</param>
</member>
<member name="M:System.Web.Helpers.WebCache.Set(System.String,System.Object,System.Int32,System.Boolean)">
<summary>Inserts an item into the <see cref="T:System.Web.Helpers.WebCache" /> object.</summary>
<param name="key">The identifier for the cache item.</param>
<param name="value">The data to insert into the cache.</param>
<param name="minutesToCache">Optional. The number of minutes to keep an item in the cache. The default is 20.</param>
<param name="slidingExpiration">Optional. true to indicate that the cache item expiration is reset each time the item is accessed, or false to indicate that the expiration is based on an absolute interval since the time that the item was added to the cache. The default is true, which means that, if you also use the default value for the <paramref name="minutesToCache" /> parameter, a cached item expires 20 minutes after it was last accessed.</param>
<exception cref="T:System.ArgumentOutOfRangeException">The value of <paramref name="minutesToCache" /> is less than or equal to zero.</exception>
<exception cref="T:System.ArgumentOutOfRangeException">Sliding expiration is enabled and the value of <paramref name="minutesToCache" /> is greater than a year.</exception>
</member>
<member name="T:System.Web.Helpers.WebGrid">
<summary>Displays data using an HTML table.</summary>
</member>
<member name="M:System.Web.Helpers.WebGrid.#ctor(System.Collections.Generic.IEnumerable{System.Object},System.Collections.Generic.IEnumerable{System.String},System.String,System.Int32,System.Boolean,System.Boolean,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>Initializes a new instance of the <see cref="T:System.Web.Helpers.WebGrid" /> class.</summary>
<param name="source">The data to display.</param>
<param name="columnNames">A collection of data source column names. By default, this value is auto-populated.</param>
<param name="defaultSort">The column name that is used to sort the table by default.</param>
<param name="rowsPerPage">The number of rows that are displayed when paging is displayed. The default is 10.</param>
<param name="canPage">true to specify that the <see cref="T:System.Web.Helpers.WebGrid" /> object can display paging; otherwise false. The default is true. </param>
<param name="canSort">true to specify that the <see cref="T:System.Web.Helpers.WebGrid" /> object can sort based on column; otherwise, false. The default is true.</param>
<param name="ajaxUpdateContainerId">The ID of the HTML element in the <see cref="T:System.Web.Helpers.WebGrid" /> instance that is used for Ajax support in order in order to make partial page updates.</param>
<param name="ajaxUpdateCallback">The JavaScript function to call after the HTML element specified by the <see cref="P:System.Web.Helpers.WebGrid.AjaxUpdateContainerId" /> property has been updated.</param>
<param name="fieldNamePrefix">The prefix for query-string fields. This value is used in order to support multiple T:System.Web.Helpers.WebGrid objects on the same page.</param>
<param name="pageFieldName">The query-string field name for the page number.</param>
<param name="selectionFieldName">The query-string field name for the selected row number.</param>
<param name="sortFieldName">The query-string field name for the sort column.</param>
<param name="sortDirectionFieldName">The query-string field name for the sort direction.</param>
</member>
<member name="P:System.Web.Helpers.WebGrid.AjaxUpdateCallback">
<summary>Gets the name of the JavaScript function to call after the HTML element specified by the <see cref="P:System.Web.Helpers.WebGrid.AjaxUpdateContainerId" /> property has been updated.</summary>
<returns>The element name.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.AjaxUpdateContainerId">
<summary>Gets the ID of the HTML element in the <see cref="T:System.Web.Helpers.WebGrid" /> object that is used for Ajax support in order to make partial-page updates.</summary>
<returns>The element ID.</returns>
</member>
<member name="M:System.Web.Helpers.WebGrid.Bind(System.Collections.Generic.IEnumerable{System.Object},System.Collections.Generic.IEnumerable{System.String},System.Boolean,System.Int32)">
<summary>Binds the specified data to the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
<returns>The populated <see cref="T:System.Web.Helpers.WebGrid" /> object.</returns>
<param name="source">The data to display.</param>
<param name="columnNames">The names of the columns to bind.</param>
<param name="autoSortAndPage">true to enable sorting and paging; otherwise, false.</param>
<param name="rowCount">The number of rows to display for each page of data.</param>
</member>
<member name="M:System.Web.Helpers.WebGrid.Column(System.String,System.String,System.Func`2,System.Boolean,System.Object)">
<summary>Adds a column object to the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
<returns>A column object.</returns>
<param name="columnName">The name of the column.</param>
<param name="header">The header of the column.</param>
<param name="format">A string that specifies the formatting of the column.</param>
<param name="style">A string that specifies the style of the column.</param>
<param name="canSort">true if the column can be sorted; otherwise, false. The default is true.</param>
</member>
<member name="P:System.Web.Helpers.WebGrid.ColumnNames">
<summary>Gets a collection of column names from the data source.</summary>
<returns>The collection of column names.</returns>
</member>
<member name="M:System.Web.Helpers.WebGrid.Columns(System.Web.Helpers.WebGridColumn[])">
<summary>Adds a collection of column objects to the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
<returns>A set of columns.</returns>
<param name="columnSet">The columns to add.</param>
</member>
<member name="P:System.Web.Helpers.WebGrid.FieldNamePrefix">
<summary>Gets the prefix for query-string fields of a page.</summary>
<returns>The prefix for query-string fields.</returns>
</member>
<member name="M:System.Web.Helpers.WebGrid.GetContainerUpdateScript(System.String)">
<summary>Converts a URL into a jQuery Ajax call.</summary>
<returns>A script used as a jQuery Ajax call.</returns>
<param name="path">The URL to convert.</param>
</member>
<member name="M:System.Web.Helpers.WebGrid.GetHtml(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,System.String,System.Collections.Generic.IEnumerable{System.Web.Helpers.WebGridColumn},System.Collections.Generic.IEnumerable{System.String},System.Web.Helpers.WebGridPagerModes,System.String,System.String,System.String,System.String,System.Int32,System.Object)">
<summary>Returns HTML that is used to render the <see cref="T:System.Web.Helpers.WebGrid" /> instance.</summary>
<returns>The HTML that represents the populated <see cref="T:System.Web.Helpers.WebGrid" /> object.</returns>
<param name="tableStyle">The CSS class to use to style the table.</param>
<param name="headerStyle">The CSS class to use to style the header row of the table.</param>
<param name="footerStyle">The CSS class to use to style the footer row of the table.</param>
<param name="rowStyle">The CSS class to use to style each row of the table.</param>
<param name="alternatingRowStyle">The CSS class to use to style the even rows of the table.</param>
<param name="selectedRowStyle">The CSS class to use to style the selected rows of the table.</param>
<param name="caption">The caption for the table.</param>
<param name="displayHeader">true to specify that the header of the table is displayed; otherwise, false. The default is true.</param>
<param name="fillEmptyRows">true to specify that the table can add empty rows to ensure the <see cref="P:System.Web.Helpers.WebGrid.RowsPerPage" /> row count is maintained; otherise, false. The default is false.</param>
<param name="emptyRowCellValue">The text that is used to populate empty rows. The <paramref name="fillEmptyRows" /> parameter must be set to true to display this value.</param>
<param name="columns">The column model for customizing column rendering.</param>
<param name="exclusions">The columns to exclude when auto-populating columns.</param>
<param name="mode">A <see cref="T:System.Web.Helpers.WebGridPagerModes" /> value specifying the mode for rendering paging support.</param>
<param name="firstText">The text for the link to the first page.</param>
<param name="previousText">The text for the link to the previous page.</param>
<param name="nextText">The text for the link to the next page.</param>
<param name="lastText">The text for the link to the last page.</param>
<param name="numericLinksCount">The number of numeric links to display.</param>
<param name="htmlAttributes">An object that contains the HTML attributes to set for the element.</param>
</member>
<member name="M:System.Web.Helpers.WebGrid.GetPageUrl(System.Int32)">
<summary>Returns the URL of the page that the <see cref="T:System.Web.Helpers.WebGrid" /> object will display based on the specified page index.</summary>
<returns>The URL of the page that the <see cref="T:System.Web.Helpers.WebGrid" /> object will display.</returns>
<param name="pageIndex">The index of the page to display.</param>
</member>
<member name="M:System.Web.Helpers.WebGrid.GetSortUrl(System.String)">
<summary>Returns a URL used to display the sorted data in the <see cref="T:System.Web.Helpers.WebGrid" /> object based on a column name.</summary>
<returns>The url used to display the sorted data.</returns>
<param name="column">The name of the column to sort the grid by.</param>
</member>
<member name="P:System.Web.Helpers.WebGrid.HasSelection">
<summary>Gets a value that determines whether any row in the <see cref="T:System.Web.Helpers.WebGrid" /> object has been selected.</summary>
<returns>true if a row has been selected; otherwise, false.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.PageCount">
<summary>Gets the number of pages that the <see cref="T:System.Web.Helpers.WebGrid" /> object has available to display.</summary>
<returns>The page count.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.PageFieldName">
<summary>Gets the query string field name for the page number of the WebGrid.</summary>
<returns>The column name.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.PageIndex">
<summary>Gets or sets the index of the current page to display.</summary>
<returns>The current page index.</returns>
</member>
<member name="M:System.Web.Helpers.WebGrid.Pager(System.Web.Helpers.WebGridPagerModes,System.String,System.String,System.String,System.String,System.Int32)">
<summary>Returns the HTML that is required to provide paging support.</summary>
<param name="mode">A <see cref="T:System.Web.Helpers.WebGridPagerModes" /> value that specifies paging support.</param>
<param name="firstText">The text for the link to the first page.</param>
<param name="previousText">The text for the link to the previous page.</param>
<param name="nextText">The text for the link to the next page.</param>
<param name="lastText">The test for the link to the last page.</param>
<param name="numericLinksCount">The number of numeric links to display.</param>
</member>
<member name="P:System.Web.Helpers.WebGrid.Rows">
<summary>Gets a list of rows that are in the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
<returns>The collection of rows.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.RowsPerPage">
<summary>Gets the number of rows to display on each page.</summary>
<returns>The row count for a page.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.SelectedIndex">
<summary>Gets or sets the index of the selected row.</summary>
<returns>The row index.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.SelectedRow">
<summary>Gets the selected row of the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
<returns>The selected row.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.SelectionFieldName">
<summary>Gets the query string field name for the selected row number of the WebGrid.</summary>
<returns>The name of the selected column.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.SortColumn">
<summary>Gets or sets the name of the column that is used to sort the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
<returns>The name of the sort column.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.SortDirection">
<summary>Gets or sets the direction that the <see cref="T:System.Web.Helpers.WebGrid" /> object is sorted.</summary>
<returns>The sort direction.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.SortDirectionFieldName">
<summary>Gets the query string field name for the sort direction of the WebGrid. </summary>
<returns>The column prefix and name.</returns>
</member>
<member name="P:System.Web.Helpers.WebGrid.SortFieldName">
<summary>Gets the query string field name for the sort column of the WebGrid. </summary>
<returns>The sort column name.</returns>
</member>
<member name="M:System.Web.Helpers.WebGrid.Table(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,System.String,System.Collections.Generic.IEnumerable{System.Web.Helpers.WebGridColumn},System.Collections.Generic.IEnumerable{System.String},System.Func`2,System.Boolean)">
<summary>Returns the HTML that is used to render the <see cref="T:System.Web.Helpers.WebGrid" /> instance that supports paging.</summary>
<returns>The HTML that represents the populated <see cref="T:System.Web.Helpers.WebGrid" /> object.</returns>
<param name="tableStyle">The CSS class to use to style the table.</param>
<param name="headerStyle">The CSS class to use to style the header row.</param>
<param name="footerStyle">The CSS class to use to style the footer row.</param>
<param name="rowStyle">The CSS class to use to style odd rows.</param>
<param name="alternatingRowStyle">The CSS class to use to style even rows.</param>
<param name="selectedRowStyle">The CSS class used to use to style the selected row.</param>
<param name="caption">The caption for the table.</param>
<param name="displayHeader">true to specify that the header of the table is displayed; otherwise, false. The default is true.</param>
<param name="fillEmptyRows">true to specify that the table can add empty rows to ensure the <see cref="P:System.Web.Helpers.WebGrid.RowsPerPage" /> row count is maintained; otherise, false. The default is false.</param>
<param name="emptyRowCellValue">The text that is used to populate empty rows. The <paramref name="fillEmptyRows" /> parameter must be set to true to display this value.</param>
<param name="columns">The column model that is used to customize column rendering.</param>
<param name="exclusions">The columns to exclude when auto-populating columns.</param>
<param name="footer">The table footer template.</param>
<param name="htmlAttributes">An object that contains the HTML attributes to set for the element.</param>
</member>
<member name="P:System.Web.Helpers.WebGrid.TotalRowCount">
<summary>Gets the total row count for the <see cref="T:System.Web.Helpers.WebGrid" /> object.</summary>
<returns>The row count.</returns>
</member>
<member name="T:System.Web.Helpers.WebGridColumn"></member>
<member name="M:System.Web.Helpers.WebGridColumn.#ctor"></member>
<member name="P:System.Web.Helpers.WebGridColumn.CanSort"></member>
<member name="P:System.Web.Helpers.WebGridColumn.ColumnName"></member>
<member name="P:System.Web.Helpers.WebGridColumn.Format"></member>
<member name="P:System.Web.Helpers.WebGridColumn.Header"></member>
<member name="P:System.Web.Helpers.WebGridColumn.Style"></member>
<member name="T:System.Web.Helpers.WebGridPagerModes"></member>
<member name="F:System.Web.Helpers.WebGridPagerModes.Numeric">
<summary />
</member>
<member name="F:System.Web.Helpers.WebGridPagerModes.NextPrevious">
<summary />
</member>
<member name="F:System.Web.Helpers.WebGridPagerModes.FirstLast">
<summary />
</member>
<member name="F:System.Web.Helpers.WebGridPagerModes.All">
<summary />
</member>
<member name="T:System.Web.Helpers.WebGridRow"></member>
<member name="M:System.Web.Helpers.WebGridRow.#ctor(System.Web.Helpers.WebGrid,System.Object,System.Int32)"></member>
<member name="M:System.Web.Helpers.WebGridRow.GetEnumerator"></member>
<member name="M:System.Web.Helpers.WebGridRow.GetSelectLink(System.String)"></member>
<member name="M:System.Web.Helpers.WebGridRow.GetSelectUrl"></member>
<member name="P:System.Web.Helpers.WebGridRow.Item(System.Int32)"></member>
<member name="P:System.Web.Helpers.WebGridRow.Item(System.String)"></member>
<member name="M:System.Web.Helpers.WebGridRow.System#Collections#IEnumerable#GetEnumerator"></member>
<member name="M:System.Web.Helpers.WebGridRow.ToString"></member>
<member name="M:System.Web.Helpers.WebGridRow.TryGetMember(System.Dynamic.GetMemberBinder,System.Object@)"></member>
<member name="P:System.Web.Helpers.WebGridRow.Value"></member>
<member name="P:System.Web.Helpers.WebGridRow.WebGrid"></member>
<member name="T:System.Web.Helpers.WebImage">
<summary>Represents an object that lets you display and manage images in in a Web page.</summary>
</member>
<member name="M:System.Web.Helpers.WebImage.#ctor(System.Byte[])">
<summary>Initializes a new instance of the <see cref="T:System.Web.Helpers.WebImage" /> class using a byte array to represent the image.</summary>
<param name="content">The image.</param>
</member>
<member name="M:System.Web.Helpers.WebImage.#ctor(System.IO.Stream)">
<summary>Initializes a new instance of the <see cref="T:System.Web.Helpers.WebImage" /> class using a stream to represent the image.</summary>
<param name="imageStream">The image.</param>
</member>
<member name="M:System.Web.Helpers.WebImage.#ctor(System.String)">
<summary>Initializes a new instance of the <see cref="T:System.Web.Helpers.WebImage" /> class using a path to represent the image location.</summary>
<param name="filePath">The path of the file that contains the image.</param>
</member>
<member name="M:System.Web.Helpers.WebImage.AddImageWatermark(System.String,System.Int32,System.Int32,System.String,System.String,System.Int32,System.Int32)">
<summary>Adds a watermark image to the image using the specified image file.</summary>
<returns>The image.</returns>
<param name="watermarkImageFilePath">The path of a file that contains the image.</param>
<param name="width">The width, in pixels, of the watermark image.</param>
<param name="height">The height, in pixels, of the watermark image.</param>
<param name="horizontalAlign">The horizontal alignment for watermark image. Values can be left, right, or center.</param>
<param name="verticalAlign">The vertical alignment for the watermark image. Values can be top, bottom, or middle.</param>
<param name="opacity">The opacity for the watermark image, specified as a value between 0 and 100.</param>
<param name="padding">The size, in pixels, of the padding around the watermark image.</param>
</member>
<member name="M:System.Web.Helpers.WebImage.AddImageWatermark(System.Web.Helpers.WebImage,System.Int32,System.Int32,System.String,System.String,System.Int32,System.Int32)">
<summary>Adds a watermark image to the image using the specified <see cref="T:System.Web.Helpers.WebImage" /> object.</summary>
<returns>The image.</returns>
<param name="watermarkImage">A <see cref="T:System.Web.Helpers.WebImage" /> object.</param>
<param name="width">The width, in pixels, of the watermark image.</param>
<param name="height">The height, in pixels, of the watermark image.</param>
<param name="horizontalAlign">The horizontal alignment for watermark image. Values can be left, right, or center.</param>
<param name="verticalAlign">The vertical alignment for the watermark image. Values can be top, bottom, or middle.</param>
<param name="opacity">The opacity for the watermark image specifies as a value between 0 and 100.</param>
<param name="padding">The size, in pixels, of the padding around the watermark image.</param>
</member>
<member name="M:System.Web.Helpers.WebImage.AddTextWatermark(System.String,System.String,System.Int32,System.String,System.String,System.String,System.String,System.Int32,System.Int32)">
<summary>Adds watermark text to the image.</summary>
<returns>The image.</returns>
<param name="text">The text to use as a watermark.</param>
<param name="fontColor">The color of the watermark text.</param>
<param name="fontSize">The font size of the watermark text.</param>
<param name="fontStyle">The font style of the watermark text.</param>
<param name="fontFamily">The font type of the watermark text.</param>
<param name="horizontalAlign">The horizontal alignment for watermark text. Values can be left, right, or center.</param>
<param name="verticalAlign">The vertical alignment for the watermark text. Values can be top, bottom, or middle.</param>
<param name="opacity">The text opacity for the watermark text specified as a value between 0 and 100.</param>
<param name="padding">The size, in pixels, of the padding around the watermark text.</param>
</member>
<member name="M:System.Web.Helpers.WebImage.Clone">
<summary>Copies the <see cref="T:System.Web.Helpers.WebImage" /> object.</summary>
<returns>The image.</returns>
</member>
<member name="M:System.Web.Helpers.WebImage.Crop(System.Int32,System.Int32,System.Int32,System.Int32)">
<summary>Crops an image.</summary>
<returns>The cropped image.</returns>
<param name="top">The number of pixels to remove from the top.</param>
<param name="left">The number of pixels to remove from the left.</param>
<param name="bottom">The number of pixels to remove from the bottom.</param>
<param name="right">The number of pixels to remove from the right.</param>
</member>
<member name="P:System.Web.Helpers.WebImage.FileName">
<summary>Gets or sets the name of the file used by the <see cref="T:System.Web.Helpers.WebImage" /> object.</summary>
<returns>The file name</returns>
</member>
<member name="M:System.Web.Helpers.WebImage.FlipHorizontal">
<summary>Flips an image horizontally.</summary>
<returns>The flipped image.</returns>
</member>
<member name="M:System.Web.Helpers.WebImage.FlipVertical">
<summary>Flips an image vertically.</summary>
<returns>The flipped image.</returns>
</member>
<member name="M:System.Web.Helpers.WebImage.GetBytes(System.String)">
<summary>Returns the image as a byte array.</summary>
<returns>The image.</returns>
<param name="requestedFormat">The <see cref="P:System.Web.Helpers.WebImage.ImageFormat" /> of the <see cref="T:System.Web.Helpers.WebImage" /> object.</param>
</member>
<member name="M:System.Web.Helpers.WebImage.GetImageFromRequest(System.String)">
<summary>Returns an image that has been uploaded using the browser.</summary>
<returns>The image.</returns>
<param name="postedFileName">(Optional) The name of the file that has been posted.</param>
</member>
<member name="P:System.Web.Helpers.WebImage.Height">
<summary>Gets the height, in pixels, of the image.</summary>
<returns>The height.</returns>
</member>
<member name="P:System.Web.Helpers.WebImage.ImageFormat">
<summary>Gets the format of the image (for example, JPEG or PNG).</summary>
<returns>The format.</returns>
</member>
<member name="M:System.Web.Helpers.WebImage.Resize(System.Int32,System.Int32,System.Boolean,System.Boolean)">
<summary>Resizes an image.</summary>
<returns>The resized image.</returns>
<param name="width">The width, in pixels, of the <see cref="T:System.Web.Helpers.WebImage" /> object.</param>
<param name="height">The height, in pixels, of the <see cref="T:System.Web.Helpers.WebImage" /> object.</param>
<param name="preserveAspectRatio">true to preserve the aspect ratio of the image; otherwise, false.</param>
<param name="preventEnlarge">true to prevent the enlargement of the image; otherwise, false.</param>
</member>
<member name="M:System.Web.Helpers.WebImage.RotateLeft">
<summary>Rotates an image to the left.</summary>
<returns>The rotated image.</returns>
</member>
<member name="M:System.Web.Helpers.WebImage.RotateRight">
<summary>Rotates an image to the right.</summary>
<returns>The rotated image.</returns>
</member>
<member name="M:System.Web.Helpers.WebImage.Save(System.String,System.String,System.Boolean)">
<summary>Saves the image using the specified file name.</summary>
<returns>The image.</returns>
<param name="filePath">The path to save the image to.</param>
<param name="imageFormat">The format used when saving the image file.</param>
<param name="forceCorrectExtension">true to force that the correct file extension is used for the format specified in <paramref name="imageFormat" />; otherwise, false.</param>
</member>
<member name="P:System.Web.Helpers.WebImage.Width">
<summary>Gets the width, in pixels, of the image.</summary>
<returns>The width.</returns>
</member>
<member name="M:System.Web.Helpers.WebImage.Write(System.String)">
<summary>Renders an image to the browser to be displayed.</summary>
<returns>The image.</returns>
<param name="requestedFormat">(Optional) The file format.</param>
</member>
<member name="T:System.Web.Helpers.WebMail">
<summary>Provides a way to construct and send an email message using Simple Mail Transfer Protocol (SMTP).</summary>
</member>
<member name="P:System.Web.Helpers.WebMail.EnableSsl">
<summary>Gets or sets whether Secure Sockets Layer (SSL) is used to encrypt the connection when sending email.</summary>
<returns>true if SSL is used to encrypt the connection; otherwise, false.</returns>
</member>
<member name="P:System.Web.Helpers.WebMail.From">
<summary>Gets or sets the email address of the sender.</summary>
<returns>The email address of the sender.</returns>
</member>
<member name="P:System.Web.Helpers.WebMail.Password">
<summary>Gets or sets the senders password based on the email account used.</summary>
<returns>The password of the sender.</returns>
</member>
<member name="M:System.Web.Helpers.WebMail.Send(System.String,System.String,System.String,System.String,System.String,System.Collections.Generic.IEnumerable{System.String},System.Boolean,System.Collections.Generic.IEnumerable{System.String})">
<summary>Sends the specified message to an SMTP server for delivery.</summary>
<param name="to">The recipients of this email message. Multiple recipients can be specified by separating them using a semicolon (;).</param>
<param name="subject">The subject line for the email message.</param>
<param name="body">The body of the email message. If <paramref name="isBodyHtml" /> is true, HTML in the body is interpreted as markup.</param>
<param name="from">The email address of the message sender.</param>
<param name="cc">The carbon copy (CC) recipients for the email message, if any.</param>
<param name="filesToAttach">A collection of file names that specifies the files to attach to the email message.</param>
<param name="isBodyHtml">true to specify that the email message body is in HTML format; false to indicate that the body is in plain-text format.</param>
<param name="additionalHeaders">A collection of headers that are sent with this email message.</param>
</member>
<member name="P:System.Web.Helpers.WebMail.SmtpPort">
<summary>Gets or sets the port used for SMTP transactions.</summary>
<returns>The port used for SMTP transactions.</returns>
</member>
<member name="P:System.Web.Helpers.WebMail.SmtpServer">
<summary>Gets or sets the SMTP server used to transmit the email message.</summary>
<returns>The SMTP server.</returns>
</member>
<member name="P:System.Web.Helpers.WebMail.SmtpUseDefaultCredentials">
<summary>Gets or sets a value that indicates whether the default credentials are sent with the requests.</summary>
<returns>true if credentials are sent with the email message; otherwise, false.</returns>
</member>
<member name="P:System.Web.Helpers.WebMail.UserName">
<summary>Gets or sets the name of email account name used to send email.</summary>
<returns>The name of the user.</returns>
</member>
</members>
</doc>
Binary file not shown.
-866
View File
@@ -1,866 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<doc>
<assembly>
<name>System.Web.Razor</name>
</assembly>
<members>
<member name="T:System.Web.Razor.CSharpRazorCodeLanguage"></member>
<member name="M:System.Web.Razor.CSharpRazorCodeLanguage.#ctor"></member>
<member name="P:System.Web.Razor.CSharpRazorCodeLanguage.CodeDomProviderType"></member>
<member name="M:System.Web.Razor.CSharpRazorCodeLanguage.CreateCodeGenerator(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
<member name="M:System.Web.Razor.CSharpRazorCodeLanguage.CreateCodeParser"></member>
<member name="P:System.Web.Razor.CSharpRazorCodeLanguage.LanguageName"></member>
<member name="T:System.Web.Razor.DocumentParseCompleteEventArgs"></member>
<member name="M:System.Web.Razor.DocumentParseCompleteEventArgs.#ctor"></member>
<member name="P:System.Web.Razor.DocumentParseCompleteEventArgs.GeneratorResults"></member>
<member name="P:System.Web.Razor.DocumentParseCompleteEventArgs.SourceChange"></member>
<member name="P:System.Web.Razor.DocumentParseCompleteEventArgs.TreeStructureChanged"></member>
<member name="T:System.Web.Razor.GeneratorResults"></member>
<member name="M:System.Web.Razor.GeneratorResults.#ctor(System.Boolean,System.Web.Razor.Parser.SyntaxTree.Block,System.Collections.Generic.IList{System.Web.Razor.Parser.SyntaxTree.RazorError},System.CodeDom.CodeCompileUnit,System.Collections.Generic.IDictionary{System.Int32,System.Web.Razor.Generator.GeneratedCodeMapping})"></member>
<member name="M:System.Web.Razor.GeneratorResults.#ctor(System.Web.Razor.Parser.SyntaxTree.Block,System.Collections.Generic.IList{System.Web.Razor.Parser.SyntaxTree.RazorError},System.CodeDom.CodeCompileUnit,System.Collections.Generic.IDictionary{System.Int32,System.Web.Razor.Generator.GeneratedCodeMapping})"></member>
<member name="M:System.Web.Razor.GeneratorResults.#ctor(System.Web.Razor.ParserResults,System.CodeDom.CodeCompileUnit,System.Collections.Generic.IDictionary{System.Int32,System.Web.Razor.Generator.GeneratedCodeMapping})"></member>
<member name="P:System.Web.Razor.GeneratorResults.DesignTimeLineMappings"></member>
<member name="P:System.Web.Razor.GeneratorResults.GeneratedCode"></member>
<member name="T:System.Web.Razor.ParserResults"></member>
<member name="M:System.Web.Razor.ParserResults.#ctor(System.Boolean,System.Web.Razor.Parser.SyntaxTree.Block,System.Collections.Generic.IList{System.Web.Razor.Parser.SyntaxTree.RazorError})"></member>
<member name="M:System.Web.Razor.ParserResults.#ctor(System.Web.Razor.Parser.SyntaxTree.Block,System.Collections.Generic.IList{System.Web.Razor.Parser.SyntaxTree.RazorError})"></member>
<member name="P:System.Web.Razor.ParserResults.Document"></member>
<member name="P:System.Web.Razor.ParserResults.ParserErrors"></member>
<member name="P:System.Web.Razor.ParserResults.Success"></member>
<member name="T:System.Web.Razor.PartialParseResult"></member>
<member name="F:System.Web.Razor.PartialParseResult.Rejected">
<summary />
</member>
<member name="F:System.Web.Razor.PartialParseResult.Accepted">
<summary />
</member>
<member name="F:System.Web.Razor.PartialParseResult.Provisional">
<summary />
</member>
<member name="F:System.Web.Razor.PartialParseResult.SpanContextChanged">
<summary />
</member>
<member name="F:System.Web.Razor.PartialParseResult.AutoCompleteBlock">
<summary />
</member>
<member name="T:System.Web.Razor.RazorCodeLanguage"></member>
<member name="M:System.Web.Razor.RazorCodeLanguage.#ctor"></member>
<member name="P:System.Web.Razor.RazorCodeLanguage.CodeDomProviderType"></member>
<member name="M:System.Web.Razor.RazorCodeLanguage.CreateCodeGenerator(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
<member name="M:System.Web.Razor.RazorCodeLanguage.CreateCodeParser"></member>
<member name="M:System.Web.Razor.RazorCodeLanguage.GetLanguageByExtension(System.String)"></member>
<member name="P:System.Web.Razor.RazorCodeLanguage.LanguageName"></member>
<member name="P:System.Web.Razor.RazorCodeLanguage.Languages"></member>
<member name="T:System.Web.Razor.RazorEditorParser"></member>
<member name="M:System.Web.Razor.RazorEditorParser.#ctor(System.Web.Razor.RazorEngineHost,System.String)"></member>
<member name="M:System.Web.Razor.RazorEditorParser.CheckForStructureChanges(System.Web.Razor.Text.TextChange)"></member>
<member name="P:System.Web.Razor.RazorEditorParser.CurrentParseTree"></member>
<member name="M:System.Web.Razor.RazorEditorParser.Dispose"></member>
<member name="M:System.Web.Razor.RazorEditorParser.Dispose(System.Boolean)"></member>
<member name="E:System.Web.Razor.RazorEditorParser.DocumentParseComplete"></member>
<member name="M:System.Web.Razor.RazorEditorParser.GetAutoCompleteString"></member>
<member name="M:System.Web.Razor.RazorEditorParser.ProcessChange(System.Threading.CancellationToken,System.Web.Razor.Text.TextChange,System.Web.Razor.Parser.SyntaxTree.Block)"></member>
<member name="M:System.Web.Razor.RazorEditorParser.QueueFullReparse(System.Web.Razor.Text.TextChange)"></member>
<member name="T:System.Web.Razor.RazorEngineHost"></member>
<member name="M:System.Web.Razor.RazorEngineHost.#ctor"></member>
<member name="M:System.Web.Razor.RazorEngineHost.#ctor(System.Web.Razor.RazorCodeLanguage)"></member>
<member name="M:System.Web.Razor.RazorEngineHost.#ctor(System.Web.Razor.RazorCodeLanguage,System.Func`1)"></member>
<member name="P:System.Web.Razor.RazorEngineHost.CodeLanguage"></member>
<member name="M:System.Web.Razor.RazorEngineHost.CreateMarkupParser"></member>
<member name="M:System.Web.Razor.RazorEngineHost.DecorateCodeGenerator(System.Web.Razor.Generator.RazorCodeGenerator)"></member>
<member name="M:System.Web.Razor.RazorEngineHost.DecorateCodeParser(System.Web.Razor.Parser.ParserBase)"></member>
<member name="M:System.Web.Razor.RazorEngineHost.DecorateMarkupParser(System.Web.Razor.Parser.MarkupParser)"></member>
<member name="P:System.Web.Razor.RazorEngineHost.DefaultBaseClass"></member>
<member name="P:System.Web.Razor.RazorEngineHost.DefaultClassName"></member>
<member name="P:System.Web.Razor.RazorEngineHost.DefaultNamespace"></member>
<member name="P:System.Web.Razor.RazorEngineHost.DesignTimeMode"></member>
<member name="P:System.Web.Razor.RazorEngineHost.GeneratedClassContext"></member>
<member name="P:System.Web.Razor.RazorEngineHost.NamespaceImports"></member>
<member name="M:System.Web.Razor.RazorEngineHost.PostProcessGeneratedCode(System.CodeDom.CodeCompileUnit,System.CodeDom.CodeNamespace,System.CodeDom.CodeTypeDeclaration,System.CodeDom.CodeMemberMethod)"></member>
<member name="P:System.Web.Razor.RazorEngineHost.StaticHelpers"></member>
<member name="T:System.Web.Razor.RazorTemplateEngine"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.#ctor(System.Web.Razor.RazorEngineHost)"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.CreateCodeGenerator(System.String,System.String,System.String)"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.CreateParser"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.IO.TextReader)"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.IO.TextReader,System.Nullable{System.Threading.CancellationToken})"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.IO.TextReader,System.String,System.String,System.String)"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.IO.TextReader,System.String,System.String,System.String,System.Nullable{System.Threading.CancellationToken})"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.Web.Razor.Text.ITextBuffer)"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.Web.Razor.Text.ITextBuffer,System.Nullable{System.Threading.CancellationToken})"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.Web.Razor.Text.ITextBuffer,System.String,System.String,System.String)"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCode(System.Web.Razor.Text.ITextBuffer,System.String,System.String,System.String,System.Nullable{System.Threading.CancellationToken})"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.GenerateCodeCore(System.Web.Razor.Text.LookaheadTextReader,System.String,System.String,System.String,System.Nullable{System.Threading.CancellationToken})"></member>
<member name="P:System.Web.Razor.RazorTemplateEngine.Host"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.ParseTemplate(System.IO.TextReader)"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.ParseTemplate(System.IO.TextReader,System.Nullable{System.Threading.CancellationToken})"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.ParseTemplate(System.Web.Razor.Text.ITextBuffer)"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.ParseTemplate(System.Web.Razor.Text.ITextBuffer,System.Nullable{System.Threading.CancellationToken})"></member>
<member name="M:System.Web.Razor.RazorTemplateEngine.ParseTemplateCore(System.Web.Razor.Text.LookaheadTextReader,System.Nullable{System.Threading.CancellationToken})"></member>
<member name="T:System.Web.Razor.VBRazorCodeLanguage"></member>
<member name="M:System.Web.Razor.VBRazorCodeLanguage.#ctor"></member>
<member name="P:System.Web.Razor.VBRazorCodeLanguage.CodeDomProviderType"></member>
<member name="M:System.Web.Razor.VBRazorCodeLanguage.CreateCodeGenerator(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
<member name="M:System.Web.Razor.VBRazorCodeLanguage.CreateCodeParser"></member>
<member name="P:System.Web.Razor.VBRazorCodeLanguage.LanguageName"></member>
<member name="T:System.Web.Razor.Generator.BaseCodeWriter"></member>
<member name="M:System.Web.Razor.Generator.BaseCodeWriter.#ctor"></member>
<member name="M:System.Web.Razor.Generator.BaseCodeWriter.EmitEndConstructor"></member>
<member name="M:System.Web.Razor.Generator.BaseCodeWriter.EmitEndLambdaExpression"></member>
<member name="M:System.Web.Razor.Generator.BaseCodeWriter.EmitEndMethodInvoke"></member>
<member name="M:System.Web.Razor.Generator.BaseCodeWriter.EmitStartMethodInvoke(System.String)"></member>
<member name="M:System.Web.Razor.Generator.BaseCodeWriter.WriteCommaSeparatedList``1(``0[],System.Action{``0})">
<typeparam name="T"></typeparam>
</member>
<member name="M:System.Web.Razor.Generator.BaseCodeWriter.WriteParameterSeparator"></member>
<member name="M:System.Web.Razor.Generator.BaseCodeWriter.WriteSnippet(System.String)"></member>
<member name="T:System.Web.Razor.Generator.CodeGenerationCompleteEventArgs"></member>
<member name="M:System.Web.Razor.Generator.CodeGenerationCompleteEventArgs.#ctor(System.String,System.String,System.CodeDom.CodeCompileUnit)"></member>
<member name="P:System.Web.Razor.Generator.CodeGenerationCompleteEventArgs.GeneratedCode"></member>
<member name="P:System.Web.Razor.Generator.CodeGenerationCompleteEventArgs.PhysicalPath"></member>
<member name="P:System.Web.Razor.Generator.CodeGenerationCompleteEventArgs.VirtualPath"></member>
<member name="T:System.Web.Razor.Generator.CodeWriter"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.#ctor"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.Clear"></member>
<member name="P:System.Web.Razor.Generator.CodeWriter.Content"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.Dispose"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.Dispose(System.Boolean)"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.EmitEndConstructor"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.EmitEndLambdaDelegate"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.EmitEndLambdaExpression"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.EmitEndMethodInvoke"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.EmitStartConstructor(System.String)"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.EmitStartLambdaDelegate(System.String[])"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.EmitStartLambdaExpression(System.String[])"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.EmitStartMethodInvoke(System.String)"></member>
<member name="P:System.Web.Razor.Generator.CodeWriter.InnerWriter"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.ToStatement"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.ToTypeMember"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteEndConstructor"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteEndLambdaDelegate"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteEndLambdaExpression"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteEndMethodInvoke"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteEndStatement"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteHelperHeaderPrefix(System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteHelperHeaderSuffix(System.String)"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteHelperTrailer"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteHiddenLinePragma"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteIdentifier(System.String)"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteLinePragma(System.Nullable{System.Int32},System.String)"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteParameterSeparator"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteReturn"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteSnippet(System.String)"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteStartAssignment(System.String)"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteStartConstructor(System.String)"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteStartLambdaDelegate(System.String[])"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteStartLambdaExpression(System.String[])"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteStartMethodInvoke(System.String)"></member>
<member name="M:System.Web.Razor.Generator.CodeWriter.WriteStringLiteral(System.String)"></member>
<member name="T:System.Web.Razor.Generator.CSharpCodeWriter"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.#ctor"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.EmitEndLambdaDelegate"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.EmitStartConstructor(System.String)"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.EmitStartLambdaDelegate(System.String[])"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.EmitStartLambdaExpression(System.String[])"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteEndStatement"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteHelperHeaderPrefix(System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteHiddenLinePragma"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteIdentifier(System.String)"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteLinePragma(System.Nullable{System.Int32},System.String)"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteReturn"></member>
<member name="M:System.Web.Razor.Generator.CSharpCodeWriter.WriteStringLiteral(System.String)"></member>
<member name="T:System.Web.Razor.Generator.CSharpRazorCodeGenerator"></member>
<member name="M:System.Web.Razor.Generator.CSharpRazorCodeGenerator.#ctor(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
<member name="M:System.Web.Razor.Generator.CSharpRazorCodeGenerator.CreateCodeWriter"></member>
<member name="M:System.Web.Razor.Generator.CSharpRazorCodeGenerator.WriteHelperVariable(System.String,System.String)"></member>
<member name="T:System.Web.Razor.Generator.GeneratedClassContext"></member>
<member name="M:System.Web.Razor.Generator.GeneratedClassContext.#ctor(System.String,System.String,System.String)"></member>
<member name="M:System.Web.Razor.Generator.GeneratedClassContext.#ctor(System.String,System.String,System.String,System.String,System.String,System.String)"></member>
<member name="M:System.Web.Razor.Generator.GeneratedClassContext.#ctor(System.String,System.String,System.String,System.String,System.String,System.String,System.String)"></member>
<member name="P:System.Web.Razor.Generator.GeneratedClassContext.AllowSections"></member>
<member name="P:System.Web.Razor.Generator.GeneratedClassContext.AllowTemplates"></member>
<member name="F:System.Web.Razor.Generator.GeneratedClassContext.Default"></member>
<member name="F:System.Web.Razor.Generator.GeneratedClassContext.DefaultExecuteMethodName"></member>
<member name="F:System.Web.Razor.Generator.GeneratedClassContext.DefaultWriteLiteralMethodName"></member>
<member name="F:System.Web.Razor.Generator.GeneratedClassContext.DefaultWriteMethodName"></member>
<member name="P:System.Web.Razor.Generator.GeneratedClassContext.DefineSectionMethodName"></member>
<member name="M:System.Web.Razor.Generator.GeneratedClassContext.Equals(System.Object)"></member>
<member name="P:System.Web.Razor.Generator.GeneratedClassContext.ExecuteMethodName"></member>
<member name="M:System.Web.Razor.Generator.GeneratedClassContext.GetHashCode"></member>
<member name="M:System.Web.Razor.Generator.GeneratedClassContext.op_Equality(System.Web.Razor.Generator.GeneratedClassContext,System.Web.Razor.Generator.GeneratedClassContext)"></member>
<member name="M:System.Web.Razor.Generator.GeneratedClassContext.op_Inequality(System.Web.Razor.Generator.GeneratedClassContext,System.Web.Razor.Generator.GeneratedClassContext)"></member>
<member name="P:System.Web.Razor.Generator.GeneratedClassContext.TemplateTypeName"></member>
<member name="P:System.Web.Razor.Generator.GeneratedClassContext.WriteLiteralMethodName"></member>
<member name="P:System.Web.Razor.Generator.GeneratedClassContext.WriteLiteralToMethodName"></member>
<member name="P:System.Web.Razor.Generator.GeneratedClassContext.WriteMethodName"></member>
<member name="P:System.Web.Razor.Generator.GeneratedClassContext.WriteToMethodName"></member>
<member name="T:System.Web.Razor.Generator.GeneratedCodeMapping"></member>
<member name="M:System.Web.Razor.Generator.GeneratedCodeMapping.#ctor(System.Int32,System.Int32,System.Int32,System.Int32)"></member>
<member name="P:System.Web.Razor.Generator.GeneratedCodeMapping.CodeLength"></member>
<member name="M:System.Web.Razor.Generator.GeneratedCodeMapping.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Generator.GeneratedCodeMapping.GetHashCode"></member>
<member name="M:System.Web.Razor.Generator.GeneratedCodeMapping.op_Equality(System.Web.Razor.Generator.GeneratedCodeMapping,System.Web.Razor.Generator.GeneratedCodeMapping)"></member>
<member name="M:System.Web.Razor.Generator.GeneratedCodeMapping.op_Inequality(System.Web.Razor.Generator.GeneratedCodeMapping,System.Web.Razor.Generator.GeneratedCodeMapping)"></member>
<member name="P:System.Web.Razor.Generator.GeneratedCodeMapping.StartColumn"></member>
<member name="P:System.Web.Razor.Generator.GeneratedCodeMapping.StartGeneratedColumn"></member>
<member name="P:System.Web.Razor.Generator.GeneratedCodeMapping.StartLine"></member>
<member name="T:System.Web.Razor.Generator.RazorCodeGenerator"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.#ctor(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.ClassName"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.CodeMappings"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.CreateCodeWriter"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.CreateLinePragma(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.CreateLinePragma(System.Web.Razor.Text.SourceLocation,System.Int32,System.Int32)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.CreateStatement(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.CurrentBlock"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.CurrentWriteLiteralMethod"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.CurrentWriteMethod"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.CurrentWriterName"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.DesignTimeMode"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.EndBlock(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.EnsureExpressionHelperVariable"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.GeneratedClass"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.GeneratedCode"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.GeneratedExecuteMethod"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.GeneratedNamespace"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.GenerateLinePragmas"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.HelperVariablesMethod"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.Host"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.InHelper"></member>
<member name="F:System.Web.Razor.Generator.RazorCodeGenerator.InheritsHelperName"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.InNestedWriterBlock"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.InSection"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.InTemplate"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.OnComplete"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.ResumeBlock(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext,System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.RootNamespaceName"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.SourceFileName"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.StartBlock(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.SuspendBlock(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext,System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.TryVisit``1(System.Web.Razor.Parser.SyntaxTree.Span,System.Action{``0})">
<typeparam name="T"></typeparam>
</member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.TryVisitSpecialSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitEndBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitError(System.Web.Razor.Parser.SyntaxTree.RazorError)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.InheritsSpan)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.VisitStartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.WriteHelperTrailer(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.WriteHelperTrailer(System.Web.Razor.Generator.RazorCodeGenerator.BlockContext,System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan)"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.WriteHelperVariable(System.String,System.String)"></member>
<member name="T:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.#ctor(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Web.Razor.Generator.CodeWriter)"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.BlockType"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.GeneratedCodeLength"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.GeneratedCodeStart"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.GeneratedColumnOffset"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.HasContent"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.MarkEndGeneratedCode"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.MarkStartGeneratedCode"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.ResetBuffer"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.SourceCodeStart"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.VisitedSpans"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.WriteLinePragma"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.BlockContext.Writer"></member>
<member name="T:System.Web.Razor.Generator.RazorCodeGenerator.HelperContext"></member>
<member name="M:System.Web.Razor.Generator.RazorCodeGenerator.HelperContext.#ctor"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.HelperContext.Content"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.HelperContext.TrailerWritten"></member>
<member name="P:System.Web.Razor.Generator.RazorCodeGenerator.HelperContext.WroteHelperPrefix"></member>
<member name="T:System.Web.Razor.Generator.VBCodeWriter"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.#ctor"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.EmitEndLambdaDelegate"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.EmitStartConstructor(System.String)"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.EmitStartLambdaDelegate(System.String[])"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.EmitStartLambdaExpression(System.String[])"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteEndStatement"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteHelperHeaderPrefix(System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteHelperHeaderSuffix(System.String)"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteHelperTrailer"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteLinePragma(System.Nullable{System.Int32},System.String)"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteReturn"></member>
<member name="M:System.Web.Razor.Generator.VBCodeWriter.WriteStringLiteral(System.String)"></member>
<member name="T:System.Web.Razor.Generator.VBRazorCodeGenerator"></member>
<member name="M:System.Web.Razor.Generator.VBRazorCodeGenerator.#ctor(System.String,System.String,System.String,System.Web.Razor.RazorEngineHost)"></member>
<member name="M:System.Web.Razor.Generator.VBRazorCodeGenerator.CreateCodeWriter"></member>
<member name="M:System.Web.Razor.Generator.VBRazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="M:System.Web.Razor.Generator.VBRazorCodeGenerator.VisitSpan(System.Web.Razor.Parser.SyntaxTree.VBOptionSpan)"></member>
<member name="M:System.Web.Razor.Generator.VBRazorCodeGenerator.WriteHelperVariable(System.String,System.String)"></member>
<member name="T:System.Web.Razor.Parser.CallbackVisitor"></member>
<member name="M:System.Web.Razor.Parser.CallbackVisitor.#ctor(System.Action{System.Web.Razor.Parser.SyntaxTree.Span})"></member>
<member name="M:System.Web.Razor.Parser.CallbackVisitor.#ctor(System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError})"></member>
<member name="M:System.Web.Razor.Parser.CallbackVisitor.#ctor(System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError},System.Action{System.Web.Razor.Parser.SyntaxTree.BlockType},System.Action{System.Web.Razor.Parser.SyntaxTree.BlockType})"></member>
<member name="M:System.Web.Razor.Parser.CallbackVisitor.#ctor(System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError},System.Action{System.Web.Razor.Parser.SyntaxTree.BlockType},System.Action{System.Web.Razor.Parser.SyntaxTree.BlockType},System.Action)"></member>
<member name="M:System.Web.Razor.Parser.CallbackVisitor.OnComplete"></member>
<member name="P:System.Web.Razor.Parser.CallbackVisitor.SynchronizationContext"></member>
<member name="M:System.Web.Razor.Parser.CallbackVisitor.VisitEndBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
<member name="M:System.Web.Razor.Parser.CallbackVisitor.VisitError(System.Web.Razor.Parser.SyntaxTree.RazorError)"></member>
<member name="M:System.Web.Razor.Parser.CallbackVisitor.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="M:System.Web.Razor.Parser.CallbackVisitor.VisitStartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
<member name="T:System.Web.Razor.Parser.CodeBlockInfo"></member>
<member name="M:System.Web.Razor.Parser.CodeBlockInfo.#ctor(System.String,System.Web.Razor.Text.SourceLocation,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.CodeBlockInfo.#ctor(System.String,System.Web.Razor.Text.SourceLocation,System.Boolean,System.Web.Razor.Parser.SyntaxTree.Span,System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="P:System.Web.Razor.Parser.CodeBlockInfo.BlockType"></member>
<member name="P:System.Web.Razor.Parser.CodeBlockInfo.InitialSpan"></member>
<member name="P:System.Web.Razor.Parser.CodeBlockInfo.IsTopLevel"></member>
<member name="P:System.Web.Razor.Parser.CodeBlockInfo.Name"></member>
<member name="M:System.Web.Razor.Parser.CodeBlockInfo.ResumeSpans(System.Web.Razor.Parser.ParserContext)"></member>
<member name="P:System.Web.Razor.Parser.CodeBlockInfo.Start"></member>
<member name="P:System.Web.Razor.Parser.CodeBlockInfo.TransitionSpan"></member>
<member name="T:System.Web.Razor.Parser.CodeParser"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.#ctor"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.AcceptDottedExpression(System.Boolean,System.Boolean,System.Char[])"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.AcceptGenericArgument"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.AcceptTypeName"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.AcceptTypeName(System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.AcceptUntilUnquoted(System.Predicate{System.Char})"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.AcceptWhiteSpaceByLines"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets(System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory,System.Boolean,System.Char)"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.BalanceBrackets(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory,System.Boolean,System.Nullable{System.Char},System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.CreateImplicitExpressionSpan(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.HandleTransition(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
<member name="P:System.Web.Razor.Parser.CodeParser.OtherParser"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.ParseBlockStart(System.Boolean,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.RequireSingleWhiteSpace"></member>
<member name="P:System.Web.Razor.Parser.CodeParser.TopLevelKeywords"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.TryAcceptStringOrComment"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.TryRecover(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.TryRecover(System.Web.Razor.Parser.RecoveryModes)"></member>
<member name="M:System.Web.Razor.Parser.CodeParser.TryRecover(System.Web.Razor.Parser.RecoveryModes,System.Predicate{System.Char},System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
<member name="T:System.Web.Razor.Parser.CodeParser.BlockParser"></member>
<member name="T:System.Web.Razor.Parser.CSharpCodeParser"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.#ctor"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.AcceptGenericArgument"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.AcceptWhiteSpaceAndComments"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.HandleReservedWord(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.HandleTransition(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.IsAtExplicitTransition"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.IsAtImplicitTransition"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseBlock"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseCaseBlock(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseConditionalBlockStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseControlFlowBody(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseDoStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseIfStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseImplicitExpression(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseImplicitExpression(System.Web.Razor.Parser.CodeBlockInfo,System.Boolean,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseInheritsStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseInvalidMarkupSwitch"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.ParseTryStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="P:System.Web.Razor.Parser.CSharpCodeParser.RazorKeywords"></member>
<member name="P:System.Web.Razor.Parser.CSharpCodeParser.TopLevelKeywords"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.TryAcceptStringOrComment"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.TryRecover(System.Boolean,System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
<member name="M:System.Web.Razor.Parser.CSharpCodeParser.WrapSimpleBlockParser(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Web.Razor.Parser.CodeParser.BlockParser)"></member>
<member name="T:System.Web.Razor.Parser.HtmlMarkupParser"></member>
<member name="M:System.Web.Razor.Parser.HtmlMarkupParser.#ctor"></member>
<member name="M:System.Web.Razor.Parser.HtmlMarkupParser.IsAtExplicitTransition"></member>
<member name="M:System.Web.Razor.Parser.HtmlMarkupParser.IsAtImplicitTransition"></member>
<member name="M:System.Web.Razor.Parser.HtmlMarkupParser.IsEndTag"></member>
<member name="M:System.Web.Razor.Parser.HtmlMarkupParser.IsStartTag"></member>
<member name="M:System.Web.Razor.Parser.HtmlMarkupParser.ParseBlock"></member>
<member name="M:System.Web.Razor.Parser.HtmlMarkupParser.ParseDocument"></member>
<member name="M:System.Web.Razor.Parser.HtmlMarkupParser.ParseSection(System.Tuple`2,System.Boolean)"></member>
<member name="T:System.Web.Razor.Parser.MarkupParser"></member>
<member name="M:System.Web.Razor.Parser.MarkupParser.#ctor"></member>
<member name="M:System.Web.Razor.Parser.MarkupParser.IsEndTag"></member>
<member name="M:System.Web.Razor.Parser.MarkupParser.IsStartTag"></member>
<member name="P:System.Web.Razor.Parser.MarkupParser.OtherParser"></member>
<member name="M:System.Web.Razor.Parser.MarkupParser.ParseDocument"></member>
<member name="M:System.Web.Razor.Parser.MarkupParser.ParseSection(System.Tuple`2,System.Boolean)"></member>
<member name="T:System.Web.Razor.Parser.ParserBase"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.#ctor"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.AcceptLineWithBlockComments(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
<member name="P:System.Web.Razor.Parser.ParserBase.Context"></member>
<member name="P:System.Web.Razor.Parser.ParserBase.CurrentCharacter"></member>
<member name="P:System.Web.Razor.Parser.ParserBase.CurrentLocation"></member>
<member name="P:System.Web.Razor.Parser.ParserBase.DesignTimeMode"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.End(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.End(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.EndBlock"></member>
<member name="P:System.Web.Razor.Parser.ParserBase.EndOfFile"></member>
<member name="P:System.Web.Razor.Parser.ParserBase.HaveContent"></member>
<member name="P:System.Web.Razor.Parser.ParserBase.InTemporaryBuffer"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.IsAtExplicitTransition"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.IsAtImplicitTransition"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.IsAtTransition"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.NextIsTransition(System.Boolean,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.OnError(System.Web.Razor.Text.SourceLocation,System.String)"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.OnError(System.Web.Razor.Text.SourceLocation,System.String,System.Object[])"></member>
<member name="P:System.Web.Razor.Parser.ParserBase.OtherParser"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.Output(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.ParseBlock"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.ParseBlockWithOtherParser(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.ParseBlockWithOtherParser(System.Web.Razor.Parser.SyntaxTree.SpanFactory,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.ParseComment"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.StartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.StartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserBase.TryParseComment(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
<member name="T:System.Web.Razor.Parser.ParserContext"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.#ctor(System.Web.Razor.Text.LookaheadTextReader,System.Web.Razor.Parser.ParserBase,System.Web.Razor.Parser.MarkupParser,System.Web.Razor.Parser.ParserBase,System.Web.Razor.Parser.ParserVisitor)"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.AcceptCurrent"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.AcceptTemporaryBuffer"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.AcceptTemporaryBufferInDesignTimeMode"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.ActiveParser"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.Append(System.String)"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.CodeParser"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.ContentBuffer"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.CurrentCharacter"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.CurrentLocation"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.CurrentSpanStart"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.DesignTimeMode"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.EndBlock"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.EndOfFile"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.FlushNextOutputSpan"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.HaveContent"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.InTemporaryBuffer"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.IsEmailPrefixOrSuffixCharacter(System.Char)"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.MarkupParser"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.OnComplete"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.OnError(System.Web.Razor.Text.SourceLocation,System.String)"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.OnError(System.Web.Razor.Text.SourceLocation,System.String,System.Object[])"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.OutputSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.PopVisitor"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.PreviousSpan"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.PreviousSpanCanGrow"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.PushVisitor(System.Web.Razor.Parser.ParserVisitor)"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.RejectTemporaryBuffer"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.Replay(System.Collections.Generic.IEnumerable{System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode},System.Collections.Generic.IEnumerable{System.Web.Razor.Parser.SyntaxTree.RazorError})"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.ResetBuffers"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.ResumeSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.SeenValidEmailPrefix"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.SkipCurrent"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.Source"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.StartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.StartTemporaryBuffer"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.SwitchActiveParser"></member>
<member name="M:System.Web.Razor.Parser.ParserContext.UpdateSeenValidEmailPrefix"></member>
<member name="P:System.Web.Razor.Parser.ParserContext.WhiteSpaceIsImportantToAncestorBlock"></member>
<member name="T:System.Web.Razor.Parser.ParserContextExtensions"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Accept(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Accept(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean,System.Nullable{System.Web.Razor.Text.SourceLocation}@,System.Nullable{System.Char}@)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptCharacters(System.Web.Razor.Parser.ParserContext,System.Int32)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptIdentifier(System.Web.Razor.Parser.ParserContext)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptLine(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptNewLine(System.Web.Razor.Parser.ParserContext)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptUntil(System.Web.Razor.Parser.ParserContext,System.Char[])"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptUntil(System.Web.Razor.Parser.ParserContext,System.Predicate{System.Char})"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptUntil(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Text.SourceLocation)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptUntilInclusive(System.Web.Razor.Parser.ParserContext,System.Char[])"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptWhile(System.Web.Razor.Parser.ParserContext,System.Predicate{System.Char})"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.AcceptWhiteSpace(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.Char,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.Char,System.Boolean,System.String)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.Char,System.Boolean,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.Char,System.Boolean,System.String,System.Boolean,System.Nullable{System.Web.Razor.Text.SourceLocation})"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.String)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean,System.String)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Expect(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean,System.String,System.Boolean,System.Nullable{System.Web.Razor.Text.SourceLocation})"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.ExpectIdentifier(System.Web.Razor.Parser.ParserContext,System.String)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.ExpectIdentifier(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.ExpectIdentifier(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean,System.Nullable{System.Web.Razor.Text.SourceLocation})"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.Peek(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.PeekAny(System.Web.Razor.Parser.ParserContext,System.Boolean,System.String[])"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.PeekAny(System.Web.Razor.Parser.ParserContext,System.String[])"></member>
<member name="M:System.Web.Razor.Parser.ParserContextExtensions.ReadWhiteSpace(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
<member name="T:System.Web.Razor.Parser.ParserHelpers"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsCombining(System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsConnecting(System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsDecimalDigit(System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsFormatting(System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsHexDigit(System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsIdentifier(System.String)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsIdentifier(System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsIdentifierPart(System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsIdentifierStart(System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsLetter(System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsNewLine(System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsNewLine(System.String)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsTerminatingCharToken(System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.IsTerminatingQuotedStringToken(System.Char)"></member>
<member name="M:System.Web.Razor.Parser.ParserHelpers.SanitizeClassName(System.String)"></member>
<member name="T:System.Web.Razor.Parser.ParserVisitor"></member>
<member name="M:System.Web.Razor.Parser.ParserVisitor.#ctor"></member>
<member name="P:System.Web.Razor.Parser.ParserVisitor.CancelToken"></member>
<member name="M:System.Web.Razor.Parser.ParserVisitor.OnComplete"></member>
<member name="M:System.Web.Razor.Parser.ParserVisitor.ThrowIfCanceled"></member>
<member name="M:System.Web.Razor.Parser.ParserVisitor.VisitEndBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
<member name="M:System.Web.Razor.Parser.ParserVisitor.VisitError(System.Web.Razor.Parser.SyntaxTree.RazorError)"></member>
<member name="M:System.Web.Razor.Parser.ParserVisitor.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="M:System.Web.Razor.Parser.ParserVisitor.VisitStartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
<member name="T:System.Web.Razor.Parser.RazorParser"></member>
<member name="M:System.Web.Razor.Parser.RazorParser.#ctor(System.Web.Razor.Parser.ParserBase,System.Web.Razor.Parser.MarkupParser)"></member>
<member name="M:System.Web.Razor.Parser.RazorParser.CreateParseTask(System.IO.TextReader,System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError})"></member>
<member name="M:System.Web.Razor.Parser.RazorParser.CreateParseTask(System.IO.TextReader,System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError},System.Threading.CancellationToken)"></member>
<member name="M:System.Web.Razor.Parser.RazorParser.CreateParseTask(System.IO.TextReader,System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError},System.Threading.SynchronizationContext)"></member>
<member name="M:System.Web.Razor.Parser.RazorParser.CreateParseTask(System.IO.TextReader,System.Action{System.Web.Razor.Parser.SyntaxTree.Span},System.Action{System.Web.Razor.Parser.SyntaxTree.RazorError},System.Threading.SynchronizationContext,System.Threading.CancellationToken)"></member>
<member name="M:System.Web.Razor.Parser.RazorParser.CreateParseTask(System.IO.TextReader,System.Web.Razor.Parser.ParserVisitor)"></member>
<member name="P:System.Web.Razor.Parser.RazorParser.DesignTimeMode"></member>
<member name="F:System.Web.Razor.Parser.RazorParser.EndCommentSequence"></member>
<member name="M:System.Web.Razor.Parser.RazorParser.Parse(System.IO.TextReader)"></member>
<member name="M:System.Web.Razor.Parser.RazorParser.Parse(System.IO.TextReader,System.Web.Razor.Parser.ParserVisitor)"></member>
<member name="M:System.Web.Razor.Parser.RazorParser.Parse(System.Web.Razor.Text.LookaheadTextReader)"></member>
<member name="M:System.Web.Razor.Parser.RazorParser.Parse(System.Web.Razor.Text.LookaheadTextReader,System.Web.Razor.Parser.ParserVisitor)"></member>
<member name="F:System.Web.Razor.Parser.RazorParser.StartCommentSequence"></member>
<member name="F:System.Web.Razor.Parser.RazorParser.TransitionCharacter"></member>
<member name="F:System.Web.Razor.Parser.RazorParser.TransitionString"></member>
<member name="T:System.Web.Razor.Parser.RecoveryModes"></member>
<member name="F:System.Web.Razor.Parser.RecoveryModes.Markup">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.RecoveryModes.Code">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.RecoveryModes.Transition">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.RecoveryModes.Any">
<summary />
</member>
<member name="T:System.Web.Razor.Parser.VBCodeParser"></member>
<member name="M:System.Web.Razor.Parser.VBCodeParser.#ctor"></member>
<member name="M:System.Web.Razor.Parser.VBCodeParser.AcceptGenericArgument"></member>
<member name="M:System.Web.Razor.Parser.VBCodeParser.HandleReservedWord(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="M:System.Web.Razor.Parser.VBCodeParser.HandleTransition(System.Web.Razor.Parser.SyntaxTree.SpanFactory)"></member>
<member name="M:System.Web.Razor.Parser.VBCodeParser.IsAtExplicitTransition"></member>
<member name="M:System.Web.Razor.Parser.VBCodeParser.IsAtImplicitTransition"></member>
<member name="P:System.Web.Razor.Parser.VBCodeParser.KeywordHandlers"></member>
<member name="M:System.Web.Razor.Parser.VBCodeParser.ParseBlock"></member>
<member name="M:System.Web.Razor.Parser.VBCodeParser.ParseInheritsStatement(System.Web.Razor.Parser.CodeBlockInfo)"></member>
<member name="P:System.Web.Razor.Parser.VBCodeParser.TopLevelKeywords"></member>
<member name="M:System.Web.Razor.Parser.VBCodeParser.TryAcceptStringOrComment"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters"></member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.None">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.NewLine">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.WhiteSpace">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.NonWhiteSpace">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.AllWhiteSpace">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters.Any">
<summary />
</member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.Block"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Block.#ctor(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Collections.Generic.IEnumerable{System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode})"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Block.#ctor(System.Web.Razor.Parser.SyntaxTree.BlockType,System.Collections.Generic.IEnumerable{System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode},System.String)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Block.Accept(System.Web.Razor.Parser.ParserVisitor)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Block.Children"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Block.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Block.FindFirstDescendentSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Block.FindLastDescendentSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Block.Flatten"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Block.GetHashCode"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Block.IsBlock"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Block.Length"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Block.LocateOwner(System.Web.Razor.Text.TextChange)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Block.Name"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Block.Start"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Block.ToString"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Block.Type"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.BlockType"></member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Statement">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Directive">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Functions">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Expression">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Helper">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Markup">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Section">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Template">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.BlockType.Comment">
<summary />
</member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.CodeSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.CanAcceptChange(System.Web.Razor.Text.TextChange)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.Create(System.Web.Razor.Parser.ParserContext,System.String)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CodeSpan.ToString"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.CommentSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.CommentSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.Create(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.GetHashCode"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperFooterSpan.ToString"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.CanAcceptChange(System.Web.Razor.Text.TextChange)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.Complete"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.GetHashCode"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.HelperHeaderSpan.ToString"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Collections.Generic.ISet{System.String},System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Collections.Generic.ISet{System.String},System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.CanAcceptChange(System.Web.Razor.Text.TextChange)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.Create(System.Web.Razor.Parser.ParserContext,System.Collections.Generic.ISet{System.String},System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.GetHashCode"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.ImplicitExpressionSpan.ToString"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.InheritsSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.String)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.BaseClass"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.Create(System.Web.Razor.Parser.ParserContext,System.String)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.GetHashCode"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.InheritsSpan.ToString"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.MarkupSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.DocumentLevel"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MarkupSpan.ToString"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.MetaCodeSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.#ctor(System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Web.Razor.Text.SourceLocation,System.String,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters,System.String,System.Int32)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.Create(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters,System.Web.Razor.Parser.SyntaxTree.SpanKind,System.String,System.Int32)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.GetHashCode"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.Namespace"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.NamespaceKeywordLength"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.NamespaceImportSpan.ToString"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.RazorError"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.#ctor(System.String,System.Web.Razor.Text.SourceLocation)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.#ctor(System.String,System.Web.Razor.Text.SourceLocation,System.Int32)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.Equals(System.Web.Razor.Parser.SyntaxTree.RazorError)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.GetHashCode"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.RazorError.Length"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.RazorError.Location"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.RazorError.Message"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.RazorError.ToString"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.String,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.CanAcceptChange(System.Web.Razor.Text.TextChange)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.Create(System.Web.Razor.Parser.ParserContext,System.String,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.GetHashCode"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.SectionName"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SectionHeaderSpan.ToString"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SingleLineMarkupSpan.GetHashCode"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.Span"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.SpanKind)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.ParserContext,System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Web.Razor.Text.SourceLocation,System.String)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.#ctor(System.Web.Razor.Parser.SyntaxTree.SpanKind,System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.Accept(System.Web.Razor.Parser.ParserVisitor)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Span.AcceptedCharacters"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.ApplyChange(System.Web.Razor.Text.TextChange)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.ApplyChange(System.Web.Razor.Text.TextChange,System.Boolean)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Span.AutoCompleteString"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.CanAcceptChange(System.Web.Razor.Text.TextChange)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Content"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.GetHashCode"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.GetOldText(System.Web.Razor.Text.TextChange)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.GetSpanTypeName"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Hidden"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.IsAtEndOfFirstLine(System.Web.Razor.Text.TextChange)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.IsAtEndOfSpan(System.Web.Razor.Text.TextChange)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Span.IsBlock"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.IsEndDeletion(System.Web.Razor.Text.TextChange)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.IsEndInsertion(System.Web.Razor.Text.TextChange)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.IsEndReplace(System.Web.Razor.Text.TextChange)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Kind"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Length"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Next"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Offset"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.OwnsChange(System.Web.Razor.Text.TextChange)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Previous"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.Span.Start"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.ToString"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.Span.TryMergeWith(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.SpanFactory"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.SpanKind"></member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.SpanKind.Transition">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.SpanKind.MetaCode">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.SpanKind.Comment">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.SpanKind.Code">
<summary />
</member>
<member name="F:System.Web.Razor.Parser.SyntaxTree.SpanKind.Markup">
<summary />
</member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.#ctor"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.OnComplete"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.Results"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.VisitEndBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.VisitError(System.Web.Razor.Parser.SyntaxTree.RazorError)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.VisitSpan(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeBuilderVisitor.VisitStartBlock(System.Web.Razor.Parser.SyntaxTree.BlockType)"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.#ctor"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.Accept(System.Web.Razor.Parser.ParserVisitor)"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.IsBlock"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.Length"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.Parent"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.SyntaxTreeNode.Start"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.TransitionSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.Create(System.Web.Razor.Parser.ParserContext)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.TransitionSpan.Create(System.Web.Razor.Parser.ParserContext,System.Boolean,System.Web.Razor.Parser.SyntaxTree.AcceptedCharacters)"></member>
<member name="T:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.#ctor(System.Web.Razor.Text.SourceLocation,System.String,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.Create(System.Web.Razor.Parser.ParserContext,System.String,System.Boolean)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.GetHashCode"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.OptionName"></member>
<member name="M:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.ToString"></member>
<member name="P:System.Web.Razor.Parser.SyntaxTree.VBOptionSpan.Value"></member>
<member name="T:System.Web.Razor.Text.BufferingTextReader"></member>
<member name="M:System.Web.Razor.Text.BufferingTextReader.#ctor(System.IO.TextReader)"></member>
<member name="M:System.Web.Razor.Text.BufferingTextReader.BeginLookahead"></member>
<member name="M:System.Web.Razor.Text.BufferingTextReader.CancelBacktrack"></member>
<member name="P:System.Web.Razor.Text.BufferingTextReader.CurrentCharacter"></member>
<member name="P:System.Web.Razor.Text.BufferingTextReader.CurrentLocation"></member>
<member name="M:System.Web.Razor.Text.BufferingTextReader.Dispose(System.Boolean)"></member>
<member name="M:System.Web.Razor.Text.BufferingTextReader.ExpandBuffer"></member>
<member name="M:System.Web.Razor.Text.BufferingTextReader.NextCharacter"></member>
<member name="M:System.Web.Razor.Text.BufferingTextReader.Peek"></member>
<member name="M:System.Web.Razor.Text.BufferingTextReader.Read"></member>
<member name="T:System.Web.Razor.Text.ITextBuffer"></member>
<member name="P:System.Web.Razor.Text.ITextBuffer.Length"></member>
<member name="M:System.Web.Razor.Text.ITextBuffer.Peek"></member>
<member name="P:System.Web.Razor.Text.ITextBuffer.Position"></member>
<member name="M:System.Web.Razor.Text.ITextBuffer.Read"></member>
<member name="T:System.Web.Razor.Text.LookaheadTextReader"></member>
<member name="M:System.Web.Razor.Text.LookaheadTextReader.#ctor"></member>
<member name="M:System.Web.Razor.Text.LookaheadTextReader.BeginLookahead"></member>
<member name="M:System.Web.Razor.Text.LookaheadTextReader.CancelBacktrack"></member>
<member name="P:System.Web.Razor.Text.LookaheadTextReader.CurrentLocation"></member>
<member name="T:System.Web.Razor.Text.SourceLocation"></member>
<member name="M:System.Web.Razor.Text.SourceLocation.#ctor(System.Int32,System.Int32,System.Int32)"></member>
<member name="P:System.Web.Razor.Text.SourceLocation.AbsoluteIndex"></member>
<member name="P:System.Web.Razor.Text.SourceLocation.CharacterIndex"></member>
<member name="M:System.Web.Razor.Text.SourceLocation.CompareTo(System.Web.Razor.Text.SourceLocation)"></member>
<member name="M:System.Web.Razor.Text.SourceLocation.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Text.SourceLocation.Equals(System.Web.Razor.Text.SourceLocation)"></member>
<member name="M:System.Web.Razor.Text.SourceLocation.GetHashCode"></member>
<member name="P:System.Web.Razor.Text.SourceLocation.LineIndex"></member>
<member name="M:System.Web.Razor.Text.SourceLocation.op_Equality(System.Web.Razor.Text.SourceLocation,System.Web.Razor.Text.SourceLocation)"></member>
<member name="M:System.Web.Razor.Text.SourceLocation.op_GreaterThan(System.Web.Razor.Text.SourceLocation,System.Web.Razor.Text.SourceLocation)"></member>
<member name="M:System.Web.Razor.Text.SourceLocation.op_Inequality(System.Web.Razor.Text.SourceLocation,System.Web.Razor.Text.SourceLocation)"></member>
<member name="M:System.Web.Razor.Text.SourceLocation.op_LessThan(System.Web.Razor.Text.SourceLocation,System.Web.Razor.Text.SourceLocation)"></member>
<member name="M:System.Web.Razor.Text.SourceLocation.ToString"></member>
<member name="F:System.Web.Razor.Text.SourceLocation.Zero"></member>
<member name="T:System.Web.Razor.Text.SourceLocationTracker"></member>
<member name="M:System.Web.Razor.Text.SourceLocationTracker.#ctor"></member>
<member name="M:System.Web.Razor.Text.SourceLocationTracker.#ctor(System.Web.Razor.Text.SourceLocation)"></member>
<member name="P:System.Web.Razor.Text.SourceLocationTracker.CurrentLocation"></member>
<member name="M:System.Web.Razor.Text.SourceLocationTracker.UpdateLocation(System.Char,System.Func`1)"></member>
<member name="M:System.Web.Razor.Text.SourceLocationTracker.UpdateLocation(System.String)"></member>
<member name="T:System.Web.Razor.Text.TextBufferReader"></member>
<member name="M:System.Web.Razor.Text.TextBufferReader.#ctor(System.Web.Razor.Text.ITextBuffer)"></member>
<member name="M:System.Web.Razor.Text.TextBufferReader.BeginLookahead"></member>
<member name="M:System.Web.Razor.Text.TextBufferReader.CancelBacktrack"></member>
<member name="P:System.Web.Razor.Text.TextBufferReader.CurrentLocation"></member>
<member name="M:System.Web.Razor.Text.TextBufferReader.Dispose(System.Boolean)"></member>
<member name="M:System.Web.Razor.Text.TextBufferReader.Peek"></member>
<member name="M:System.Web.Razor.Text.TextBufferReader.Read"></member>
<member name="T:System.Web.Razor.Text.TextChange"></member>
<member name="M:System.Web.Razor.Text.TextChange.#ctor(System.Int32,System.Int32,System.Web.Razor.Text.ITextBuffer,System.Int32,System.Int32,System.Web.Razor.Text.ITextBuffer)"></member>
<member name="M:System.Web.Razor.Text.TextChange.ApplyChange(System.String,System.Int32)"></member>
<member name="M:System.Web.Razor.Text.TextChange.ApplyChange(System.Web.Razor.Parser.SyntaxTree.Span)"></member>
<member name="M:System.Web.Razor.Text.TextChange.Equals(System.Object)"></member>
<member name="M:System.Web.Razor.Text.TextChange.GetHashCode"></member>
<member name="P:System.Web.Razor.Text.TextChange.IsDelete"></member>
<member name="P:System.Web.Razor.Text.TextChange.IsInsert"></member>
<member name="P:System.Web.Razor.Text.TextChange.IsReplace"></member>
<member name="P:System.Web.Razor.Text.TextChange.NewBuffer"></member>
<member name="P:System.Web.Razor.Text.TextChange.NewLength"></member>
<member name="P:System.Web.Razor.Text.TextChange.NewPosition"></member>
<member name="P:System.Web.Razor.Text.TextChange.NewText"></member>
<member name="M:System.Web.Razor.Text.TextChange.Normalize"></member>
<member name="P:System.Web.Razor.Text.TextChange.OldBuffer"></member>
<member name="P:System.Web.Razor.Text.TextChange.OldLength"></member>
<member name="P:System.Web.Razor.Text.TextChange.OldPosition"></member>
<member name="P:System.Web.Razor.Text.TextChange.OldText"></member>
<member name="M:System.Web.Razor.Text.TextChange.op_Equality(System.Web.Razor.Text.TextChange,System.Web.Razor.Text.TextChange)"></member>
<member name="M:System.Web.Razor.Text.TextChange.op_Inequality(System.Web.Razor.Text.TextChange,System.Web.Razor.Text.TextChange)"></member>
<member name="M:System.Web.Razor.Text.TextChange.ToString"></member>
<member name="T:System.Web.Razor.Text.TextChangeType"></member>
<member name="F:System.Web.Razor.Text.TextChangeType.Insert">
<summary />
</member>
<member name="F:System.Web.Razor.Text.TextChangeType.Remove">
<summary />
</member>
</members>
</doc>
Binary file not shown.
@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<doc>
<assembly>
<name>System.Web.WebPages.Deployment</name>
</assembly>
<members>
<member name="T:System.Web.WebPages.Deployment.PreApplicationStartCode"></member>
<member name="M:System.Web.WebPages.Deployment.PreApplicationStartCode.Start"></member>
<member name="T:System.Web.WebPages.Deployment.WebPagesDeployment"></member>
<member name="F:System.Web.WebPages.Deployment.WebPagesDeployment.CacheKeyPrefix"></member>
<member name="M:System.Web.WebPages.Deployment.WebPagesDeployment.GetAssemblyPath(System.Version)"></member>
<member name="M:System.Web.WebPages.Deployment.WebPagesDeployment.GetVersion(System.String)"></member>
<member name="M:System.Web.WebPages.Deployment.WebPagesDeployment.IsEnabled(System.String)"></member>
<member name="M:System.Web.WebPages.Deployment.WebPagesDeployment.IsExplicitlyDisabled(System.String)"></member>
</members>
</doc>
Binary file not shown.
@@ -1,71 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<doc>
<assembly>
<name>System.Web.WebPages.Razor</name>
</assembly>
<members>
<member name="T:System.Web.WebPages.Razor.PreApplicationStartCode"></member>
<member name="M:System.Web.WebPages.Razor.PreApplicationStartCode.Start"></member>
<member name="T:System.Web.WebPages.Razor.RazorBuildProvider"></member>
<member name="M:System.Web.WebPages.Razor.RazorBuildProvider.#ctor"></member>
<member name="M:System.Web.WebPages.Razor.RazorBuildProvider.AddVirtualPathDependency(System.String)"></member>
<member name="P:System.Web.WebPages.Razor.RazorBuildProvider.AssemblyBuilder"></member>
<member name="P:System.Web.WebPages.Razor.RazorBuildProvider.CodeCompilerType"></member>
<member name="E:System.Web.WebPages.Razor.RazorBuildProvider.CodeGenerationCompleted"></member>
<member name="E:System.Web.WebPages.Razor.RazorBuildProvider.CodeGenerationStarted"></member>
<member name="M:System.Web.WebPages.Razor.RazorBuildProvider.CreateHost"></member>
<member name="M:System.Web.WebPages.Razor.RazorBuildProvider.GenerateCode(System.Web.Compilation.AssemblyBuilder)"></member>
<member name="M:System.Web.WebPages.Razor.RazorBuildProvider.GetGeneratedType(System.CodeDom.Compiler.CompilerResults)"></member>
<member name="M:System.Web.WebPages.Razor.RazorBuildProvider.InternalOpenReader"></member>
<member name="P:System.Web.WebPages.Razor.RazorBuildProvider.VirtualPath"></member>
<member name="P:System.Web.WebPages.Razor.RazorBuildProvider.VirtualPathDependencies"></member>
<member name="T:System.Web.WebPages.Razor.WebCodeRazorHost"></member>
<member name="M:System.Web.WebPages.Razor.WebCodeRazorHost.#ctor(System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebCodeRazorHost.#ctor(System.String,System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebCodeRazorHost.GetClassName(System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebCodeRazorHost.PostProcessGeneratedCode(System.CodeDom.CodeCompileUnit,System.CodeDom.CodeNamespace,System.CodeDom.CodeTypeDeclaration,System.CodeDom.CodeMemberMethod)"></member>
<member name="T:System.Web.WebPages.Razor.WebPageRazorHost"></member>
<member name="M:System.Web.WebPages.Razor.WebPageRazorHost.#ctor(System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebPageRazorHost.#ctor(System.String,System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebPageRazorHost.AddGlobalImport(System.String)"></member>
<member name="P:System.Web.WebPages.Razor.WebPageRazorHost.CodeLanguage"></member>
<member name="M:System.Web.WebPages.Razor.WebPageRazorHost.CreateMarkupParser"></member>
<member name="P:System.Web.WebPages.Razor.WebPageRazorHost.DefaultBaseClass"></member>
<member name="P:System.Web.WebPages.Razor.WebPageRazorHost.DefaultClassName"></member>
<member name="P:System.Web.WebPages.Razor.WebPageRazorHost.DefaultDebugCompilation"></member>
<member name="P:System.Web.WebPages.Razor.WebPageRazorHost.DefaultPageBaseClass"></member>
<member name="M:System.Web.WebPages.Razor.WebPageRazorHost.GetClassName(System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebPageRazorHost.GetCodeLanguage"></member>
<member name="M:System.Web.WebPages.Razor.WebPageRazorHost.GetGlobalImports"></member>
<member name="P:System.Web.WebPages.Razor.WebPageRazorHost.IsSpecialPage"></member>
<member name="P:System.Web.WebPages.Razor.WebPageRazorHost.PhysicalPath"></member>
<member name="M:System.Web.WebPages.Razor.WebPageRazorHost.PostProcessGeneratedCode(System.CodeDom.CodeCompileUnit,System.CodeDom.CodeNamespace,System.CodeDom.CodeTypeDeclaration,System.CodeDom.CodeMemberMethod)"></member>
<member name="M:System.Web.WebPages.Razor.WebPageRazorHost.RegisterSpecialFile(System.String,System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebPageRazorHost.RegisterSpecialFile(System.String,System.Type)"></member>
<member name="P:System.Web.WebPages.Razor.WebPageRazorHost.VirtualPath"></member>
<member name="T:System.Web.WebPages.Razor.WebRazorHostFactory"></member>
<member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.#ctor"></member>
<member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.ApplyConfigurationToHost(System.Web.WebPages.Razor.Configuration.RazorPagesSection,System.Web.WebPages.Razor.WebPageRazorHost)"></member>
<member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateDefaultHost(System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateDefaultHost(System.String,System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateHost(System.String,System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateHostFromConfig(System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateHostFromConfig(System.String,System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateHostFromConfig(System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup,System.String)"></member>
<member name="M:System.Web.WebPages.Razor.WebRazorHostFactory.CreateHostFromConfig(System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup,System.String,System.String)"></member>
<member name="T:System.Web.WebPages.Razor.Configuration.HostSection"></member>
<member name="M:System.Web.WebPages.Razor.Configuration.HostSection.#ctor"></member>
<member name="P:System.Web.WebPages.Razor.Configuration.HostSection.FactoryType"></member>
<member name="F:System.Web.WebPages.Razor.Configuration.HostSection.SectionName"></member>
<member name="T:System.Web.WebPages.Razor.Configuration.RazorPagesSection"></member>
<member name="M:System.Web.WebPages.Razor.Configuration.RazorPagesSection.#ctor"></member>
<member name="P:System.Web.WebPages.Razor.Configuration.RazorPagesSection.Namespaces"></member>
<member name="P:System.Web.WebPages.Razor.Configuration.RazorPagesSection.PageBaseType"></member>
<member name="F:System.Web.WebPages.Razor.Configuration.RazorPagesSection.SectionName"></member>
<member name="T:System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup"></member>
<member name="M:System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup.#ctor"></member>
<member name="F:System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup.GroupName"></member>
<member name="P:System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup.Host"></member>
<member name="P:System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup.Pages"></member>
</members>
</doc>
Binary file not shown.
-884
View File
@@ -1,884 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<doc>
<assembly>
<name>System.Web.WebPages</name>
</assembly>
<members>
<member name="T:System.Web.Helpers.AntiForgery">
<summary>Helps prevent malicious scripts from submitting forged page requests.</summary>
</member>
<member name="M:System.Web.Helpers.AntiForgery.GetHtml">
<summary>Adds an authenticating token to a form to help protect against request forgery.</summary>
<returns>Returns a string that contains the encrypted token value in a hidden HTML field.</returns>
<exception cref="T:System.ArgumentException">The current <see cref="T:System.Web.HttpContext" /> object is null.</exception>
</member>
<member name="M:System.Web.Helpers.AntiForgery.GetHtml(System.Web.HttpContextBase,System.String,System.String,System.String)">
<summary>Adds an authenticating token to a form to help protect against request forgery, allowing callers to specify added authentication details.</summary>
<returns>Returns the encrypted token value in a hidden HTML field.</returns>
<param name="httpContext">The HTTP context data for a request.</param>
<param name="salt">An optional random string of characters (such as Z*7g1&amp;p4) that is used to add complexity to the encryption for extra safety. The default is a null string.</param>
<param name="domain">The domain of a Web application that a request is submitted from.</param>
<param name="path">The virtual root path of a Web application that a request is submitted from.</param>
<exception cref="T:System.ArgumentNullException">The supplied <see cref="T:System.Web.HttpContextBase" /> object is null.</exception>
</member>
<member name="M:System.Web.Helpers.AntiForgery.Validate">
<summary>Validates that input data from an HTML form field comes from the user who submitted the data.</summary>
<exception cref="T:System.ArgumentException">The current <see cref="T:System.Web.HttpContext" /> value is null.</exception>
<exception cref="T:System.Web.Helpers.HttpAntiForgeryException">The HTTP cookie token that accompanies a valid request is missing-or-The form token is missing.-or-The form token value does not match the cookie token value.-or-The form token value does not match the cookie token value.</exception>
</member>
<member name="M:System.Web.Helpers.AntiForgery.Validate(System.Web.HttpContextBase,System.String)">
<summary>Validates that input data from an HTML form field comes from the user who submitted the data, allowing callers to specify additional custom details for the validation.</summary>
<param name="salt">An optional random string of characters (such as Z*7g1&amp;p4) used to decrypt an authentication token created by the <see cref="T:System.Web.Helpers.AntiForgery" /> class. The default is a null string.</param>
<exception cref="T:System.ArgumentException">The current <see cref="T:System.Web.HttpContext" /> value is null.</exception>
<exception cref="T:System.Web.Helpers.HttpAntiForgeryException">The HTTP cookie token that accompanies a valid request is missing-or-The form token is missing.-or-The form token value does not match the cookie token value.-or-The form token value does not match the cookie token value.-or-The <paramref name="salt" /> value supplied does not match the <paramref name="salt" /> value used to create the form token.</exception>
</member>
<member name="T:System.Web.Helpers.UnvalidatedRequestValues">
<summary>Provides access to unvalidated values in the <see cref="T:System.Web.HttpRequest" /> object.</summary>
</member>
<member name="P:System.Web.Helpers.UnvalidatedRequestValues.Form">
<summary>Gets a collection of unvalidated Web form values.</summary>
<returns>An unvalidated collection of Web form values.</returns>
</member>
<member name="P:System.Web.Helpers.UnvalidatedRequestValues.Item(System.String)">
<summary>Gets an unvalidated object from a collection in the <see cref="T:System.Web.HttpRequest" /> object.</summary>
<returns>A member of a collection contained in the <see cref="T:System.Web.HttpRequest" /> object.</returns>
<param name="key">The name of the collection member to get.</param>
</member>
<member name="P:System.Web.Helpers.UnvalidatedRequestValues.QueryString">
<summary>Gets a collection of unvalidated query-string values.</summary>
<returns>A collection of unvalidated query-string values.</returns>
</member>
<member name="T:System.Web.Helpers.Validation">
<summary>Excludes fields of the Request object from being checked for potentially unsafe HTML markup.</summary>
</member>
<member name="M:System.Web.Helpers.Validation.Unvalidated(System.Web.HttpRequest)">
<summary>Returns an unvalidated version of form values or query-string values.</summary>
<returns>An <see cref="System.Web.Helpers.UnvalidatedRequestValues" /> object that contains unvalidated versions of the form and query string values.</returns>
<param name="request">The <see cref="T:System.Web.HttpRequest" /> object that contains values to exclude.</param>
</member>
<member name="M:System.Web.Helpers.Validation.Unvalidated(System.Web.HttpRequest,System.String)">
<summary>Returns an unvalidated value from the form or query string based on the field that has been requested.</summary>
<returns>A string that contains unvalidated text from the specified field or query-string value.</returns>
<param name="request">The <see cref="T:System.Web.HttpRequest" /> object that contains values to exclude from validation s</param>
<param name="key">The name of the field to exclude from validation.</param>
</member>
<member name="M:System.Web.Helpers.Validation.Unvalidated(System.Web.HttpRequestBase)">
<summary>Returns an unvalidated version of form values or query-string values.</summary>
<returns>An <see cref="System.Web.Helpers.UnvalidatedRequestValues" /> object that contains unvalidated versions of the form and query-string values.</returns>
<param name="request">The <see cref="T:System.Web.HttpRequest" /> object that contains values to exclude from validation.</param>
</member>
<member name="M:System.Web.Helpers.Validation.Unvalidated(System.Web.HttpRequestBase,System.String)">
<summary>Returns an unvalidated value from the form or query string based on the field that has been requested.</summary>
<returns>A string that contains unvalidated text from the specified field or query-string value.</returns>
<param name="request">The <see cref="T:System.Web.HttpRequestBase" /> object that contains values to exclude from validation.</param>
<param name="key">The name of the field to exclude from validation.</param>
</member>
<member name="T:System.Web.Mvc.HttpAntiForgeryException">
<summary>This class and its members support the .NET Framework infrastructure and are not intended to be used directly from your code.</summary>
</member>
<member name="M:System.Web.Mvc.HttpAntiForgeryException.#ctor">
<summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
</member>
<member name="M:System.Web.Mvc.HttpAntiForgeryException.#ctor(System.String)">
<summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
<param name="message">Details about the exception.</param>
</member>
<member name="M:System.Web.Mvc.HttpAntiForgeryException.#ctor(System.String,System.Exception)">
<summary>This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.</summary>
<param name="message">Details about the exception.</param>
<param name="innerException">An exception that occurred before the current exception.</param>
</member>
<member name="T:System.Web.Mvc.TagBuilder"></member>
<member name="M:System.Web.Mvc.TagBuilder.#ctor(System.String)"></member>
<member name="M:System.Web.Mvc.TagBuilder.AddCssClass(System.String)"></member>
<member name="P:System.Web.Mvc.TagBuilder.Attributes"></member>
<member name="M:System.Web.Mvc.TagBuilder.CreateSanitizedId(System.String)"></member>
<member name="M:System.Web.Mvc.TagBuilder.CreateSanitizedId(System.String,System.String)"></member>
<member name="M:System.Web.Mvc.TagBuilder.GenerateId(System.String)"></member>
<member name="P:System.Web.Mvc.TagBuilder.IdAttributeDotReplacement"></member>
<member name="P:System.Web.Mvc.TagBuilder.InnerHtml"></member>
<member name="M:System.Web.Mvc.TagBuilder.MergeAttribute(System.String,System.String)"></member>
<member name="M:System.Web.Mvc.TagBuilder.MergeAttribute(System.String,System.String,System.Boolean)"></member>
<member name="M:System.Web.Mvc.TagBuilder.MergeAttributes``2(System.Collections.Generic.IDictionary{``0,``1})">
<typeparam name="TKey"></typeparam>
<typeparam name="TValue"></typeparam>
</member>
<member name="M:System.Web.Mvc.TagBuilder.MergeAttributes``2(System.Collections.Generic.IDictionary{``0,``1},System.Boolean)">
<typeparam name="TKey"></typeparam>
<typeparam name="TValue"></typeparam>
</member>
<member name="M:System.Web.Mvc.TagBuilder.SetInnerText(System.String)"></member>
<member name="P:System.Web.Mvc.TagBuilder.TagName"></member>
<member name="M:System.Web.Mvc.TagBuilder.ToString"></member>
<member name="M:System.Web.Mvc.TagBuilder.ToString(System.Web.Mvc.TagRenderMode)"></member>
<member name="T:System.Web.Mvc.TagRenderMode">
<summary>Enumerates the modes that are available for rendering HTML tags.</summary>
</member>
<member name="F:System.Web.Mvc.TagRenderMode.Normal">
<summary>Represents normal mode.</summary>
</member>
<member name="F:System.Web.Mvc.TagRenderMode.StartTag">
<summary>Represents the start-tag mode.</summary>
</member>
<member name="F:System.Web.Mvc.TagRenderMode.EndTag">
<summary>Represents end-tag mode.</summary>
</member>
<member name="F:System.Web.Mvc.TagRenderMode.SelfClosing">
<summary>Represents self-closing-tag mode.</summary>
</member>
<member name="T:System.Web.WebPages.ApplicationPart"></member>
<member name="M:System.Web.WebPages.ApplicationPart.#ctor(System.Reflection.Assembly,System.String)"></member>
<member name="M:System.Web.WebPages.ApplicationPart.ProcessVirtualPath(System.Reflection.Assembly,System.String,System.String)"></member>
<member name="M:System.Web.WebPages.ApplicationPart.Register(System.Web.WebPages.ApplicationPart)"></member>
<member name="T:System.Web.WebPages.ApplicationStartPage"></member>
<member name="M:System.Web.WebPages.ApplicationStartPage.#ctor"></member>
<member name="P:System.Web.WebPages.ApplicationStartPage.Application"></member>
<member name="F:System.Web.WebPages.ApplicationStartPage.CacheKeyPrefix"></member>
<member name="P:System.Web.WebPages.ApplicationStartPage.Context"></member>
<member name="P:System.Web.WebPages.ApplicationStartPage.Markup"></member>
<member name="P:System.Web.WebPages.ApplicationStartPage.Output"></member>
<member name="F:System.Web.WebPages.ApplicationStartPage.StartPageVirtualPath"></member>
<member name="P:System.Web.WebPages.ApplicationStartPage.VirtualPath"></member>
<member name="M:System.Web.WebPages.ApplicationStartPage.Write(System.Object)"></member>
<member name="M:System.Web.WebPages.ApplicationStartPage.Write(System.Web.WebPages.HelperResult)"></member>
<member name="M:System.Web.WebPages.ApplicationStartPage.WriteLiteral(System.Object)"></member>
<member name="T:System.Web.WebPages.HelperPage"></member>
<member name="M:System.Web.WebPages.HelperPage.#ctor"></member>
<member name="P:System.Web.WebPages.HelperPage.App"></member>
<member name="P:System.Web.WebPages.HelperPage.AppState"></member>
<member name="P:System.Web.WebPages.HelperPage.Cache"></member>
<member name="P:System.Web.WebPages.HelperPage.Context"></member>
<member name="P:System.Web.WebPages.HelperPage.CurrentPage"></member>
<member name="M:System.Web.WebPages.HelperPage.Href(System.String,System.Object[])"></member>
<member name="P:System.Web.WebPages.HelperPage.Html"></member>
<member name="P:System.Web.WebPages.HelperPage.IsAjax"></member>
<member name="P:System.Web.WebPages.HelperPage.IsPost"></member>
<member name="P:System.Web.WebPages.HelperPage.Model"></member>
<member name="P:System.Web.WebPages.HelperPage.ModelState"></member>
<member name="P:System.Web.WebPages.HelperPage.Page"></member>
<member name="P:System.Web.WebPages.HelperPage.PageContext"></member>
<member name="P:System.Web.WebPages.HelperPage.PageData"></member>
<member name="P:System.Web.WebPages.HelperPage.Request"></member>
<member name="P:System.Web.WebPages.HelperPage.Response"></member>
<member name="P:System.Web.WebPages.HelperPage.Server"></member>
<member name="P:System.Web.WebPages.HelperPage.Session"></member>
<member name="P:System.Web.WebPages.HelperPage.UrlData"></member>
<member name="P:System.Web.WebPages.HelperPage.User"></member>
<member name="P:System.Web.WebPages.HelperPage.VirtualPath"></member>
<member name="M:System.Web.WebPages.HelperPage.WriteLiteralTo(System.IO.TextWriter,System.Object)"></member>
<member name="M:System.Web.WebPages.HelperPage.WriteLiteralTo(System.IO.TextWriter,System.Web.WebPages.HelperResult)"></member>
<member name="M:System.Web.WebPages.HelperPage.WriteTo(System.IO.TextWriter,System.Object)"></member>
<member name="M:System.Web.WebPages.HelperPage.WriteTo(System.IO.TextWriter,System.Web.WebPages.HelperResult)"></member>
<member name="T:System.Web.WebPages.HelperResult"></member>
<member name="M:System.Web.WebPages.HelperResult.#ctor(System.Action{System.IO.TextWriter})"></member>
<member name="M:System.Web.WebPages.HelperResult.ToHtmlString"></member>
<member name="M:System.Web.WebPages.HelperResult.ToString"></member>
<member name="M:System.Web.WebPages.HelperResult.WriteTo(System.IO.TextWriter)"></member>
<member name="T:System.Web.WebPages.HttpContextExtensions"></member>
<member name="M:System.Web.WebPages.HttpContextExtensions.RedirectLocal(System.Web.HttpContextBase,System.String)">
<summary>Redirects to the root of the Web site if the host is not local.</summary>
<param name="context">The HTTP context of the HTTP request.</param>
<param name="url">A locally hosted URL.</param>
</member>
<member name="M:System.Web.WebPages.HttpContextExtensions.RegisterForDispose(System.Web.HttpContextBase,System.IDisposable)"></member>
<member name="T:System.Web.WebPages.ITemplateFile"></member>
<member name="P:System.Web.WebPages.ITemplateFile.TemplateInfo"></member>
<member name="T:System.Web.WebPages.IVirtualPathFactory"></member>
<member name="M:System.Web.WebPages.IVirtualPathFactory.CreateInstance(System.String)"></member>
<member name="M:System.Web.WebPages.IVirtualPathFactory.Exists(System.String)"></member>
<member name="T:System.Web.WebPages.IWebPageRequestExecutor"></member>
<member name="M:System.Web.WebPages.IWebPageRequestExecutor.Execute(System.Web.WebPages.WebPage)"></member>
<member name="T:System.Web.WebPages.PageVirtualPathAttribute"></member>
<member name="M:System.Web.WebPages.PageVirtualPathAttribute.#ctor(System.String)"></member>
<member name="P:System.Web.WebPages.PageVirtualPathAttribute.VirtualPath"></member>
<member name="T:System.Web.WebPages.PreApplicationStartCode"></member>
<member name="M:System.Web.WebPages.PreApplicationStartCode.Start"></member>
<member name="T:System.Web.WebPages.RequestExtensions"></member>
<member name="M:System.Web.WebPages.RequestExtensions.IsUrlLocalToHost(System.Web.HttpRequestBase,System.String)"></member>
<member name="T:System.Web.WebPages.ResponseExtensions"></member>
<member name="M:System.Web.WebPages.ResponseExtensions.OutputCache(System.Web.HttpResponseBase,System.Int32,System.Boolean,System.Collections.Generic.IEnumerable{System.String},System.Collections.Generic.IEnumerable{System.String},System.Collections.Generic.IEnumerable{System.String},System.Web.HttpCacheability)"></member>
<member name="M:System.Web.WebPages.ResponseExtensions.SetStatus(System.Web.HttpResponseBase,System.Int32)"></member>
<member name="M:System.Web.WebPages.ResponseExtensions.SetStatus(System.Web.HttpResponseBase,System.Net.HttpStatusCode)"></member>
<member name="M:System.Web.WebPages.ResponseExtensions.WriteBinary(System.Web.HttpResponseBase,System.Byte[])"></member>
<member name="M:System.Web.WebPages.ResponseExtensions.WriteBinary(System.Web.HttpResponseBase,System.Byte[],System.String)"></member>
<member name="T:System.Web.WebPages.SectionWriter"></member>
<member name="T:System.Web.WebPages.StartPage"></member>
<member name="M:System.Web.WebPages.StartPage.#ctor"></member>
<member name="P:System.Web.WebPages.StartPage.ChildPage"></member>
<member name="P:System.Web.WebPages.StartPage.Context"></member>
<member name="M:System.Web.WebPages.StartPage.ExecutePageHierarchy"></member>
<member name="M:System.Web.WebPages.StartPage.GetStartPage(System.Web.WebPages.WebPageRenderingBase,System.String,System.Collections.Generic.IEnumerable{System.String})"></member>
<member name="P:System.Web.WebPages.StartPage.Layout"></member>
<member name="P:System.Web.WebPages.StartPage.Page"></member>
<member name="P:System.Web.WebPages.StartPage.PageData"></member>
<member name="M:System.Web.WebPages.StartPage.RenderPage(System.String,System.Object[])"></member>
<member name="M:System.Web.WebPages.StartPage.RunPage"></member>
<member name="M:System.Web.WebPages.StartPage.Write(System.Object)"></member>
<member name="M:System.Web.WebPages.StartPage.Write(System.Web.WebPages.HelperResult)"></member>
<member name="M:System.Web.WebPages.StartPage.WriteLiteral(System.Object)"></member>
<member name="T:System.Web.WebPages.StringExtensions">
<summary>Provides utility methods for converting string values to other data types.</summary>
</member>
<member name="M:System.Web.WebPages.StringExtensions.As``1(System.String)">
<summary>Converts a string to a strongly typed value of the specified data type.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
<typeparam name="TValue">The data type to convert to.</typeparam>
</member>
<member name="M:System.Web.WebPages.StringExtensions.As``1(System.String,``0)">
<summary>Converts a string to the specified data type and specifies a default value.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
<param name="defaultValue">The value to return if <paramref name="value" /> is null.</param>
<typeparam name="TValue">The data type to convert to.</typeparam>
</member>
<member name="M:System.Web.WebPages.StringExtensions.AsBool(System.String)">
<summary>Converts a string to a Boolean (true/false) value.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.AsBool(System.String,System.Boolean)">
<summary>Converts a string to a Boolean (true/false) value and specifies a default value.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
<param name="defaultValue">The value to return if <paramref name="value" /> is null or an invalid value. The default is false.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.AsDateTime(System.String)">
<summary>Converts a string to a <see cref="T:System.DateTime" /> value.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.AsDateTime(System.String,System.DateTime)">
<summary>Converts a string to a <see cref="T:System.DateTime" /> value and specifies a default value.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
<param name="defaultValue">The value to return if <paramref name="value" /> is null or an invalid value. The default is the minimum time value on the system.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.AsDecimal(System.String)">
<summary>Converts a string to a <see cref="T:System.Decimal" /> number.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.AsDecimal(System.String,System.Decimal)">
<summary>Converts a string to a <see cref="T:System.Decimal" /> number and specifies a default value.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
<param name="defaultValue">The value to return if <paramref name="value" /> is null or invalid.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.AsFloat(System.String)">
<summary>Converts a string to a <see cref="T:System.Single" /> number.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.AsFloat(System.String,System.Single)">
<summary>Converts a string to a <see cref="T:System.Single" /> number and specifies a default value.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
<param name="defaultValue">The value to return if <paramref name="value" /> is null.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.AsInt(System.String)">
<summary>Converts a string to an integer.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.AsInt(System.String,System.Int32)">
<summary>Converts a string to an integer and specifies a default value.</summary>
<returns>The converted value.</returns>
<param name="value">The value to convert.</param>
<param name="defaultValue">The value to return if <paramref name="value" /> is null or is an invalid value.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.Is``1(System.String)">
<summary>Checks whether a string can be converted to the specified data type.</summary>
<returns>
<paramref name="true" /> if <paramref name="value" /> can be converted to the specified type; otherwise, <paramref name="false" />.</returns>
<param name="value">The value to test.</param>
<typeparam name="TValue">The data type to convert to.</typeparam>
</member>
<member name="M:System.Web.WebPages.StringExtensions.IsBool(System.String)">
<summary>Checks whether a string can be converted to the Boolean (true/false) type.</summary>
<returns>
<paramref name="true" /> if <paramref name="value" /> can be converted to the specified type; otherwise, <paramref name="false" />.</returns>
<param name="value">The string value to test.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.IsDateTime(System.String)">
<summary>Checks whether a string can be converted to the <see cref="T:System.DateTime" /> type.</summary>
<returns>
<paramref name="true" /> if <paramref name="value" /> can be converted to the specified type; otherwise, <paramref name="false" />.</returns>
<param name="value">The string value to test.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.IsDecimal(System.String)">
<summary>Checks whether a string can be converted to the <see cref="T:System.Decimal" /> type.</summary>
<returns>
<paramref name="true" /> if <paramref name="value" /> can be converted to the specified type; otherwise, <paramref name="false" />.</returns>
<param name="value">The string value to test.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.IsEmpty(System.String)">
<summary>Checks whether a string value is null or empty.</summary>
<returns>true if <paramref name="value" /> is null or is a zero-length string (""); otherwise, false.</returns>
<param name="value">The string value to test.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.IsFloat(System.String)">
<summary>Checks whether a string can be converted to the <see cref="T:System.Single" /> type.</summary>
<returns>true if <paramref name="value" /> can be converted to the specified type; otherwise, false.</returns>
<param name="value">The string value to test.</param>
</member>
<member name="M:System.Web.WebPages.StringExtensions.IsInt(System.String)">
<summary>Checks whether a string can be converted to an integer.</summary>
<returns>
<paramref name="true" /> if <paramref name="value" /> can be converted to the specified type; otherwise, <paramref name="false" />.</returns>
<param name="value">The string value to test.</param>
</member>
<member name="T:System.Web.WebPages.TemplateFileInfo"></member>
<member name="M:System.Web.WebPages.TemplateFileInfo.#ctor(System.String)"></member>
<member name="P:System.Web.WebPages.TemplateFileInfo.VirtualPath"></member>
<member name="T:System.Web.WebPages.TemplateStack"></member>
<member name="M:System.Web.WebPages.TemplateStack.GetCurrentTemplate(System.Web.HttpContextBase)"></member>
<member name="M:System.Web.WebPages.TemplateStack.Pop(System.Web.HttpContextBase)"></member>
<member name="M:System.Web.WebPages.TemplateStack.Push(System.Web.HttpContextBase,System.Web.WebPages.ITemplateFile)"></member>
<member name="T:System.Web.WebPages.VirtualPathFactoryManager"></member>
<member name="M:System.Web.WebPages.VirtualPathFactoryManager.RegisterVirtualPathFactory(System.Web.WebPages.IVirtualPathFactory)"></member>
<member name="T:System.Web.WebPages.WebPage">
<summary>Represents an ASP.NET Razor page.</summary>
</member>
<member name="M:System.Web.WebPages.WebPage.#ctor">
<summary>Called from a derived class to create a new instance that is based on the <see cref="T:System.Web.WebPages.WebPage" /> class.</summary>
</member>
<member name="P:System.Web.WebPages.WebPage.Context">
<summary>Gets or sets the <see cref="T:System.Web.HttpContextBase" /> object that is associated with a page.</summary>
<returns>An object that references HTTP data about the current context of a page.</returns>
</member>
<member name="M:System.Web.WebPages.WebPage.ExecutePageHierarchy">
<summary>Executes the code in a set of dependent Web pages.</summary>
</member>
<member name="P:System.Web.WebPages.WebPage.Html">
<summary>Gets the <see cref="T:System.Web.WebPages.Html.HtmlHelper" /> object that is associated with a page.</summary>
<returns>An object that supports rendering HTML form controls in a page.</returns>
</member>
<member name="M:System.Web.WebPages.WebPage.InitializePage">
<summary>Initializes an object that inherits from the <see cref="T:System.Web.WebPages.WebPage" /> class.</summary>
</member>
<member name="P:System.Web.WebPages.WebPage.Model">
<summary>Gets the model that is associated with a page.</summary>
<returns>An object that represents a model that is associated with the view data for a page.</returns>
</member>
<member name="P:System.Web.WebPages.WebPage.ModelState">
<summary>Gets the state data for the model that is associated with a page.</summary>
<returns>The state of the model.</returns>
</member>
<member name="M:System.Web.WebPages.WebPage.RegisterPageExecutor(System.Web.WebPages.IWebPageRequestExecutor)">
<summary>Adds a class to a list of classes that handle page execution and that implement custom features for pages.</summary>
<param name="executor">The class to add.</param>
</member>
<member name="T:System.Web.WebPages.WebPageBase"></member>
<member name="M:System.Web.WebPages.WebPageBase.#ctor"></member>
<member name="M:System.Web.WebPages.WebPageBase.ConfigurePage(System.Web.WebPages.WebPageBase)"></member>
<member name="M:System.Web.WebPages.WebPageBase.CreateInstanceFromVirtualPath(System.String)"></member>
<member name="M:System.Web.WebPages.WebPageBase.DefineSection(System.String,System.Web.WebPages.SectionWriter)">
<summary>Called by content pages to create named content sections.</summary>
<param name="name">The name of the section to create.</param>
<param name="action">The type of action to take with the new section.</param>
</member>
<member name="M:System.Web.WebPages.WebPageBase.ExecutePageHierarchy"></member>
<member name="M:System.Web.WebPages.WebPageBase.ExecutePageHierarchy(System.Web.WebPages.WebPageContext,System.IO.TextWriter)"></member>
<member name="M:System.Web.WebPages.WebPageBase.ExecutePageHierarchy(System.Web.WebPages.WebPageContext,System.IO.TextWriter,System.Web.WebPages.WebPageRenderingBase)"></member>
<member name="M:System.Web.WebPages.WebPageBase.InitializePage"></member>
<member name="M:System.Web.WebPages.WebPageBase.IsSectionDefined(System.String)"></member>
<member name="P:System.Web.WebPages.WebPageBase.Layout">
<summary>Gets or sets the path of a layout page.</summary>
<returns>The path of the layout page.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageBase.Output"></member>
<member name="P:System.Web.WebPages.WebPageBase.OutputStack"></member>
<member name="P:System.Web.WebPages.WebPageBase.Page">
<summary>Provides property-like access to page data that is shared between pages, layout pages, and partial pages.</summary>
<returns>An object that contains page data.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageBase.PageData">
<summary>Provides array-like access to page data that is shared between pages, layout pages, and partial pages.</summary>
<returns>A dictionary that contains page data.</returns>
</member>
<member name="M:System.Web.WebPages.WebPageBase.PopContext"></member>
<member name="M:System.Web.WebPages.WebPageBase.PushContext(System.Web.WebPages.WebPageContext,System.IO.TextWriter)"></member>
<member name="M:System.Web.WebPages.WebPageBase.RenderBody">
<summary>In layout pages, renders the portion of a content page that is not within a named section.</summary>
<returns>The HTML content to render.</returns>
</member>
<member name="M:System.Web.WebPages.WebPageBase.RenderPage(System.String,System.Object[])">
<summary>Renders the content of one page within another page.</summary>
<returns>The HTML content to render.</returns>
<param name="path">The path of the page to render.</param>
<param name="data">(Optional) An array of data to pass to the page being rendered. In the rendered page, these parameters can be accessed by using the <see cref="P:System.Web.WebPages.WebPageBase.PageData" /> property.</param>
</member>
<member name="M:System.Web.WebPages.WebPageBase.RenderSection(System.String)">
<summary>In layout pages, renders the content of a named section.</summary>
<returns>The HTML content to render.</returns>
<param name="name">The section to render.</param>
</member>
<member name="M:System.Web.WebPages.WebPageBase.RenderSection(System.String,System.Boolean)">
<summary>In layout pages, renders the content of a named section and specifies whether the section is required.</summary>
<returns>The HTML content to render.</returns>
<param name="name">The section to render.</param>
<param name="required">true to specify that the section is required; otherwise, false. The default is false.</param>
</member>
<member name="M:System.Web.WebPages.WebPageBase.Write(System.Object)"></member>
<member name="M:System.Web.WebPages.WebPageBase.Write(System.Web.WebPages.HelperResult)"></member>
<member name="M:System.Web.WebPages.WebPageBase.WriteLiteral(System.Object)"></member>
<member name="T:System.Web.WebPages.WebPageContext">
<summary>Contains data that is used by a <see cref="T:System.Web.WebPages.WebPage" /> object to reference details about the Web application, the current HTTP request context, the current execution context, and page data.</summary>
</member>
<member name="M:System.Web.WebPages.WebPageContext.#ctor"></member>
<member name="M:System.Web.WebPages.WebPageContext.#ctor(System.Web.HttpContextBase,System.Web.WebPages.WebPageRenderingBase,System.Object)"></member>
<member name="P:System.Web.WebPages.WebPageContext.Current">
<summary>Gets a reference to the current <see cref="T:System.Web.WebPages.WebPageContext" /> object that is associated with a page.</summary>
<returns>The current page context object.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageContext.Model"></member>
<member name="P:System.Web.WebPages.WebPageContext.Page">
<summary>Gets the <see cref="T:System.Web.WebPages.WebPageRenderingBase" /> object that is associated with a page.</summary>
<returns>The page rendering object.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageContext.PageData">
<summary>Gets the page data that is shared between pages, layout pages, and partial pages.</summary>
<returns>A dictionary that contains page data.</returns>
</member>
<member name="T:System.Web.WebPages.WebPageExecutingBase">
<summary>Provides objects and methods that are used to execute and render all ASP.NET Razor pages.</summary>
</member>
<member name="M:System.Web.WebPages.WebPageExecutingBase.#ctor"></member>
<member name="P:System.Web.WebPages.WebPageExecutingBase.App">
<summary>Gets the application state data cast as a <see cref="T:System.Dynamic.DynamicObject" /> object that callers can use to create and access custom application-scoped properties.</summary>
<returns>An object that references the application state data.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageExecutingBase.AppState">
<summary>Gets a reference to global application state data that can be shared across sessions and requests in an ASP.NET application.</summary>
<returns>The application state data.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageExecutingBase.Context">
<summary>When overridden in a derived class, gets or sets the <see cref="T:System.Web.HttpContextBase" /> object that is associated with a page.</summary>
<returns>The current context data.</returns>
</member>
<member name="M:System.Web.WebPages.WebPageExecutingBase.Execute"></member>
<member name="M:System.Web.WebPages.WebPageExecutingBase.NormalizePath(System.String)"></member>
<member name="P:System.Web.WebPages.WebPageExecutingBase.VirtualPath"></member>
<member name="M:System.Web.WebPages.WebPageExecutingBase.Write(System.Object)"></member>
<member name="M:System.Web.WebPages.WebPageExecutingBase.Write(System.Web.WebPages.HelperResult)"></member>
<member name="M:System.Web.WebPages.WebPageExecutingBase.WriteLiteral(System.Object)"></member>
<member name="M:System.Web.WebPages.WebPageExecutingBase.WriteLiteralTo(System.IO.TextWriter,System.Object)"></member>
<member name="M:System.Web.WebPages.WebPageExecutingBase.WriteTo(System.IO.TextWriter,System.Object)"></member>
<member name="M:System.Web.WebPages.WebPageExecutingBase.WriteTo(System.IO.TextWriter,System.Web.WebPages.HelperResult)"></member>
<member name="T:System.Web.WebPages.WebPageHttpHandler"></member>
<member name="M:System.Web.WebPages.WebPageHttpHandler.#ctor(System.Web.WebPages.WebPage)"></member>
<member name="M:System.Web.WebPages.WebPageHttpHandler.CreateFromVirtualPath(System.String)"></member>
<member name="P:System.Web.WebPages.WebPageHttpHandler.DisableWebPagesResponseHeader"></member>
<member name="M:System.Web.WebPages.WebPageHttpHandler.GetRegisteredExtensions"></member>
<member name="P:System.Web.WebPages.WebPageHttpHandler.IsReusable"></member>
<member name="M:System.Web.WebPages.WebPageHttpHandler.ProcessRequest(System.Web.HttpContext)"></member>
<member name="M:System.Web.WebPages.WebPageHttpHandler.RegisterExtension(System.String)"></member>
<member name="F:System.Web.WebPages.WebPageHttpHandler.WebPagesVersionHeaderName"></member>
<member name="T:System.Web.WebPages.WebPageRenderingBase">
<summary>Provides methods and properties that are used to render pages that use the Razor view engine.</summary>
</member>
<member name="M:System.Web.WebPages.WebPageRenderingBase.#ctor">
<summary>Initializes a new instance of the <see cref="T:System.WebPages.WebPageRenderingBase" /> class.</summary>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.Cache">
<summary>When overridden in a derived class, gets the cache object for the current application domain.</summary>
<returns>The cache object.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.Culture">
<summary>Gets or sets the culture for the current thread.</summary>
<returns>The culture for the current thread.</returns>
</member>
<member name="M:System.Web.WebPages.WebPageRenderingBase.ExecutePageHierarchy">
<summary>When overridden in a derived class, calls the methods that are used to initialize the page.</summary>
</member>
<member name="M:System.Web.WebPages.WebPageRenderingBase.Href(System.String,System.Object[])">
<summary>When overridden in a derived class, builds a URL using the specified parameters.</summary>
<returns>A URL.</returns>
<param name="path">The path to include in the URL.</param>
<param name="pathParts">Additional path information.</param>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.IsAjax">
<summary>When overridden in a derived class, get a value that indicates whether Ajax is being used during the request of the Web page.</summary>
<returns>true if Ajax is being used during the request; otherwise, false.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.IsPost">
<summary>When overridden in a derived class, returns a value that indicates whether the HTTP data transfer method used by the client to request the Web page is POST.</summary>
<returns>true if the HTTP verb is "POST"; otherwise, false.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.Layout">
<summary>When overridden in a derived class, gets or sets the path of a layout page.</summary>
<returns>The path of a layout page.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.Page">
<summary>When overridden in a derived class, provides property-like access to page data that is shared between pages, layout pages, and partial pages.</summary>
<returns>An object that contains page data.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.PageContext">
<summary>Gets the HTTP context for the Web page.</summary>
<returns>The HTTP context for the Web page.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.PageData">
<summary>When overridden in a derived class, provides array-like access to page data that is shared between pages, layout pages, and partial pages.</summary>
<returns>An object that provides array-like access to page data.</returns>
</member>
<member name="M:System.Web.WebPages.WebPageRenderingBase.RenderPage(System.String,System.Object[])">
<summary>When overridden in a derived class, renders a Web page.</summary>
<returns>The markup that represents the Web page.</returns>
<param name="path">The path of the page to render.</param>
<param name="data">Additional data that is used to render the page.</param>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.Request">
<summary>When overridden in a derived class, gets the <see cref="T:System.Web.HttpRequest" /> object for the current HTTP request.</summary>
<returns>A <see cref="T:System.Web.HttpRequest" /> object that contains the HTTP values sent by a client during a Web request.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.Response">
<summary>When overridden in a derived class, gets the <see cref="T:System.Web.HttpResponse" /> object for the current HTTP response.</summary>
<returns>A <see cref="T:System.Web.HttpResponse" /> object that contains the HTTP-response information from an ASP.NET operation.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.Server">
<summary>When overridden in a derived class, gets the <see cref="T:System.Web.HttpServerUtility" /> object that provides methods that can be used as part of Web-page processing.</summary>
<returns>The <see cref="T:System.Web.HttpServerUtility" /> object.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.Session">
<summary>When overridden in a derived class, gets the <see cref="T:System.Web.HttpSessionState" /> object for the current HTTP request.</summary>
<returns>Session data for the current request.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.TemplateInfo">
<summary>When overridden in a derived class, gets information about the currently executing file.</summary>
<returns>Information about the currently executing file.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.UICulture">
<summary>Gets or sets the current culture used by the ResourceManager to look up culture-specific resources at run time.</summary>
<returns>The current culture used by the Resource Manager.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.UrlData">
<summary>When overridden in a derived class, gets data related to the URL path.</summary>
<returns>Data related to the URL path.</returns>
</member>
<member name="P:System.Web.WebPages.WebPageRenderingBase.User">
<summary>When overridden in a derived class, gets a user value based on the HTTP context.</summary>
<returns>A user value based on the HTTP context.</returns>
</member>
<member name="T:System.Web.WebPages.Html.HtmlHelper">
<summary>Represents support for rendering HTML controls in a Web page.</summary>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.AttributeEncode(System.Object)">
<returns>Returns <see cref="T:System.String" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.AttributeEncode(System.String)">
<returns>Returns <see cref="T:System.String" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String,System.Boolean)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String,System.Boolean,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String,System.Boolean,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.CheckBox(System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.DropDownList(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Encode(System.Object)">
<returns>Returns <see cref="T:System.String" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Encode(System.String)">
<returns>Returns <see cref="T:System.String" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Hidden(System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Hidden(System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Hidden(System.String,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Hidden(System.String,System.Object,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="P:System.Web.WebPages.Html.HtmlHelper.IdAttributeDotReplacement">
<returns>Returns <see cref="T:System.String" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Label(System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Label(System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Label(System.String,System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Label(System.String,System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Label(System.String,System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Int32,System.Boolean)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Int32,System.Boolean)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Int32,System.Boolean,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Int32,System.Boolean,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ListBox(System.String,System.String,System.Collections.Generic.IEnumerable{System.Web.WebPages.Html.SelectListItem},System.Object,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Password(System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Password(System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Password(System.String,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Password(System.String,System.Object,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object,System.Boolean)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object,System.Boolean,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object,System.Boolean,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.RadioButton(System.String,System.Object,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.Raw(System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.String,System.Int32,System.Int32,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.String,System.Int32,System.Int32,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextArea(System.String,System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextBox(System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextBox(System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextBox(System.String,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.TextBox(System.String,System.Object,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="P:System.Web.WebPages.Html.HtmlHelper.ValidationInputCssClassName">
<returns>Returns <see cref="T:System.String" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String,System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String,System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationMessage(System.String,System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.Boolean)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.String)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.String,System.Boolean,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.String,System.Boolean,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.String,System.Collections.Generic.IDictionary{System.String,System.Object})">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="M:System.Web.WebPages.Html.HtmlHelper.ValidationSummary(System.String,System.Object)">
<returns>Returns <see cref="T:System.Web.IHtmlString" />.</returns>
</member>
<member name="P:System.Web.WebPages.Html.HtmlHelper.ValidationSummaryClass">
<returns>Returns <see cref="T:System.String" />.</returns>
</member>
<member name="T:System.Web.WebPages.Html.ModelState"></member>
<member name="M:System.Web.WebPages.Html.ModelState.#ctor"></member>
<member name="P:System.Web.WebPages.Html.ModelState.Errors"></member>
<member name="P:System.Web.WebPages.Html.ModelState.Value"></member>
<member name="T:System.Web.WebPages.Html.ModelStateDictionary"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.#ctor"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.#ctor(System.Web.WebPages.Html.ModelStateDictionary)"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.Add(System.Collections.Generic.KeyValuePair{System.String,System.Web.WebPages.Html.ModelState})"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.Add(System.String,System.Web.WebPages.Html.ModelState)"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.AddError(System.String,System.String)"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.AddFormError(System.String)"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.Clear"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.Contains(System.Collections.Generic.KeyValuePair{System.String,System.Web.WebPages.Html.ModelState})"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.ContainsKey(System.String)"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.CopyTo(System.Collections.Generic.KeyValuePair{System.String,System.Web.WebPages.Html.ModelState}[],System.Int32)"></member>
<member name="P:System.Web.WebPages.Html.ModelStateDictionary.Count"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.GetEnumerator"></member>
<member name="P:System.Web.WebPages.Html.ModelStateDictionary.IsReadOnly"></member>
<member name="P:System.Web.WebPages.Html.ModelStateDictionary.IsValid"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.IsValidField(System.String)"></member>
<member name="P:System.Web.WebPages.Html.ModelStateDictionary.Item(System.String)"></member>
<member name="P:System.Web.WebPages.Html.ModelStateDictionary.Keys"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.Merge(System.Web.WebPages.Html.ModelStateDictionary)"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.Remove(System.Collections.Generic.KeyValuePair{System.String,System.Web.WebPages.Html.ModelState})"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.Remove(System.String)"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.SetModelValue(System.String,System.Object)"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.System#Collections#IEnumerable#GetEnumerator"></member>
<member name="M:System.Web.WebPages.Html.ModelStateDictionary.TryGetValue(System.String,System.Web.WebPages.Html.ModelState@)"></member>
<member name="P:System.Web.WebPages.Html.ModelStateDictionary.Values"></member>
<member name="T:System.Web.WebPages.Html.SelectListItem"></member>
<member name="M:System.Web.WebPages.Html.SelectListItem.#ctor"></member>
<member name="M:System.Web.WebPages.Html.SelectListItem.#ctor(System.Web.WebPages.Html.SelectListItem)"></member>
<member name="P:System.Web.WebPages.Html.SelectListItem.Selected"></member>
<member name="P:System.Web.WebPages.Html.SelectListItem.Text"></member>
<member name="P:System.Web.WebPages.Html.SelectListItem.Value"></member>
<member name="T:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider"></member>
<member name="M:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider.#ctor"></member>
<member name="P:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider.ApplicationScope"></member>
<member name="P:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider.CurrentScope"></member>
<member name="P:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider.GlobalScope"></member>
<member name="P:System.Web.WebPages.Scope.AspNetRequestScopeStorageProvider.RequestScope"></member>
<member name="T:System.Web.WebPages.Scope.IScopeStorageProvider"></member>
<member name="P:System.Web.WebPages.Scope.IScopeStorageProvider.CurrentScope"></member>
<member name="P:System.Web.WebPages.Scope.IScopeStorageProvider.GlobalScope"></member>
<member name="T:System.Web.WebPages.Scope.ScopeStorage"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorage.CreateTransientScope"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorage.CreateTransientScope(System.Collections.Generic.IDictionary{System.Object,System.Object})"></member>
<member name="P:System.Web.WebPages.Scope.ScopeStorage.CurrentProvider"></member>
<member name="P:System.Web.WebPages.Scope.ScopeStorage.CurrentScope"></member>
<member name="P:System.Web.WebPages.Scope.ScopeStorage.GlobalScope"></member>
<member name="T:System.Web.WebPages.Scope.ScopeStorageDictionary"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.#ctor"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.#ctor(System.Collections.Generic.IDictionary{System.Object,System.Object})"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Add(System.Collections.Generic.KeyValuePair{System.Object,System.Object})"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Add(System.Object,System.Object)"></member>
<member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.BackingStore"></member>
<member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.BaseScope"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Clear"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Contains(System.Collections.Generic.KeyValuePair{System.Object,System.Object})"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.ContainsKey(System.Object)"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.CopyTo(System.Collections.Generic.KeyValuePair{System.Object,System.Object}[],System.Int32)"></member>
<member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.Count"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.GetEnumerator"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.GetItems"></member>
<member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.IsReadOnly"></member>
<member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.Item(System.Object)"></member>
<member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.Keys"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Remove(System.Collections.Generic.KeyValuePair{System.Object,System.Object})"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.Remove(System.Object)"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.SetValue(System.Object,System.Object)"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.System#Collections#IEnumerable#GetEnumerator"></member>
<member name="M:System.Web.WebPages.Scope.ScopeStorageDictionary.TryGetValue(System.Object,System.Object@)"></member>
<member name="P:System.Web.WebPages.Scope.ScopeStorageDictionary.Values"></member>
<member name="T:System.Web.WebPages.Scope.StaticScopeStorageProvider"></member>
<member name="M:System.Web.WebPages.Scope.StaticScopeStorageProvider.#ctor"></member>
<member name="P:System.Web.WebPages.Scope.StaticScopeStorageProvider.CurrentScope"></member>
<member name="P:System.Web.WebPages.Scope.StaticScopeStorageProvider.GlobalScope"></member>
</members>
</doc>
Binary file not shown.
+123 -137
View File
@@ -1,152 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
<PropertyGroup>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
<!-- Enable the restore command to run before builds -->
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
<!-- Enable the restore command to run before builds -->
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
<!-- Property that enables building a package from a project -->
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
<!-- Property that enables building a package from a project -->
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
<!-- Determines if package restore consent is required to restore packages -->
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
<!-- Download NuGet.exe if it does not already exist -->
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageSources)' == '' ">
<!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
<!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
<!--
<PackageSource Include="https://www.nuget.org/api/v2/" />
<PackageSource Include="https://my-nuget-source/nuget/" />
-->
<PackageSource Include="https://nuget.org/api/v2/" />
<PackageSource Include="http://www.myget.org/F/umbracocore/" />
</ItemGroup>
<!-- Determines if package restore consent is required to restore packages -->
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
<!-- Windows specific commands -->
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
</PropertyGroup>
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
<PackagesConfig>packages.config</PackagesConfig>
</PropertyGroup>
<PropertyGroup>
<!-- NuGet command -->
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
<!-- Download NuGet.exe if it does not already exist -->
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
</PropertyGroup>
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
<NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
<PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
<PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
<ItemGroup Condition=" '$(PackageSources)' == '' ">
<!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
<!--
<PackageSource Include="https://nuget.org/api/v2/" />
<PackageSource Include="https://my-nuget-source/nuget/" />
-->
<PackageSource Include="https://nuget.org/api/v2/" />
<PackageSource Include="http://www.myget.org/F/umbracocore/" />
</ItemGroup>
<!-- Commands -->
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
<!-- Windows specific commands -->
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
</PropertyGroup>
<!-- We need to ensure packages are restored prior to assembly resolve -->
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
RestorePackages;
$(BuildDependsOn);
</BuildDependsOn>
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
<PackagesConfig>packages.config</PackagesConfig>
</PropertyGroup>
<!-- Make the build depend on restore packages -->
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
$(BuildDependsOn);
BuildPackage;
</BuildDependsOn>
</PropertyGroup>
<PropertyGroup>
<!-- NuGet command -->
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
<Target Name="CheckPrerequisites">
<!-- Raise an error if we're unable to locate nuget.exe -->
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
<!--
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
This effectively acts as a lock that makes sure that the download operation will only happen once and all
parallel builds will have to wait for it to complete.
-->
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
</Target>
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
<Target Name="_DownloadNuGet">
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
</Target>
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
<Exec Command="$(RestoreCommand)"
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
<Exec Command="$(RestoreCommand)"
LogStandardErrorAsError="true"
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
</Target>
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
<!-- Commands -->
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "</RestoreCommand>
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
<Exec Command="$(BuildCommand)"
Condition=" '$(OS)' != 'Windows_NT' " />
<Exec Command="$(BuildCommand)"
LogStandardErrorAsError="true"
Condition=" '$(OS)' == 'Windows_NT' " />
</Target>
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<OutputFilename ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Reference Include="System.Core" />
<Using Namespace="System" />
<Using Namespace="System.IO" />
<Using Namespace="System.Net" />
<Using Namespace="Microsoft.Build.Framework" />
<Using Namespace="Microsoft.Build.Utilities" />
<Code Type="Fragment" Language="cs">
<![CDATA[
try {
OutputFilename = Path.GetFullPath(OutputFilename);
<!-- We need to ensure packages are restored prior to assembly resolve -->
<ResolveReferencesDependsOn Condition="$(RestorePackages) == 'true'">
RestorePackages;
$(ResolveReferencesDependsOn);
</ResolveReferencesDependsOn>
Log.LogMessage("Downloading latest version of NuGet.exe...");
WebClient webClient = new WebClient();
webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
<!-- Make the build depend on restore packages -->
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
$(BuildDependsOn);
BuildPackage;
</BuildDependsOn>
</PropertyGroup>
<Target Name="CheckPrerequisites">
<!-- Raise an error if we're unable to locate nuget.exe -->
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
<SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
<!--
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
This effectively acts as a lock that makes sure that the download operation will only happen once and all
parallel builds will have to wait for it to complete.
-->
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
</Target>
<Target Name="_DownloadNuGet">
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
</Target>
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
<Exec Command="$(RestoreCommand)"
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
<Exec Command="$(RestoreCommand)"
LogStandardErrorAsError="true"
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
</Target>
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
<Exec Command="$(BuildCommand)"
Condition=" '$(OS)' != 'Windows_NT' " />
<Exec Command="$(BuildCommand)"
LogStandardErrorAsError="true"
Condition=" '$(OS)' == 'Windows_NT' " />
</Target>
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<OutputFilename ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Reference Include="System.Core" />
<Using Namespace="System" />
<Using Namespace="System.IO" />
<Using Namespace="System.Net" />
<Using Namespace="Microsoft.Build.Framework" />
<Using Namespace="Microsoft.Build.Utilities" />
<Code Type="Fragment" Language="cs">
<![CDATA[
try {
OutputFilename = Path.GetFullPath(OutputFilename);
Log.LogMessage("Downloading latest version of NuGet.exe...");
WebClient webClient = new WebClient();
webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
return true;
}
catch (Exception ex) {
Log.LogErrorFromException(ex);
return false;
}
]]>
</Code>
</Task>
</UsingTask>
<UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
<ParameterGroup>
<EnvKey ParameterType="System.String" Required="true" />
<EnvValue ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Using Namespace="System" />
<Code Type="Fragment" Language="cs">
<![CDATA[
try {
Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
}
catch {
}
]]>
</Code>
</Task>
</UsingTask>
</Project>
return true;
}
catch (Exception ex) {
Log.LogErrorFromException(ex);
return false;
}
]]>
</Code>
</Task>
</UsingTask>
</Project>
@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<actionScriptProperties analytics="false" mainApplicationPath="DesktopMediaUploader.mxml" projectUUID="9115d8c5-0cb4-4a34-8702-48456cca7762" version="6">
<compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compilerSourcePath/>
<libraryPath defaultLinkType="0">
<libraryPathEntry kind="4" path="">
<excludedEntries>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/flex.swc" useDefaultLinkType="false"/>
</excludedEntries>
</libraryPathEntry>
<libraryPathEntry kind="1" linkType="1" path="libs"/>
</libraryPath>
<sourceAttachmentPath/>
</compiler>
<applications>
<application path="DesktopMediaUploader.mxml">
<airExcludes>
<airExclude path="assets/dmu_orange.fla"/>
<airExclude path="assets/logo.psd"/>
<airExclude path="assets/icon-128-old.png"/>
<airExclude path="assets/icon-128.psd"/>
</airExcludes>
</application>
</applications>
<modules/>
<buildCSSFiles/>
</actionScriptProperties>
-2
View File
@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="2"/>
-24
View File
@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>DesktopMediaUploader</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.adobe.flexbuilder.project.flexbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.adobe.flexbuilder.project.apollobuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.adobe.flexbuilder.project.apollonature</nature>
<nature>com.adobe.flexbuilder.project.flexnature</nature>
<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
</natures>
</projectDescription>
@@ -1,3 +0,0 @@
#Tue Jul 20 11:35:49 BST 2010
eclipse.preferences.version=1
encoding/<project>=utf-8
Binary file not shown.
@@ -1,154 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<application xmlns="http://ns.adobe.com/air/application/2.0">
<!-- Adobe AIR Application Descriptor File Template.
Specifies parameters for identifying, installing, and launching AIR applications.
xmlns - The Adobe AIR namespace: http://ns.adobe.com/air/application/2.0
The last segment of the namespace specifies the version
of the AIR runtime required for this application to run.
minimumPatchLevel - The minimum patch level of the AIR runtime required to run
the application. Optional.
-->
<!-- A universally unique application identifier. Must be unique across all AIR applications.
Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
<id>org.umbraco.DesktopMediaUploader</id>
<!-- Used as the filename for the application. Required. -->
<filename>Desktop Media Uploader</filename>
<!-- The name that is displayed in the AIR application installer.
May have multiple values for each language. See samples or xsd schema file. Optional. -->
<name>Desktop Media Uploader</name>
<!-- An application version designator (such as "v1", "2.5", or "Alpha 1"). Required. -->
<version>v2.1.0</version>
<!-- Description, displayed in the AIR application installer.
May have multiple values for each language. See samples or xsd schema file. Optional. -->
<description>
This application allows you to upload media to an Umbraco website directly from your desktop.
</description>
<!-- Copyright information. Optional -->
<copyright>2010 Umbraco.org</copyright>
<!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
<!-- <publisherID></publisherID> -->
<!-- Settings for the application's initial window. Required. -->
<initialWindow>
<!-- The main SWF or HTML file of the application. Required. -->
<!-- Note: In Flash Builder, the SWF reference is set automatically. -->
<content>DesktopMediaUploader.swf</content>
<!-- The title of the main window. Optional. -->
<!-- <title></title> -->
<!-- The type of system chrome to use (either "standard" or "none"). Optional. Default standard. -->
<!-- <systemChrome></systemChrome> -->
<!-- Whether the window is transparent. Only applicable when systemChrome is none. Optional. Default false. -->
<!-- <transparent></transparent> -->
<!-- Whether the window is initially visible. Optional. Default false. -->
<!-- <visible></visible> -->
<!-- Whether the user can minimize the window. Optional. Default true. -->
<!-- <minimizable></minimizable> -->
<!-- Whether the user can maximize the window. Optional. Default true. -->
<!-- <maximizable></maximizable> -->
<!-- Whether the user can resize the window. Optional. Default true. -->
<!-- <resizable></resizable> -->
<!-- The window's initial width in pixels. Optional. -->
<!-- <width></width> -->
<!-- The window's initial height in pixels. Optional. -->
<!-- <height></height> -->
<!-- The window's initial x position. Optional. -->
<!-- <x></x> -->
<!-- The window's initial y position. Optional. -->
<!-- <y></y> -->
<!-- The window's minimum size, specified as a width/height pair in pixels, such as "400 200". Optional. -->
<!-- <minSize></minSize> -->
<!-- The window's initial maximum size, specified as a width/height pair in pixels, such as "1600 1200". Optional. -->
<!-- <maxSize></maxSize> -->
</initialWindow>
<!-- We recommend omitting the supportedProfiles element, -->
<!-- which in turn permits your application to be deployed to all -->
<!-- devices supported by AIR. If you wish to restrict deployment -->
<!-- (i.e., to only mobile devices) then add this element and list -->
<!-- only the profiles which your application does support. -->
<!-- <supportedProfiles>desktop extendedDesktop mobileDevice extendedMobileDevice</supportedProfiles> -->
<!-- The subpath of the standard default installation location to use. Optional. -->
<!-- <installFolder></installFolder> -->
<!-- The subpath of the Programs menu to use. (Ignored on operating systems without a Programs menu.) Optional. -->
<!-- <programMenuFolder></programMenuFolder> -->
<!-- The icon the system uses for the application. For at least one resolution,
specify the path to a PNG file included in the AIR package. Optional. -->
<icon>
<image16x16>assets/icon-16.png</image16x16>
<image32x32>assets/icon-32.png</image32x32>
<image48x48>assets/icon-48.png</image48x48>
<image128x128>assets/icon-128.png</image128x128>
</icon>
<!-- Whether the application handles the update when a user double-clicks an update version
of the AIR file (true), or the default AIR application installer handles the update (false).
Optional. Default false. -->
<!-- <customUpdateUI></customUpdateUI> -->
<!-- Whether the application can be launched when the user clicks a link in a web browser.
Optional. Default false. -->
<allowBrowserInvocation>true</allowBrowserInvocation>
<!-- Listing of file types for which the application can register. Optional. -->
<!-- <fileTypes> -->
<!-- Defines one file type. Optional. -->
<!-- <fileType> -->
<!-- The name that the system displays for the registered file type. Required. -->
<!-- <name></name> -->
<!-- The extension to register. Required. -->
<!-- <extension></extension> -->
<!-- The description of the file type. Optional. -->
<!-- <description></description> -->
<!-- The MIME content type. -->
<!-- <contentType></contentType> -->
<!-- The icon to display for the file type. Optional. -->
<!-- <icon>
<image16x16></image16x16>
<image32x32></image32x32>
<image48x48></image48x48>
<image128x128></image128x128>
</icon> -->
<!-- </fileType> -->
<!-- </fileTypes> -->
</application>
@@ -1,90 +0,0 @@
/* CSS file */
@namespace s "library://ns.adobe.com/flex/spark";
@namespace mx "library://ns.adobe.com/flex/mx";
global
{
focus-color: #EEB470;
selection-color: #EEB470;
roll-over-color: #EEEEEE;
}
mx|Tree
{
textSelectedColor: #ffffff;
textRollOverColor: #000000;
selection-color: #f36f21;
roll-over-color: #cccccc;
}
#grpSignInForm s|Label
{
paddingTop: 5px;
}
#grpSignInForm s|CheckBox s|Label
{
paddingTop: 0;
}
.header
{
borderColor: #7a7a7a;
backgroundColor: #7a7a7a;
paddingTop: 25px;
paddingBottom: 25px;
paddingLeft: 25px;
paddingRight: 25px;
}
.header mx|Label
{
color: #ffffff;
font-size: 16px;
font-weight: bold;
}
.header s|DropDownList
{
skinClass: ClassReference('org.umbraco.desktopmediauploader.skins.HeaderDropDownListSkin');
color: #ffffff;
content-background-color: #7a7a7a;
roll-over-color: #f36f22;
}
.header s|DropDownList s|Label
{
font-size: 12px;
font-weight: normal;
}
#btnSignIn,
#btnUpload
{
cornerRadius: 5px;
borderThickness: 2px;
downSkin: Embed(source="assets/dmu_orange.swf", symbol="Button_downSkin");
overSkin: Embed(source="assets/dmu_orange.swf", symbol="Button_overSkin");
upSkin: Embed(source="assets/dmu_orange.swf", symbol="Button_upSkin");
paddingLeft: 20px;
paddingRight: 20px;
paddingTop: 7px;
paddingBottom: 7px;
color: #ffffff;
font-weight: bold;
font-size: 14px;
text-roll-over-color: #ffffff;
text-selected-color: #ffffff;
text-disabled-color: #cccccc;
}
.signOutButton
{
skinClass: ClassReference('org.umbraco.desktopmediauploader.skins.SignOutButtonSkin');
}
.removeButton
{
skinClass: ClassReference('org.umbraco.desktopmediauploader.skins.RemoveButtonSkin');
}
@@ -1,65 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<s:WindowedApplication xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:s="library://ns.adobe.com/flex/spark"
xmlns:mx="library://ns.adobe.com/flex/mx"
skinClass="org.umbraco.desktopmediauploader.skins.ApplicationSkin"
width="330" height="600" showStatusBar="false"
xmlns:views="org.umbraco.desktopmediauploader.views.*"
windowComplete="init();" >
<fx:Style source="DesktopMediaUploader.css"/>
<fx:Script>
<![CDATA[
import org.umbraco.desktopmediauploader.events.*;
import org.umbraco.desktopmediauploader.util.*;
import mx.controls.Alert;
protected function init():void
{
StageHelper.stage = stage;
NativeApplication.nativeApplication.addEventListener(BrowserInvokeEvent.BROWSER_INVOKE, app_BrowserInvoke);
vwSignIn.addEventListener(SignedInEvent.SIGNED_IN, vwSignIn_SignedIn);
vwUpload.addEventListener(SignedOutEvent.SIGNED_OUT, vwUpload_SignOut);
vwSignIn.init();
}
protected function app_BrowserInvoke(e:BrowserInvokeEvent):void
{
vwSignIn.visible = true;
vwUpload.visible = false;
}
protected function vwSignIn_SignedIn(e:SignedInEvent):void
{
vwSignIn.visible = false;
vwUpload.visible = true;
}
protected function vwUpload_SignOut(e:SignedOutEvent):void
{
vwSignIn.visible = true;
vwUpload.visible = false;
}
]]>
</fx:Script>
<fx:Declarations>
<!-- Place non-visual elements (e.g., services, value objects) here -->
</fx:Declarations>
<views:SignInView id="vwSignIn" left="0" top="0" right="0" bottom="0">
</views:SignInView>
<views:UploadView id="vwUpload" left="0" top="0" bottom="0" right="0"
visible="false">
</views:UploadView>
</s:WindowedApplication>
-21
View File
@@ -1,21 +0,0 @@
package
{
public class Model
{
[Bindable] public static var url:String;
[Bindable] public static var username:String;
[Bindable] public static var password:String;
[Bindable] public static var ticket:String;
[Bindable] public static var displayName:String;
[Bindable] public static var umbracoPath:String;
[Bindable] public static var maxRequestLength:Number;
[Bindable] public static var currentFolder:XML;
[Bindable] public static var folderId:Number = 0;
[Bindable] public static var folderName:String = "";
[Bindable] public static var folderPath:String = "";
[Bindable] public static var replaceExisting:Boolean = false;
}
}
Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 655 B

Binary file not shown.
Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Some files were not shown because too many files have changed in this diff Show More