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

20533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
fbda4fc8d1 Fixes part of the failing tests 2017-10-09 17:49:01 +11:00
Shannon
312b994537 Merge branch 'dev-v7' into temp-U4-10503-2 2017-10-09 16:42:21 +11:00
Shannon
dd1bfe9cbf Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-10-09 16:08:14 +11:00
Shannon
de17b69564 U4-10452 Unable to create new User Groups programmatically - publicizes UserGroup 2017-10-09 16:07:55 +11:00
Shannon
7f44f4a030 readonly field 2017-10-09 16:01:49 +11:00
Shannon
422219ab21 Updates the cache file paths to be resolved behind a lazy so that there's proper locking in place for accessing the value, this also makes the code a little nicer. 2017-10-09 16:01:22 +11:00
Shannon Deminick
9986a3c2c2 Merge pull request #2162 from Bitmapped/U4-9081-external 
U4-10369: Split out ConfigureUmbracoAuthentication method
 2017-10-09 15:50:45 +11:00
Shannon
ce81416368 Ensures the DistCache file is stored in the same configured temp location as the plugin cache files 2017-10-09 14:50:34 +11:00
Shannon
04e04ae47a Ensures that the local folder does not also get created when using the env temp storage location, this is also a tiny bit better for perfs 2017-10-09 14:40:23 +11:00
Warren Buckley
0f6e7d26c9 Merge pull request #1596 from StefanoChiodino/U4-7721 
U4-7721 install button miss aligned
 2017-10-06 15:00:09 +01:00
Warren Buckley
51ceba6fea Merge pull request #1780 from bjarnef/dev-v7-U4-9599 
U4-9599 - Fix caret in font size select
 2017-10-06 14:25:55 +01:00
Sebastiaan Janssen
5dde2efe0d U4-10506 Importing a specially crafted document type file can cause XXE attack 2017-10-06 15:14:41 +02:00
Sebastiaan Janssen
fe2b86b681 Html encode nodenames to prevent XSS attacks. Fixes U4-10497 XSS Vulnerability in page name. 2017-10-06 14:38:21 +02:00
Warren Buckley
368fec4ac1 Merge pull request #2231 from umbraco/temp-U4-10503 
U4-10503 Umbraco plugins cache files should be stored in the same local temp location as the umbraco xml cache file
 2017-10-06 13:27:22 +01:00
Shannon
9016147118 Streamlines temp folder name so it's consistent, ensure the folder exists before writing to it 2017-10-06 12:11:20 +11:00
Shannon
bee75803f7 Adds file exist checks 2017-10-06 11:51:27 +11:00
Shannon
7b3f7f4ad4 U4-10503 Umbraco plugins cache files should be stored in the same local temp location as the umbraco xml cache file 2017-10-06 11:47:25 +11:00
Shannon Deminick
f6c25f29c0 Merge pull request #2229 from keroberts/dev-v7-U4-10496 
Fix Typo in Email Property Editor
 2017-10-06 01:01:48 +11:00
keroberts
6de3b920eb Fix Typo in Email Property Editor 2017-10-05 14:04:02 +01:00
Sebastiaan Janssen
76dc311586 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	src/Umbraco.Tests/Web/Mvc/HtmlStringUtilitiesTests.cs
#	src/Umbraco.Web/HtmlStringUtilities.cs
 2017-10-02 13:51:21 +02:00
Sebastiaan Janssen
581f15b172 Manually applying change from U4-10478 7.7.1 HtmlStringUtilities Truncate throws an IndexOutOfRange when input word is shorter than "…" and crash the entire site to 7.6.9 too. 2017-10-01 12:05:40 +02:00
Robert
daf01fb0fa Merge pull request #2226 from erikarenhill/U4-10478 
U4-10478: Bugfix where it would throw an IndexOutOfBounds
 2017-09-30 00:32:57 +02:00
Zsolt
588640037c Merge pull request #2054 from bjarnef/dev-v7-U4-7044 
U4-7044 - Adjust icon and heading to fix issue with icon position in IE
 2017-09-29 10:28:10 +02:00
Zsolt
7b106caf95 Merge pull request #2214 from bjarnef/dev-v7-U4-10461 
U4-10461 - Format dates using culture of current backoffice user
 2017-09-29 10:14:27 +02:00
