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

1956 Commits

Author SHA1 Message Date
antoine
b8034fa325 canvasdesigner.*.js added to ignore file 
Conflicts:
	.gitignore
 2014-09-30 09:24:38 +02:00
antoine
a9cf1aa874 contour reference deleted 2014-09-23 20:18:46 +02:00
per ploug
b3769e4117 Removes 3rd party app + trees from app+tree.config 2014-09-23 19:53:12 +02:00
per ploug
8194fb7b32 Canvas views 2014-09-23 16:36:04 +02:00
per ploug
0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02:00
per ploug
e1793ad95c merge 2014-09-23 08:48:36 +02:00
Shannon
fa2ed768db Adds forms dashboards and sections to normal development config 2014-09-23 12:40:10 +10:00
per ploug
872aff0c96 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-09-22 21:06:15 +02:00
per ploug
375fda2007 Merge remote-tracking branch 'origin/7.2.0-WIPFormsInstallDashboard' into 7.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-09-22 21:03:09 +02:00
per ploug
5f5c8c7693 Forms section + dashboard 2014-09-22 20:07:35 +02:00
per ploug
9464d2a648 Adds support for hiding navigation when tree is empty 2014-09-22 20:07:03 +02:00
Sebastiaan Janssen
e2ec9230b9 Bring preview badge waaay to the foreground 2014-09-22 16:05:28 +02:00
Shannon
d87a426294 Implements the ability to have customized and configurable list views for specific content types 2014-09-22 18:18:09 +10:00
Shannon
51061e10a9 Gets the 'return to list' button working for all content types 2014-09-19 11:52:13 +10:00
Shannon
c43be77288 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-15 19:01:49 +10:00
Shannon
b38acdd654 List view config complete: U4-4972 Make list view configurable, 2014-09-15 19:01:28 +10:00
Shannon
96d570e760 Gets most of the configurable list view working, need to add some validation to the pre-value editor, some styling for the sorting of a field, add another system field for 'published date' (if possible), fix up the localized text for return to list view, fix up the persisting of the last page viewed in a list view 2014-09-15 13:53:33 +10:00
Shannon
afbeb50d55 List view pre-values working with fields and headers, list view now rendering data again, removed the config ui bits from the content type editor 2014-09-12 14:07:42 +10:00
Shannon
9bb5869cde reverting all things to do with additional list view column in db which is no longer necessary and removing additions to ui changes in the content tyep editor which are also no longer necessary 2014-09-12 11:50:56 +10:00
per ploug
5d2ac582b7 Gridview design polish 2014-09-11 14:50:05 +02:00
Stephan
a3ad8e2cab Die, Marco, die. 2014-09-11 08:24:01 +02:00
Shannon
7422238087 Merge branch 'AndyButland-u4-4972' into 7.2.0 
Conflicts:
	src/Umbraco.Web/Editors/MediaTypeController.cs
 2014-09-10 15:35:57 +10:00
Shannon
6afead5207 Merge branch 'u4-4972' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-4972 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
 2014-09-10 15:35:05 +10:00
Shannon
eb6326487f Fixes grunt watches, Fixes: U4-3138 Examine mgmt dashboard styling is broken, rebuilds the mgmt dashboard in angular 2014-09-09 18:53:47 +10:00
Dan Lister
dfe89b50ae Update Dashboard.Release.config 
Amended dashboard.release.config 'Change password' tab caption casing to match other tab captions
 2014-09-02 15:55:34 +01:00
Shannon Deminick
07a52f659d Merge pull request #463 from kgiszewski/feature/rte-config 
Fix for U4-5409 headline justification in the RTE
 2014-08-28 08:14:19 +10:00
Kevin Giszewski
5420be483c Add style attribute to the headline white-listed attributes 2014-08-27 10:32:29 -04:00
Shannon
2f2d55e24f ensure normal browser cache is busted for auth upgrade view 2014-08-26 09:39:07 +10:00
Sebastiaan Janssen
101e116baf Bump version number 2014-08-25 15:14:21 +02:00
Shannon
88da00cdd3 Merge branch '7.2.0' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
 2014-08-25 16:57:10 +10:00
Shannon
e2d04e2b3a Merge branch '7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/modals.less
	src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
 2014-08-24 21:35:08 -06:00
bjarnef
8609427d3c Fix for U4-3953 (modified) 
I overlooked the installing message, so here the message is still
visible below the progressbar. Furthermore the same is fixed for the
uninstalling progressbar, which I didn't noticed previously.
 2014-08-24 20:51:36 +02:00
Morten Christensen
7d52ed873e Merge pull request #449 from nul800sebastiaan/uaas-events 
Adding events for use by Courier/UaaS
 2014-08-20 14:12:38 +02:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
Sebastiaan Janssen
468cdf64ff Merge pull request #447 from Jeavon/UpdateImageProcessor 
Update ImageProcessor to v1.9.0 and ImageProcessor.Web to v3.3.0
 2014-08-19 14:37:34 +02:00
Sebastiaan Janssen
8b34b4e8a1 Merge pull request #416 from Graphicnerd/7.1.5 
Updated the sortable frame in Umbraco Backoffice
 2014-08-19 14:02:28 +02:00
per ploug
9aa9de5a7a WIP on background package installs 2014-08-18 20:42:56 +02:00
Shannon
0fd37d708d Merge branch 'U4-5332' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-U4-5332 2014-08-15 12:04:54 -06:00
Sebastiaan Janssen
1ccee3f305 Moved all logic of PartialViewTasks and PartialViewMacroTasks to a base class as the only difference was 3 variables 
Added events: PartialView(Macro): Create, Save and Delete
Added events: Template: Save (there's already a legacy event, this is a new one to transition to)
PartialViewMacro.ascx.cs was adding ".cshtml" just so that it could strip it of again, crazy
 2014-08-14 17:20:25 +02:00
per ploug
5e738a2b7b Fixed: U4-4734 Remove default alt text on images from RTE 2014-08-13 11:01:56 +02:00
per ploug
dd72fd04bd Fixed: U4-5025 Backoffice spelling errors 2014-08-13 10:42:46 +02:00
per ploug
231c50319f Fixed: U4-5343 Move grid.config out of Umbraco folder 2014-08-13 10:04:54 +02:00
Jeavon Leopold
6b455aaa19 Add ImageProcessor httpmodule to web.template.config 2014-08-12 17:51:30 +01:00
Jeavon Leopold
b2ca814fdb Update ImageProcessor to v1.9.0 and ImageProcessor.Web to v3.3.0 2014-08-12 16:59:31 +01:00
antoine
9789fbdb79 tuning config for current umbraco kit starter 2014-08-07 18:11:50 +02:00
Shannon
7dfa633fb3 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Core/Sync/DefaultServerMessenger.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
 2014-08-05 12:49:51 -06:00
Shannon
62d3dc78fa Ensures all caching is disabled for editing templates (master pages and views) 2014-08-05 10:59:54 -06:00
per ploug
a0bf366c85 Fixed: U4-4485 Unsaved changes prompt not appearing for RTE 2014-08-05 13:43:07 +02:00
Declan Cook
60e81a051d U4-5110 Prevent IE Compatibility Mode 2014-08-04 16:18:43 +01: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