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

14218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
3272cd5c4d Fix PropertyValueEditor.ConvertDbToEditor for decimals, use invariant culture 2015-11-12 15:31:18 +01:00
Stephan
1d5602a22c Fix PluginManagerTests, post-6c5e35e 2015-11-12 15:31:09 +01:00
Claus
49560d8f2e Fixes: U4-7370 Upgrading from 7.3.1 to 7.4 fails 
Added migration for 7.3.2, ensuring the identity on the table is correct. It failed due to rows initially being inserted with identity disabled and therefore the seed of the table was zero even when the table had data.
 2015-11-10 12:10:36 +01:00
Shannon
a351f6cfc8 Fixes up the error handling with move/copy dialogs. 2015-11-09 17:58:43 +01:00
Shannon
85e5c0c219 fixes jquery reference issue (again) 2015-11-09 17:10:33 +01:00
Shannon
7eb922a550 fixes build (merge issue) 2015-11-09 12:37:29 +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
Shannon Deminick
974c7cb48c Merge pull request #882 from umbraco/temp-U4-7351 
Temp u4 7351
 2015-11-09 03:28:41 -08:00
Sebastiaan Janssen
48fdb75d96 Improves clean scripts for Claus 2015-11-09 09:25:59 +01:00
Sebastiaan Janssen
a97094458d U4-7356 <siteMap><providers> element can only be added once, when using nuget update-packge 
U4-7356 Fixed
 2015-11-09 09:25:58 +01:00
Claus Jensen
33d7292cb1 Merge pull request #843 from umbraco/temp-U4-7224 
Temp u4 7224 - clean up content type editor validation styling
 2015-11-06 12:58:57 +01:00
Mads Rasmussen
06a1899edf clear alias when name is empty 2015-11-06 11:49:01 +01:00
Claus Jensen
16126c2b4e Merge pull request #881 from umbraco/temp-U4-7281 
show warning when editing data type in content type editor
 2015-11-06 10:30:08 +01:00
Mads Rasmussen
3dbd738639 set new bottom height to make room for cancel button 2015-11-05 10:52:22 +01:00
Mads Rasmussen
a34431493e remove watchers on available and selected models from umbChildSelector directive to prevent digest loop going crazy 2015-11-05 10:37:23 +01:00
Mads Rasmussen
6e1dc87996 wait for content before loading sub views 2015-11-05 10:32:12 +01:00
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
Mads Rasmussen
127afbfbf1 show warning when editing data type 2015-11-03 10:48:56 +01:00
Mads Rasmussen
b632beb067 set title attr on alias input 2015-11-03 10:13:02 +01:00
Sebastiaan Janssen
6f6b7d5772 This namespace doesn't exist 2015-11-03 10:00:11 +01:00
Stephan
30f0c96052 Fix AsyncLock finalizer throwing exceptions 2015-10-31 12:47:04 +01:00
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