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

3394 Commits

Author SHA1 Message Date
Anders Bjerner
e37bbdfcf4 New Danish translation for "Dato for Fortryd udgivelse" 2017-11-11 17:18:44 +01:00
Shannon
9290f61f94 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	src/Umbraco.Core/Security/MembershipProviderExtensions.cs
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-11-08 17:36:27 +11:00
Sebastiaan Janssen
51fec0c7d3 Remove misleading text, nothing bad will happen when you close the sort panel, sorting is a background task. 2017-11-07 14:03:17 +01:00
Sebastiaan Janssen
87ace12a4f Prevent double clicks of the Save button 
U4-10646 Sorting nodes in edge cases can lead to blanking out of property data
 2017-11-07 13:49:02 +01:00
Daniël Knippers
c066280990 Make a shiny template for the emails that are sent from Umbraco 
Make a shiny template for the emails that are sent from Umbraco (only for EN and EN-US).
 2017-11-02 16:44:08 +00:00
Richard Thompson
594c473134 Updated grammar 
Updated the grammar of the email validation messages
 2017-10-30 15:00:08 +00:00
Sebastiaan Janssen
18e377f159 U4-10564 - Update ImageProcessor dependencies 2017-10-24 13:20:33 +02:00
Sebastiaan Janssen
7e7f9902f6 Bumps version to 7.7.4 2017-10-23 14:18:00 +02:00
Sebastiaan Janssen
a36184a261 Bump version to 7.6.11 2017-10-23 14:14:59 +02:00
Sebastiaan Janssen
b70f543790 Reverts wrongly committed files 2017-10-23 14:02:00 +02:00
Stephan
edfe212227 Fix login issue 2017-10-20 15:35:30 +02:00
Richard Thompson
507e3ece98 Removed duplicate translations 
Removed duplicate definition of English translations
 2017-10-18 15:36:17 +01:00
Stephan
d0fbc362b2 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-10-17 15:00:13 +02:00
Stephan
7f86166abf Merge branch 'dev-v7' of https://github.com/hfloyd/Umbraco-CMS into temp-u4-7115 2017-10-17 14:59:07 +02:00
Sebastiaan Janssen
461ce64feb Bump version to 7.6.10 2017-10-17 10:57:18 +02:00
Sebastiaan Janssen
fd577afe2c Html encode nodenames to prevent XSS attacks. Fixes U4-10497 XSS Vulnerability in page name. 
(cherry picked from commit fe2b86b681)
 2017-10-16 20:32:56 +02:00
Stephan
909e3788ea Merge branch 'U4-5722' of https://github.com/NikRimington/Umbraco-CMS into temp-u4-5722b 2017-10-16 17:20:19 +02:00
Sebastiaan Janssen
80f172e3fb Bump version to 7.7.3 2017-10-16 14:56:43 +02:00
Sebastiaan Janssen
5eced19816 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
 2017-10-16 14:24:18 +02:00
Claus
4bd263e7bc U4-10524 Show warning in UI for the media/content picker that is referencing a trashed or deleted item 
U4-10533 Show warning in UI for the link picker that is referencing a trashed or deleted item
cherrypicked from dev-v7.
 2017-10-16 13:52:17 +02:00
Claus
b094bfad29 U4-10533 Show warning in UI for the link picker that is referencing a trashed or deleted item 2017-10-16 13:05:20 +02:00
Shannon
916bc6badb U4-10539 - reverts merge issue that reverted the fix for U4-9262 
(cherry picked from commit 2a0cc71d06)
 2017-10-16 08:38:17 +02:00
Shannon
2a0cc71d06 U4-10539 - reverts merge issue that reverted the fix for U4-9262 2017-10-16 17:05:33 +11:00
Claus
13055ad1f2 U4-10524 Show warning in UI for any picker that is referencing a trashed or deleted item 
fixing the trash flag not getting mapped via automapper.
fixing up the ui for mediapicker.
fixing a small ui issue with the contentpicker and trashed content.
 2017-10-12 11:35:08 +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
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
Sebastiaan Janssen
880ae5cb95 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 2017-09-28 20:01:44 +02:00
Zsolt
e0801cd05a Merge branch 'dev-v7' into dev-v7-U4-10462 2017-09-28 16:33:25 +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
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
Sebastiaan Janssen
01ba781e75 Make sure to expose the regex during install so the validation actually works 2017-09-27 13:06:43 +02:00
Sebastiaan Janssen
33cf983cae Bump version 2017-09-25 11:19:36 +02:00
Bjarne Fyrstenborg
fa777c46b1 Localize user filters 2017-09-24 21:43:23 +02:00
Bjarne Fyrstenborg
4fc51e4a8b Translate last login 2017-09-23 02:19:55 +02:00
Bjarne Fyrstenborg
925f64c79d Localize "select user group" dialog heading 2017-09-22 23:26:09 +02:00
Bjarne Fyrstenborg
439c460220 Localize user management heading 2017-09-22 23:12:33 +02:00
Bjarne Fyrstenborg
ae1702c62a Remove unused translation keys 2017-09-22 23:03:38 +02:00
Bjarne Fyrstenborg
1ed29fb8bb Add translations of new user management and fix other translations 2017-09-22 23:01:43 +02:00
Sebastiaan Janssen
e0025db56d Merge remote-tracking branch 'origin/dev-v7.7' into dev-v7 2017-09-21 08:26:59 +02:00
Shannon Deminick
7142222234 Merge pull request #2201 from wanddy/dev-v7 
Improve Chinese translation
 2017-09-20 09:36:30 +10:00
Sebastiaan Janssen
0070d8b913 Bump version 2017-09-19 14:23:58 +02:00
Sebastiaan Janssen
eda7f1e527 Bump version 2017-09-19 14:17:19 +02:00
Wanddy Huang(黄仁祥)
0f17a27d86 Improve Chinese translation 
Improve Chinese translation.
 2017-09-19 15:56:47 +08:00
Sebastiaan Janssen
0dfbe4d4eb Bump version 2017-09-18 23:08:32 +02:00
Sebastiaan Janssen
48f2aa4f15 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-18 14:19:47 +02:00
Sebastiaan Janssen
5d74e61bcf Bump version 2017-09-18 14:16:57 +02:00
Shannon
20290582d9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-18 15:37:23 +10:00
Shannon Deminick
731c51bfc7 Merge pull request #2200 from abjerner/patch-21 
Just had to have #2200 (Danish translations for the user section in Umbraco 7.7)
 2017-09-18 15:05:43 +10:00