98ceabaf7e
Don't point web.config to MVC 4.0.0.1, it may not be installed (merge fail..)
2014-11-27 20:44:48 +01:00
85bcb7ad2b
Update migration
2014-11-27 20:20:56 +01:00
adea6dd2f6
Final addition to disallowed upload files
2014-11-27 15:28:38 +01:00
cad0650223
#U4-5901 Fixed Due in version 7.2.0
...
Remote Code Execution
2014-11-27 14:29:49 +01:00
d8909fe09c
Also adds migration for U4-5837
2014-11-27 14:11:18 +01:00
bf5acf6724
#U4-5837 Fixed Due in version 7.2.0
...
Missing Indexes
2014-11-27 13:57:39 +01:00
9bf33f0eea
#U4-5893 Fixed
...
Related Links - rearranging a link will completely remove all link content fields
2014-11-27 13:24:23 +01:00
0155a094b1
Bump Version
2014-11-27 12:12:31 +01:00
08432e8b23
U4-5895 follow up on U4-5889
2014-11-27 12:05:38 +01:00
717f67874a
Fix nodeType.ascx merge issue
2014-11-27 11:57:38 +01:00
dc27368397
Fixes: U4-5891
2014-11-27 17:57:33 +11:00
de7900cd2e
Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0
2014-11-26 22:47:51 +01:00
c288c2b9a3
Improves sorting of doc types before importing. Related to U4-5868
2014-11-26 22:47:36 +01:00
26032e46dd
Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0
2014-11-26 14:42:41 +01:00
caee5c6baf
#U4-5889 Fixed Due in version 7.2.0
...
Cross Site Scripting through umbraco uploader
2014-11-26 14:42:24 +01:00
ea9c37d500
Implements U4-5868 Packager should include compositions
2014-11-26 14:22:31 +01:00
a1c223bc2b
Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken.
...
Leaves the additional reference to System.Web.Http in web.config so that you don't get the System.Web.Http.ApiController when 4.0.0.1 is indeed in the GAC.
2014-11-26 10:43:46 +01:00
6afd9b37a6
Merge branch '7.1.9' into 7.2.0
2014-11-26 15:29:18 +11:00
1930022f19
Fixes: U4-5714 Calling Index() on IPublishedContent level 1 media fails
2014-11-26 10:52:30 +11:00
bece953fa3
fixes a null check
2014-11-26 10:20:19 +11:00
a41d37b1cf
Fixes assembly error msg.
2014-11-26 09:44:31 +11:00
31603f7063
Fixes assembly error msg.
2014-11-26 09:43:44 +11:00
4520c06454
Fixes missing filename in the log
2014-11-25 19:21:10 +01:00
9f0c00827d
Fixes build, still had some wrong paths preventing build.bat from working
2014-11-25 18:54:25 +01:00
3330c617b4
Merge branch '7.1.9' into 7.2.0
...
Conflicts:
src/SQLCE4Umbraco/SqlCEHelper.cs
2014-11-25 17:04:47 +01:00
0df0b78b90
#U4-5453 Fixed
...
Enabling IIS Compression gives ERR_CONTENT_DECODING_FAILED in backoffice
2014-11-25 16:56:44 +01:00
c6b6685dc7
Fixes the build for VS15
2014-11-25 16:55:59 +01:00
2db45eaca3
Merge pull request #516 from nul800sebastiaan/vs2014
...
Fixes VS14 build.
2014-11-25 15:52:05 +01:00
b876e34586
Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0
2014-11-25 14:41:50 +01:00
935436203e
Adds razor helper comments to all grid razor views
2014-11-25 14:41:43 +01:00
9580c8965f
Merge branch '7.1.9' into 7.2.0
...
Conflicts:
src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
2014-11-25 11:34:49 +01:00
7c3c477f18
Merge remote-tracking branch 'origin/7.1.9' into 7.1.9
...
Conflicts:
src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
2014-11-25 11:28:48 +01:00
d7cc626396
U4-1083 - proper error message on content type alias duplicate
2014-11-25 11:25:04 +01:00
e2cc342adf
Removes non-completed/tested/used code for templates which was during a WIP of the grid some time ago.
2014-11-25 17:36:44 +11:00
ea785a6585
Fixes: U4-5867 Installer, no starter kit link moves when starter kit list is populated
2014-11-25 13:14:18 +11:00
46a8e586ce
Fixes: U4-5872 Using list view editor as a standard property on media type causes error
2014-11-25 12:51:55 +11:00
fa0f15f5c4
fix merge
2014-11-25 10:05:10 +11:00
6a15c2603d
Merge branch '7.1.9' into 7.2.0
...
Conflicts:
src/Umbraco.Web.UI/umbraco/config/lang/da.xml
src/Umbraco.Web.UI/umbraco/config/lang/de.xml
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
src/Umbraco.Web.UI/umbraco/config/lang/es.xml
src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
src/Umbraco.Web.UI/umbraco/config/lang/he.xml
src/Umbraco.Web.UI/umbraco/config/lang/it.xml
src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
src/Umbraco.Web.UI/umbraco/config/lang/no.xml
src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
2014-11-25 09:59:08 +11:00
9d50a4d2a5
Re Fixes: U4-5220 XSLT Extensions in App_Code or /bin not working in 7.1.4 - this is just a work-around fix, the real problem is the dll's in the user's bin folder.
2014-11-25 09:50:16 +11:00
60263c9040
Re Fixes: U4-5220 XSLT Extensions in App_Code or /bin not working in 7.1.4 - this is just a work-around fix, the real problem is the dll's in the user's bin folder.
2014-11-25 09:48:54 +11:00
ba6a5825fa
Fixes: U4-5742 Grid "thumbnail" property for media
2014-11-24 09:16:53 +01:00
321e2f9de0
Merge pull request #546 from readingdancer/UmbUkFest-U4-3979
...
Updated the language files to fix issue #U4-3979
2014-11-24 13:12:56 +11:00
4e68380c32
Update en.xml
2014-11-23 15:12:40 +01:00
9834352de2
- Added all the missing Key's to the Spanish file
...
- Updated the help documentation URL's
- Updated the Community Contributor URL's
2014-11-23 03:30:18 +00:00
da87ba8bc7
Merge remote-tracking branch 'origin/7.1.9' into 7.2.0
...
Conflicts:
src/Umbraco.Core/Services/PackagingService.cs
2014-11-21 09:59:31 +11:00
d34255b1fc
Fixes display order (U4-4347)
2014-11-21 09:49:29 +11:00
9b6ab24890
Merge pull request #562 from tompipe/umbukfest-U4-4347
...
If no doctypes exist then hide Master Doc Type dropdown
2014-11-21 09:47:21 +11:00
2341622243
Merge pull request #558 from LottePitcher/7.1.9
...
U4-5851
2014-11-21 09:31:02 +11:00
956a51ab67
Merge pull request #557 from AnthonyCogworks/umbUKFest-u4-5307
...
Issue U4-5307 - Added umb-editor css class to allow text box stretching.
2014-11-21 09:30:14 +11:00
ee040eb04f
Merge branch 'umbukfest-U4-4731' of https://github.com/tompipe/Umbraco-CMS into tompipe-umbukfest-U4-4731
...
Conflicts:
src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
2014-11-21 09:25:57 +11:00
Sebastiaan Janssen