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

10790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
antoine
e701f0d8a1 new editor for the ui designer 2014-08-05 18:01:04 +02:00
per ploug
173d4c9655 Fixed: U4-4485 Unsaved changes prompt not appearing for RTE 2014-08-05 13:43:12 +02:00
per ploug
a0bf366c85 Fixed: U4-4485 Unsaved changes prompt not appearing for RTE 2014-08-05 13:43:07 +02:00
per ploug
a8bcb16303 Fixed: U4-4016 Script folder should not be clickable, or should render a view 2014-08-05 13:43:04 +02:00
Sebastiaan Janssen
5fd59a6450 Fix merge problems 2014-08-04 13:56:51 +02:00
Sebastiaan Janssen
dba180d809 Merge remote-tracking branch 'origin/7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
 2014-08-04 13:32:44 +02:00
Sebastiaan Janssen
1c83114c78 Merge pull request #436 from lucasch/U4-5109 
U4-5109 - Added an icon for the Visual Blocks tinymce plugin to the skins CSS files
 2014-08-04 09:11:54 +02:00
Sebastiaan Janssen
46c07e55e4 Merge pull request #438 from AndyButland/u4-5221 
U4-5221 - Ensured multi-value data type prevalues are rendered sorted according to defined sort order
 2014-08-04 08:57:35 +02:00
AndyButland
90eb5dc7ac Ensured multi-value data type prevalues are rendered sorted according to defined sort order 2014-08-03 20:00:04 +02:00
user
d6833c9b86 Updated the Umbraco TinyMCE skin to use the templates icon for visual blocks, 
Visual blocks had no icon in the css
 2014-08-01 11:58:33 -05:00
Sebastiaan Janssen
aceef2b318 Add missing grid view files. 2014-08-01 12:12:25 +02:00
Shannon Deminick
2325c8a64f Merge pull request #434 from naepalm/7.1.5 
Updated the dictionary table icons and the CSS
 2014-07-31 18:46:29 -06:00
per ploug
d8a0502055 Updates to the grid editor 
Updates the active grid with correct width, permissions etc on config
changes
 2014-07-31 14:45:49 +02:00
per ploug
4e1214085e Split grid rendering into seperate editor views 2014-07-31 14:45:48 +02:00
Sebastiaan Janssen
d4e205a47a Merge branch 'AndyButland-wip-u4-3963' into 7.1.5 2014-07-31 12:43:03 +02:00
Sebastiaan Janssen
84df6e5315 Merge branch 'wip-u4-3963' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3963 2014-07-31 12:42:45 +02:00
Sebastiaan Janssen
9957bbfb5d Remove unnecessary reference to ace.js that resulted in javascript errors 2014-07-31 10:08:31 +02:00
Janae Cram
af3b655073 Updated the dictionary table icons and the CSS to make the section more usable. 2014-07-30 09:12:06 -07:00
Shannon
f8e366bb4a fixes minor bool check in js for jslint 2014-07-29 11:23:58 -06:00
Shannon Deminick
6439d7337d Merge pull request #433 from arknu/rte_imagesizing 
U4-4729: Make max image dimension in RTE configurable
 2014-07-29 10:59:43 -06:00
Stephan
56dddbca1c U4-5275 - use IPublishedContentModelFactory for members 2014-07-29 10:56:49 +02:00
Stephan
53ea491bd6 U4-5286 - add property converter for color picker 2014-07-29 09:52:00 +02:00
arknu
cad946905c Bugfix: 0 value was ignored 2014-07-27 13:06:02 +02:00
arknu
49c26f4a5e Followup: make sure that defualt value is applied in RTE 2014-07-27 12:46:52 +02:00
arknu
45b173c0db U4-4729: Make max image dimension in RTE configurable 2014-07-27 01:25:39 +02:00
Stephan
c2816e759b Fail IPublishedContentFactory faster 2014-07-25 11:00:56 +02:00
Shannon Deminick
7ab8ea4da4 Merge pull request #432 from AndyButland/u4-5138 
U4 5138 - fixed a couple of issues with list view styling and function
 2014-07-24 15:24:51 -07:00
