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

2861 Commits

Author SHA1 Message Date
Stephan
7c5542dca3 Facade - Cleanup access to 'current' 2016-07-20 19:23:09 +02:00
Stephan
f584404324 U4-8551 - import NuCache code 2016-07-20 18:43:53 +02:00
Stephan
6e84e085c1 Merge branch dev-v8 into temp-u4-8497 2016-07-20 18:04:41 +02:00
Stephan
f4aad94505 Fix build batch (is it real?) 2016-07-20 15:10:33 +02:00
Stephan
f9fd8b67b1 Fix build after merge 2016-07-20 13:33:47 +02:00
Stephan
d6462370fc Fix after merge 2016-07-20 11:31:20 +02:00
Stephan
77c2766d55 Merge branch origin/dev-v7 into dev-v8 2016-07-18 14:42:06 +02:00
Shannon
a86a5d3db2 U4-8636 New Packager - Do not allow a package to be installed multiple times 
adds better localization support for installing/uninstalling and validates the installation target
 2016-07-11 14:34:02 +02:00
Shannon
d377ebfc47 Ensures you cannot install an already installed package in the local install area, localizes errors, ensures the installed packages list only shows the latest installed versions, ensures when uninstalling a package it removes all versions it installed. 2016-07-11 12:42:26 +02:00
Shannon
7858ad5634 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-07-11 09:40:04 +02:00
Shannon
ca0ffe23ba U4-8718 Latest ClientDependency release 2016-07-11 09:39:54 +02:00
Stephan
3c7245f9ba Merge origin/dev-v7 into dev-v8 2016-07-08 16:32:06 +02:00
Stephan
f8b315dad0 Build - fix warnings 2016-07-08 14:17:49 +02:00
Warren Buckley
a319aa9503 Merge pull request #1365 from umbraco/temp-packaging 
U4-8670 Ensure the create package system in the back office allows for specifying correct metadata
 2016-07-07 13:08:19 +01:00
Shannon
092abfb56d Gets created packages deletion working, gets the min umb version field working on the created packages UI 2016-06-29 15:31:10 +02:00
Shannon
1a02841649 U4-8472 Add web.config file to media folder path to prevent all execution based files from being run by IIS 2016-06-28 16:01:23 +02:00
Shannon
eec0e4f946 Merge branch 'U4-8588' of https://github.com/JimBobSquarePants/Umbraco-CMS into dev-v7 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI/packages.config
 2016-06-27 14:20:13 +02:00
Shannon Deminick
46690ed405 Merge pull request #1284 from umbraco/temp-U4-265 
U4-265 Time zone adjustment in Umbraco backend for Date/Time picker
 2016-06-27 14:15:13 +02:00
Shannon
37f67b505c Changes the greymed color to be a bit darker (after discussing with mads), makes the forms styles use greymed instead of a custom one, removes the first line from the help (too long) 2016-06-27 14:14:49 +02:00
Shannon Deminick
5fc2d93709 Merge pull request #1354 from abjerner/patch-8 
Implemented better translations for the create data type dialog
 2016-06-27 09:45:27 +02:00
Sebastiaan Janssen
b840ab250a Merge pull request #1238 from Dynacy/patch-1 
Create tr.xml
 2016-06-24 13:08:17 +02:00
Anders Bjerner
a70aa5cb25 Added translations for en-US 2016-06-23 18:14:58 +02:00
Anders Bjerner
6e1e7ff8ba Added translations for English 2016-06-23 18:13:37 +02:00
Anders Bjerner
74c22c8491 Added translations for Danish 2016-06-23 18:13:03 +02:00
Sebastiaan Janssen
abd2e70b6a Make sure to hide the timezone offset message when no offsetting is needed (server and client are in the same timezone) 2016-06-22 17:19:24 +02:00
Sebastiaan Janssen
d2ad39f2d3 Merge pull request #1287 from bjarnef/dev-v7-U4-8526 
Fix a few translations in da.xml
 2016-06-21 17:47:06 +02:00
Sebastiaan Janssen
f58c9b5056 Merge branch 'u4-8191' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8191 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs
 2016-06-21 17:33:57 +02:00
