yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,123 Commits 4 Branches 7 Tags
2f16aa25c39ed95cede4d3a33f921c8d2de8b8a2
Commit Graph

14123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
2f16aa25c3 Fixes: U4-7347 Document type editor template name and alias get set to null 2015-11-03 19:49:00 +01:00
Sebastiaan Janssen
6f6b7d5772 This namespace doesn't exist 2015-11-03 10:00:11 +01:00
Shannon
6269e7b3f2 Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into 7.4.0 2015-10-27 11:41:45 +01:00
Shannon Deminick
283de5a7d6 Merge pull request #831 from umbraco/temp-U4-7178-media-library 
Temp u4 7178 media library
 2015-10-27 11:41:10 +01:00
Shannon
8f7add203e Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
 2015-10-27 10:29:11 +01:00
Mads Rasmussen
3033b0a705 Fixes: U4-7303 Shift + select to select a range of items 2015-10-27 08:53:53 +01:00
Mads Rasmussen
6faf4c4dbf Merge pull request #814 from umbraco/dev-v7-contenttypeeditor-validation 
U4-7119 New Content Type editor requires server side validation wired up
 2015-10-23 09:34:29 +02:00
Mads Rasmussen
8d81d9922c fix js errors when unsubscribing events 2015-10-22 20:27:29 +02:00
Mads Rasmussen
4007ece6b4 Add copy bulk action to content + redo move dialog 2015-10-22 19:52:56 +02:00
Per Ploug
dd05fe7466 merge 2015-10-22 18:07:17 +02:00
Per Ploug
b4286cffbe Fixes up folderbrowser inheritance 2015-10-22 18:05:42 +02:00
Shannon
e2251ec41a Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2015-10-22 17:54:09 +02:00
Shannon
33f7ed5129 Fixes: U4-7223 GetCropUrl outputs html entities in url when used in css 
Adding in HtmlHelper extensions for GetCropUrl.
 2015-10-22 17:52:58 +02:00
Shannon Deminick
427ea3d87b Merge pull request #832 from umbraco/temp-U4-7223 
Fixes: U4-7223 GetCropUrl outputs html entities in url when used in css
 2015-10-22 17:51:46 +02:00
Shannon
602915a311 makes FolderBrowserPropertyEditor have the grid as the primary layout for the list view. 2015-10-22 17:47:22 +02:00
Per Ploug
7463836ed2 merge 2015-10-22 17:45:46 +02:00
Shannon
f66c07ec81 updates base data creation to not install the folder browser and instead to use the default media list view for the media folder property. Updates the FolderBrowserPropertyEditor to use the default list view property editor with no pre-values. 2015-10-22 17:34:01 +02:00
Per Ploug
49991ca84a Merge branch 'temp-U4-7178-media-library' of https://github.com/umbraco/Umbraco-CMS into temp-U4-7178-media-library 2015-10-22 17:29:55 +02:00
Shannon
9ed44a6314 fixes DataTypeController to only exclude System List views 2015-10-22 15:43:10 +02:00
Shannon
fd26f98356 fixes template mapping issue when saving content types 2015-10-22 15:10:44 +02:00
Mads Rasmussen
9372b1df47 fix placeholder width on input auto resize in firefox 2015-10-22 14:02:18 +02:00
Claus
0cf44c1bd0 Fixes: U4-7223 GetCropUrl outputs html entities in url when used in css 
Adding in HtmlHelper extensions for GetCropUrl.
 2015-10-22 13:42:38 +02:00
Mads Rasmussen
83d16c3986 remove z-index on list view settings to allow overlays inside 2015-10-22 12:48:19 +02:00
Mads Rasmussen
a6cb2a38ac remove margin 2015-10-22 12:47:19 +02:00
Shannon
41c5f6a8bf Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
 2015-10-22 12:12:03 +02:00
