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

7788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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