Shannon
|
0e727f91da
|
Merge branch 'refs/heads/dev-v7.6' into temp-U4-9310
# Conflicts:
# src/UmbracoExamine/UmbracoMemberIndexer.cs
|
2017-02-07 13:21:02 +11:00 |
|
Shannon
|
a71ec8dd81
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
|
2017-02-07 12:50:44 +11:00 |
|
Shannon
|
f816a63b54
|
Ok, reverting the correct commit this time: Revert "Fixes database context issue during startup when there is no db configured"
|
2017-02-07 12:49:26 +11:00 |
|
Shannon
|
138991d951
|
OMG Re-rever "DOH! Revert "Fixes database context issue during startup when there is no db configured", i reverted the wrong commit on the wrong branch
|
2017-02-07 12:43:06 +11:00 |
|
Shannon
|
92ce064d30
|
DOH! Revert "Fixes database context issue during startup when there is no db configured" pushed to the wrong branch
|
2017-02-07 12:40:28 +11:00 |
|
Shannon
|
ab3bfa4e92
|
Fixes database context issue during startup when there is no db configured
|
2017-02-07 12:39:35 +11:00 |
|
Shannon
|
fa8f3985b8
|
Fixes database context issue during startup when there is no db configured
|
2017-02-07 12:33:37 +11:00 |
|
Shannon
|
179523224a
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
|
2017-02-07 12:15:54 +11:00 |
|
Shannon
|
19e4bee34e
|
fixes test
|
2017-02-07 12:02:38 +11:00 |
|
Shannon
|
f1709f6066
|
Fixes identity seed for db
|
2017-02-07 11:58:10 +11:00 |
|
Shannon
|
f2be235f85
|
Fixes the db data type for UDI media picker, fixes the initial db installation data to use the new pickers.
|
2017-02-07 11:44:04 +11:00 |
|
Mikkel Holck Madsen
|
175c785705
|
Merge pull request #1722 from umbraco/temp-U4-9458
Changes IndexFieldPolicies to be a StaticFieldCollection which is a k…
|
2017-02-06 21:45:54 +01:00 |
|
Mikkel Holck Madsen
|
72aebd3ecf
|
Merge branch 'dev-v7' into temp-U4-9458
|
2017-02-06 21:44:26 +01:00 |
|
Warren Buckley
|
c8408760df
|
Merge pull request #1737 from umbraco/temp-U4-9474
Fixes: U4-9474 Update macro picker to follow the new picker UI
|
2017-02-06 16:03:25 +00:00 |
|
Warren Buckley
|
5834649abc
|
Merge pull request #1733 from umbraco/temp-U4-9466
fixes: U4-9466 Duplicate reorder links for Umbraco grid
|
2017-02-06 15:36:04 +00:00 |
|
Mads Rasmussen
|
2eda70542f
|
rename macro container to macro picker
|
2017-02-06 16:16:26 +01:00 |
|
Mads Rasmussen
|
a2a17faca1
|
Fixes: U4-9474 Update macro picker to follow the new picker UI
|
2017-02-06 16:11:51 +01:00 |
|
Shannon
|
a6c2844d12
|
updates nuspec with correctly targeted framework
|
2017-02-07 01:03:50 +11:00 |
|
Mikkel Holck Madsen
|
802cbb82c4
|
Merge pull request #1723 from umbraco/temp-U4-9448
U4-9448 Slave Front End server requires write access to database when…
|
2017-02-06 15:01:30 +01:00 |
|
Shannon
|
6f16b98b32
|
regression issue from refactoring how media works with Deploy
|
2017-02-07 00:57:44 +11:00 |
|
Mikkel Holck Madsen
|
42f5507fe8
|
Merge pull request #1734 from umbraco/temp-U4-9492
U4-9492 Update to latest ImageProcessor
|
2017-02-06 14:39:01 +01:00 |
|
Shannon
|
72910cb35e
|
Updates everything to .Net 4.6.2, had to update the semver reference too - no breaking changes though
|
2017-02-07 00:22:34 +11:00 |
|
Shannon
|
7be30ad6ac
|
Moves all binding redirects via code to one place
|
2017-02-06 23:46:44 +11:00 |
|
Sebastiaan Janssen
|
5a8e37f5b4
|
U4-9492 Update to latest ImageProcessor
|
2017-02-06 13:46:10 +01:00 |
|
Shannon
|
f87ccc0a53
|
Updates nuspec
|
2017-02-06 23:36:56 +11:00 |
|
Shannon
|
40ed77103f
|
Updates to latest 1.x version of log4net (before the real 2.x version) with binding redirects and codebase binding redirects to redirect from non-signed to signed version
|
2017-02-06 23:07:20 +11:00 |
|
Mads Rasmussen
|
483762a984
|
fixes: U4-9466 Duplicate reorder links for Umbraco grid
|
2017-02-06 12:50:34 +01:00 |
|
Richard Soeteman
|
a3c7b1fcfe
|
Fixed issue U4-9494
|
2017-02-06 11:51:44 +01:00 |
|
Stephan
|
145ca54dcf
|
Merge origin/dev-v7.6 into temp-u4-9322
|
2017-02-06 11:29:04 +01:00 |
|
Richard Soeteman
|
02785eea42
|
Fixed issue U4-9493
|
2017-02-06 11:26:58 +01:00 |
|
Stephan
|
1aecb66167
|
U4-9322 - restore DatabaseContext ctors, see U4-9477
|
2017-02-06 11:17:24 +01:00 |
|
Stephan
|
96244f9f7b
|
U4-9322 - pushed DEBUG_SCOPES by mistake
|
2017-02-06 10:43:39 +01:00 |
|
Stephan
|
e0cc59d212
|
Merge branch 'temp-u4-9322' of https://github.com/umbraco/Umbraco-CMS into temp-u4-9322
|
2017-02-06 10:09:31 +01:00 |
|
Stephan
|
dd2946419b
|
U4-9322 - fix broken DEBUG_SCOPES
|
2017-02-06 10:08:29 +01:00 |
|
Shannon
|
d0ea8e83ad
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
|
2017-02-06 19:49:00 +11:00 |
|
Shannon Deminick
|
3c7d3b2f63
|
Merge pull request #1724 from umbraco/temp-installer-url-update
Update NewInstallStep.cs
|
2017-02-06 19:42:23 +11:00 |
|
Shannon
|
a65ad3c72a
|
Adds equality members for all event args, updates equality check for EventDefinitionBase to include the args (since that is quite important!), creates an OrderedHashSet class which can deduplicate lists for us based on member equality and supports first in or last in + tests.
|
2017-02-06 18:46:23 +11:00 |
|
Shannon
|
f6a7b25e87
|
Updates CacheRefresherEventHandler to have consistent events, adds logic to find the event based on definitions, adds tests to test them all
|
2017-02-06 17:26:06 +11:00 |
|
Shannon
|
0e06245177
|
Adds notes for stephen to look at
|
2017-02-06 14:46:02 +11:00 |
|
Stephan
|
5a81a9eed7
|
U4-9322 - various fixes
|
2017-02-04 15:44:56 +01:00 |
|
Stephan
|
38e7d7e697
|
Merge remote-tracking branch 'origin/temp-u4-9322' into temp-u4-9322
|
2017-02-03 21:54:55 +01:00 |
|
Stephan
|
820069d5d5
|
U4-9322 - filesystems & cleanup
|
2017-02-03 20:01:43 +01:00 |
|
Stephan
|
49f3979d18
|
U4-9487 - optimize initialization of xml nodes
|
2017-02-03 19:28:43 +01:00 |
|
Emil Wangaa
|
055e209e0b
|
Fixed the path and virtualpath when creating and scaffolding codefiles
Ensuring that javascript files are created with the .js extension
|
2017-02-03 12:06:49 +01:00 |
|
Shannon
|
5579563105
|
Creates a test (which fails) so that stephen can have a look
|
2017-02-03 14:56:08 +11:00 |
|
Shannon
|
cda9d0f9f2
|
pretty big perf boost so that we aren't going to the services user cache everytime we want to know the user's culture, this will already be set on the thread!
|
2017-02-03 14:42:06 +11:00 |
|
Shannon
|
49b7f15e3d
|
fixes tests
|
2017-02-03 13:32:22 +11:00 |
|
Shannon
|
8ae700eedf
|
code formatting and merge fixing
|
2017-02-03 12:23:32 +11:00 |
|
Shannon
|
411bbcc192
|
Merge branch 'refs/heads/dev-v7.6' into temp-u4-9322
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/ContentTypeService.cs
# src/Umbraco.Core/Services/DataTypeService.cs
# src/Umbraco.Core/Services/MacroService.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Core/Services/MemberService.cs
# src/Umbraco.Core/Services/MemberTypeService.cs
# src/Umbraco.Core/Services/UserService.cs
# src/Umbraco.Web/Umbraco.Web.csproj
|
2017-02-03 12:14:38 +11:00 |
|
Shannon
|
d598fdce54
|
Updates to latest Examine release
|
2017-02-03 12:03:56 +11:00 |
|