Mads Rasmussen
cf09603c08 check for array in media grid 2015-10-22 11:52:29 +02:00
Mads Rasmussen
4975ab870b remove sortable in content grid until we find a solution for saving 2015-10-22 11:47:35 +02:00
Mads Rasmussen
2eb36710e2 remove sortable from media grid until we find a way to save sort order 2015-10-22 11:28:08 +02:00
Mads Rasmussen
bf7e49f774 remove console log 2015-10-22 11:23:53 +02:00
Mads Rasmussen
cbaccafbc3 remove old pagination markup 2015-10-22 11:23:05 +02:00
Mads Rasmussen
cf13d89086 add directive for list view layouts so we do not get values from parent scope 2015-10-22 11:21:53 +02:00
Shannon Deminick
5f45f715a1 Merge pull request #829 from umbraco/temp-u4-6927 
Adds browser refresh to uninstall
 2015-10-22 11:14:32 +02:00
Shannon
842980a7df fixes issue with empty tree alias being passed in when attempting to sync tree 2015-10-22 11:14:06 +02:00
Shannon Deminick
a7e2c0b4dc Merge pull request #804 from rasmusjp/feature/copy-content-dialog 
Added recursive option to copy dialog
 2015-10-22 10:38:07 +02:00
Mads Rasmussen
9449a778e9 move list view pagination to directive 2015-10-22 09:42:00 +02:00
Mads Rasmussen
153e2ecfae use "item" instead of "document" to cover both content, media and folder. 2015-10-21 19:47:39 +02:00
Mads Rasmussen
5aa844393f add selected folders and items to an selection array. Move list layout logic to list layout controller. 2015-10-21 19:44:35 +02:00
Shannon
042e6e1c52 fixes breaking change with renaming tree aliases. 2015-10-21 18:48:23 +02:00
Shannon
98fadf82a1 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2015-10-21 18:44:07 +02:00
Shannon
da48e1b392 Fixes: U4-6962 Public access in multiple levels is broken in 7.3 
Ensured the backoffice UI will look at protection for the specific node only (no inheritance) when specifying public access.
Added non-recursive method to Access class.
Fixed bug causing the tree (child nodes) not to update correctly after changing public access on nodes.
 2015-10-21 18:43:30 +02:00
Shannon Deminick
4881b4cd7d Merge pull request #827 from umbraco/temp-U4-6962 
Fixes: U4-6962 Public access in multiple levels is broken in 7.3
 2015-10-21 18:38:21 +02:00
Shannon
73fb761c4d Fixes issue with umb-editor-sub-views so that each view is actually rendered out and not replaced otherwise when you switch sections all of the wired up validation gets removed. This will also enable us to highlight the menu header when validation errors exist on that section. We also now show a single validation error message even when there is client side validation errors. 2015-10-21 17:52:58 +02:00
Per Ploug
a7aa13fcb6 Adds browser refresh to uninstall 
- InstalledPackage triggers a clientside refresh to installer.aspx - as
the installedpackage.aspx cannot be used for the last step since the
package is now gone
- installer.aspx displays the final uninstall message after browser
refreshing
- uses same clientside redirect as installs
 2015-10-21 14:34:19 +02:00
Per Ploug
c8f1340868 Rolls back update to jquery from 2.1.4 to 2.0.3 2015-10-21 14:22:44 +02:00
Per Ploug
08a46d62ed Merge branch 'temp-U4-7178-media-library' of https://github.com/umbraco/Umbraco-CMS into temp-U4-7178-media-library 2015-10-21 12:57:54 +02:00
Per Ploug
3996170151 Makes the folderbrowser proxy the media listview 
This handles upgrades which already use the folderbrowser to
automatically switch to the media listview
 2015-10-21 12:57:35 +02:00
Per Ploug
9f090801fc Obsoletes the Folderbrowser and changes install to use List-view 2015-10-21 12:52:10 +02:00
Mads Rasmussen
b4ab7ff963 fix breadcrumbs in media section 2015-10-21 12:33:31 +02:00
Claus Jensen
04e46c7cd1 Merge pull request #815 from umbraco/temp-U4-7198 
Fixes: U4-7198 Change default log4net config to include machine name …
 2015-10-21 12:20:45 +02:00
Per Ploug
1b55f04129 small docs comment fix 2015-10-21 11:52:51 +02:00