500d25fd5a
Merge remote-tracking branch 'origin/6.1.3' into 7.0.0
...
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
2013-07-24 13:10:43 +10:00
ffff9efaa8
Fixes: U4-2535 The actions/publish.aspx page does not publish correctly and show the correct publish result
2013-07-24 13:06:25 +10:00
7f4abb4893
Fixed editContent.aspx to let the business logic handle the property validation when trying to publish and show the correct status message result (if it was not publishable). Adds the invalid properties collection to the PublishStatus so those can be shown too.
2013-07-24 12:54:10 +10:00
4d39ce1202
Fixes Allow At Root styling
2013-07-24 11:44:26 +10:00
5dc43e99fa
Got media controllers working just like content, have tried to share as much code as possible between them. Can probably do a bit better but there's minimal code replication.
2013-07-23 18:55:31 +10:00
53891a69af
Fixed up the media uploader property editor so that it doesn't store any json, this leaves it as fully backwards compatible with 6.x < but also still allows us to upload multiple images if we want.
2013-07-23 16:43:08 +10:00
4df80eb976
Merge remote-tracking branch 'origin/6.1.3' into 7.0.0
...
Conflicts:
src/Umbraco.Core/Models/PropertyExtensions.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/packages.config
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
2013-07-23 13:41:42 +10:00
d657f2c3cb
Gets the back office routing to /umbraco again.
2013-07-23 13:33:37 +10:00
398bc6d767
Fix merge issue
2013-07-22 12:15:54 +02:00
5d3ef8d97f
Merge branch '6.1.3' of https://github.com/Myster/Umbraco-CMS into Myster-6.1.3
...
Conflicts:
src/Umbraco.Web.UI/umbraco/config/lang/de.xml
src/Umbraco.Web.UI/umbraco/config/lang/no.xml
2013-07-22 12:09:41 +02:00
b565a3468b
Moves larger util classes to their own files, fixes up the notification service to ensure notifications go away properly.
2013-07-22 18:40:02 +10:00
845770c4bb
Merge pull request #69 from abryukhov/patch-2
...
tinyMCE internal language pack - RU
2013-07-22 00:05:22 -07:00
771dc10c85
Merge pull request #68 from abryukhov/patch-3
...
tinyMCE internal language pack - RU
2013-07-22 00:04:23 -07:00
2ac76202e5
Merge pull request #67 from abryukhov/patch-4
...
tinyMCE internal language pack - RU
2013-07-22 00:04:11 -07:00
a5ecbe96e2
Merge pull request #66 from abryukhov/patch-5
...
tinyMCE internal language pack - RU
2013-07-22 00:04:03 -07:00
7240b22e48
Merge pull request #65 from abryukhov/patch-6
...
tinyMCE internal language pack - RU
2013-07-22 00:03:51 -07:00
1f00589cb4
Merge pull request #64 from abryukhov/patch-7
...
tinyMCE internal language pack - RU
2013-07-22 00:03:33 -07:00
60b14487a9
Merge pull request #63 from abryukhov/patch-8
...
tinyMCE internal language pack - RU
2013-07-22 00:03:24 -07:00
33bc85a843
Merge pull request #62 from abryukhov/patch-9
...
tinyMCE internal language pack - RU
2013-07-22 00:03:14 -07:00
e6642674d4
Merge pull request #61 from abryukhov/patch-10
...
tinyMCE internal language pack - RU
2013-07-22 00:03:01 -07:00
8ad5fb3c44
Merge pull request #60 from abryukhov/patch-11
...
tinyMCE internal language pack - RU
2013-07-22 00:02:50 -07:00
1752d14c57
Merge pull request #59 from abryukhov/patch-12
...
tinyMCE internal language pack - RU
2013-07-22 00:02:40 -07:00
ec4ccba1a7
Merge pull request #58 from abryukhov/patch-13
...
tinyMCE internal language pack - RU
2013-07-22 00:02:32 -07:00
0244492a89
Merge pull request #57 from abryukhov/patch-14
...
tinyMCE internal language pack - RU
2013-07-22 00:02:22 -07:00
546cf2c84d
Merge pull request #56 from abryukhov/patch-15
...
tinyMCE internal language pack - RU
2013-07-22 00:02:14 -07:00
d354dde774
Merge pull request #55 from abryukhov/patch-16
...
tinyMCE internal language pack - RU
2013-07-22 00:02:03 -07:00
5dd14723e9
tinyMCE internal language pack - RU
2013-07-22 10:29:12 +07:00
7134e80c44
tinyMCE internal language pack - RU
2013-07-22 10:27:31 +07:00
f7196ee8f9
tinyMCE internal language pack - RU
2013-07-22 10:26:47 +07:00
fdecd697b7
tinyMCE internal language pack - RU
2013-07-22 10:26:04 +07:00
6c03dac869
tinyMCE internal language pack - RU
2013-07-22 10:25:18 +07:00
6cdb564a9f
tinyMCE internal language pack - RU
2013-07-22 10:24:31 +07:00
0da8a8db36
tinyMCE internal language pack - RU
2013-07-22 10:23:51 +07:00
a4a9620889
tinyMCE internal language pack - RU
2013-07-22 10:22:46 +07:00
2307424fb6
tinyMCE internal language pack - RU
2013-07-22 10:22:01 +07:00
ca124fb662
tinyMCE internal language pack - RU
2013-07-22 10:21:16 +07:00
6787252f9b
tinyMCE internal language pack - RU
2013-07-22 10:20:36 +07:00
ef3094f8d9
tinyMCE internal language pack - RU
2013-07-22 10:19:51 +07:00
a2a20133aa
tinyMCE internal language pack - RU
2013-07-22 10:18:38 +07:00
bb750d186a
tinyMCE internal language pack - RU
2013-07-22 10:17:56 +07:00
f2a7dde5ce
tinyMCE internal language pack - RU
2013-07-22 10:16:00 +07:00
73e2559a13
tinyMCE internal language pack - RU
2013-07-22 10:14:48 +07:00
80f8a9d01c
Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3
2013-07-22 12:44:06 +10:00
41c920a4ec
Updated to latest CDF version which contains some fixes.
2013-07-22 11:29:32 +10:00
9421ae054f
Removes security.service
...
Merges into user.service, moves the umbraco.security module into
umbraco.services, instead of in the root module, we could consider
doing that for umbraco.resources as well.
2013-07-21 22:14:05 +02:00
1f79b71738
Merge branch '6.1.3' of github.com:umbraco/Umbraco-CMS into 6.1.3
2013-07-19 15:59:09 +02:00
64fb588556
defaultDocumentTypeProperty is no longer case-sensitive. Added to the Release config as well so it makes it into the umbraco downloadable package.
2013-07-19 15:41:29 +02:00
90cfd004cb
Merge branch 'wip-u4-1949' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-1949
2013-07-19 15:41:15 +02:00
b5494546c7
defaultDocumentTypeProperty is no longer case-sensitive. Added to the Release config as well so it makes it into the umbraco downloadable package.
2013-07-19 15:40:12 +02:00
7bac1ef1cd
Merge branch 'wip-u4-1949' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-1949
2013-07-19 15:22:05 +02:00
Shannon