yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,331 Commits 4 Branches 7 Tags
3094dea5d4b28cb2f8a87639acb4d647e67c5be1
Commit Graph

9942 Commits

Author SHA1 Message Date
Sebastiaan Janssen
2db45eaca3 Merge pull request #516 from nul800sebastiaan/vs2014 
Fixes VS14 build.
 2014-11-25 15:52:05 +01:00
per ploug
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
per ploug
935436203e Adds razor helper comments to all grid razor views 2014-11-25 14:41:43 +01:00
Stephan
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
Stephan
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
Stephan
d7cc626396 U4-1083 - proper error message on content type alias duplicate 2014-11-25 11:25:04 +01:00
Shannon
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
Shannon
ea785a6585 Fixes: U4-5867 Installer, no starter kit link moves when starter kit list is populated 2014-11-25 13:14:18 +11:00
Shannon
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
Shannon
fa0f15f5c4 fix merge 2014-11-25 10:05:10 +11:00
Shannon
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
Shannon
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
Shannon
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
per ploug
ba6a5825fa Fixes: U4-5742 Grid "thumbnail" property for media 2014-11-24 09:16:53 +01:00
Shannon Deminick
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
Sebastiaan Janssen
4e68380c32 Update en.xml 2014-11-23 15:12:40 +01:00
Chris Houston
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
Shannon
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
Shannon
d34255b1fc Fixes display order (U4-4347) 2014-11-21 09:49:29 +11:00
Shannon Deminick
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
Shannon Deminick
2341622243 Merge pull request #558 from LottePitcher/7.1.9 
U4-5851
 2014-11-21 09:31:02 +11:00
Shannon Deminick
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
Shannon
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
Shannon Deminick
e358d3b170 Merge pull request #555 from ismailmayat/umbUKFest-906 
fix for u4-906
 2014-11-21 09:20:08 +11:00
Shannon
71ca90d74b Merge remote-tracking branch 'origin/6.2.2' into 6.2.4 2014-11-21 09:14:22 +11:00
Shannon Deminick
752ce55cfa Merge pull request #551 from kristianschneider/UmbUkFest-5737 
Fix for U4-5737 Create package: ContentType Tab index not saved
 2014-11-21 08:55:30 +11:00
Shannon Deminick
d1e684cb40 Merge pull request #550 from tompipe/umbukfest-U4-5848 
Reset the template when converting a doctype and the new doctype does no...
 2014-11-21 08:46:16 +11:00
Shannon Deminick
98b41256c1 Merge pull request #547 from Alain-es/umbUkFest-U4422 
Bug fix U4-4422
 2014-11-21 08:18:42 +11:00
Tom Pipe
bc446a63fe If no doctypes exist then hide Master Doc Type dropdown 
Fixes U4-4347
 2014-11-20 17:04:34 +00:00
Lotte Pitcher
dca14f3eb4 U4-5851 - Typo of 'seperate' when creating new MNTP data type : changed to 'separate' 2014-11-20 15:41:06 +00:00
Anthony Dang
1abdca2432 Issue U4-5307 - Added umb-editor css class to allow text box stretching. 2014-11-20 15:22:13 +00:00
Tom Pipe
8a214b5181 Correctly translate property label and description on ALL Tabs 
Fixes U4-4731
 2014-11-20 15:19:58 +00:00
Ismail Mayat
6db4fedcad some reason there is double quote escape which is not needed as peta poco handles any encoding 2014-11-20 15:12:34 +00:00
Gareth Evans - Cloud46 Limited
b6695b6953 Fixed type in Step 4 install wizard - U4-3556. 2014-11-20 14:48:26 +00:00
Alejandro Ocampo
8820fa1fdf U4-4400 Make upload new media item button bit clearer 2014-11-20 14:27:33 +00:00
Kristian Schneider
3e66235932 amendment to U4-5737 Create package: ContentType Tab index not saved to ensure that the sortorder gets updated when importing doctypes 2014-11-20 14:23:47 +00:00
Tom Pipe
91f087141b Reset the template when converting a doctype and the new doctype does not have a template assigned 
Fixes U4-5848
 2014-11-20 14:22:19 +00:00
Kristian Schneider
1ab321c7b1 Fix for U4-5737 Create package: ContentType Tab index not saved 2014-11-20 14:04:13 +00:00
Chris Houston
dffcf10032 Fixed ticket U4-4840 invalid Italian words in the Italian language file. 2014-11-20 12:44:41 +00:00
per ploug
6265354327 Fixes grid auto-resizing fields on hidden tabs 2014-11-20 13:39:28 +01:00
Chris Houston
054033c73f Updated the language files to fix issue #U4-3979 and also corrected invalid URL's across all the language files. 2014-11-20 12:24:49 +00:00
Kristian Schneider
4fcd23d8dc Fix for U4-5657 List view typo: "There are no items show in the list." 2014-11-20 12:04:54 +00:00
Alain
86f39aee03 Bug fix U4-4422 2014-11-20 12:32:46 +01:00
per ploug
9190930f49 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-19 15:08:52 +01:00
per ploug
11ec43c5c1 Have grid refresh editor config automatically 2014-11-19 15:08:43 +01:00
per ploug
1b83c5c180 Fluid grid views in seperate files 2014-11-19 10:37:17 +01:00
Shannon
8a98b66cfd removes un-needed lock on data type service 2014-11-19 12:47:33 +11:00
Shannon
9638bd8bd2 Fixes: U4-5758 Unable to add pre values to checkbox/dropdown list datatype after removing previous values correctly 2014-11-19 12:37:49 +11:00
Shannon Deminick
362717c05d Merge pull request #541 from jforage/issue-U4-5758 
Fix to issue U4-5758. Branched off from 7.2.0
 2014-11-19 12:03:36 +11:00
Shannon
16d9b9f527 fix last failing test 2014-11-19 11:58:00 +11:00