Shannon
1e8f016234 Fixes: U4-5111 7.1.4 JavaScript runtime error: 'UmbClientMgr' is undefined 2014-07-24 15:13:41 -07:00
Shannon
d07ba12e73 Fixes merge 2014-07-24 14:50:06 -07:00
Shannon
7d7fa0e389 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-07-24 09:42:44 -07:00
Shannon
fdab6d5de5 Merge branch '6.2.2' of https://github.com/umbraco/Umbraco-CMS into 6.2.2 2014-07-24 09:39:12 -07:00
Shannon
ff94eba3a7 Fixes: U4-5273 6.2: Umbraco.Field no longer rendering macro container 2014-07-24 09:39:05 -07:00
Shannon
834de2099f updates manifest watcher just to ensure we don't try to shut down the app domain more than once. 2014-07-24 09:06:45 -07:00
Shannon
904ee40a34 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-07-24 08:57:07 -07:00
Shannon
99973841e3 Fixes up packaging service - problem with setting property values properly on import due to a wip portion of getting tag values set correctly, though this was solved at the repo level and i unfortunately forgot to re-update this code. 2014-07-24 08:57:02 -07:00
Sebastiaan Janssen
e200e2fc48 Removes obsolete cachebrowser 2014-07-24 16:17:40 +02:00
Sebastiaan Janssen
69c7ecad59 Got bitten by stray files that were left behing in _BuildOutput folder, clean before build 2014-07-24 14:43:40 +02:00
Sebastiaan Janssen
b1350fa4a6 Customize button was displayed lower than installer button 2014-07-24 14:40:33 +02:00
Sebastiaan Janssen
6014608d5a Microsoft.AspNet.WebApi.Host doesn't exist ;) 2014-07-24 14:24:13 +02:00
Shannon
929180224f Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 2014-07-23 14:07:47 -07:00
Shannon
22dde5a421 U4-4738 Backoffice search should support node ID search 2014-07-23 14:07:21 -07:00
Shannon
ee5c532be7 Fixes: U4-4738 Backoffice search should support node ID search 2014-07-23 14:07:05 -07:00
Shannon
c9b27b5a70 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-07-23 12:32:53 -07:00
Shannon
7f510c107a updates proj's with correct specific version attributes 2014-07-23 12:31:38 -07:00
Shannon
2ebfd8f3d4 updates nuspec to have latest versions for all dependencies 2014-07-23 12:31:16 -07:00
Shannon
6e20be993b updates nuspec to have latest versions for all dependencies 2014-07-23 12:31:03 -07:00
Shannon
84fad1300b All nuget refs are now up to date and installed correctly with copy local set correctly for all non gac 4.5 assemblies as well as the specific version attribute. 2014-07-23 12:19:40 -07:00
Shannon
fd7930256b Uninstalls package CodeSharp.Package.AspNetWebPage and removes refs to Nuget.Core and Webpages.Administration - neither of which are used anywhere... but we've been shipping Umbraco with them for some reason. 2014-07-23 10:53:30 -07:00
Shannon
6319b10881 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
	src/SQLCE4Umbraco/app.config
	src/Umbraco.Core/app.config
	src/Umbraco.Tests/App.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/umbraco.MacroEngines/App.Config
	src/umbraco.businesslogic/app.config
	src/umbraco.datalayer/app.config
	src/umbraco.editorControls/app.config
 2014-07-23 10:08:01 -07:00
Shannon
c24775adb0 re-installs mvc, webapi and ensures running the latest 2.0.x versions of webpages and razor, now all proj's are consistent with correct versions referenced and copy local set correctly. 2014-07-23 10:03:26 -07:00