Sebastiaan Janssen
df95b2a402 Same trick as for web.config, copy the ClientDependency.config from a template once and then ignore it so we don't always get prompted to commit it 2016-06-21 10:53:52 +02:00
Stephan
afcf2e195e Upgrade to ModelsBuilder 3.0.3 2016-06-20 16:10:06 +02:00
Shannon
c5aa97e23a Merge branch 'temp-packages' into dev-v7 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
 2016-06-14 14:15:47 +02:00
Shannon
a8c71e52ec Ensures the min umbraco version is checked when installing packages that have the strict flag set. 2016-06-13 23:35:09 +02:00
Sebastiaan Janssen
b2cd4820be Updates Examine 2016-06-13 23:24:19 +02:00
James Jackson-South
c9c1aea8ab Update ImageProcessor, clean up log message 2016-06-14 04:54:26 +10:00
AndyButland
0a00be7cfe Set fixed value for click-jacking protection to sameorigin instead of deny 2016-06-13 20:48:37 +02:00
James Jackson-South
b7ef324287 Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into U4-8588 2016-06-14 04:24:46 +10:00
Sebastiaan Janssen
d83d7956bb Dev v7 health check (#1220) 
Adds health check feature including some initial checks
 2016-06-13 17:42:05 +02:00
James Jackson-South
33cbcbb7d4 Save projects. 2016-06-13 22:47:49 +10:00
James Jackson-South
b0a4cc3333 Updates ImageProcessor 💥 
- Update versions
- Add ImageProcessorLogger
 2016-06-13 22:43:05 +10:00
Shannon
cba91145ee Updates new packages tree, obsoletes old one, have the package UI running for root node and sub nodes only for created packages. 2016-06-12 15:19:42 +02:00
Damiaan
7b101caf0b update examine documentation links 2016-06-03 11:36:07 +02:00
Simon Busborg
2ce2a03072 Local installer 2016-06-01 13:03:19 +02:00
Shannon Deminick
f5f7cf8d63 Merge pull request #1277 from umbraco/temp-u4-8447 
U4-8447
 2016-06-01 12:57:01 +02:00
Sebastiaan Janssen
347732463f Continued from PR 1254 (#1296) 
* Changes Umbraco.Core to use project.json for package references, instead of nuget (next is the Web proj)

Changes the build to use correct version of MSBuild
Updates the Web.UI project to reference Microsoft.CodeDom.Providers.DotNetCompilerPlatform so that we can use c# 6 in views
Updates all other projects to use auto-package restore instead of the legacy nuget target restore

* Updates Umbraco.Web to use project.json - removes the lock file (will ignore)

* updates ignore to ignore lock files

* forgot about the tests project, removed the old nuget targets

* Need to restore some packages before we can build

* Update to latest nuget.exe which understands project.json

* This happened automatically, I'm guessing new NuGet removed these

* Correctly restore all necessary packages

* Fix merge problems and package version dependency conflicts

* Removes unnecessary file

* Removes unnecessary file

* Some things didn't make it during the merge, re-applying

* And even more changes that got reverted

* And even more changes that got reverted
 2016-06-01 12:37:52 +02:00
Shannon
6a5a736877 Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
# Conflicts:
#	.gitignore
#	build/UmbracoVersion.txt
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
#	src/Umbraco.Core/Services/DataTypeService.cs
#	src/Umbraco.Core/Xml/XmlHelper.cs
#	src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
#	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
#	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/config/ClientDependency.config
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/LabelPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultipleMediaPickerPropertyEditor.cs
#	src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
#	src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/content.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs
#	src/umbraco.cms/businesslogic/Packager/Installer.cs
#	src/umbraco.cms/businesslogic/translation/Translation.cs
 2016-05-31 16:00:32 +02:00
Stephan
8c33a31f37 U4-8447 - fix services setup 2016-05-30 17:56:25 +02:00
Sebastiaan Janssen
720a46686b U4-8500 Get c# docs building (#1291) 
fetches docfx, builds the metadata and builds the docs with the correct filters
builds the UI docs from the same powershell script
 2016-05-30 12:02:13 +02:00
bjarnef
2f1b234d85 Fix template translation 2016-05-26 22:43:15 +02:00
bjarnef
00ae650ee2 Modify a few other keys 2016-05-26 22:37:49 +02:00
bjarnef
e3dae6d77e Fix a few translations in da.xml 2016-05-26 22:24:33 +02:00
Simon Busborg
259ccd653e Added dummy data to packages 2016-05-26 14:13:55 +02:00