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

1150 Commits

Author SHA1 Message Date
michael
8ee98ebdf9 Review and add translation labels to language file fr.xml (sync with latest en version) 2016-09-09 13:37:24 +02:00
michael
d74a30e4e4 Review and add translation labels to language file fr.xml 2016-09-09 13:17:53 +02:00
Shannon Deminick
5fc2d93709 Merge pull request #1354 from abjerner/patch-8 
Implemented better translations for the create data type dialog
 2016-06-27 09:45:27 +02:00
Sebastiaan Janssen
b840ab250a Merge pull request #1238 from Dynacy/patch-1 
Create tr.xml
 2016-06-24 13:08:17 +02:00
Anders Bjerner
a70aa5cb25 Added translations for en-US 2016-06-23 18:14:58 +02:00
Anders Bjerner
6e1e7ff8ba Added translations for English 2016-06-23 18:13:37 +02:00
Anders Bjerner
74c22c8491 Added translations for Danish 2016-06-23 18:13:03 +02:00
Sebastiaan Janssen
d2ad39f2d3 Merge pull request #1287 from bjarnef/dev-v7-U4-8526 
Fix a few translations in da.xml
 2016-06-21 17:47:06 +02:00
AndyButland
0a00be7cfe Set fixed value for click-jacking protection to sameorigin instead of deny 2016-06-13 20:48:37 +02:00
Sebastiaan Janssen
d83d7956bb Dev v7 health check (#1220) 
Adds health check feature including some initial checks
 2016-06-13 17:42:05 +02:00
bjarnef
2f1b234d85 Fix template translation 2016-05-26 22:43:15 +02:00
bjarnef
00ae650ee2 Modify a few other keys 2016-05-26 22:37:49 +02:00
bjarnef
e3dae6d77e Fix a few translations in da.xml 2016-05-26 22:24:33 +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
Mads Rasmussen
6a593d8b5e Merge pull request #1245 from greystate/U4-8377 
Fix for U4-8377
 2016-05-17 10:42:12 +02:00
Mads Rasmussen
38bc38486a Merge pull request #1229 from bjarnef/dev-v7-U4-8300 
Wrap text "Include all child nodes" in a label
 2016-05-17 10:13:06 +02:00
Simon Busborg
924eac1b95 Merge pull request #1235 from bjarnef/dev-v7-U4-8347 
Fix localization of listview buttons/links actions.
 2016-05-11 10:06:51 +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
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
Chriztian Steinmeier
066ef6809b Change the language keys necessary for the fix 2016-04-26 23:36:42 +02:00
bjarnef
fcdf212c4c Rename area alias 2016-04-24 18:42:46 +02:00
Dynacy
ff5714196c Update tr.xml 2016-04-22 12:34:03 +03:00
Dynacy
b607ba52f4 Create tr.xml 
Turkish Language
 2016-04-22 12:26:26 +03:00
bjarnef
9174029126 Fix localization of listview buttons/links actions. 2016-04-18 22:33:38 +02:00
bjarnef
3564e70259 Localize "unsaved changes" dialog. 2016-04-18 20:42:19 +02:00
bjarnef
e9bf41e869 Wrap text "Include all child nodes" in a label 2016-04-14 23:22:26 +02: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
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
Sebastiaan Janssen
8e8b8bdea1 Revert "Removes old obsoleted ping.aspx" 
This reverts commit 453efc02a5.

Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

U4-8274 '/umbraco/ping.aspx' is missing
 2016-04-04 09:20:59 +02:00
Sebastiaan Janssen
680396daab Localize server-side error message for disallowed file uploads 2016-04-03 12:08:23 +02:00
Stephan
4cca364511 U4-8103 - refactor YSOD overlay to display inner exceptions 2016-03-31 16:36:36 +02:00
Stephan
9e0ed94d77 Fix typo in lang xml files 2016-03-31 12:56:24 +02:00
Mitton
6ad56863d4 Grid translation - French 2016-03-18 06:15:37 +02:00
Mitton
2703fa7ea2 Grid translation - French 2016-03-18 06:12:44 +02:00
AndyButland
e3411f7212 Provided a check that a language was selected when sending to translation such that a message is returned to the user rather than an unexpected error 2016-03-12 19:26:45 +01:00
Stephan
610538261e U4-7641 - enable content type copy 2016-02-25 15:26:03 +01:00
Sebastiaan Janssen
c64f6f894e U4-8024 Unable to use MvcBuildViews since 7.4.0 upgrade because 'umbraco.cms.presentation.create.controls.content' has been removed 
Removes files for which the codebehind no longer exists
 2016-02-23 17:23:55 +01:00
Warren Buckley
baaa9340e4 Merge pull request #1131 from umbraco/temp-U4-7918 
Fixes U4-7918 Make icon picker for document type and list views consistent
 2016-02-19 12:03:27 +00:00
Mads Rasmussen
183a5b5c43 U4-7472: fix macro parameter column width 2016-02-19 09:52:29 +01:00
Mads Rasmussen
1a0c095f40 Merge pull request #932 from engern/MacroParamSortOrder 
Fixes U4-7472 - Should be possible to sort macro parameters
 2016-02-19 09:27:27 +01:00
Warren Buckley
3bf79f0a23 Merge pull request #1102 from umbraco/temp-U4-7837 
Fixes: U4-7837 Changing document type should refresh the current node
 2016-02-16 12:22:56 +00:00
Simon Busborg
3cdebf4427 Fixes U4-7918 Make icon picker for document type and list views consistent 2016-02-12 09:38:37 +01:00
Alexander Bryukhov
52f4dfec80 Update UI language ru.xml 
According new keys added to the 7.4.0 nightly build 164 (models builder keys)
 2016-02-11 22:29:33 +06:00
Sebastiaan Janssen
1eedbba97a Merge pull request #920 from darrenferguson/dev-v7 
change the text "Reload nodes" to just "Reload" my editors don't know…
 2016-02-11 12:04:45 +01:00
Shannon Deminick
4b6aee7fd9 Merge pull request #1109 from abryukhov/patch-3 
Update UI language ru.xml
 2016-02-10 15:44:42 +01:00