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

2550 Commits

Author SHA1 Message Date
Per Ploug
22c9f393a0 Update ModelsBuilder nuget reference 2016-01-13 11:45:40 +01:00
Sebastiaan Janssen
ff83d2e1f4 U4-7561 Backoffice Media Section should provide information on physical location of files 2016-01-12 17:41:53 +01:00
Sebastiaan Janssen
5a62713de4 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
 2016-01-12 11:39:10 +01:00
Sebastiaan Janssen
70035632b6 Update ImageProcessor and UrlRewritingNet dependencies 2016-01-12 11:22:49 +01:00
Stephan
b259b14629 TEMP add ModelsBuilder file to Core (will need to revert and use NuGet package) 2016-01-11 15:18:18 +01:00
Claus
cb05f3fe03 Reverted changes no longer needed after work on inherited/nested doctypes. 
Changed default to allow inherited doctypes.
 2016-01-11 14:04:03 +01:00
Claus
a7212f6b60 Changing config setting to the default. 
Referencing wrong config element.
 2016-01-11 12:07:34 +01:00
Claus
e509099cdb Setting for enabling inherited documenttypes. 2016-01-11 12:06:35 +01:00
Sebastiaan Janssen
701dea5de7 Merge pull request #969 from umbraco/temp-U4-7591 
U4-7591 File cleanup for old editor 'tasks' and 'create' dialogs
 2016-01-06 13:43:14 +01:00
Shannon
b0060a9592 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/InstallGit.cmd
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
	src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
	src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
	src/Umbraco.Web/WebServices/SaveFileController.cs
 2016-01-06 10:46:38 +01:00
Sebastiaan Janssen
5ad5e945c4 Merge pull request #813 from TimGeyssens/dev-v7 
Fixes U4-7249 Insert Macro split button, when selecting a macro that …
 2016-01-05 19:49:14 +01:00
Sebastiaan Janssen
4ef7b7735e Fixes U4-6510 again as merging PR apparently went wrong 2016-01-05 17:04:11 +01:00
Sebastiaan Janssen
db538d95ba Bumps version 2016-01-05 16:11:59 +01:00
Simon Busborg
deb1f2f343 Fixes: U4-7337 Change Wording in Doctype Editor 2016-01-04 11:18:34 +01:00
Per Ploug
6245c0408b Default settings for models builder 
Livemodels enabled, dlls models disabled, views/web.config includes the
models namespace
 2015-12-30 09:57:13 +01:00
Shannon
1040700bfd Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/ContentTypeController.cs
 2015-12-29 11:26:15 +01:00
Shannon
66ae47443a Merge branch 'temp-U4-7569' into 7.4.0 2015-12-28 10:37:32 +01:00
Shannon
c6dbb0f7fa reverts member tree order 2015-12-28 10:35:54 +01:00
Shannon
5eff065835 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2015-12-28 10:19:24 +01:00
Robert Foster
fbee58e445 Added json mimetype Mapping to web.config.template to support things like manifest.json in certain browsers (e.g. IE). 2015-12-26 19:05:44 +11:00
Robert Foster
a5e87dcedf Fix for IE not being able to install packages in Umbraco backoffice. 2015-12-26 18:57:24 +11:00
Shannon
c470df783c U4-7591 File cleanup for old editor 'tasks' and 'create' dialogs 2015-12-22 16:27:50 +01:00
Shannon
f3f70a3243 U4-7591 File cleanup for old editor 'tasks' and 'create' dialogs 2015-12-21 15:19:15 +01:00
Claus
1655749c5d Merge branch 'temp-U4-7549' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
 2015-12-17 10:41:44 +01:00
Shannon
fcbac0138a U4-7549 For new installs make the Image use the image cropper instead of upload 
Also fixes issue with media type editor which was a bug resulting fromn(U4-6837)
 2015-12-16 17:23:50 +01:00
