yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,637 Commits 4 Branches 7 Tags
d3f3e161e074636001e39cd7b6a34e6fd4fee7f8
Commit Graph

11637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
per ploug
d3f3e161e0 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/installer/installer.service.js
 2014-11-18 17:45:23 +01:00
per ploug
90d78d1b60 Install fact, minor tweak 2014-11-18 17:43:30 +01:00
Sebastiaan Janssen
5673b1907b Grid also renders the macro, so added to that description as well 2014-11-18 17:37:13 +01:00
Sebastiaan Janssen
bc9ebb24f9 Makes it clear the checkbox is for both RTE and the grid 2014-11-18 17:12:03 +01:00
Sebastiaan Janssen
084e9e00ce Fix spelling mistake in new installer fact 2014-11-18 17:07:43 +01:00
per ploug
96e4f723b1 Fixes issue with grid media without size config 2014-11-18 13:58:49 +01:00
per ploug
163a03986c force add base.cshtml 2014-11-18 13:22:56 +01:00
per ploug
7007389505 New installer fact 2014-11-18 13:14:33 +01:00
Stephan
2336905dae Merge remote-tracking branch 'origin/7.2.0' into 7.2.0 2014-11-18 13:10:20 +01:00
Stephan
a2164819f5 Safe compositions for 7.2 2014-11-18 13:09:57 +01:00
Morten Christensen
6b345bfc75 Ignoring *_Without_Examine tests which seem to cause eternal loop. 2014-11-18 12:41:22 +01:00
Morten Christensen
a699f32178 Correcting invalid tests related to Compositions 2014-11-18 12:40:31 +01:00
Stephan
e597886d0f Merge remote-tracking branch 'origin/7.2.0' into 7.2.0 2014-11-18 10:32:28 +01:00
Stephan
10e53de029 Safe compositions for 7.2 2014-11-18 10:29:46 +01:00
Shannon Deminick
c9336ba32f Merge pull request #520 from Jeavon/U4-5698 
Fix for U4-5698 - EntityService.GetObjectType throws for deleted Id's
 2014-11-18 17:15:12 +11:00
Shannon
55190b7318 Fixes: U4-5707 Cannot upgrade 6.2.2 site to 7.2 2014-11-18 15:59:15 +11:00
Shannon
0328ba1aec Working on U4-5707 Cannot upgrade 6.2.2 site to 7.2 2014-11-18 15:06:27 +11:00
Shannon
1accc6275a Updates how the validation works in the member model mapper to use the native validation stuff instead of custom pre-values. 2014-11-18 14:32:51 +11:00
Shannon Deminick
ce80c9a244 Merge pull request #540 from AndyButland/u4-5619 
U4-5619 - Applied required setting for text field client-side validation to handle both native and custom properties
 2014-11-18 14:22:25 +11:00
Shannon
2d9bd394ae Updates the codemirror plugin for tinymce so that it uses it's own alias: codemirror, so the code and codemirror plugins can be enabled individually. 2014-11-18 14:06:43 +11:00
Shannon
b3c291206a Merge branch '7.1.9' into 7.2.0 2014-11-18 12:23:51 +11:00
Shannon
f3f6504398 Working on: U4-5711 Media cache valueDictionary exception 2014-11-18 12:23:32 +11:00
Shannon
52629f829d Working on: U4-5711 Media cache valueDictionary exception 2014-11-18 12:05:03 +11:00
Shannon
3496c5aece Fix merge issue 2014-11-18 11:08:14 +11:00
Shannon
613f56107d Merge branch '7.1.9' into 7.2.0 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
 2014-11-18 10:52:50 +11:00
Shannon
c47d59a257 Fixes: U4-5820 List View showing content of complete site after deleting last page of data 2014-11-18 10:50:56 +11:00
Shannon
8fe0e4223b fixes media service paged query so recycle bin works properly 2014-11-18 10:13:21 +11:00
per ploug
9abda14530 fixes U4-5541 Update copy for tag property editor to clearly state to press 'enter' after entering a tag 
Instead of requiring enter to save, it will also add tags on blur so
entered data isnt lost
 2014-11-18 00:08:16 +01:00
