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

2650 Commits

Author SHA1 Message Date
Shannon
999be9c578 Merge branch 'view-save-restore-cursor' of https://github.com/pynej/Umbraco-CMS into pynej-view-save-restore-cursor 2016-03-17 11:26:09 +01:00
Stephan
5369a6fc56 Upgrade ModelsBuilder to 3.0.1 2016-03-14 13:37:49 +01:00
Sebastiaan Janssen
fb42574c34 Revert "U4-5334 Richtext editor inserts extra p - tags to html output" - apparently it does just as much harm as it does good 
This reverts commit 9ad3b6a337.
 2016-03-12 21:02:05 +01:00
Sebastiaan Janssen
9ad3b6a337 U4-5334 Richtext editor inserts extra p - tags to html output 
#U4-5334 Fixed
 2016-03-12 12:58:53 +01:00
Jeremy Pyne
91da14b0c6 Second fix for partial views. 2016-03-11 14:56:55 -05:00
Jeremy Pyne
f361e286ed This minor fix will restore the editors cursor in CoreArea editor boxes when they save the item. There is a check included to prevent this behavior is the server level code changes the file for some reason as then the cursor location could act unpredictably, so instead we just let it reset to the beginning of the file. 2016-03-11 14:44:21 -05:00
Sebastiaan Janssen
b2407eab98 Merge pull request #1107 from bjarnef/dev-v7-tinymce-font-icons 
Change icons for richtext editor config
 2016-03-10 17:47:46 +01:00
Stephan
610538261e U4-7641 - enable content type copy 2016-02-25 15:26:03 +01:00
Sebastiaan Janssen
c64f6f894e U4-8024 Unable to use MvcBuildViews since 7.4.0 upgrade because 'umbraco.cms.presentation.create.controls.content' has been removed 
Removes files for which the codebehind no longer exists
 2016-02-23 17:23:55 +01:00
Warren Buckley
baaa9340e4 Merge pull request #1131 from umbraco/temp-U4-7918 
Fixes U4-7918 Make icon picker for document type and list views consistent
 2016-02-19 12:03:27 +00:00
Mads Rasmussen
183a5b5c43 U4-7472: fix macro parameter column width 2016-02-19 09:52:29 +01:00
Mads Rasmussen
1a0c095f40 Merge pull request #932 from engern/MacroParamSortOrder 
Fixes U4-7472 - Should be possible to sort macro parameters
 2016-02-19 09:27:27 +01:00
Mads Rasmussen
f2fc70f731 Merge pull request #982 from abryukhov/patch-4 
U4-7616 - Nodes sort dialog - additional date formats
 2016-02-18 14:19:06 +01:00
Sebastiaan Janssen
7debe17c58 Merge remote-tracking branch 'origin/7.3.8' into dev-v7 
Conflicts:
	src/Umbraco.Web.UI/packages.config
 2016-02-17 11:56:24 +01:00
Sebastiaan Janssen
3d6fd2d785 Updates to SQL CE 4.0.0.1 2016-02-17 11:44:33 +01:00
Shannon
1c2dec00fc bumps version 2016-02-16 13:32:03 +01:00
Warren Buckley
3bf79f0a23 Merge pull request #1102 from umbraco/temp-U4-7837 
Fixes: U4-7837 Changing document type should refresh the current node
 2016-02-16 12:22:56 +00:00
Shannon
cc5ac1a84c bumps version 2016-02-16 11:57:10 +01:00
Lars-Erik Aabech
d0de54e2d3 Grid translations: 
Fixed a silly long translation of "Add content".
Added missing keys.
Fixed a few spelling mistakes.
 2016-02-16 08:50:07 +01:00
Simon Busborg
3cdebf4427 Fixes U4-7918 Make icon picker for document type and list views consistent 2016-02-12 09:38:37 +01:00
Alexander Bryukhov
52f4dfec80 Update UI language ru.xml 
According new keys added to the 7.4.0 nightly build 164 (models builder keys)
 2016-02-11 22:29:33 +06:00