Sebastiaan Janssen
a0ac0b55d0 Update trees transform with new aliases and sorting, also re-ordered member tree to have member types first, think that was the intention 2015-12-16 17:02:10 +01:00
Shannon Deminick
9cc57479da Merge pull request #957 from umbraco/temp-U4-7186 
Fixes: U4-7186 Go through the remaining dialogs and check for consistency
 2015-12-16 16:35:02 +01:00
Shannon
790727e952 Fixes reference to new data type tree alias "dataTypes" (breaking because of U4-7150) 2015-12-16 16:19:16 +01:00
Shannon
37a8cf7069 Removes unecessary items in the UI.xml file 2015-12-16 16:16:34 +01:00
Shannon
ea86c8bcff Fixes reference to new member group tree alias "memberGroups" (breaking because of U4-7150) 2015-12-16 16:07:56 +01:00
Sebastiaan Janssen
5b825bdeae Merge branch '7.4.0' into temp-U4-7448 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
 2015-12-15 17:16:15 +01:00
Sebastiaan Janssen
46e7112abd Merge pull request #955 from umbraco/temp-U4-7537 
U4-7537 File cleanup for old content type editor
 2015-12-15 16:08:11 +01:00
Sebastiaan Janssen
d123967b14 Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
 2015-12-15 15:31:47 +01:00
Mads Rasmussen
5d4f4376dd make overlay component of rich text editor link picker in property editor and grid editor 2015-12-15 15:26:07 +01:00
Mads Rasmussen
fe7f73ff57 setup global ysod overlay + change error model 2015-12-15 15:18:33 +01:00
Rune Strand
fc0fe61c2f Add ysodOverlay to listview and localized dialog buttons 2015-12-15 15:18:32 +01:00
Shannon
727fd3aa17 U4-7537 File cleanup for old content type editor 2015-12-15 15:12:22 +01:00
Sebastiaan Janssen
bb4994f9fc Merge pull request #935 from torerikk/dev-v7 
Update Norwegian translations
 2015-12-15 15:10:46 +01:00
Mads Rasmussen
191f82aaaa Fixes: U4-7448 Grid - Sorting view 2015-12-15 14:34:13 +01:00
Sebastiaan Janssen
c813eccb45 Merge branch 'dev-v7' into 7.4.0 2015-12-15 13:53:50 +01:00
Sebastiaan Janssen
80f597a7eb U4-7424 - Also update all other errors displayed in the frontend 2015-12-15 12:51:45 +01:00
Sebastiaan Janssen
0629b49112 Merge branch 'U4-7424' of https://github.com/engern/Umbraco-CMS into engern-U4-7424 2015-12-15 12:13:35 +01:00
Sebastiaan Janssen
6ce4354ef3 Merge branch 'dev-v7' into 7.4.0 2015-12-15 11:14:15 +01:00
Sebastiaan Janssen
1bf2a3b1bf Merge branch 'dev-v7' of https://github.com/TimoPerplex/Umbraco-CMS into TimoPerplex-dev-v7 
Conflicts:
	src/Umbraco.Web/Editors/ImagesController.cs
 2015-12-15 11:12:13 +01:00
Shannon Deminick
8ce8455773 Merge pull request #950 from umbraco/temp-U4-7373 
Fixes U4-7373 Error notifications shown are hidden underneath the dialogs
 2015-12-15 10:53:55 +01:00
Shannon
26b70a4a4e Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
 2015-12-15 10:40:52 +01:00
Simon Busborg
ecb6c8e52c Fix for U4-7373 Error notifications shown are hidden underneath the dialogs 
http://issues.umbraco.org/issue/U4-7373
 2015-12-15 10:08:19 +01:00
Rune Strand
10b828379b Element hinzufügen! 2015-12-09 09:31:38 +01:00
Sebastiaan Janssen
a101367292 This would've stayed here for years and be irrelevant, we can link to twitter profiles in the docs on Our 2015-12-08 14:02:43 +01:00
Sebastiaan Janssen
e90fedb835 Bumps version 2015-12-08 13:54:57 +01:00