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

19020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
1a435148d8 U4-10026 - inject idkmap 2017-06-20 08:55:08 +02:00
Stephan
de348a9946 Merge remote-tracking branch 'origin/dev-v7' into temp-u4-10026 2017-06-20 08:41:04 +02:00
akierczynska
791e6a5f92 Update pl.xml 2017-06-19 18:19:35 +01:00
Shannon
1f6f8df5b5 Turns out when we empty the recycle bin we weren't removing associated cmsTask info. This also adds a null check since a SingleOrDefault call can return null. I've only seen this cause a problem when there is corrupt data but it should still be checked. 2017-06-19 23:48:18 +10:00
Niels Hartvig
7f5eff6e53 Fixes build, removes more unused client files 2017-06-19 15:43:53 +02:00
Shannon
d885265818 Changes restart tracking to use code we used to have in there which is an in memory marker for the app domain, this is a little cleaner 2017-06-19 23:40:51 +10:00
Niels Hartvig
be6140a38b Revert "More client files clean-up (including a duplicate tinymce)" 
This reverts commit 8ee05063a2.
 2017-06-19 15:27:36 +02:00
Niels Hartvig
8ee05063a2 More client files clean-up (including a duplicate tinymce) 2017-06-19 15:05:02 +02:00
Shannon
7920383904 U4-10034 Package install may not wait for app domain restart in all cases 2017-06-19 23:02:06 +10:00
Niels Hartvig
1a3d9e27f4 Removing unused v6 images 2017-06-19 14:46:21 +02:00
Shannon Deminick
2654f9189f Merge pull request #1973 from marcemarc/marcemarc-u4-9480 
Revised fix for issue: U4-9489 - Just fix logResource.js parameters
 2017-06-19 20:33:37 +10:00
Sebastiaan Janssen
d7453b5a6e Updating the CG link so we can modify it without releasing a new version 
Updated links to our/tv to be https
 2017-06-19 09:49:15 +02:00
Sebastiaan Janssen
5ed8ceb85e Merge pull request #2000 from umbraco/updates-installer-764 
Update installer photo + tlc on starter kit install screen
 2017-06-19 09:34:40 +02:00
Mikkel Holck Madsen
b7ea0840a9 Merge pull request #2007 from abryukhov/patch-6 
Update ru.xml UI resources
 2017-06-19 09:29:45 +02:00
Shannon Deminick
6b65f1c197 Merge pull request #1970 from Sam7/dev-v7 
U4-9973 Remove sealed modifier from ExternalSignInAutoLinkOptions class
 2017-06-19 17:27:24 +10:00
Alexander Bryukhov
bc7dc8629e Update ru.xml UI resources 
Couple of translation corrections
 2017-06-18 18:35:48 +07:00
Michael Latouche
d3c2b0a247 Merge pull request #2 from umbraco/dev-v7 
Merge dev-v7 into my fork
 2017-06-17 01:16:26 +02:00
Stephan
464711d3c8 U4-10026 - use id-key map for getting by guid 2017-06-16 14:09:20 +02:00
Mikkel Holck Madsen
b15fd4496a Merge pull request #1699 from richarth/patch-2 
Spelling and Grammar changes
 2017-06-15 15:24:56 +02:00
Mikkel Holck Madsen
b3ea0c83f9 Merge pull request #1832 from leekelleher/issue/U4-8098 
Fixes U4-8900 - XPath: "$current" on Multinodetreepicker gives error in Document Type editor
 2017-06-15 15:02:14 +02:00
Shannon Deminick
c1aefe0686 Merge pull request #2002 from rmorrin/obsolete-namespace-errors 
Fix incorrect namespace in deprecated class messages
 2017-06-15 14:16:30 +02:00
Ryan Morrin
907dd8092a Fix incorrect namespace in deprecated class messages 2017-06-15 13:04:30 +01:00
Sebastiaan Janssen
7b5568ecb4 Merge pull request #1993 from AndersBrohus/U4-10008 
U4-10008 - New danish translation for "Preview" - button
 2017-06-15 12:43:25 +02:00
Shannon Deminick
2fd383960d Merge pull request #1997 from umbraco/temp-U4-10014 
U4-10014 Making package install events public
 2017-06-14 22:41:11 +02:00
