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

10991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
6ce303a918 Completes: U4-5264 Add Count methods to IContentService, IMediaService, etc... 2014-08-05 12:37:20 -06:00
Shannon
62d3dc78fa Ensures all caching is disabled for editing templates (master pages and views) 2014-08-05 10:59:54 -06:00
Shannon
3374f9e023 Ensures that the batched distributed calls doesn't cache refresh the server executing the distributed calls since tht will already be done locally. 2014-08-05 10:32:07 -06:00
Stephan
2675992d82 Merge branch '6.2.2' into 6.2-4931 2014-08-05 18:20:04 +02:00
Stephan
0a321e37fc Merge branch '7.1.5' into 7.1-4931 2014-08-05 18:15:51 +02:00
Stephan
f3ca9e067b Merge remote-tracking branch 'origin/7.1.5' into 7.1.5 2014-08-05 18:08:20 +02:00
Stephan
4814fb3e96 U4-5276 - get package installer to respect binding redirects 2014-08-05 18:07:50 +02:00
antoine
e701f0d8a1 new editor for the ui designer 2014-08-05 18:01:04 +02:00
Stephan
ce29f54663 U4-4837 - bugfix Umbraco.Core.EnumerableExtensions.InGroupsOf 2014-08-05 17:52:43 +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
Shannon
7261162d8a Fixes some of U4-2633 Bundle all cache refresher transmissions into a single call per request for much better performance. See last note on issue. 2014-08-04 17:50:19 -06:00
Shannon Deminick
5f9b6c14f4 Merge pull request #441 from countrywide/U4-5110 
U4-5110 Prevent IE Compatibility Mode
 2014-08-04 10:59:27 -06:00
Shannon Deminick
7685e53cfe Merge pull request #440 from countrywide/7.1.5 
Fix for issue U4-4162 - MacroContainer editing
 2014-08-04 10:56:02 -06:00
Declan Cook
60e81a051d U4-5110 Prevent IE Compatibility Mode 2014-08-04 16:18:43 +01:00
Declan Cook
b2436bd9b6 Fix for issue U4-4162 - MacroContainer editing 
Allows editing of first element in a macro container.
 2014-08-04 16:07:07 +01: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
6ee078108d Added NodeCount property to ITag/Tag and an optional flag to tag retrieval methods on TagsService, in order to retrieve the count for the tag as well as it's text 2014-08-03 23:09:56 +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
Shannon
b5f900e789 added a couple of tests for member names 2014-07-28 19:37:44 -07: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
5165d70fbb Merge branch '7.1.5' into 7.1-4931 2014-07-25 11:05:31 +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