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

19070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
a603fd0c46 Merge branch 'TEMP-u4-10135' of https://github.com/umbraco/Umbraco-CMS into TEMP-u4-10135 
# Conflicts:
#	src/Umbraco.Web/HtmlStringUtilities.cs
 2017-09-06 10:05:00 +10:00
Shannon
4b5c49907c switches to constant - comments out what seems to be a totally unused variable 2017-09-06 10:01:39 +10:00
Robert
972d5f8296 Reverted back to last commit, invalid html check added 2017-09-03 21:17:53 +02:00
Robert
73937172dc Added check for invalid HTML and sanitization on said HTML 
Added HtmlSanitization package
Added check for invalid HTML and sanitization on WordsToLength and Truncate methods
Addes some extra comments
 2017-08-31 11:43:06 +02:00
Robert
8c1996a7a1 Changed from the String object qualifier to type qualifier 2017-08-31 09:15:02 +02:00
Robert
039ab8f1d2 Null check for firstTrim added and fixed typo 2017-08-30 09:18:45 +02:00
Robert
68fd74897f Replaced the Regex parse with HtmlAgilityPack parser 2017-08-28 10:52:53 +02:00
Robert
047a41c05e Having a space in a tag is now taken as a char length and not as a space between words 2017-08-28 10:14:16 +02:00
Robert
84f684ed31 Truncate with trimming should now work, added some mpore tests for truncate by words methods 
Fix: Original Truncate method show now be able to trim
Add: Added some more tests for Truncate by words to cater for tagsAsContent parameter
Fix: In original truncate, currentTextLength prop will be increased everytime a tag is added, this will fix an issue when tagsAsContent is set to true (it would have added an extra char per tag, which would have went over to the next word)
 2017-08-25 11:39:13 +02:00
Robert
54f86c06f0 Fix TruncateByWords to work with tags 2017-08-21 12:30:16 +02:00
Claus
bb01eca7b7 added a few tests for the new UmbracoHelper methods. 2017-08-15 13:08:30 +02:00
Robert
cddc6f3116 Cleared useless methods 2017-07-12 12:28:40 +02:00
Robert
769f0d97d2 Added TruncateByWords method + overloads 2017-07-12 10:35:09 +02:00
Robert
1d3279fe07 Merge pull request #2036 from bjarnef/dev-v7-U4-10130 
U4-10130 - Equal height of input and button
 2017-07-11 10:48:23 +02:00
Robert
88bb796f4d Merge branch 'dev-v7' into dev-v7-U4-10130 2017-07-11 10:41:58 +02:00
Robert
97878ac25a Merge pull request #2037 from bjarnef/dev-v7-U4-9933 
U4-9933 - Update datepicker styles
 2017-07-11 09:56:48 +02:00
Bjarne Fyrstenborg
c645a2cf15 Update styles of datepicker 2017-07-08 00:45:18 +02:00
Bjarne Fyrstenborg
5fb8d990f8 Include original missing changes 2017-07-07 23:52:20 +02:00
Bjarne Fyrstenborg
8626e4337f Adjust search icon position 2017-07-07 23:40:02 +02:00
Bjarne Fyrstenborg
0f22c41eee Update height of input in header 2017-07-07 23:21:19 +02:00
Bjarne Fyrstenborg
e73fda14b5 Adjust height of input fields 2017-07-07 23:16:11 +02:00
Bjarne Fyrstenborg
a04df8070a Revert "Make examine search input and button more consistent with UI" 
This reverts commit 60c1052db1.
 2017-07-07 22:51:32 +02:00
Bjarne Fyrstenborg
60c1052db1 Make examine search input and button more consistent with UI 2017-07-07 22:12:27 +02:00
Sebastiaan Janssen
0445588c6b Merge pull request #2033 from umbraco/temp-revert-newstarterkitdefault 
Reverts the change for the installer screen which needs to be ready f…
 2017-07-06 15:31:45 +02:00
