yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,359 Commits 4 Branches 7 Tags
02599e1254635cb2c0ee00a12be8dc128d33207a
Commit Graph

12359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon Deminick
02599e1254 Merge pull request #694 from Alain-es/datepicker-custom-format 
Datepicker custom format
 2015-05-20 14:48:36 +10:00
Stephan
ac7ff31a67 U4-6626 - XmlCache, bugfix locks 2015-05-19 20:08:52 +02:00
Stephan
009f071f48 XmlCache - comments 2015-05-19 14:04:32 +02:00
Stephan
e0ecb3291d XmlCache - bugfix running with file cache disabled 2015-05-19 10:20:36 +02:00
Stephan
dbaf7c0190 U4-6597 - fix issue with caches that would cache exceptions 2015-05-19 09:24:38 +02:00
Stephan
16e06b6d4d Revert 444a028, 0e5a469 and 9d8f33e 2015-05-19 09:24:25 +02:00
Shannon
444a028e30 adds tests for caching exceptions and only caching one time and fixes HttpRequestCacheProvider to work with them. 2015-05-19 15:57:11 +10:00
Shannon
0e5a469577 Fixes: U4-6597 Umbraco fails to reconnect to a SQL Server if it started up when SQL server was offline - however this requires some review. 2015-05-19 14:29:25 +10:00
Shannon
9d8f33e98e Fixes: U4-6597 Umbraco fails to reconnect to a SQL Server if it started up when SQL server was offline - however this requires some review. 2015-05-19 14:25:31 +10:00
Alain-es
2abb3177af Datepicker custom format 2015-05-18 15:57:27 +01:00
Alain-es
43f99e11a5 Datepicker custom format 2015-05-18 15:54:50 +01:00
Shannon
3b791c75f6 Fixes: U4-5020 Login view on mobile screen is too big 2015-05-18 20:09:03 +10:00
Shannon Deminick
35cb4d5690 Merge pull request #693 from sebastian-claesson/dev-v7 
Fixed login-view on mobile devices
 2015-05-18 19:37:33 +10:00
Sebastian Claesson Hoffback
adde7c2f50 Fixed login-view on mobile devices 
On smaller screens the login-view was too far to the right.

Related issue: http://issues.umbraco.org/issue/U4-5020
 2015-05-18 11:34:13 +02:00
Shannon Deminick
62943d391f Merge pull request #692 from bjarnef/dev-v7-U4-6629 
Fix changes in user section labels
 2015-05-18 13:47:13 +10:00
Shannon Deminick
0942eb839d Merge pull request #691 from Vrijdagonline/dev-v7 
Updating Dutch Translations
 2015-05-18 11:38:29 +10:00
bjarnef
21a4dfe33e Fix changes in user section labels 
Fixed translation in da.xml according to change in en.xml  from 7.2.4 to
7.2.5
 2015-05-17 22:16:39 +02:00
Stephan
8121fc42e5 U4-6626 - fix log level 2015-05-17 21:47:31 +02:00
Stephan
c356ed1df8 Logger - add AppDomain.Id to log 2015-05-17 18:48:26 +02:00
Stephan
92f56ccedd U4-6626 - XmlCache, bugfix locks 2015-05-17 18:48:25 +02:00
Stephan
7cbe2410e4 Do not flood the log when installing a new version 2015-05-17 18:48:21 +02:00
Arjan Woldring
1dda3ce45d Updating Dutch Translations 
Missing keys added, deleted keys deleted, reorderded some keys based on
the english one and corrected couple of wrong translations.
 2015-05-16 19:06:04 +02:00
Shannon Deminick
1e29a4a8ca Merge pull request #688 from sebastian-claesson/dev-v7 
Swedish was using the wrong format for variables
 2015-05-15 15:46:17 +10:00
Sebastian Claesson Hoffback
01de0bd6a1 Swedish was using the wrong format for variables 
The swedish translation was using {0} instead of %0%. Leading to alot of
texts being weirdly formated.
 2015-05-15 07:22:11 +02:00
Shannon Deminick
4d0d29c004 Merge pull request #686 from Aaen/dev-v7 
Change translation for add row for fix issue U4-6564
 2015-05-14 07:57:12 +10:00
Shannon Deminick
741c2bb085 Merge pull request #687 from sebastian-claesson/dev-v7 
Swedish translation for the grid-editor
 2015-05-14 07:54:16 +10:00
Sebastian Claesson Hoffback
2c809857af Swedish translation for the grid-editor 
Swedish translation was completly missing for the grid-editor
 2015-05-13 14:59:27 +02:00
