yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,397 Commits 4 Branches 7 Tags
82e4e505842e19aa538aa562cf7abe5fde354fe5
Commit Graph

13397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
82e4e50584 Merge pull request #841 from umbraco/temp-U4-7231 
U4-7231 TryConvertTo<T> of ObjectExtensions doesn't do null checks (c…
 2015-10-28 17:09:30 +01:00
Sebastiaan Janssen
775e63148d Merge branch 'temp-U4-5963' into dev-v7 2015-10-28 17:02:51 +01:00
Sebastiaan Janssen
4259b02b8d Merge branch 'dev-v7' into temp-U4-5963 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2015-10-28 16:56:40 +01:00
Sebastiaan Janssen
0c402310d9 Fixes tests failing due to missing path 2015-10-28 16:07:54 +01:00
Stephan
8d92330ad6 Fix broken comments 2015-10-28 15:01:23 +01:00
Sebastiaan Janssen
44e76f741f Merge pull request #840 from umbraco/temp-U4-7021 
Fixes: U4-7021 "Actions" dropdown not available to children in listvi…
 2015-10-28 14:52:48 +01:00
Shannon
ecbced5c62 Massively simplifies the RenderActionInvoker which will support the native MVC caching and both async and non async support. U4-7270 Async Index actions for controllers implementing IRenderMvcController do not render view correctly 2015-10-28 14:31:40 +01:00
Shannon
e6773dafc1 Updates PR to only display the prop alias in the title attribute when in debug mode. U4-4794 Display the property alias for content properties & provide a link to the content type from the generic properties tab 2015-10-28 12:45:15 +01:00
Shannon Deminick
7b8b7ed170 Merge pull request #837 from digbyswift/dev-v7 
U4-7270 - Addition of allowance for async/await Index actions
 2015-10-28 12:33:32 +01:00
Shannon Deminick
c0997e1b9f Merge pull request #817 from tobbbe/hooverpropforalias 
Hoover a property in backend to get its alias
 2015-10-28 12:31:20 +01:00
Shannon
d4f862a44f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-10-28 12:28:41 +01:00
Shannon
64c983eb07 Updates PR with fixes for code and implementation logic for the url list. 2015-10-28 12:28:29 +01:00
Shannon
e25222162c Merge branch 'danieland-U4-7296-Link-to-each-items-doc-type-from-Properies-tab-in-Content-section' into dev-v7 2015-10-28 09:50:20 +01:00
Shannon
e022687457 Merge branch 'U4-7296-Link-to-each-items-doc-type-from-Properies-tab-in-Content-section' of https://github.com/danieland/Umbraco-CMS into danieland-U4-7296-Link-to-each-items-doc-type-from-Properies-tab-in-Content-section 2015-10-28 09:49:55 +01:00
Shannon
ef64409a9a U4-7231 TryConvertTo<T> of ObjectExtensions doesn't do null checks (causes handled errors on members after upgrade) 2015-10-27 18:29:46 +01:00
Shannon
f0b68ac31e Fixes: U4-7021 "Actions" dropdown not available to children in listview nodes 2015-10-27 18:13:18 +01:00
Sebastiaan Janssen
6c80bd9eb9 U4-6385 Poor Handling of disallowedUploadFiles 
#U4-6385 State: Review
 2015-10-27 13:45:02 +01:00
Sebastiaan Janssen
c7b7bf1510 Merge pull request #839 from umbraco/temp-U4-7214 
U4-7214 Culture is not supported. Parameter name: name en_us is an in…
 2015-10-27 11:27:53 +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
badd9ae289 Merge pull request #833 from umbraco/temp-U4-7201 
Fixes: U4-7201 Can only save once in some editors after upgrade to 7.3
 2015-10-23 11:45:24 +02:00
Kieron McIntyre
db6755a5bb Addition of allowance for async/await Index actions 2015-10-23 10:04:14 +01:00
Daniel
738815170c more nullchecks needed? 
null check that we can access user
 2015-10-23 00:21:42 +02:00
Daniel
ef091e8c3a U4-7296 
http://issues.umbraco.org/issue/U4-7296
 2015-10-22 23:41:18 +02:00
Daniel
71b3810e9c Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7 2015-10-22 21:49:49 +02: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
e3bade4d1a Merge pull request #816 from Jeavon/U4-7260 
Fix for U4-7260
 2015-10-22 18:08:23 +02:00
Shannon Deminick
633b0b0003 Merge pull request #830 from albinj/dev-v7 
U4-7283 - Only Master/Single ServerRole should be removing old instru…
 2015-10-22 18:06:53 +02:00
Shannon Deminick
82adf48699 Merge pull request #805 from umbraco/temp-7234 
Fixes #7234
 2015-10-22 18:06:14 +02:00
Shannon
63be12b9fe Merge branch 'dev-v7-U4-6967' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-6967 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2015-10-22 18:03:03 +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
79583c571c Fixes: U4-7201 Can only save once in some editors after upgrade to 7.3 2015-10-22 15:40:12 +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
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
albinj
f535ece685 U4-7283 - Only Master/Single ServerRole should be removing old instructions from the database 2015-10-21 14:29:18 +01: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
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 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
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
Shannon
30bc89ba93 U4-7092 can't show avatar because in China all users can't access to some sites. - Fixes where and how the avatar gets loaded, we first check if it exist or that we can connect to the internet and then load it, removes the avatar loading from the user service.. not sure why it was even there. 2015-10-16 14:45:49 +02:00
Shannon
841c8d69fc removes unused avatar directive 2015-10-16 14:30:23 +02:00
Shannon
aa780d2b8a updates the googlefontpicker to lazy load the required google font lib. 2015-10-16 14:09:54 +02:00
Shannon
59f15f1618 updates the canvas loader, ensures that there are no external dependencies and that paths are relative. 2015-10-16 14:09:27 +02:00
TOXIC\Tobbe
b2f0a9f23d Hoover a property in backend to get its alias 2015-10-16 14:07:19 +02:00
Shannon
40cd07f3f4 removes wide setting from canvas designer since it does not exist. 2015-10-16 13:36:30 +02:00