yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,669 Commits 4 Branches 7 Tags
350161bfee208c3f0142e9badb019b63e4db885a
Commit Graph

2210 Commits

Author SHA1 Message Date
Per Ploug
350161bfee Actions button 2015-05-29 12:11:29 +02:00
Mads Rasmussen
acdc81a384 Do not add contentType to available content type model 2015-05-29 11:55:37 +02:00
Per Ploug
89ca027835 Delete dialog POC and label change 2015-05-29 11:46:47 +02:00
Mads Rasmussen
19cc7effe7 add Checklist-model to composition dialog - change from composite id to alias 2015-05-29 11:36:16 +02:00
Per Ploug
271bc6ba4c Adds scaffolding to the CT service 2015-05-29 09:21:34 +02:00
Per Ploug
e4eb6363ea Wires up the save button 2015-05-29 09:21:28 +02:00
Per Ploug
fcf6d70803 Minor ui changes 2015-05-29 09:21:21 +02:00
Mads Rasmussen
96d0c01217 Change add property flow + better styling of property settings dialog 2015-05-28 16:34:37 +02:00
Mads Rasmussen
80096c941b rename properties to match model 2015-05-28 12:25:06 +02:00
Mads Rasmussen
5c27a925f2 Remove padding from tabs + make init property background color white 2015-05-28 09:49:28 +02:00
Mads Rasmussen
6221dd206c Change flow when adding properties/data types 2015-05-27 16:33:02 +02:00
Mads Rasmussen
3d0ccc9405 Merge tabs when they have the same name 2015-05-26 13:48:26 +02:00
Shannon Deminick
1a65b85816 fixing naming conventions 2015-05-26 09:36:00 +10:00
Shannon Deminick
3c659cfc7c fixing naming conventions 2015-05-26 09:35:32 +10:00
Shannon Deminick
967654e2bd fixing naming conventions 2015-05-26 09:34:25 +10:00
Shannon Deminick
ebaced7ac5 fixing naming conventions 2015-05-26 09:33:46 +10:00
Shannon Deminick
9306e1db64 fixing naming conventions 2015-05-26 09:32:18 +10:00
Shannon Deminick
5075d3446f fixing naming conventions 2015-05-26 09:31:45 +10:00
Mads Rasmussen
098270100c Started on compositions + restyled some elements 2015-05-21 21:35:57 +02:00
Per Ploug
0f01925c4a Fixed less file casing and paths 2015-05-21 07:50:02 +02:00
Mads Rasmussen
58c93c899a Added sorting functionality 2015-05-20 14:58:17 +02:00
Mads Rasmussen
6e4f6a7bae Html and styles for toolbar 2015-05-20 10:23:37 +02:00
Mads Rasmussen
2b2ed00298 New tab and placeholder styling 2015-05-20 09:31:40 +02:00
Mads Rasmussen
f7e079f0d8 get configured data types, custom editors and systems data types in dialog. Make it possible to select one. 2015-05-19 13:47:48 +02:00
Mads Rasmussen
57127460f9 Added getAllUsersConfigured and getAllUserPropertyEditors as resource 2015-05-19 13:46:38 +02:00
Mads Rasmussen
f1dfa28228 Add the last changes from the old branche 2015-05-19 12:31:59 +02:00
Per Ploug
65f2b43185 Latest files from mads 2015-05-14 07:39:18 +02:00
Per Ploug
ef069e0aa1 Content Type Editor work merged in 2015-05-13 17:12:28 +02:00
Shannon
de7294335f Adds nicer extensions for the Localize methods to not pass in a Culture and take the Culture from the current thread. Adds GUID Id display to the content/media/members editor 2015-05-13 17:33:59 +10:00
Shannon
64cbeb4c9d Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Services/EntityService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
	src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
	src/umbraco.cms/businesslogic/template/Template.cs
 2015-05-13 12:20:43 +10:00
Shannon
f829b0b16c Fixes text not overlayed on top of icon for folders in folder browser 2015-05-13 10:56:25 +10:00
Shannon
795de94a5f Fixes: U4-6102 After renaming Grid row configurations all data is lost for renames. So now we have warnings for both deletes and renames. 2015-05-11 18:46:26 +10:00
Shannon
d6699ab3b3 Fixes: U4-6102 After renaming Grid row configurations all data is lost, also ensures that all events are unsubscribed on destroy 2015-05-11 16:18:35 +10:00
Shannon
3be1cd8b0d Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/packages.config
 2015-05-07 16:24:29 +10:00
Shannon
8443513b2b fixes sorting with multipletextbox 2015-05-07 13:39:28 +10:00
Shannon
fec9d066f0 Merge branch 'property-editor-fixes' of https://github.com/pynej/Umbraco-CMS into pynej-property-editor-fixes 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
	src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
 2015-05-07 13:24:59 +10:00
Shannon
4e6a3458d0 Fixes: U4-6600 Label on files not just folders in file browser (media) and fixes up the last image rendered in the photo browser, as well as the overlays, whitespace and overflow and vertical alignment. 2015-05-07 12:57:23 +10:00
Shannon
d4f3dbcfc0 Merge branch 'media-label' of https://github.com/iamphill/Umbraco-CMS into iamphill-media-label 2015-05-07 12:01:31 +10:00
Shannon
6a0656fbb0 fixes spacing for radio/check boxes (U4-6036) tested in ie, ff and chrome 2015-05-07 11:59:10 +10:00
Shannon Deminick
9dc0999ebd Merge pull request #595 from redmorello/U4-6036 
U4 6036 - Checkbox and Radio button styling incorrect in backend
 2015-05-07 11:49:30 +10:00
Shannon Deminick
a3e37de1ad Merge pull request #633 from bjarnef/dev-v7-U4-4507 
U4-4507 - Make expand arrow in sections as a toggle
 2015-05-07 11:02:08 +10:00
Shannon Deminick
692a8f807e Merge pull request #638 from bjarnef/dev-v7-U4-6276 
Fix for U4-6276 - Keep headline at same position
 2015-05-07 10:51:32 +10:00
Shannon
f4bdcae411 Fixes: U4-6236 umbraco 7 macro parameters saving "null" 2015-05-07 10:47:36 +10:00
Shannon Deminick
d8b029eba6 Merge pull request #680 from WebCentrum/dev-v7-gridsort 
U4-6593 - After sort, reset the TinyMCE editors with previous settings
 2015-05-07 10:13:29 +10:00
Shannon
7c01670caf fixes mem leaks by not unsubscribing from events 2015-05-07 09:11:39 +10:00
Shannon
3ce5ff882e Fixes U4-5213 in a better way using a query string so it's clear where it redirects to 2015-05-07 09:11:25 +10:00
Shannon
6e7aa19073 Fixes U4-5213 in a better way using a query string so it's clear where it redirects to 2015-05-07 09:00:43 +10:00
Allyen
8299243129 U4-6593 - After sort, reset the TinyMCE editors with previous settings 2015-05-05 22:07:18 +02:00
Shannon
2f9753cc12 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
	src/umbraco.macroRenderings/app.config
 2015-05-05 12:27:01 +10:00
Allyen
2f4ff6aaae Login redirect to originally requested URL 2015-05-04 11:49:07 +02:00