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

2032 Commits

Author SHA1 Message Date
per ploug
3c8be919da Fixes U4-5824 Grid editor lacks localized labels 2014-11-17 21:24:51 +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
per ploug
5c17201006 Fixes custom grid view lookup 2014-11-13 15:42:36 +01: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
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
dd143681f1 By default, changes all log output for NH to be Warn 2014-11-12 16:02:02 +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
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
990f271c63 Merge 2014-11-05 20:10:06 +01: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
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
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
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
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
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
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
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
9f4d72e137 Improve NuGet upgrades 2014-10-16 13:41:00 +02:00
Shannon
ca58e8f98f Fixes: U4-4176 v7, cannot disable users in right-click-menu. 2014-10-16 18:45:02 +10: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
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
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
4121e3a427 Fixes: U4-5616 Cannot sort tabs/groups 2014-10-14 15:22:28 +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 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
per ploug
0057421f98 Update grid partials to grid/ instead of canvas/ 2014-10-07 14:40:45 +02:00
per ploug
be8e4b9fe5 grid partials 2014-10-07 14:01:48 +02:00
per ploug
b6fd0489e2 Renames canvas editor into grid again 2014-10-07 13:39:18 +02:00
Sebastiaan Janssen
5501c9531b Bump version 2014-10-07 11:22:51 +02: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