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

5133 Commits

Author SHA1 Message Date
Shannon
def8ee4962 fixes ysod when indexing grid content when the value is not a string (sub json value) 2016-05-25 14:38:24 +02:00
Shannon
8cea391a3f U4-8514 Fix installation issue when there are stale cookies on localhost 2016-05-25 14:36:00 +02:00
Shannon
81d1ac74d2 U4-8513 Fix the RestartApplicationPool extension to null out the current identity 2016-05-25 13:56:42 +02:00
Claus
247a5f415d added a check to create macroScripts folder if it doesn't exist when creating a scripting file. 2016-05-25 12:12:52 +02:00
Shannon Deminick
8d5dabdfff Merge pull request #1282 from umbraco/temp-U4-7332 
U4-7332 Default gravatar link broken
 2016-05-25 12:00:38 +02:00
Sebastiaan Janssen
f817eefd5c Merge pull request #1280 from umbraco/temp-U4-8358 
U4-8358 Writers can't schedule publish/unpublish times
 2016-05-24 16:25:55 +02:00
Sebastiaan Janssen
6cb817fc01 U4-7332 Default gravatar link broken 2016-05-24 16:20:20 +02:00
Stephan
42021a56b2 U4-8290 - minor cleanup & refactoring 2016-05-24 15:55:26 +02:00
Stephan
0a4a230c07 Merge branch 'u4-8290' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8290 2016-05-24 08:15:47 +02:00
Shannon
877b7d4af7 U4-8358 Writers can't schedule publish/unpublish times 2016-05-23 19:23:59 +02:00
Sebastiaan Janssen
bbe37ea6b9 U4-8349 Cannot create Scripting Files in Umbraco 7.4.0 2016-05-23 08:55:51 +02:00
Sebastiaan Janssen
43d791f9a5 U4-6504 SmtpClient Not Properly Disposed, Causing Emails to Fail Periodically 2016-05-23 08:27:30 +02:00
Shannon
06ae15ee7c reverts the cloning change 2016-05-19 16:12:12 +02:00
Stephan
08ae03a2d4 Merge branch 'dev-v7' into better-memory-xmlcache 2016-05-17 19:10:38 +02:00
Shannon
512c19a132 U4-8461 ERROR umbraco.presentation.webservices.nodeSorter - Could not update content sort order 2016-05-17 13:27:45 +02:00
Shannon
1e468cda5d Removes unused method, ensures that Cloning only occurs once per request (sort of hacky). Before if you have a few nodes that are published but have pending changes, then perform a sort, then the xml will be cloned for as many times as there were content changes. 2016-05-17 13:26:47 +02:00
Mads Rasmussen
adebd4acd6 Merge pull request #1169 from AndyButland/u4-7468 
Fixes U4 7468 - mis-assigned translator when sending to translation
 2016-05-17 13:18:15 +02:00
Shannon
d826f04b54 Ensures sort order is accurate to what is in the database 2016-05-17 12:17:05 +02:00
Shannon
f130e86c88 U4-8448 Background task runner missing a null check during shutdown 2016-05-12 12:27:02 +02:00
Shannon
8d5556d4bc Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-05-12 11:16:46 +02:00
Shannon
4d0dc90042 Revert "RteMacroRenderingValueConverter should return an IHtmlString" 
This reverts commit 7e9a14be83.
 2016-05-12 11:16:39 +02:00
Shannon
7ae1060f50 U4-7295 Examine search with the data in the grid should be easier OOTB 2016-05-10 18:25:18 +02:00
AndyButland
4f3d82cf10 Change field to which data is saved for a data type if provided in prevalues and handle potential mis-matched types on display 2016-05-10 10:50:59 +02:00
AndyButland
7b6bcd24ae Added value type as a pre-value to the label property editor 2016-05-08 23:39:47 +02:00
AndyButland
7858521c8b Converted usage of property editor value type strings to constants 2016-05-08 22:05:23 +02:00
Shannon Deminick
f79a1f1a71 Merge pull request #1253 from umbraco/temp-u4-8406 
U4-8406 - restart app pool by unloading domain and support read-only …
 2016-05-04 16:51:41 +02:00
