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

6552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
perploug
c7c3bb6183 Forgot to update the dashboard.release.config 2013-08-30 12:29:48 +02:00
perploug
6a480b9def Fixes the imageHelper image lookup so it works with and without tabs 2013-08-30 12:05:05 +02:00
perploug
e921c670dd Another missing package file 2013-08-30 10:54:28 +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
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
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
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