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

13425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
cfab30a1ef Fix thread CultureInfo issue breaking PetaPoco 2015-10-31 12:47:03 +01:00
Stephan
1dd0086eb5 Revert "strange/crazy peta poco fix for cultures" 
This reverts commit 0d29e1438c.
 2015-10-31 12:47:02 +01:00
Sebastiaan Janssen
bbe4a87784 U4-6171 Continuous Deployment from Visual Studio Online to Azure Websites not working as expected 
#U4-6171 Fixed
 2015-10-29 16:07:07 +01:00
Sebastiaan Janssen
cbd5c295bd Merge pull request #728 from vnbaaij/dev-v7 
Fix for #U4-6171 Continuous Deployment from Visual Studio Online to A…
 2015-10-29 16:05:20 +01:00
Shannon
0d29e1438c strange/crazy peta poco fix for cultures 2015-10-29 15:24:06 +01:00
Sebastiaan Janssen
5a1ace9362 Revert "Fixes tests failing due to missing path" 
This reverts commit 0c402310d9.
 2015-10-29 13:00:51 +01:00
Stephan
da85e4eb28 fixes list view ancestor check fix 2015-10-29 12:20:10 +01:00
Shannon
fbc08d66f1 fixes list view ancestor check 2015-10-29 12:05:46 +01:00
Shannon
79f04bf939 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-10-29 11:57:07 +01:00
Shannon
9ab90595e2 Adds a filter to the interceptor to ignore errors for certain requests. 2015-10-29 11:56:23 +01:00
Sebastiaan Janssen
51b618826c Merge pull request #844 from ryanmcdonough/UKFest-U4-7151 
Update database placeholder to backslash for instance name.
 2015-10-29 11:16:56 +01:00
ryanmcdonough
04c28e5006 Update database placeholder to backslash for instance name. 2015-10-29 09:56:22 +00:00
Sebastiaan Janssen
c160ce98c1 Merge pull request #794 from mstodd/dev-v7 
Setting UMB_CONTEXT with Domain "FALSE"
 2015-10-29 10:19:28 +01:00
Sebastiaan Janssen
c3a60ea0e0 Merge pull request #838 from ryanmcdonough/U4-7302 
Login overlay now higher than bootstrap datepicker
 2015-10-29 09:19:42 +01:00
Stephan
3408efdee4 Merge pull request #842 from umbraco/temp-U4-7285 
U4-7285 Fix DistributedCache.ClearXxxCacheOnCurrentServer
 2015-10-28 19:38:04 +01:00
Shannon
1f0dc7e65d Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-10-28 18:26:44 +01:00
Shannon
f89083c772 bumped version 2015-10-28 18:26:34 +01:00
Sebastiaan Janssen
752065e540 Merge pull request #835 from umbraco/temp-U4-7032 
U4-7032 7.3.0 Custom backoffice login provider requires simpler implementation extensibility
 2015-10-28 18:25:10 +01:00
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
84db2f4d85 U4-7285 Every server that reads a instruction from umbracoCacheInstruction will also write the same instruction to the database. Intentional ? 2015-10-27 19:24:56 +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
ryanmcdonough
780937dae9 Login overlay now higher than bootstrap datepicker 2015-10-26 15:49:55 +00:00
Shannon
9b054eaa47 Adds native ability to be able to fallback to default password checking if specifying a custom IBackOfficeUserPasswordChecker 2015-10-26 14:51:19 +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
Shannon
96c087d00f adds a ctor to the BackOfficeUserManager to allow better inheritance so that all settings are initialized by default, changes init method to be protected so other devs can use it. Adds a new property for devs to use to more easily extend the logic to just validate the username/password. 2015-10-22 18:40:20 +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