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

1723 Commits

Author SHA1 Message Date
Shannon
ea86c8bcff Fixes reference to new member group tree alias "memberGroups" (breaking because of U4-7150) 2015-12-16 16:07:56 +01:00
Sebastiaan Janssen
c813eccb45 Merge branch 'dev-v7' into 7.4.0 2015-12-15 13:53:50 +01:00
Sebastiaan Janssen
80f597a7eb U4-7424 - Also update all other errors displayed in the frontend 2015-12-15 12:51:45 +01:00
Sebastiaan Janssen
44ebd8d9ea Proper formatting of this file, only whitespace changes 2015-12-15 12:18:23 +01:00
Sebastiaan Janssen
0629b49112 Merge branch 'U4-7424' of https://github.com/engern/Umbraco-CMS into engern-U4-7424 2015-12-15 12:13:35 +01:00
Sebastiaan Janssen
6ce4354ef3 Merge branch 'dev-v7' into 7.4.0 2015-12-15 11:14:15 +01:00
Sebastiaan Janssen
1bf2a3b1bf Merge branch 'dev-v7' of https://github.com/TimoPerplex/Umbraco-CMS into TimoPerplex-dev-v7 
Conflicts:
	src/Umbraco.Web/Editors/ImagesController.cs
 2015-12-15 11:12:13 +01:00
Sebastiaan Janssen
453efc02a5 Removes old obsoleted ping.aspx 2015-12-04 11:10:12 +01:00
Sebastiaan Janssen
c7aa3d63fb Merge branch 'temp-U4-7372' into 7.4.0 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs
 2015-12-03 09:22:19 +01:00
Sebastiaan Janssen
9949e2676d Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-12-01 15:16:57 +01:00
Shannon
fd66f08520 Fixes setting auth cookie during install, removes some try/catch/swallow with some error messaging, converts some String -> string and == false updates. 2015-11-26 13:07:22 +01:00
Shannon
d300146cf6 trips content/media names, makes sure that the content type editor when rendering template names html encodes the names. 2015-11-25 20:44:53 +01:00
Shannon
c97617f5b5 Fixes: U4-7461 xss vulnerability in content type editor 2015-11-25 20:15:28 +01:00
Shannon
924a016ffe Fixes U4-7457 Server side request forgery (xsrf) in feedproxy.aspx 2015-11-25 18:05:57 +01:00
Claus
89afacf161 Merge pull request #915 from umbraco/temp-U4-7380 
U4-7380 Backoffice timeouts after 7.3.1  upgrade
 2015-11-24 11:35:01 +01:00
engern
07c714fd11 Fixes U4-7424 
Add the possibilty to change the error message when a macro partial view
fails to render.
 2015-11-21 11:33:46 +01:00
Shannon Deminick
e5b0a4d98c Merge pull request #854 from Spijkerboer/UKFest-U4-7322 
Uk fest u4 7322
 2015-11-19 19:26:53 +01:00
Shannon
555b520a0c Cleans up the usages of auth cookies. OWIN is in charge of auth cookies but because we have Webforms, WebApi, MVC and OWIN, they all like to deal with cookies differently. OWIN should still be solely in charge of the auth cookies, so the auth extensions are cleaned up, the renewal now works by queuing the renewal and we have custom middleware detect if a force renewal has been queued and we renew the auth cookie there. Have obsoleted a few methods that should not be used that write auth tickets directly (this is purely for backwards compat with webforms). All of these changes now ensure that the auth cookie is renewed consistently between Webforms, WebApi, MVC and OWIN. Some changes also include ensuring that OWIN is used to sign out. 2015-11-19 18:12:21 +01:00
Sebastiaan Janssen
d0865017d1 Merge branch 'dev-v7' into 7.4.0 2015-11-18 19:42:13 +01:00
Shannon Deminick
9fa606e065 Merge pull request #907 from umbraco/temp-U4-7414 
U4-7414 Deleted tab's properties should become generic properties
 2015-11-18 17:01:02 +01:00
Claus
29ec8cb2d3 Merge pull request #857 from gerwinbouwhuis/UKFest-U4-5581 
Uk fest u4 5581
 2015-11-18 14:32:52 +01:00
Stephan
eb5589e064 Remove PropertyGroup.ParentId, sanitize Property groups/types 2015-11-17 16:55:14 +01:00
Stephan
8d00d931b0 U4-7414 Deleted tab's properties should become generic properties 2015-11-17 16:36:57 +01:00
Sebastiaan Janssen
da479430d4 Merge branch 'dev-v7' into 7.4.0 2015-11-17 13:49:21 +01:00
Claus
c37a6bb928 Merge pull request #870 from JJCLane/UKFest-U4-6094 
Adds a check to include users in the send to translation list that ha…
 2015-11-17 13:48:01 +01:00
Sebastiaan Janssen
05c592860d 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.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-11-17 13:43:19 +01:00
Shannon
a0761b92b8 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/RevertToCleanInstall.bat
	build/RevertToEmptyInstall.bat
	src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbavatar.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/views/components/application/umb-avatar.html
	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
 2015-11-09 12:33:53 +01:00
Jordan Lane
5d9a935621 Adds a check to include users in the send to translation list that have the translate permission for current page 
http://issues.umbraco.org/issue/U4-6094#
 2015-10-29 16:50:00 +00:00
Jeffrey Schoemaker
f871de61d5 U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:28:12 +01:00
Jeffrey Schoemaker
e02693e46b U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:27:33 +01:00
Jeffrey Schoemaker
db62d14b1a U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:27:05 +01:00
gerwin.bouwhuis
697daab4d7 change :get the correct alternative recursive field 2015-10-29 13:50:30 +01:00
gerwin.bouwhuis
93d89535aa undo 2015-10-29 13:32:50 +01:00
gerwin.bouwhuis
eb093ca4a6 change : find the correct alternative recursive field 2015-10-29 13:23:43 +01:00
Dennis Spijkerboer
bf43ce3281 Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into UKFest-U4-7322 2015-10-29 12:57:27 +01:00
Dennis Spijkerboer
c37ba0dc8a Checked if the trimmed value starts and ends with brackets. If so, use the trimmed value. 2015-10-29 12:56:07 +01:00
Sebastiaan Janssen
6c80bd9eb9 U4-6385 Poor Handling of disallowedUploadFiles 
#U4-6385 State: Review
 2015-10-27 13:45:02 +01:00
TimoPerplex
9b0aa49d4d Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7 2015-10-27 13:08:32 +01:00
Shannon
d1805b1448 U4-7214 Culture is not supported. Parameter name: name en_us is an invalid culture identifier error selecting user with different language after upgrade to 7.3.0 2015-10-27 11:22:28 +01:00
Shannon Deminick
a1e62dae5e Merge pull request #834 from Attackmonkey/Fix-U4-7257 
Fixes issue where dictionary items are displayed in a random order
 2015-10-22 18:43:23 +02:00
Tim
0568bf51f0 Fixes issue where dictionary items are displayed in a random order (see issue U4-7257) 2015-10-22 17:17:29 +01:00
Shannon Deminick
82adf48699 Merge pull request #805 from umbraco/temp-7234 
Fixes #7234
 2015-10-22 18:06:14 +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
042e6e1c52 fixes breaking change with renaming tree aliases. 2015-10-21 18:48:23 +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
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
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
Claus
30d8e53541 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor 2015-10-14 09:58:43 +02:00
Niels Hartvig
a75a58b719 Fixes #7234 2015-10-12 18:45:01 +02:00
Shannon
52d2306e17 Fixes: U4-7196 XSS vulnerability in BrowseRepository 2015-10-06 11:36:54 +02:00