Shannon
0d11b15b3f This fixes the LoadContentFromDatabase method - before this was storing every single xml node in memory in dictionaries (x2) and then performing the re-organization of all nodes afterwords to construct a document, now we just read each row and organize the document accordingly, 2016-05-04 16:36:43 +02:00
Stephan
5f8747b4d3 U4-1780 - detect colliding urls (#1243) 
* U4-1780 - detect colliding urls

* U4-1780 - fix error message

* U4-1780 - fix XmlHelper issue with sortOrder

* U4-1780 - bugfix
 2016-05-04 12:45:20 +02:00
Stephan
67996cdb64 U4-8406 - restart app pool by unloading domain and support read-only web.config 2016-05-04 08:45:50 +02:00
Claus
1186b7cb47 Merge pull request #1246 from umbraco/temp-u4-2508 
U4-2508 - improve culture detection in 404 situation
 2016-05-03 11:02:31 +02:00
Shannon
f03daf819e Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-05-02 23:06:45 +02:00
Shannon
febaddaaef U4-8394 When persisting the xml cache file it double loads the full xml structure into memory before writing it to a file 2016-05-02 23:05:46 +02:00
Stephan
6dea69c5a1 U4-2508 - improve culture detection in 404 situation 2016-04-27 19:09:49 +02:00
Stephan
fb99e375d0 U4-5699 - update template alias in gui after saving 2016-04-25 14:14:55 +02:00
Stephan
7e9a14be83 RteMacroRenderingValueConverter should return an IHtmlString 2016-04-25 11:18:22 +02:00
Claus
9b39f712be U4-3411 Adding new language doesn't sync the tree 2016-04-25 10:11:54 +02:00
Shannon
7e71dcd2ae Merge remote-tracking branch 'origin/dev-v7.5' into dev-v7 2016-04-20 12:56:03 +02:00
Sebastiaan Janssen
bf70e208ad U4-8325 XSLT macro rendering logs too much in Info mode (after upgrade 7.1.4 => 7.4.0) 2016-04-14 09:34:53 +02:00
Aleksey Fedotov
9e3941e8e1 Fixed logger context class 2016-04-13 22:14:21 +05:00
Shannon
dbff25bd6d Merge branch 'dev-v7' into dev-v7.5 2016-04-13 15:16:28 +02:00
Shannon
82b4b4e668 Merge remote-tracking branch 'origin/7.5-ListViewCustomFieldSorting' into dev-v7.5 
Conflicts:
	src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
 2016-04-13 14:44:22 +02:00
Shannon
ce0ecd8114 Ensures that the emails sent our are in the culture of the user, fixes issue of logging in after resetting password and then logging out again 2016-04-13 14:35:40 +02:00
Shannon
e610a5ef54 Changes the password reset link to be a real link (not an angular deep link), this means there is less logging of the reset code in a query string and less visibility of it, this also means that the validation of the code happens instantly. The premise for this is the same as how we deal with external authentication requests and uses ViewData/TempData with redirects. Fixes the models to have the correct attributes to be able to directly json serialize them. 2016-04-13 13:51:12 +02:00
Shannon
f279000d00 removes unecessary methods from user.service.js, ensures correct error msg when resetting password on the server, fixes email copy and allows for non-html emails if the copy is plain text, removes the need for more than one email msg in the lang files and uses the correct way to replace tokens, 2016-04-12 19:54:04 +02:00
Shannon
1361e017a2 Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222 
Conflicts:
	src/Umbraco.Core/Security/BackOfficeUserManager.cs
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/routes.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-04-12 18:07:25 +02:00
Claus
cf7756a96d Merge pull request #1217 from umbraco/temp-U4-8298 
Fixes: U4-8298 CacheRefresher authorization logic reversed - traditio…
 2016-04-12 13:19:59 +02:00
Claus
20347c1ccd Fixing typo. 2016-04-12 13:17:41 +02:00
Shannon
36255709e6 U4-8297 Custom MembershipProvider search doesn't work in the listview 2016-04-07 18:16:03 +02:00
Shannon
506ed9f866 U4-8286 Add OWIN startup events to the UmbracoDefaultOwinStartup class 2016-04-07 17:51:09 +02:00
Shannon
f87bec398d U4-8239 DisableBrowserCacheAttribute causing YSOD when a previous exceptions is thrown before the filter kicks in 2016-04-07 16:44:45 +02:00