Shannon Deminick
9df2979d7d Merge pull request #539 from AndyButland/u4-5757 
U4-5757 - Recycle bin list view issue
 2014-11-18 10:07:55 +11:00
Shannon
f4a81bfc04 Fixes: U4-5822 Can't create my own implementation of a PropertyvalueConverter for MacroContainer 2014-11-18 09:44:40 +11:00
Shannon
bff7aba778 updates naming conventions in csproj 2014-11-18 09:41:02 +11:00
Shannon Deminick
ade7278724 Merge pull request #542 from OrbintSoft/7.2.0 
Fix to :
 2014-11-18 09:15:05 +11:00
Stefano Balzarotti
f5835baa27 Fix to : 
http://issues.umbraco.org/issue/U4-5475
http://our.umbraco.org/forum/getting-started/installing-umbraco/56540-Could-not-install-packages
http://our.umbraco.org/forum/getting-started/installing-umbraco/57035-Installing-Package-Error-invalid-search
http://issues.umbraco.org/issue/U4-5571

Ecc...

This is only  a temporary workaround, because this is a stupid way of parsing a URI!!
1) It's not a real parsing, it uses browser DOM API with correlated compability problems (Invalid Protocol in Internet Explorer)
2) Check the validity of url clientside is useless...
 2014-11-17 23:00:43 +01:00
per ploug
d7f6bd0d20 Missing grid cshtml file in csproj 2014-11-17 22:35:41 +01:00
per ploug
d92e5ca2e3 Fixes U4-5586 HTML in property descriptions is not supported in v7 2014-11-17 22:31:57 +01:00
per ploug
94465892ed Adds radiobuttonlist prevalue editor 2014-11-17 22:23:03 +01:00
per ploug
4b59caf18f PR from andy butland manually added 
Adds Pixes unit to rte config field, close buttons to grid config
dialogs
 2014-11-17 22:23:00 +01:00
Per Ploug
a0994ff105 Merge pull request #538 from AndyButland/u4-5608 
U4-5608 - fixed styling issue with embedded items in grid
 2014-11-17 21:39:54 +01:00
per ploug
9b3a7b8abc Allows the grid to crop images 2014-11-17 21:24:54 +01:00
per ploug
bb93f0a4a2 Fixes U4-5723 Only enable macros allowed in RTE in grid 2014-11-17 21:24:52 +01:00
per ploug
3c8be919da Fixes U4-5824 Grid editor lacks localized labels 2014-11-17 21:24:51 +01:00
per ploug
168893a888 Fixes issues with image directives 
Didnt work properly outside property editor
 2014-11-17 21:24:46 +01:00
Shannon
d61d6008da Adds internal event for when a package is installed which gives access to the InstalledPackage instance which contains a PackageInstance reference that contains all of the files installed in the package 2014-11-17 18:00:51 +11:00
AndyButland
47a78c1bcb Applied required setting for text field client-side validation to handle both native and custom properties 2014-11-16 23:53:36 +01:00
AndyButland
dfdf85fc0b Fixed filter that was returning all nodes for list view display of recycle bin 2014-11-16 22:12:21 +01:00
AndyButland
8862b99e6a Added css style to ensure embedded items don't take up more width than the column they are within when editing 2014-11-16 21:44:08 +01:00
Sebastiaan Janssen
a1a1b9ebb5 Merge branch '7.1.9' into 7.2.0 2014-11-15 14:19:51 +01:00
Sebastiaan Janssen
403f64eeed Only set comment to blank if there's command line arguments 2014-11-15 14:19:26 +01:00
Sebastiaan Janssen
5a26a52157 Merge branch '7.1.9' into 7.2.0 
Conflicts:
	build/Build.bat
	build/UmbracoVersion.txt
 2014-11-15 14:18:34 +01:00
Sebastiaan Janssen
5aa29cc150 Adds version comment to UmbracoVersion.txt and makes it possible to overrule by adding arguments to build.bat 2014-11-15 14:04:19 +01:00