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

13763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
ecd024c462 U4-7681 Legacy CMSNode.Parent uses old SqlHelper API and doesn't keep a reference 2016-01-08 13:59:40 +01:00
Shannon Deminick
ced0a852b1 Merge pull request #1000 from bjarnef/dev-v7-U4-7648 
Set focus on input by clicking label
 2016-01-07 10:14:07 +01:00
bjarnef
ba0da15f7f Set focus on input by clicking label 2016-01-07 01:04:55 +01:00
bjarnef
2875cd10f3 Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7 2016-01-06 22:01:33 +01:00
Sebastiaan Janssen
d2483159bc Fixes unit tests, not all packages will have the sort order in there 2016-01-06 15:59:23 +01:00
Sebastiaan Janssen
48ab3f580c Fixes the build 2016-01-06 15:21:45 +01:00
Claus
c524d67a37 Fixes: U4-7553 Importing Document Type doesn't respect property sort order 
Handling sortOrder property in both import/export.

(cherry picked from commit 378479b4c1)

# Conflicts:
#	src/Umbraco.Core/Services/PackagingService.cs
 2016-01-06 14:56:31 +01:00
Shannon
4c3258812c normalize culture for test 2016-01-06 12:50:41 +01:00
Shannon
bc98f5e8fc code cleanup. 
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
 2016-01-06 12:49:18 +01:00
Shannon
6f2f6c088b Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-06 12:48:36 +01:00
Shannon
da91923577 Changes ObjectExtensions NormalizeNumberDecimalSeparator to use normal Culture (not UI Culture) 2016-01-06 12:48:26 +01:00
Sebastiaan Janssen
fbc46d8046 Merge pull request #989 from umbraco/temp-U4-7643 
U4-7643 DatabaseServerMessenger.cs causes lucene indexes to rebuild o…
 2016-01-06 12:43:36 +01:00
Shannon
e8a0fae557 adds notes 2016-01-06 12:24:09 +01:00
Shannon Deminick
e0baf45247 Merge pull request #992 from umbraco/temp-U4-5168 
U4-5168 Media Items label says "Document Type" instead of  "Media Type"
 2016-01-06 12:22:53 +01:00
Sebastiaan Janssen
43e983e27a Corrects spelling of localStorateDir to localStorageDir 2016-01-06 12:17:48 +01:00
Sebastiaan Janssen
b882806847 Merge pull request #980 from umbraco/temp-U4-7614 
U4-7614 Allow Examine's local temp storage to exist in the current Us…
 2016-01-06 12:09:31 +01:00
Shannon
58c30cd7a6 removes erroneous reverse call 2016-01-06 12:00:50 +01:00
Shannon Deminick
ae1b6d95b8 Merge pull request #990 from umbraco/temp-PVS-Studio 
Temp pvs studio
 2016-01-06 12:00:28 +01:00
Sebastiaan Janssen
403af78ba9 U4-5168 Media Items label says "Document Type" instead of "Media Type" 2016-01-06 11:22:15 +01:00
Sebastiaan Janssen
59fe690a88 Code sample No.10 2016-01-05 23:34:30 +01:00
Sebastiaan Janssen
a15b005d95 Code sample No.6, No.7 2016-01-05 23:22:16 +01:00
Sebastiaan Janssen
b94c396d4e Code sample No.5 2016-01-05 23:20:47 +01:00
Sebastiaan Janssen
8afc4f5ad1 Code sample No.3 2016-01-05 23:15:25 +01:00
Sebastiaan Janssen
f68b2de9e3 Code sample No.2 2016-01-05 23:13:37 +01:00
Sebastiaan Janssen
f4e29d90e0 Code sample No.1 2016-01-05 23:12:09 +01:00
Sebastiaan Janssen
5ad5e945c4 Merge pull request #813 from TimGeyssens/dev-v7 
Fixes U4-7249 Insert Macro split button, when selecting a macro that …
 2016-01-05 19:49:14 +01:00
