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

169 Commits

Author SHA1 Message Date
elitsa
d7696e8d91 Making a variable const 2018-12-18 11:34:50 +01:00
elitsa
8518aaf4c1 Merge branch 'temp7-269-xss-stylesheets' of https://github.com/umbraco/Umbraco-CMS into temp7-269-xss-stylesheets 
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
 2018-12-10 11:00:31 +01:00
elitsa
9edafe37e1 Merge branch 'dev-v7' into temp7-269-xss-stylesheets 
# Conflicts resolved:
#	src/Umbraco.Core/StringExtensions.cs
 2018-12-10 10:57:30 +01:00
Sebastiaan Janssen
ebcf011287 Revert the addition of + which was a leftover from debugging 2018-12-06 16:58:12 +01:00
Elitsa Marinovska
914d956ada Merge branch 'dev-v7' into temp7-269-xss-stylesheets 2018-12-03 12:50:40 +01:00
elitsa
3ef4da0615 Reverting. 2018-12-03 12:15:34 +01:00
elitsa
0abe685d7f Removing malicious code from the name of a Stylesheet. 2018-12-03 09:00:44 +01:00
elitsa
ae36e02f4c Reverting to the origin. 2018-12-03 08:54:08 +01:00
elitsa
3a26fe8fe2 Removing malicious code from the name of a Stylesheet. 2018-12-03 08:45:11 +01:00
Warren Buckley
54a2aa00a7 Revert "Temp8 tinymce" 2018-11-22 14:05:51 +00:00
Shannon
57074d3545 some code cleanup 2018-11-22 15:26:10 +11:00
Shannon
0c5cf5256b manual merge pass #2 2018-10-02 12:57:19 +02:00
Stephan
ad633c7606 Merge branch 'temp8-2758' into temp8 2018-07-10 09:36:28 +02:00
Stephan
ecf9a928d7 Refactor variations 2018-07-03 13:05:21 +02:00
Anthony
43fdd691fe Removed obsolete methods from Umbraco.Core which are not used 2018-07-01 18:58:58 +01:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Sebastiaan Janssen
9008e6af88 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	docs/CONTRIBUTING_DETAILED.md
#	docs/README.md
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
#	src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
#	src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/LanguageTreeController.cs
 2018-06-06 21:15:11 +02:00
Mundairson
e7c1d3dd2e Removed old version. 2018-06-05 12:25:37 +01:00
Mundairson
379ac8a3cb Refactored the extension method to call the native method. 2018-06-05 12:25:06 +01:00
Shannon
9b08a73210 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
#	src/Umbraco.Web/UmbracoHelper.cs
 2018-05-30 15:29:08 +10:00
Dan Booth
3f35eca999 Fixed ContainsAny method so that it uses the passed in Comparison method (which enabled case-insensitive comparisons to work) 2018-05-10 14:28:16 +01:00
Stephan
71ed99f080 Fix some tests 2018-05-05 10:46:52 +02:00
Stephan
b35d28c568 Merge branch temp8 into temp8-U4-11227 2018-05-03 15:12:42 +02:00
Stephan
bcf46eceb6 Cleanup, get rid of warnings 2018-05-03 15:11:52 +02:00
Stephan
a545c3c333 Fix 2018-05-02 18:15:22 +02:00
Stephan
aaa1ac0700 Merge branch temp8 into temp8-U4-11227 2018-05-02 17:50:58 +02:00
Shannon
6fe9c4d4df Fixes the null PublishName problem, ensures the quey strings are not replaced when selecting a doc type 2018-05-02 15:35:26 +10:00
Stephan
038fc87a40 Cleanup, fix tests 2018-04-30 15:11:01 +02:00
Stephan
bcd0c95ec1 Refactor getting urls 2018-04-30 09:14:14 +02:00
Stephan
ce8775b3e7 Cleanup IPublishedContent 2018-04-30 09:14:13 +02:00
Stephan
dbf1b1e0d4 Refactor DomainHelper 2018-04-27 17:54:49 +02:00
Shannon
3cdc0e1142 Removes IShortStringHelper.ReplaceMany, this should just be a normal string extension and removes the need to load in IUmbracoSettings for this simple purpose, this fixes some unit tests 2018-04-27 10:26:32 +10:00
Shannon
a673babfb7 Fixes Content List View installation, removes unecessary properties from the RecycleBinEventArgs, updates both the upload and image cropper property editors to properly remove all files including any associated with variants, updates several other places to deal with variants and Property.GetValue(langId), adds notes, ensures we are returning the corect IDictionary instead of Dictionary for some interfaces 2018-04-04 13:11:12 +10:00
Stephan
fcf2b27953 More content refactoring (tests) 2017-11-10 11:27:12 +01:00
Stephan
5ba2ffcbf3 CrLfTab 2017-09-23 10:08:18 +02:00
Stephan
9a28250a8d Port 7.7 - WIP 2017-09-15 18:22:19 +02:00
Shannon
513aa0b95d Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-28 22:41:14 +10:00
Sebastiaan Janssen
7a0c6ab975 Merge pull request #2135 from umbraco/temp-U4-10301 
U4-10301 Change the PluginManager hash to use more reliable and consi…
 2017-08-28 11:44:40 +02:00
Stephan
934d03e63f Port 7.7 - WIP 2017-08-24 21:24:14 +02:00
Shannon
04ac744277 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-23 15:23:04 +10:00
Sebastiaan Janssen
4404ce94c5 Merge pull request #2142 from abjerner/patch-17 
Typo
 2017-08-21 14:24:52 +02:00
Anders Bjerner
86bc701511 Typo 
Very minor typo, but still ;)
 2017-08-21 14:16:01 +02:00
Shannon
f7097d571c U4-10301 Change the PluginManager hash to use more reliable and consistent hashes 2017-08-17 11:38:57 +10:00
Shannon
044120ffd2 Gets inherited permissions working, adds lots of unit tests, few more tests to write now. 2017-07-13 00:07:51 +10: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
Stephan
81234cd702 Rename DI to Composing 2017-05-30 15:46:25 +02:00
Stephan
8561d85f7a porting 7.6-rc1 into 8 2017-05-24 12:25:39 +02:00
Jason Prothero
d8811d6b46 Refactored code for FIPS compliance support. Added/converted to using a more generic Hash() method instead of directly using MD5. 2017-05-10 13:35:28 -07:00
Shannon
8e06a88a2c bumps version, publicizes method 2016-12-23 14:52:18 +11:00
Stephan
8e056aba66 Merge origin/dev-v7.6 into dev-v8-zbwip (builds, not tested) 2016-11-23 10:33:12 +01:00