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

14014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Claus Jensen
1089aef00a Merge pull request #825 from umbraco/temp-U4-7217 
Fixes: U4-7217 umbracoReservedUrls do not always resolve correctly.
 2015-10-21 11:52:39 +02:00
Claus
f48166e6ed 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 11:29:05 +02:00
Shannon
a67feb7881 cherry picks media type child listing 2015-10-20 14:57:28 +02:00
Shannon
8950d94b25 adds unit test showing deleting a property group does not delete the property types. 2015-10-20 14:51:08 +02:00
Shannon
bb6299cc01 Fixes: U4-7217 umbracoReservedUrls do not always resolve correctly. 
Verified that all tests in GlobalSettingsTests run correctly.
Removes the strange old legacy compare thing and replaces it with a more readable Linq solution that ensures that the strings compared are always consistent.
 2015-10-20 09:48:58 +02:00
Shannon Deminick
2176f2a1c9 Merge pull request #802 from tmoxon/dev-v7 
Null check to prevent object reference error with public properties on custom indexers
 2015-10-19 18:05:33 +02:00
Shannon
d5bcfce4db Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into 7.4.0 2015-10-19 16:35:46 +02:00
Shannon Deminick
a368b6188b Merge pull request #821 from umbraco/temp-U4-7175 
Fixed: U4-7175 Discard changes overlay sometimes breaks the url
 2015-10-19 16:34:44 +02:00
Per Ploug
8cf27c810d doctype editcontroller for modelsbuilder 2015-10-19 15:56:49 +02:00
Shannon Deminick
6a351bede1 Merge pull request #823 from umbraco/tmp-6797 
U4-6797 - clear domains cache when deleting content
 2015-10-19 15:52:37 +02:00
Shannon Deminick
efc1aae0ae Merge pull request #822 from umbraco/tmp-3642 
U4-3642 - proper validation msg in hostnames dialog
 2015-10-19 15:49:09 +02:00
Per Ploug
c455c1f930 Fixed: U4-7175 Discard changes overlay sometimes breaks the url 2015-10-19 08:44:21 +02:00
Stephan
df39e027fd U4-3642 - proper validation msg in hostnames dialog 2015-10-16 17:23:12 +02:00
Stephan
64f05e4c97 U4-6797 - clear domains cache when deleting content 2015-10-16 17:21:44 +02:00
Per Ploug
44226a22e9 Removes legacy files 2015-10-16 15:16:43 +02:00
Per Ploug
9955084cd6 Ensures routing only loads from all-lower case templates 2015-10-16 15:16:41 +02:00
Per Ploug
92aee24f0c Moves cache refreshing into a submodule 
So it doesnt conflict with templateCache (also an issue with ng-tables)
 2015-10-16 15:16:41 +02:00
Per Ploug
d8fc73d36b Grunt and npm file for experiment view cache 2015-10-16 15:16:40 +02:00
Per Ploug Krogslund
d1a7a94cd4 Adjust directive filenames to all lowercase. 2015-10-16 15:13:48 +02:00
Per Ploug Krogslund
1a9bac67a1 hex background moved forms directives 2015-10-16 15:13:47 +02:00
Per Ploug Krogslund
285b072f17 navresize moved to app directives 2015-10-16 15:13:47 +02:00
Per Ploug Krogslund
b6e879cb5c ump-confirm moved to components/ 2015-10-16 15:13:46 +02:00
Per Ploug Krogslund
b13b329f90 Panel, panel and control group moved to components 2015-10-16 15:13:46 +02:00
Per Ploug Krogslund
3c4b398ebd Tab views path typo 2015-10-16 15:13:45 +02:00
Per Ploug Krogslund
881713c360 All app specific directives in /components/applications 
All directives used for the main application grid, such as section
navigation, avatar etc in one place
 2015-10-16 15:13:44 +02:00
Per Ploug Krogslund
045bc91bbc umb-property.html Moved to components/editor/ 
Duplicate files, removing this one.
 2015-10-16 15:13:44 +02:00
Per Ploug Krogslund
eda337d955 ump-editor.html replaced by umb-property-editor 
Still backwards compatible, but more obvious name
 2015-10-16 15:13:43 +02:00
Per Ploug Krogslund
443c31dc4a Moves grid.rte directive to components/grid 2015-10-16 15:13:42 +02:00
Per Ploug Krogslund
99c084186b Directive cleanup 
Moves all form elements related directives to components/forms
Moves tree directives to components/tree
Moves image+cropper directives to components/imaging
Moves validation directives to components/validation
Moves all obsolete directives and their views to _obsolete (still
works)
 2015-10-16 15:13:42 +02:00
Per Ploug Krogslund
daf5b2f68b Imaging directives moved into components 2015-10-16 15:13:40 +02:00
Per Ploug Krogslund
12ed9193a0 Remove never used umb-field directive 2015-10-16 15:13:40 +02:00
Per Ploug Krogslund
b2afbc24d9 Remove umb-blur in favour of on-blur directive 
Was only used in content-type editor work sofar
 2015-10-16 15:13:39 +02:00
Per Ploug Krogslund
185e567ef4 Consistant tab directive paths 2015-10-16 15:13:38 +02:00
Stephan
3a5a32c65f U4-7255 - fix RefreshInstruction serialization 2015-10-16 12:28:14 +02:00
Shannon
cc55af07f1 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-10-15 17:16:48 +02:00
Shannon
57622cef9a Fixes: U4-7198 Change default log4net config to include machine name in file name 2015-10-15 17:14:24 +02:00
Shannon
30ad3f5aa6 bumps version 2015-10-15 17:12:13 +02:00
Shannon
2c11f0be0f updates method to use the available request instance instead of using HttpContext.Current! no idea why it was using that. 2015-10-15 17:07:46 +02:00
Shannon
c514ce8da3 Fixes: U4-7248 Can't update roles on public access, obsolete AddOrUpdateRule 2015-10-15 17:06:00 +02:00