Sebastiaan Janssen
4ef7b7735e Fixes U4-6510 again as merging PR apparently went wrong 2016-01-05 17:04:11 +01:00
Sebastiaan Janssen
db538d95ba Bumps version 2016-01-05 16:11:59 +01:00
Sebastiaan Janssen
cef7cd1ca7 Merge pull request #981 from umbraco/temp-U4-7583 
U4-7583
 2016-01-05 16:02:51 +01:00
Shannon
726416fe0c Fixes: U4-7624 Datepicker Sql server error 
Since we are not saving the formatted value, don't try parsing the date with formatting config.
Added in explicit parsing format compatible with the one used when saving the value, just to ensure parsing is done the same way.
 2016-01-05 15:47:42 +01:00
Shannon Deminick
1957d8bb3b Merge pull request #928 from kiasyn/patch-1 
U4-7400 - Datepicker is not updating scope model value in time for 3r…
 2016-01-05 15:19:31 +01:00
Shannon
fab30d353a U4-7223 GetCropUrl outputs html entities in url when used in css 2016-01-05 14:54:02 +01:00
Shannon
75990b5961 U4-7643 DatabaseServerMessenger.cs causes lucene indexes to rebuild on app startup 2016-01-05 14:20:13 +01:00
Shannon
18900d0e25 Fixes: U4-6659 Examine: Specific doctype not being indexed 2016-01-05 12:38:13 +01:00
Shannon
d08f4230c8 U4-7538 GetRemainingTimeoutSeconds is double setting the cookie in 7.4 2016-01-05 12:35:06 +01:00
Shannon
15d06557e9 U4-7605 Colons/Parens Unnecessarily Removed From Data Type Names 2016-01-05 11:42:02 +01:00
Shannon
8d2e708d1c Adds exception handling for the BackOfficeUserStore - this will occur if the external OAuth provider doesn't return the Email or Name correctly, then an exception is swallowed at the service level and the user is not actually created, but the BackOfficeUserStore could not detect this, so it's detecting this now. 2016-01-05 11:36:52 +01:00
Shannon
280573be28 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-05 11:35:35 +01:00
Shannon
415aaf3e2b U4-7477 xss char stripping on data type names is being too agressive 2016-01-05 11:35:24 +01:00
Sebastiaan Janssen
5081027482 Improve batch files: SETLOCAL makes sure we don't change the user's actual path, so no need to revert changes any more either 2016-01-05 11:33:10 +01:00
Shannon
ac1785bc08 U4-7583 2015-12-28 16:20:48 +01:00
Shannon
1da1a20734 ensures the setting is enabled for the searcher too 2015-12-28 13:43:47 +01:00
Shannon
c765ab9112 U4-7614 Allow Examine's local temp storage to exist in the current User's temp storage location - useful for Azure 2015-12-28 13:37:56 +01:00
Shannon Deminick
664aa3842d Merge pull request #979 from robertjf/dev-v7 
fix for issue U4-7609/U4-7610 - IE related problems
 2015-12-28 10:09:29 +01:00
Robert Foster
fbee58e445 Added json mimetype Mapping to web.config.template to support things like manifest.json in certain browsers (e.g. IE). 2015-12-26 19:05:44 +11:00
Robert Foster
a5e87dcedf Fix for IE not being able to install packages in Umbraco backoffice. 2015-12-26 18:57:24 +11:00
Robert Foster
ffe41fe060 Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' 2015-12-18 22:45:46 +11:00
Shannon Deminick
e89cc24d51 Merge pull request #958 from lars-erik/overridable-domain-repository 
Can't log into youtrack. Simple changes to repositoryfactory and umbr…
 2015-12-16 10:19:25 +01:00
Claus
61f3b2ae4a Added CultureInvariant to regex. 2015-12-16 09:53:15 +01:00
Claus
a752c7ee4b Merge branch 'rasmusjp-U4-7462' into dev-v7 2015-12-16 09:52:36 +01:00