Dennis Aaen
236d6ee302 Change translation for add row for fix issue U4-6564 2015-05-13 13:27:37 +02:00
Shannon
f829b0b16c Fixes text not overlayed on top of icon for folders in folder browser 2015-05-13 10:56:25 +10:00
Sebastiaan Janssen
a42526b890 This file just keeps being marked as "changed" by git, committing it so I don't have to discard changes all the time 2015-05-12 11:15:02 +02:00
Shannon
3a36513307 Fixes: U4-6609 SQL Exception when trying to delete a template that isn't assigned to any doc type 2015-05-12 17:59:06 +10:00
Shannon
0548a32405 adds some simple docs to umb settings 2015-05-12 17:32:26 +10:00
Shannon
433950dd59 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-05-12 12:39:57 +10:00
Shannon
ad8926668e Fixes: U4-6588 UmbracoSettings Error404 support Guids and Xpath - To achieve this, had to create an Id -> Key and Key -> Id method on EntityService including a cache for it which means updating all relavent cache refreshers to clear this cache when things are removed. Moved the logic for parsing an Umbraco XPath query (with tokens) to a stand-alone testable class (though haven't written tests), move the logic for looking up a not found page to the NotFoundHandlerHelper (instead of legacy 'library'). Fixes the $root query, since I don't think that ever worked. I've tested $root now for both MNTP and for the not found handler and it works. 2015-05-12 12:39:46 +10:00
Sebastiaan Janssen
4ebc0fe4cf U4-6383 Download all translation tasks as XML Error 
#U4-6383 Fixed Due in version 7.2.5
 2015-05-11 21:33:52 +02:00
Shannon
1b1455067e Fixes: U4-6606 maxInvalidPasswordAttempts work for the UsersMembershipProvider doesn't work any more 2015-05-11 19:44:59 +10:00
Shannon
795de94a5f Fixes: U4-6102 After renaming Grid row configurations all data is lost for renames. So now we have warnings for both deletes and renames. 2015-05-11 18:46:26 +10:00
Shannon
d6699ab3b3 Fixes: U4-6102 After renaming Grid row configurations all data is lost, also ensures that all events are unsubscribed on destroy 2015-05-11 16:18:35 +10:00
Shannon
d94b334375 Moves login logging to the provider level 2015-05-11 12:22:56 +10:00
Shannon
a4a49b1466 Revert "Fixes MVC 4.0.0.1 problem once and for all." - All MVC ref's are 4.0.0.0, no web config transforms (also there was never a 4.0.0.1 version of System.Net.Http). Everything works on my machine now, even with 4.0.0.1 installed in the GAC. 2015-05-11 11:45:13 +10:00
Shannon Deminick
2c92cd9ca9 Merge pull request #683 from umbraco/U4-6603 
U4-6603 Log failed login attempts
 2015-05-11 09:07:24 +10:00
Sebastiaan Janssen
c34605937c U4-6603 Log failed login attempts 
#U4-6603 Fixed
 2015-05-10 17:47:32 +02:00
Shannon Deminick
2a9d3df822 Merge pull request #682 from hfloyd/dev-v7 
English Language file updates (Umbraco/config/lang)
 2015-05-08 08:48:38 +10:00
Heather Floyd
3b849987bf Small fixes to 'en' language file. Update of 'en-us' language file to match 'en' language file. 2015-05-07 16:41:12 -04:00
Shannon
8443513b2b fixes sorting with multipletextbox 2015-05-07 13:39:28 +10:00
Shannon
fec9d066f0 Merge branch 'property-editor-fixes' of https://github.com/pynej/Umbraco-CMS into pynej-property-editor-fixes 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
	src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
 2015-05-07 13:24:59 +10:00
Shannon
a69c7dd1fc Manually merges PR: 564 2015-05-07 13:09:29 +10:00
Shannon
4e6a3458d0 Fixes: U4-6600 Label on files not just folders in file browser (media) and fixes up the last image rendered in the photo browser, as well as the overlays, whitespace and overflow and vertical alignment. 2015-05-07 12:57:23 +10:00
Shannon
a5bb8ba8ee Merge branch 'iamphill-media-label' into dev-v7 2015-05-07 12:01:44 +10:00
Shannon
d4f3dbcfc0 Merge branch 'media-label' of https://github.com/iamphill/Umbraco-CMS into iamphill-media-label 2015-05-07 12:01:31 +10:00