yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,977 Commits 4 Branches 7 Tags
512c19a13208ab7091c34174479fad10255b6f4a
Commit Graph

13352 Commits

Author SHA1 Message Date
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
Shannon
d826f04b54 Ensures sort order is accurate to what is in the database 2016-05-17 12:17:05 +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
Claus
729b179473 Merge pull request #1242 from umbraco/temp-u4-8370 
U4-8370 - fix broken upgrade
 2016-05-03 12:54:47 +02:00
Claus
20b67e47be Fixed property name to match property of the dynamic. 2016-05-03 12:54:22 +02:00
Shannon Deminick
52b6e04ad4 Merge pull request #1248 from rustyswayne/dev-v7 
Appends forum link to developer comment for reference when evaluating code removal.
 2016-05-03 11:35:56 +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
rs@merchello.com
029e50dd3c Appends comment and forum reference to developer comment for reference when evaluating code removal. 2016-05-02 13:17:13 -07:00
Simon Busborg
2a87c926f3 Merge pull request #1234 from bjarnef/dev-v7-U4-8343 
Localize "unsaved changes" dialog.
 2016-05-02 10:44:47 +02:00
Simon Busborg
f7ee47a37f Fixes U4-8029 Editor settings for "Grid Layouts" is too wide and text overflows 2016-05-02 10:18:37 +02:00
Stephan
6dea69c5a1 U4-2508 - improve culture detection in 404 situation 2016-04-27 19:09:49 +02:00
Mads Rasmussen
4b682e0669 Merge pull request #1201 from bjarnef/dev-v7-U4-8022 
U4-8022 - Fix issues with tree icons + legacy icons
 2016-04-25 21:13:14 +02:00
Mads Rasmussen
4886631d54 Merge pull request #1202 from bjarnef/dev-v7-U4-7967 
U4-7967 - Fix errors when saving document type when no icon is selected
 2016-04-25 20:14:11 +02:00
Stephan
2c3c0eae12 U4-8370 - fix broken upgrade 2016-04-25 17:10:10 +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
bjarnef
fcdf212c4c Rename area alias 2016-04-24 18:42:46 +02:00
Søren Gregersen
bad1372313 Update ICacheProvider.cs 
Not really an abstract class... :)
 2016-04-23 15:58:18 +02:00
Shannon
7e13781d8b fixes merge issue 2016-04-20 16:04:35 +02:00
Shannon
72cef006d3 bumps version 2016-04-20 15:56:06 +02:00
Shannon
6124126835 Fixes the custom field sorting, no longer has a sub query for order by, now supports both mysql and sqlce, adds a unit test (should add more though) 2016-04-20 15:50:38 +02:00
Shannon
7e71dcd2ae Merge remote-tracking branch 'origin/dev-v7.5' into dev-v7 2016-04-20 12:56:03 +02:00
bjarnef
3564e70259 Localize "unsaved changes" dialog. 2016-04-18 20:42:19 +02:00
Per Ploug
fcaa4ad8d6 JsDocs comments on listviewhelper (U4-7185) 2016-04-14 11:36:24 +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 Deminick
a015032442 fixed typo 2016-04-13 16:45:47 +02:00
Shannon Deminick
38f6a7a8b6 fixed typo 2016-04-13 16:45:01 +02:00
Stephan
7886b7814d U4-8312 - models generation false error (#1222) 2016-04-13 15:57:27 +02:00
Shannon
c3b4a9128a ensures all GetPagedDescendant methods are mocked - fixes tests. 2016-04-13 15:47:21 +02:00
Shannon
dbff25bd6d Merge branch 'dev-v7' into dev-v7.5 2016-04-13 15:16:28 +02:00
Shannon
c9c391e477 fixed type, decimal sorting now works 2016-04-13 15:05:23 +02:00
Shannon
10bb16316d Updates sorting code to support decimals - need to test on MySql 2016-04-13 14:49:37 +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
d424b13ac4 Fixes some styling, wording and validation 2016-04-12 18:59:39 +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
76054bb783 Enabling sorting by the Name column. 
OrderDirection is only reversed if reclicking the same sort column.
 2016-04-12 15:36:28 +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
Shannon
1e5b6a6a0f Fixes: U4-8298 CacheRefresher authorization logic reversed - traditional load balancing will not work 2016-04-07 15:42:51 +02:00