yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,851 Commits 4 Branches 7 Tags
612c38654da9b6e5273990f6d35d77ab3e6f9b32
Commit Graph

24851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
612c38654d Merge branch origin/dev-v7 into temp8 2018-09-06 13:07:09 +02:00
Warren Buckley
2ae9405fcf Merge pull request #2906 from umbraco/temp8-190 
fixes: 190 - Re-enable tours
 2018-09-04 13:42:29 +01:00
Warren
e0c0bc7da4 Update getting started tour template tour - to use Model.Name as opposed to older Model.Content.Name 2018-09-04 13:29:42 +01:00
Mads Rasmussen
e221a1af36 fix the rest of the create media tour 2018-09-04 13:35:31 +02:00
Mads Rasmussen
0286984c5b prefix directive 2018-09-04 13:19:34 +02:00
Warren
306c12de69 Merge branch 'temp8-190' of https://github.com/umbraco/Umbraco-CMS into temp8-190 2018-09-04 11:35:26 +01:00
Warren
0ea2682661 Adds in new util directive isolate-form used for nested forms that you do not want dirty to propogate upwards to parent forms 2018-09-04 11:34:10 +01:00
Mads Rasmussen
54255b41a0 make special zIndex's for the tour 2018-09-04 11:17:27 +02:00
Mads Rasmussen
5b3b160f3b Make header styling consistent 2018-09-04 10:27:53 +02:00
Mads Rasmussen
b8f141982b fix create doc type tour 2018-09-04 09:42:34 +02:00
Mads Rasmussen
3bc7f0a124 wait for animations to be done 2018-09-04 09:41:26 +02:00
Sebastiaan Janssen
5dd04d9a3e Merge pull request #2902 from umbraco/abjerner-patch-2 
The name field is not automatically in focus when creating a new data type folder
 2018-09-04 09:38:15 +02:00
Anders Bjerner
6ff2f1eabb The name field is not automatically in focus when creating a new data type folder 2018-09-03 18:06:15 +02:00
Mads Rasmussen
b72fc95d1f fix up getting started and create content tours 2018-09-03 16:02:39 +02:00
Sebastiaan Janssen
ac9c6305e7 Update CONTRIBUTING_DETAILED.md 2018-09-03 12:12:27 +02:00
Sebastiaan Janssen
b2b9b53af1 Whoops, fixes previous commit for #2896 2018-09-02 10:03:51 +02:00
Sebastiaan Janssen
2dd5010d2c Seems there is no need to hide the .small class, fixes #2896 2018-09-02 09:57:45 +02:00
Sebastiaan Janssen
83ce9050e8 Fix U4-10029 Umbraco.ReplaceLineBreaksForHtml should return an IHtmlString #2881 2018-08-31 21:07:56 +02:00
Sebastiaan Janssen
d8cd2c109f Merge branch 'feature/remove-logout-aspx' of https://github.com/imranhaidercogworks/Umbraco-CMS into imranhaidercogworks-feature/remove-logout-aspx 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
 2018-08-31 21:07:32 +02:00
Sebastiaan Janssen
bfd12b3a7b Merge pull request #2888 from mvanhelmont/#2886 
Media Picker should not show deleted items #2886
 2018-08-31 20:43:47 +02:00
Sebastiaan Janssen
396b499e81 Merge pull request #2885 from adhaliwal34/comment-change 
Fix comment regarding the length of the salt bytes array
 2018-08-31 20:27:32 +02:00
Sebastiaan Janssen
61ce1bcdca Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-08-31 20:21:58 +02:00
Sebastiaan Janssen
ec1d2a6433 Merge branch 'mvanhelmont-U4-11589' into dev-v7 2018-08-31 20:21:05 +02:00
Sebastiaan Janssen
9ea9c5d6b7 Don't repeat the code to check for and create a template 2018-08-31 20:20:37 +02:00
Sebastiaan Janssen
fee9bce110 Merge branch 'U4-11589' of https://github.com/mvanhelmont/Umbraco-CMS into mvanhelmont-U4-11589 2018-08-31 20:11:50 +02:00
Sebastiaan Janssen
222720aea4 Merge pull request #2884 from AliSheikhTaheri/temp-u4-8310 
Temp u4 8310 - Fixed can't rename of a document type alias by changing its casing
 2018-08-31 20:06:07 +02:00
Sebastiaan Janssen
9e3213147f Merge pull request #2883 from mvanhelmont/U4-11145 
U4-11145 Email validation is too strict on password reset screen
 2018-08-31 19:50:54 +02:00
Sebastiaan Janssen
075fcdc155 Merge pull request #2881 from skttl/patch-10 
U4-10029 Umbraco.ReplaceLineBreaksForHtml should return an IHtmlString
 2018-08-31 19:42:57 +02:00
Marcel van Helmont
c29357b845 inside ensureWithinStartNode also check if node is trashed otherwise go to startnode. 2018-08-30 21:06:29 +02:00
Stephan
4a32eebb0b Cleanup logging 2018-08-30 19:08:55 +02:00
Stephan
8b4e2c5bcb Fix tests, a culture is not edited if not available 2018-08-30 13:06:41 +02:00
Stephan
7ab393f2b2 Fix TestHelper for properties comparisons 2018-08-30 12:51:55 +02:00
Stephan
52c6377366 Fix failing test due to 66a00546d 2018-08-30 12:08:01 +02:00
AJ_Dhaliwal
cc680f2cfb Fix comment regarding the length of the salt bytes array 2018-08-30 18:03:44 +08:00
Stephan
069c42ef36 Ensure all ILogger impl support message templates 2018-08-30 10:48:27 +02:00
Sebastiaan Janssen
58dab23d04 Fix links 2018-08-30 10:00:29 +02:00
Sebastiaan Janssen
90a47cd042 Move from docs to github folder 2018-08-30 09:58:29 +02:00
Sebastiaan Janssen
fb6079d4e2 Add issue templates and updated PR template 2018-08-30 09:57:17 +02:00
Shannon
f359648215 fixes U4-11463 MembershipHelper is not working with basic auth on the initial request 2018-08-30 09:57:16 +02:00
Marcel van Helmont
74ca315197 added val-email to corrrectly validate emails supporting new TLD 2018-08-29 15:38:12 +02:00
Ali.Taheri
541e546f7b u4-8310 - Added error message to the xml file. 2018-08-29 14:35:20 +01:00
Ali.Taheri
26a8d680d4 u4-8310 - Fixed rename content type with the same alias but with different casing. 2018-08-29 14:28:33 +01:00
Stephan
451b58ee50 Fix for Serilog PR 2018-08-29 11:41:04 +02:00
Stephan
3e183a057e Fix for Serilog PR 2018-08-29 11:37:36 +02:00
Stephan
9e07bf0948 Improve ILogger documentation 2018-08-29 09:12:14 +02:00
Shannon
c85128dd11 Fixes redirect when creating new content for a specific culture 2018-08-29 13:30:48 +10:00
Marcel van Helmont
ec1a3f0fe8 make sure alias is camelCase format 2018-08-28 22:44:53 +02:00
Marcel van Helmont
8ce200bd16 added toggles to allow creating templates for collection and collection item 2018-08-28 21:32:18 +02:00
Søren Kottal
a6fd377f31 Update UmbracoHelper.cs 2018-08-28 20:21:49 +02:00
Søren Kottal
ba22ac4e83 Update HtmlStringUtilities.cs 2018-08-28 20:18:12 +02:00