Stephan
9c9ba477aa
Merge dev-v7 into dev-v7-contenttypeeditor
Conflicts:
src/Umbraco.Core/Constants-ObjectTypes.cs
src/Umbraco.Web.UI.Client/gruntFile.js
src/Umbraco.Web.UI.Client/src/loader.dev.js
src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
src/Umbraco.Web/Umbraco.Web.csproj
2015-09-16 13:25:32 +02:00
..
2013-09-03 18:28:14 +10:00
2015-07-24 11:52:30 +02:00
2015-07-01 18:02:58 +02:00
2015-04-01 13:41:28 +11:00
2015-05-13 18:19:23 +10:00
2015-09-01 15:00:27 +02:00
2015-09-11 17:49:47 +02:00
2013-08-12 15:17:34 +02:00
2013-10-09 14:31:30 +11:00
2015-01-19 15:12:34 +11:00
2015-01-19 15:12:34 +11:00
2015-08-05 16:30:21 +02:00
2015-05-07 11:43:53 +10:00
2015-05-07 16:24:29 +10:00
2015-01-30 10:32:46 +11:00
2015-03-05 17:08:58 +11:00
2015-06-25 10:16:35 +02:00
2015-06-24 17:47:20 +02:00
2015-07-22 12:10:21 +02:00
2015-03-09 17:53:58 +11:00
2015-01-30 10:32:46 +11:00
2013-03-21 14:40:17 -01:00
2015-06-18 19:16:49 +02:00
2015-01-21 17:03:56 +11:00
2015-07-02 17:19:42 +02:00
2015-01-12 18:52:30 +11:00
2015-01-21 17:03:56 +11:00
2014-08-13 09:38:40 +02:00
2015-09-10 14:20:21 +02:00
2014-02-20 22:34:54 +11:00
2015-02-10 15:39:12 +01:00
2014-04-22 17:48:08 +10:00
2014-09-12 11:50:56 +10:00
2013-09-05 18:38:54 +10:00
2014-04-16 13:39:42 +10:00
2015-07-02 17:19:42 +02:00
2013-03-13 01:09:29 +04:00
2015-08-04 15:42:44 +02:00
2015-01-15 11:49:32 +11:00
2014-10-21 11:43:58 +10:00
2014-10-21 11:43:58 +10:00
2014-05-17 15:35:30 +10:00
2013-11-07 17:16:22 +01:00
2013-03-13 01:09:29 +04:00
2013-03-13 01:09:29 +04:00
2014-01-08 14:32:38 +11:00
2014-10-21 11:43:58 +10:00
2013-11-07 17:16:22 +01:00
2015-06-24 14:17:24 +02:00
2015-01-09 19:15:01 +11:00
2014-04-30 16:53:14 +02:00
2015-09-01 15:00:27 +02:00
2014-04-30 16:53:14 +02:00
2014-10-21 11:43:58 +10:00
2014-10-21 11:43:58 +10:00
2015-08-28 13:28:00 +02:00
2014-10-21 11:43:58 +10:00
2015-01-14 12:09:30 +11:00
2014-01-10 15:38:57 +01:00
2015-07-06 17:50:10 +02:00
2014-05-12 13:48:56 +10:00
2014-05-17 15:35:30 +10:00
2013-11-07 17:16:22 +01:00
2013-11-07 17:16:22 +01:00
2013-03-13 01:09:29 +04:00
2014-12-01 15:26:20 +01:00
2015-03-03 18:33:04 +11:00
2014-02-12 17:14:16 +11:00
2014-12-01 15:26:20 +01:00
2014-02-19 16:14:34 +11:00
2015-06-24 14:17:24 +02:00
2014-05-08 11:38:05 +10:00
2015-05-04 14:36:46 +10:00
2015-09-08 11:34:34 +02:00
2015-09-08 11:34:34 +02:00
2014-05-16 12:08:17 +10:00
2014-05-16 12:08:17 +10:00
2015-06-25 16:30:06 +02:00
2015-04-08 11:47:16 +10:00
2014-04-29 13:06:10 +10:00
2015-07-13 15:52:21 +02:00
2014-12-12 17:02:03 +01:00
2014-05-15 12:49:03 +10:00
2014-05-15 12:49:03 +10:00
2015-06-08 17:59:56 +02:00
2014-06-02 15:40:24 +10:00
2015-01-28 18:24:12 +11:00
2015-01-28 18:24:12 +11:00
2014-03-11 14:47:00 +11:00
2014-04-16 13:39:42 +10:00
2014-04-16 14:01:38 +10:00
2015-09-08 11:34:34 +02:00
2013-08-12 15:17:34 +02:00
2015-08-26 14:00:56 +02:00
2015-09-08 11:34:34 +02:00
2015-01-15 11:49:32 +11:00
2014-08-03 23:09:56 +02:00
2014-05-15 12:49:03 +10:00
2015-01-05 22:23:05 +01:00
2014-08-15 10:30:12 +02:00
2014-08-15 10:30:12 +02:00
2014-04-16 13:39:42 +10:00
2013-03-21 00:05:56 +06:00
2015-09-08 11:34:34 +02:00
2013-12-16 18:10:44 +11:00
2015-08-04 15:42:44 +02:00
2015-03-03 18:33:04 +11:00
2015-06-08 17:59:56 +02:00
2015-06-08 17:59:56 +02:00
2014-08-20 15:58:57 +02:00
2015-03-06 16:05:37 +11:00