Stephan
853e2c7888
Build - cleanup InstallGit
2016-07-08 13:46:23 +02:00
Sebastiaan Janssen
54009a04c3
Makes sense, recent commit removed one of these classes
2016-06-21 17:58:04 +02:00
Stephan
f54022c5d2
Fix exception in DefaultDatabaseFactory during installs
2016-06-21 17:38:08 +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
Stephan
a512880855
U4-8553 - NPoco 3.3.4
2016-06-20 16:42:25 +02:00
Shannon Deminick
9959d58fbc
Merge pull request #1300 from umbraco/temp-u4-8400
...
U4-8400 (part) - cleanup repository cache policies
2016-06-02 14:51:29 +02:00
Stephan
bc375e5fc2
U4-8400 - kill repository cache policy factories
2016-06-02 10:44:06 +02:00
Stephan
743a1451f5
U4-8400 - cleanup and document repository cache policies
2016-06-02 10:36:19 +02:00
Sebastiaan Janssen
4ba1692b49
Remove some debug info an unnecessary path modification
2016-06-01 22:34:38 +02:00
Sebastiaan Janssen
8ec981f72e
Missing CDF dependency
2016-06-01 22:04:09 +02:00
Sebastiaan Janssen
3314d4ccdf
Trying to get datalayer to build
2016-06-01 21:56:43 +02:00
Sebastiaan Janssen
5732d12f8d
Seems like we're gettting there..
2016-06-01 14:08:21 +02:00
Sebastiaan Janssen
988b0485b9
Oops, forgot to remove experiments
2016-06-01 14:02:09 +02:00
Sebastiaan Janssen
e627b55ec7
Okay, let's put the packages where AppVeyor is actually looking for them then
2016-06-01 13:55:58 +02:00
Sebastiaan Janssen
3b74e660a7
Is this path supported?
2016-06-01 13:45:59 +02:00
Sebastiaan Janssen
518e266832
AppVeyor recommends this method for doing package restore
2016-06-01 13:27:46 +02:00
Shannon
bad6785ac6
Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8
2016-06-01 13:24:23 +02:00
Shannon
1c82d8ac4e
argh! no more extension methods that depend on singletons
2016-06-01 13:24:12 +02:00
Sebastiaan Janssen
570fd86919
Letting this restore be verbose for a minute because I think it has some problems
2016-06-01 13:16:18 +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
0f0718db80
Hopefully fixes the build
2016-06-01 12:51:08 +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
b7985cb2c8
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
...
# Conflicts:
# src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
2016-06-01 12:20:12 +02:00
Shannon
aff03997d9
Moves static event binding for prop editors to startup handlers
2016-06-01 11:27:08 +02:00
Shannon
11552da6ec
reverts change made to remove the 'child container' - this actually works well and doesn't interfere with the main container's scope mananger. Ignores the one failing test, need to ask Stephan
2016-06-01 00:36:10 +02:00
Shannon
df9160b3cd
Removes the 'Child Container' idea (that was bad and would consume lots of mem) and instead we use Scopes. Ensures that the app event handlers are creating during a single Scope operation in the CoreBootManager. Changes MigrationBase and all sub-classes to have an IMigrationContext as a ctor param. Updates the MigrationResolver to resolve Migration instances with the passed in IMigrationContext value. Simplifies MigrationBase since now we know we have a context to work with, there's no need to GetUp/GetDown Expression methods. Updates the MigrationRunner to use the MigrationContext instead of creating one itself.
2016-05-31 23:29:15 +02:00
Shannon
a1b6240299
Fixes more merge issues and tests, removes lucene dependency from core (not sure why it was there), creates IExamineIndexCollectionAccessor for better testing for classes that require access to the indexers like the GridPropertyEditor.
2016-05-31 19:24:33 +02:00
Shannon
c025dd463f
Fixes up merging issues, bit of manual process with this one
2016-05-31 17:24:40 +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
Sebastiaan Janssen
cff7dbc81a
Temp u4 8495 ( #1293 )
...
* U4-8495 Create YML file for AppVeyor
* Secret token needs to be in single quotes
* Secure token instead of a configuration variable should make the slack notification work
* Only post to Slack when build fails
2016-05-31 15:21:37 +02:00
Shannon
2f44241439
fixes test
2016-05-31 15:17:00 +02:00
Stephan
18351b57b4
Consolidate on NewtonSoft.Json 8.0.3
2016-05-31 11:28:33 +02:00
Stephan
ec4373a4df
Upgraded to NPoco 3.3.3
2016-05-31 11:27:51 +02:00
Stephan
7a9ff1fc3b
U4-8447 - bugfix
2016-05-30 18:45:33 +02:00
Stephan
a514ffc258
U4-8447 - fix xml serialization
2016-05-30 18:32:32 +02:00
Stephan
8c33a31f37
U4-8447 - fix services setup
2016-05-30 17:56:25 +02:00
Sebastiaan Janssen
1121362ca9
Merge pull request #1295 from umbraco/temp-U4-8511
...
U4-8511 Update moment.js to the version to 2.10.3 for release
2016-05-30 16:08:51 +02:00
Sebastiaan Janssen
6ad4390d20
Merge pull request #1294 from umbraco/temp-U4-8331
...
Fixes: U4-8331 Umbraco.MultipleMediaPicker 'pick only images' should not allow a folder to be picked
2016-05-30 14:57:14 +02:00
Mads Rasmussen
8d5742acb7
Merge pull request #1281 from umbraco/temp-U4-8445
...
U4-8445 Validation on the Email field for Members will not allow the …
2016-05-30 14:41:46 +02:00
Shannon
4aa4a03013
U4-8511 Update moment.js to the version to 2.10.3 for release
2016-05-30 14:25:47 +02:00
Mads Rasmussen
9190855bcf
add configuration to disable folder select
2016-05-30 14:08:30 +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
Mads Rasmussen
11c1b5a2c4
Merge pull request #1126 from KevinJump/dev-v7-StylesheetProperties-U4-7160
...
U4-7160: Stylesheet RegEx to capture multi class properties
2016-05-30 10:51:30 +02:00
Simon Busborg
885d14bcb6
Fixes: U4-8455 IE11 - Image Cropper stretches the image when zooming
2016-05-30 10:01:39 +02:00
Mads Rasmussen
654f130105
Merge pull request #1275 from bjarnef/dev-v7-U4-8489
...
Ensure correct font is used for icon-check
2016-05-30 09:56:05 +02:00
Mads Rasmussen
2f445543f4
Merge pull request #1263 from lars-erik/U4-8443
...
U4-8443 - Immediately create node from list view when only one available document type
2016-05-30 09:39:38 +02:00
Simon Busborg
216c70becc
Merge pull request #1273 from gkonings/disable-submit-overlay
...
U4-8332
disable/enable submit button on overlay window
2016-05-30 09:35:42 +02:00
Simon Busborg
7046fca333
Merge pull request #1274 from bjarnef/dev-v7-U4-8486
...
Fixes some styling for login screen on narrow screen sizes
2016-05-30 09:27:42 +02:00
Simon Busborg
43ece1aba4
Merge pull request #1272 from gkonings/slider-default-round
...
Removed required attribute from slider-handle
2016-05-30 09:19:28 +02:00
Mads Rasmussen
b3b4cd4654
Fixes: U4-8480 Allow deleting empty tab when creating a doctype
2016-05-25 15:30:35 +02:00
