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

11604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sebastiaan Janssen
9be3bdb8a5 Makes sure that the very first build on a fresh machine works immediately (previously you'd get an error saying that some NuGet packages were restored and you need to run the build again). 2014-11-15 13:14:40 +01:00
Sebastiaan Janssen
c0baac2b38 Should fix the build for real now. Sets GenerateSerializationAssemblies to Off which then doesn't produce umbraco.XmlSerializers.dll any more. 
Should be safe as this is only used for updatechecker and packageinstaller. From:  http://hashtagfail.com/post/5255977780/sgen-loaderexceptions-error - "Visual Studio attempts to generate a serialization assembly containing the types in your solution, to improve XmlSerializer serialization performance, should you choose to serialize your types."

Conflicts:
	build/NuSpecs/tools/install.core.ps1
 2014-11-15 12:38:28 +01:00
Sebastiaan Janssen
31903c8ead Merge pull request #536 from yannisgu/fixDotLess 
Fix dotless reference in csproj
 2014-11-14 17:17:21 +01:00
Sebastiaan Janssen
e59b14b7e7 Makes sure that the very first build on a fresh machine works immediately (previously you'd get an error saying that some NuGet packages were restored and you need to run the build again). 2014-11-14 17:16:33 +01:00
Sebastiaan Janssen
cb869b9064 Merge branch '7.1.9' into 7.2.0 
Conflicts:
	build/Build.bat
 2014-11-14 16:53:34 +01:00
Sebastiaan Janssen
b20fc22577 U4-5814 Apply MVC 4.0.0.1 security update 2014-11-14 16:51:51 +01:00
yannisgu
df0c297f55 Fix dotless reference in csproj 
In the packages.config the version 1.4.1 of dotless is referenced while in the csproj the version 1.4.0 was referenced.
 2014-11-14 11:16:20 +01:00
Stephan
e36dc368d9 U4-5802 - fix Ancestor<T>, AncestorOrSelf<T> + document 2014-11-14 10:27:57 +01:00
antoine
656ba98b1b U4-5793 prevent drag element off screen vertically 2014-11-13 21:29:18 +01:00
per ploug
5c17201006 Fixes custom grid view lookup 2014-11-13 15:42:36 +01:00
per ploug
d86a1946a7 Filter grid cell and row settings 
Settings and styles can now be specifically applied to a cell or a row,
by default on both
 2014-11-13 10:58:42 +01:00
per ploug
18bf4a87b4 Grid component editors should only open on insert 2014-11-13 10:57:51 +01:00
per ploug
91475c7103 Fixes the bottom floating buttons 
On datatype editor buttons floated randomly at the bottom
 2014-11-13 09:22:54 +01:00
per ploug
88934a3f14 Darkens the grid layout editor 2014-11-13 09:22:49 +01:00
per ploug
80b5c99111 Sanitizes empty grid items 2014-11-13 09:22:47 +01:00
Shannon
658a045168 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-13 18:07:10 +11:00
Shannon
ccd438ba26 Fixes: U4-5801 macro container property needs to be type TEXT 2014-11-13 18:06:58 +11:00
per ploug
71863f8ba1 Sets a horizontal overflow on grid cells 
To avoid that cell editors go beyond the cell horizontally
 2014-11-13 07:52:19 +01:00
Shannon
6df6e3bdad Fixes: U4-3737 macro container make sure you can define the allowed macros + the max number 2014-11-13 17:44:03 +11:00
Shannon
9019c49ee8 Merge branch '7.1.9' into 7.2.0 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs
	src/UmbracoExamine/BaseUmbracoIndexer.cs
	src/UmbracoExamine/DataServices/UmbracoContentService.cs
	src/UmbracoExamine/DataServices/UmbracoMediaService.cs
	src/UmbracoExamine/UmbracoContentIndexer.cs
	src/UmbracoExamine/UmbracoMemberIndexer.cs
 2014-11-13 16:32:50 +11:00
Shannon
74ebf67aef updates the local storage sync, simplifies options and does more error checking in case sync cannot occur - which will default to normal storage. 2014-11-13 15:49:34 +11:00
Shannon
33036f80fe Fixes: U4-5789 Add native option to UmbracoExamine library to run the indexes locally 2014-11-13 14:01:13 +11:00
Shannon
0688550143 start integrating the local templ storage option for examine 2014-11-13 13:09:29 +11:00
Shannon
d43b673092 Merge branch '7.1.9' of https://github.com/umbraco/Umbraco-CMS into 7.1.9 2014-11-13 13:06:53 +11:00
Shannon
4ec37b9d3a Fixes: U4-5391 Create config to explicitly set the 'base url' for a website that is not running as a load balanced site - used for scheduled tasks/publishing/keepalive 2014-11-13 13:05:27 +11:00
Shannon Deminick
a5240a852e Merge pull request #527 from designagencytom/patch-4 
Flip ternary to prevent defaults being overridden from false to true.
 2014-11-13 10:46:58 +11:00
Shannon Deminick
c74c269b9a Merge pull request #535 from zpqrtbnk/7.2.0-wherein 
Add WhereIn PetaPoco Sql Extension
 2014-11-13 09:35:00 +11:00
per ploug
0cbdebc9b0 Merge remote-tracking branch 'origin/7.2.0' into 7.2.0 
Conflicts:

	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
 2014-11-12 15:44:11 +01:00
per ploug
4f655acda5 Splits the grid layout config into 3 2014-11-12 15:37:23 +01:00
Stephan
0cb396825f Add WhereIn PetaPoco Sql Extension 2014-11-12 14:42:03 +01:00