Sebastiaan Janssen
4f6e023d77 Make sure that everybody working on the source actually gets these assembly references in web.config 2016-02-11 17:11:02 +01:00
Shannon
ca6821104b updated to MB 3.0.0 final 2016-02-11 16:26:21 +01:00
Sebastiaan Janssen
1eedbba97a Merge pull request #920 from darrenferguson/dev-v7 
change the text "Reload nodes" to just "Reload" my editors don't know…
 2016-02-11 12:04:45 +01:00
Sebastiaan Janssen
33aa04bb2f Updates ImageProcessor.Web 2016-02-11 10:35:52 +01:00
Sebastiaan Janssen
d1f513df69 Updates ImageProcessor 2016-02-10 17:09:40 +01:00
Shannon Deminick
4b6aee7fd9 Merge pull request #1109 from abryukhov/patch-3 
Update UI language ru.xml
 2016-02-10 15:44:42 +01:00
Sebastiaan Janssen
157bf0d1eb Include modelsbuilder App_Plugins files in csproj so that the build actually includes them 2016-02-10 14:57:41 +01:00
Mads Rasmussen
0303196f42 show Ulog error message when models builder fails 2016-02-10 11:47:01 +01:00
Mads Rasmussen
c8faf17017 Fixes: U4-7799 ModelsBuilder button in Content Type Editor should save the current content type 2016-02-10 11:47:00 +01:00
Shannon
1b84e33392 reinstall the RC2 version 2016-02-10 10:43:41 +01:00
Shannon
be449a96f7 updates to MB rc2 2016-02-10 10:26:08 +01:00
Alexander Bryukhov
a22bfb927a Update UI language ru.xml 
According new keys added to the 7.4.0 nightly build 162
 2016-02-09 22:18:11 +06:00
Sebastiaan Janssen
5e8200ecb2 U4-7909 7.4-rc1 is missing references because it's using portable class libraries now 
#U4-7909 Fixed
 2016-02-09 17:10:43 +01:00
Stephan
b6a9734755 Fix ModelsBuilder integration 2016-02-09 11:46:26 +01:00
Simon Busborg
881e8daafd Merge pull request #1104 from abryukhov/patch-3 
Update UI language ru.xml
 2016-02-08 18:51:20 +01:00
bjarnef
5176b68935 Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7-tinymce-font-icons 2016-02-08 15:07:36 +01:00
bjarnef
0bfc5f1272 Change icons in tinymce config 2016-02-08 15:07:16 +01:00
Claus
54c1d25296 Fixes: U4-6407 Change Document Type feature on a node doesn't support compositions 2016-02-08 14:39:16 +01:00
Alexander Bryukhov
0ea15ae22e Update UI language ru.xml 
According new / changed keys of 7.4 nightly build 161
 2016-02-07 11:37:06 +06:00
Asbjørn Riis-Knudsen
54548ffc68 U4-7819: Use correct messages when saving Media and Member types 2016-02-06 17:34:36 +01:00
Claus
44f2a9e96f Fixes: U4-7837 Changing document type should refresh the current node 2016-02-05 14:37:01 +01:00
Claus
00d012162f Added a bunch of missing translations in user overlay. 2016-02-05 10:38:15 +01:00
Shannon
25482f53ef updates to MB RC1 2016-02-04 20:23:11 +01:00
Sebastiaan Janssen
16caeb96bd Another build warning that can be removed 2016-02-04 18:36:26 +01:00
Sebastiaan Janssen
fbd5bdbd1d Surely nobody on their dev machines has the "trust" node in their web.configs any more, no more need to transform that one (gave warning during build.bat) 2016-02-04 18:35:16 +01:00
Shannon
9978b0d8ea Merge branch 'dev-v7' into temp-U4-3447 2016-02-04 18:30:58 +01:00
Shannon
67c3ea7c00 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-03 13:44:03 +01:00
Shannon
e423864781 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicy.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicyFactory.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
	src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Cache/FullDataSetCachePolicyTests.cs
	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
	src/Umbraco.Web.UI.Client/src/less/hacks.less
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/WebBootManager.cs
 2016-02-03 12:30:11 +01:00
Mads Rasmussen
edaa335b18 Fixes: U4-7744 Better validation message when Reordering tabs 2016-02-03 11:55:19 +01:00