mikkelhm
4d316cf0ce Reverts the change for the installer screen which needs to be ready for the new starterkit and Lessons 2017-07-06 15:06:55 +02:00
Mikkel Holck Madsen
864650193a Merge pull request #2032 from umbraco/temp-U4-10124 
U4-10124 Update IFileService to handle MacroScripts and UserControls
 2017-07-06 12:58:17 +02:00
Claus
cfa7b0a092 U4-10124 Update IFileService to handle MacroScripts and UserControls 2017-07-06 10:44:51 +02:00
Mikkel Holck Madsen
5726420848 Merge pull request #2030 from umbraco/temp-U4-10098 
U4-10098 Update FileService to support legacy MacroScript and UserCon…
 2017-07-06 09:15:18 +02:00
Claus
ca752f74bc updating array length. 2017-07-04 17:29:32 +02:00
Claus
b840a0992c adding shadow filesystems. 2017-07-04 14:47:29 +02:00
Claus
51997d0651 U4-10098 Update FileService to support legacy MacroScript and UserControl folders 2017-07-04 14:28:15 +02:00
Shannon Deminick
9482104ec5 Merge pull request #2028 from umbraco/temp-U4-4905 
Removed "remove paragraph tags" field
 2017-07-04 12:33:25 +10:00
Robert
7053c175f8 Removed "remove paragraph tags" field 2017-07-03 13:44:37 +02:00
Claus
b2116480fc fix formatting. 2017-07-03 11:17:05 +02:00
Claus
caef6cc623 Merge pull request #2026 from wanddy/dev-v7 
Improve Chinese translation
 2017-07-03 08:32:47 +02:00
wanddy
280ad246ab Merge remote-tracking branch 'remotes/origin/dev-v7' into dev-v7 2017-06-30 19:46:09 +08:00
Claus
44cfe5da84 missing nullcheck. 2017-06-30 10:46:44 +02:00
Claus
d5fd266b19 missing semicolon. 2017-06-30 10:34:58 +02:00
wanddy
5768992ccc Improve Chinese translation to match the newest version based on en.xml file. 
Signed-off-by: wanddy <wanddy@163.com>
 2017-06-30 12:10:59 +08:00
Mads Rasmussen
81aae79b42 Merge pull request #2015 from umbraco/temp-U4-9839 
U4-9839 Media Picker: If I only upload one photo then select it as a …
 2017-06-29 14:54:49 +02:00
Claus
9edbb3fc26 Merge pull request #1634 from soreng/patch-2 
use already defined variable, instead of mapping the path twice
 2017-06-29 14:47:21 +02:00
Claus
7fdd2bcdfc Merge pull request #2018 from AndyButland/u4-4090 
Fixes U4-4090 - by preserved line breaks in property descriptions...
 2017-06-29 14:43:13 +02:00
Claus
ba90fdeb56 Merge pull request #1778 from bjarnef/dev-v7-U4-9585 
Allow leading whitespace in textstring prevalue editor
 2017-06-29 14:40:10 +02:00
Claus
d6bae1b58f Merge pull request #1958 from poornimanayar/U4-9661 
U4-9661 Remove "move" button in member section
 2017-06-29 14:37:00 +02:00
Claus
ef53db52f7 Merge pull request #1850 from pijemcolu/temp-U4-9710 
U4-9710 ImageCropDataSet.HasImage returns wrong value
 2017-06-29 14:07:59 +02:00
Claus
863b97039c Merge pull request #1632 from bjarnef/dev-v7-U4-9181 
U4-9181 - Fix sorting of grid editor config
 2017-06-29 13:55:12 +02:00
Claus
1a1adbf647 Merge pull request #2024 from greystate/drobar-partialviews 
Updates to partialviews
 2017-06-29 13:47:54 +02:00
Claus
5c745565da Merge pull request #2025 from umbraco/temp-U4-8970 
U4-8988 Adding translations for Chinese (Taiwan)
 2017-06-29 13:28:06 +02:00
Claus
5dec54badb U4-8988 Adding translations for Chinese (Taiwan) 2017-06-29 13:27:31 +02:00
Claus
e5e725b376 Merge pull request #2022 from umbraco/temp-U4-5454 
Temp u4 5454
 2017-06-29 12:32:57 +02:00