Zsolt
828a94bc4f Merge pull request #2213 from bjarnef/dev-v7-U4-10462 
U4-10462 - Localize dropdown filters
 2017-09-29 09:28:42 +02:00
Shannon
efd1ea5b86 bumps version 2017-09-29 13:18:58 +10:00
Shannon
376d93de61 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 2017-09-29 13:18:17 +10:00
Shannon
33d7598d3c Adding key fallback to list view select functions to fix issue when selecting multiple items with an ID of int.MaxValue 2017-09-29 13:16:53 +10:00
Shannon Deminick
6a74967a49 Merge pull request #2212 from callumbwhyte/U4-10464 
U4-10464: Fixes selecting multiple list view items when item ID is int.MaxValue
 2017-09-29 13:13:31 +10:00
Shannon
79351efd36 Fixes the JS errors with recent changes 2017-09-29 13:08:47 +10:00
Shannon Deminick
70c9da93e9 Merge pull request #2211 from callumbwhyte/U4-10463 
U4-10463: Fixes Backoffice opening custom section on login instead of content section
 2017-09-29 12:30:16 +10:00
Shannon Deminick
521acc0618 Merge pull request #2220 from umbraco/temp-U4-10437 
U4-10437 Listview children not showing after upgrade to 7.7
 2017-09-29 12:24:02 +10:00
Shannon
95c3a7386d simplifies logic 2017-09-29 12:21:48 +10:00
Sebastiaan Janssen
448a99d5a4 Fix "Item already exists in dictionary" when selecting items in the list view 2017-09-28 22:00:25 +02:00
Sebastiaan Janssen
83f705e19f Merge branch 'dev-v7' into temp-U4-10437 2017-09-28 20:07:27 +02:00
Sebastiaan Janssen
880ae5cb95 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 2017-09-28 20:01:44 +02:00
Sebastiaan Janssen
476773fce5 Merge pull request #2224 from umbraco/temp-U4-5222 
U4-5222 Rollback Feature fails to update the UI to show the rolled ba…
 2017-09-28 20:00:13 +02:00
Sebastiaan Janssen
953355cddd Merge pull request #2222 from umbraco/temp-U4-10364-2 
U4-10364 SQL error occurs when we attempt to sort media items by "Cre…
 2017-09-28 19:39:19 +02:00
Zsolt
e0801cd05a Merge branch 'dev-v7' into dev-v7-U4-10462 2017-09-28 16:33:25 +02:00
erikarenhill
b363a1711a U4-10478: Bugfix where it would throw an IndexOutOfBounds when passing a word shorter than … to Truncate. Now checks whether the input wanted an elipsis and also if it reached the end. 2017-09-28 15:52:13 +02:00
negyven6
45fca02dd1 Merge pull request #2210 from bjarnef/dev-v7-U4-10442 
U4-10442 - Localization of users section
 2017-09-28 15:18:15 +02:00
Sebastiaan Janssen
b426f92e4f Update README.md 2017-09-28 13:53:18 +02:00
Sebastiaan Janssen
3e3372752a Update README.md 2017-09-28 13:52:16 +02:00
negyven6
4104ffc699 Merge pull request #2204 from bjarnef/dev-v7-fix-cropper-zindex 
U4-10440 - Fix image cropper z-index with focal point behind sticky bar
 2017-09-28 11:36:43 +02:00
negyven6
f63aa2e2ed Merge pull request #2207 from bjarnef/dev-v7-U4-10446 
U4-10446 - Fix IE issues with action button in tree
 2017-09-28 10:35:07 +02:00
negyven6
57553a5956 Merge pull request #2206 from bjarnef/dev-v7-U4-10445 
U4-10445 - Fix IE issues with user boxes
 2017-09-28 10:22:21 +02:00
Shannon
d2d43255aa U4-5222 Rollback Feature fails to update the UI to show the rolled back content - requires refresh 2017-09-28 02:38:53 +10:00
Shannon
9ad767a285 removes regex configuration bits 2017-09-27 23:13:02 +10:00
Shannon
b39e218d51 U4-10364 SQL error occurs when we attempt to sort media items by "Created by" column 2017-09-27 23:04:53 +10:00
Shannon
22ff362521 Changes email validation in c# to use the email address attribute like we do elsewhere in the codebase, adds unit test assertions to verify it validates the new odd email addresses 2017-09-27 22:50:47 +10:00