Niels Hartvig
a2c5c35394 Update installer photo + tlc on starter kit install screen 2017-06-14 11:45:03 +02:00
Mikkel Holck Madsen
c0616a37bf Merge pull request #1999 from umbraco/temp-tryAscii 
Enable trying to convert urls to ascii
 2017-06-14 10:12:58 +02:00
Mikkel Holck Madsen
da4be3be65 Merge pull request #1995 from umbraco/temp-backofficeguids 
Adds hoverstates for metadata(documenttypes, datatypes etc), making it possible to see their guids in the backoffice
 2017-06-14 08:27:41 +02:00
Shannon Deminick
08c4a75af7 Merge pull request #1945 from protherj/U4-9792-fips-support 
U4-9792 -- Update Umbraco to be FIPS compliant
 2017-06-13 15:05:21 +02:00
Claus
308c381e17 U4-10014 Making package install events public 2017-06-13 13:28:23 +02:00
Jason Prothero
e99309aa2f Merge pull request #3 from protherj/fips-refactoring 
Added RFC 4122 compliant GUID support to StrringExtensions ToGuid()
 2017-06-12 13:47:26 -07:00
Jason Prothero
917a2b78dd Added RFC 4122 compliant GUID support to the ToGuid() method on StrringExtensions.cs. Verified the SHA1 hash works with the ToGuid() method via unit tests. 2017-06-12 13:44:42 -07:00
Mads Rasmussen
e559a6d485 add key as hover on name 2017-06-12 14:55:12 +02:00
Claus
160518e977 adding guids to backoffice. 2017-06-12 12:12:14 +02:00
Anders Brohus
f985725118 Create da.xml 2017-06-11 22:01:57 +02:00
=
7f75802e4e allow DecimalValueConverter to understand signs in the front of the number. wonder if this could be more configurable as there are many other options avaialble." 2017-06-06 22:18:12 -06:00
Jeavon Leopold
5eb330b7d7 Add GetAbsoluteMediaUrl method to UrlHelper for the Open Graph starter kit lesson 2017-06-05 17:32:05 +02:00
Sebastiaan Janssen
2191d33844 Bumps version 2017-06-05 16:33:47 +02:00
Sebastiaan Janssen
92a507bc87 New CG year 2017-06-05 16:02:04 +02:00
Niels Hartvig
1b844421fc Updates to installer to use the new starter kit (and updates core version) 2017-06-04 20:47:33 +02:00
Niels Hartvig
df9c6baed7 Updates a few numbers in the installer 2017-06-04 18:10:29 +02:00
Sebastiaan Janssen
53357b0582 Merge pull request #1976 from umbraco/temp-U4-9980 
Temp u4 9980
 2017-06-04 14:55:23 +02:00
Sebastiaan Janssen
1164f1cdbb Merge branch 'dev-v7' into temp-U4-9980 2017-06-04 14:55:03 +02:00
Niels Hartvig
7f05b80a22 Make Seb happy 2017-06-04 14:02:05 +02:00
Niels Hartvig
20239a9b71 Adds a null check to avoid breaking tests (and to comform to coding standards) 2017-06-04 14:00:51 +02:00
Sebastiaan Janssen
c4b07cc3ae Merge pull request #1974 from umbraco/temp-U4-9980 
Adds support for keys in package content
 2017-06-03 18:36:28 +02:00
Sebastiaan Janssen
771935b8a5 Update PackagingService.cs 2017-06-03 18:36:00 +02:00
Niels Hartvig
73bb401f81 Updating to TryParse to make Sir Janssen happy :-) 2017-06-03 18:34:09 +02:00
Niels Hartvig
8ccbe4c1e4 Adds support for keys in package content 2017-06-03 17:34:31 +02:00
Marc Goodson
cf3343749f Revert fix to umbrequesthelper.service it was NEVER meant to be able to receive an array of a single dictionary item - actual fix is to change logResource to not pass params in this way 2017-06-02 21:04:12 +01:00
Marc Goodson
079df4a8b7 Pass logType and SinceDate as an array of key value pairs and not an array of a single dictionary - the logapi was never meant to be able to receive a dictionary... see comments on http://issues.umbraco.org/issue/U4-9489 for details 2017-06-02 21:02:46 +01:00