Shannon
aadcdc9c15
ensures session id is set on user data on login.
2014-05-22 13:17:15 +10:00
Shannon
e04eed41e7
Merge remote-tracking branch 'origin/6.2.1' into 7.1.4
...
Conflicts:
src/Umbraco.Core/Models/DeepCloneHelper.cs
src/Umbraco.Core/Models/PreValue.cs
src/Umbraco.Core/Models/PreValueCollection.cs
src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
2014-05-22 13:01:23 +10:00
Shannon
62887607ff
fixes csrf with mediauploader.ashx
2014-05-22 12:44:04 +10:00
Shandem
54a639ffcd
Merge pull request #387 from lars-erik/Fix-U4-4264
...
Fixes U4-4264 (dictionary tree collapses) while we wait for angularification.
2014-05-22 10:47:47 +10:00
Shannon
9f16bee040
Fixes: U4-4952 RTE: macro editing - parameter dialog blank
2014-05-21 15:27:10 +10:00
Stephan
976d1b1ff6
Merge pull request #385 from zpqrtbnk/7.1.4
...
U4-4618 - public PublishedContentModel & Factory
2014-05-20 15:41:41 +02:00
Lars-Erik Aabech
8a4e39a999
Fixes U4-4264 while we wait for angularification.
2014-05-20 15:05:45 +02:00
Stephan
f325794523
U4-4949 - fix issue with domains
2014-05-20 09:32:26 +02:00
Stephan
0b3733f992
Merge remote-tracking branch 'origin/7.1.4' into 7.1.4
2014-05-20 09:28:03 +02:00
Stephan
2926a79c3f
U4-4949 - fix issue with domains
2014-05-20 09:24:40 +02:00
Stephan
ef7a6f19ba
Fix the build
2014-05-20 08:57:27 +02:00
Stephan
95a4bb9ba6
refactor PublishedContentModelFactory
2014-05-19 13:15:47 +02:00
Stephan
32b7871eaf
Rename PublishedContentModelFactoryImpl
2014-05-19 13:01:49 +02:00
Sebastiaan Janssen
3ec6d2b82f
U4-4861 6.2.0 Nuget package copies wrong files
2014-05-19 10:08:26 +02:00
Stephan
cd03e80410
Optimize PublishedContentModelFactoryImpl
2014-05-18 21:57:59 +02:00
Stephan
9ed3561b56
Fix the build
2014-05-18 21:41:34 +02:00
Stephan
28da44f0de
Refactor PublishedContentModelFactory
2014-05-18 21:31:53 +02:00
Stephan
f8d7aeec80
Merge branch '7.1.4' into HEAD
2014-05-18 21:29:37 +02:00
Stephan
dacec47cd9
Fix the build
2014-05-18 21:27:41 +02:00
Stephan
57f06ba447
U4-4618 - public PublishedContentModel & Factory
2014-05-18 19:57:39 +02:00
Stephan
82c1c95e35
Detached PublishedProperty - refactor
2014-05-18 19:06:28 +02:00
Shannon
420746397d
fixes macro property saving issue in editor (to ensure the alias/key can be changed)
2014-05-17 15:35:56 +10:00
Shannon
142a9963af
Fixes macro property saving issue in repo
2014-05-17 15:35:30 +10:00
Sebastiaan Janssen
d697c590e7
U4-4930 NuGet update fails to copy new Umbraco binaries
2014-05-16 18:54:49 +02:00
Sebastiaan Janssen
1dd103caa3
U4-4930 NuGet update fails to copy new Umbraco binaries
2014-05-16 18:53:23 +02:00
Sebastiaan Janssen
a55cd67fd6
U4-4650 Pluralization of document type aliases doesn't always work
2014-05-16 14:33:25 +02:00
Sebastiaan Janssen
43bfd6e472
U4-4650 Pluralization of document type aliases doesn't always work
2014-05-16 14:33:03 +02:00
Sebastiaan Janssen
afa81be102
Fixes U4-4650 Pluralization of document type aliases doesn't always work
2014-05-16 14:23:40 +02:00
Sebastiaan Janssen
b07665f4d4
Fixes U4-4650 Pluralization of document type aliases doesn't always work
2014-05-16 14:22:13 +02:00
Sebastiaan Janssen
0ebd66d926
Merge branch 'dampee-oembed_slideshare' into 7.1.3
2014-05-16 12:51:26 +02:00
Sebastiaan Janssen
8d45898274
UmbracoVersion property no longer needed. Added data folder to the targets.
2014-05-16 12:44:02 +02:00
Sebastiaan Janssen
a99a33477a
Centralized the current Umbraco version number in UmbracoVersion.txt that will be read by
...
buildbelle.bat, build.bat and the umbraco.web.ui.csproj so it works in VS, command line and
also in TeamCity.
2014-05-16 12:27:54 +02:00
Sebastiaan Janssen
b42d3b226d
Bump version
2014-05-16 11:29:35 +02:00
Sebastiaan Janssen
b6925f9f07
Merge branch 'gambrose-7.1.2' into 7.1.3
2014-05-16 11:28:02 +02:00
Stephan
ddd0e8abb5
Bugfix media cache property alias case sensitivity
2014-05-16 10:10:55 +02:00
Stephan
e07f573683
Fix the build
2014-05-16 09:57:21 +02:00
Shannon
ffbb1a85ab
Fixes: U4-4312 Spelling error on "Retreive" should be Retrieve -U7.0.0.4
2014-05-16 12:43:23 +10:00
Shannon
ac9c938e92
Fixes: U4-4923 Failed to retrieve data for application tree media after upgrade to 7.1.2
2014-05-16 12:42:21 +10:00
Shannon
1f88960b3f
Fixes: U4-4926 Pre-values need to be cloned in/out of the cache
...
Conflicts:
src/Umbraco.Core/Models/PreValue.cs
src/Umbraco.Core/Models/PreValueCollection.cs
2014-05-16 12:09:47 +10:00
Shannon
d8edf67b82
Fixes: U4-4842 Unable to edit "name" and "alias" to MediaType property
2014-05-16 12:09:08 +10:00
Shannon
762656e964
Fixes: U4-4926 Pre-values need to be cloned in/out of the cache
2014-05-16 12:08:17 +10:00
Shannon
46a4f9242c
fixes test
2014-05-16 11:43:20 +10:00
Shannon
8cae2526d5
Fixes: U4-4842 Unable to edit "name" and "alias" to MediaType property
2014-05-16 11:34:10 +10:00
Graham Ambrose
6b313aba48
CopyUmbracoFilesToWebRoot assumes packages loacation
...
CopyUmbracoFilesToWebRoot assumes packages folder is always one dir up from
project file which is not always the case.
I have changed to use MSBuildThisFileDirectory which makes the path
relative the the UmbracoCms.targets file.
MSBuildThisFileDirectory is supported from MSBuild 4 but as ToolsVersion is
already set to 4.0 that should not be a problem.
UmbracoVersion property is no longer required but removing it may break
external target files depending on it. Have moved it to props file as this
makes it more reliable for external targets files.
2014-05-15 22:43:24 +01:00
Shannon
365a8e85e9
Fixes: U4-2356
2014-05-15 16:13:54 +10:00
Shannon
7b4c58538d
wrote test to confirm: U4-2356
2014-05-15 16:11:59 +10:00
Shannon
e41c99d5bc
Merge branch 'ma1f-7.1.2' into 7.1.3
2014-05-15 15:44:56 +10:00
Shannon
a49dd36461
Merge branch '7.1.2' of https://github.com/ma1f/Umbraco-CMS into ma1f-7.1.2
2014-05-15 15:43:53 +10:00
Mark van Schaik
82a1e85431
solves issue U4-2356 when deleting templates
2014-05-15 16:37:32 +12:00
Shannon
5f9dddafd8
fixed an upgrade script when upgrading from old 4.x versions
2014-05-15 14:11:43 +10:00
