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

1843 Commits

Author SHA1 Message Date
Karl Tynan
9f9b9d8ccc Update translation alias to use existing emptyRecycleBin naming instead of Trashcan 
Removed unused translation alias also
 2018-12-19 16:00:04 +01:00
Shannon
219a236069 removes unused lang keys 2018-12-07 12:06:16 +11:00
Shannon
339417b977 Merge remote-tracking branch 'origin/temp8' into temp8-3087-tree-grouping 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
 2018-10-16 13:11:09 +11:00
Lotte Pitcher
a3de30934d Re-adding the language keys for login greeting on a Sunday (greeting0) that were accidentally removed 2018-10-14 16:56:18 +02:00
Warren Buckley
f63a9e93b0 Merge remote-tracking branch 'origin/temp8' into temp8-3087-tree-grouping 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web/Trees/DictionaryTreeController.cs
 2018-10-09 08:53:40 +01:00
Warren Buckley
b2bc259bd5 Adds in lang keys 2018-10-08 14:19:52 +01:00
elitsa
b68b962d6f Removed all keys which are not being referenced anywhere in the code base. 2018-10-08 11:58:22 +02:00
Shannon
651b4a348a gets unpublish working 2018-10-03 14:27:48 +02:00
Shannon
b96e1343c2 renames lang files back to correct cased folder... now we'll see if merging detects renames 2018-07-31 15:00:56 +10:00
Shannon
d272dbf611 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	build/NuSpecs/tools/Readme.txt
#	src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs
#	src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs
#	src/Umbraco.Core/Packaging/Models/PackageAction.cs
#	src/Umbraco.Core/PropertyEditors/PreValueField.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
#	src/Umbraco.Tests/Dependencies/NuGet.cs
#	src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
#	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
#	src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml
#	src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml
#	src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml
#	src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml
#	src/Umbraco.Tests/Services/PerformanceTests.cs
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
#	src/Umbraco.Web.UI.Client/src/less/navs.less
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html
#	src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI/Properties/Settings.Designer.cs
#	src/Umbraco.Web.UI/Properties/Settings.settings
#	src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web.UI/config/feedProxy.Release.config
#	src/Umbraco.Web.UI/config/feedProxy.config
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/he.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
#	src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
#	src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Install/InstallHelper.cs
#	src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
#	src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
#	src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
#	src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
#	src/Umbraco.Web/Properties/Settings.settings
#	src/Umbraco.Web/Properties/Settings1.Designer.cs
#	src/Umbraco.Web/Routing/PublishedContentRequest.cs
#	src/Umbraco.Web/Trees/PackagesTreeController.cs
#	src/Umbraco.Web/UI/LegacyDialogHandler.cs
#	src/Umbraco.Web/UmbracoModule.cs
#	src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
#	src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
#	src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl
#	src/Umbraco.Web/app.config
#	src/Umbraco.Web/umbraco.presentation/item.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs
#	src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs
#	src/umbraco.MacroEngines/RazorDynamicNode/DynamicNodeList.cs
#	src/umbraco.businesslogic/ApplicationTree.cs
#	src/umbraco.businesslogic/BasePages/BasePage.cs
#	src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
#	src/umbraco.editorControls/uploadfield/uploadField.cs
 2018-07-31 14:57:20 +10:00
Shannon
814e4c781f testing rename change 2018-07-31 14:44:23 +10:00
Sebastiaan Janssen
c8cc5278f3 Merge branch 'update-our-umbraco-url-references' of https://github.com/imranhaidercogworks/Umbraco-CMS into imranhaidercogworks-update-our-umbraco-url-references 2018-07-30 11:20:32 +02:00
Sebastiaan Janssen
960755b22c Merge pull request #2818 from BatJan/patch-3 
Adding danish translations for labels added in PR #2342
 2018-07-30 09:39:00 +02:00
BatJan
9a2fd293cd Adding danish translations for labels added in PR #2342 
Adding danish translations for labels added in PR #2342
 2018-07-28 23:03:00 +02:00
Dave Woestenborghs
9b8943f80c U4-10681 Added dutch translations for labels added in PR #2342 2018-07-28 11:37:23 +02:00
Imran Haider
2660b31370 Updated our.umbraco.org to .com 2018-07-27 16:41:57 +01:00
Imran Haider
7baca85f6a Update ourumbraco references to https 2018-07-27 16:08:38 +01:00
Richard Thompson
60910efc53 U4-10681 Restore option in media recycle bin (#2342) 2018-07-27 15:56:18 +02:00
Jan Skovgaard
b8af6f7987 Add title attributes to the "buttons" inside the umbConfirmAction directive providing translations for english and danish at the same time 2018-07-27 13:03:12 +02:00
BatJan
9b9173d64f Use the umbConfirmAction directive when deleting tags (#2795) 2018-07-27 11:24:29 +02:00
Dave Woestenborghs
7109338f68 U4-10502 added dutch translations for user management 2018-07-27 08:01:59 +02:00
Sebastiaan Janssen
295f59e236 Merge pull request #2230 from StefanoChiodino/dev-v7 
Normalises whitespace (replace tabs) and add EOF line
 2018-07-25 22:17:33 +02:00
agrath
43fd34ab80 U4-11152 Add visual indicator to trashed media items in the media pic… (#2542) 2018-07-24 16:10:30 +02:00
Sebastiaan Janssen
5a8f37ff02 Merge pull request #2767 from mikecp/mikecp-update-fr 
Synchronise fr.xml file with en.xml file + translate new stuff
 2018-07-12 13:17:11 +02:00
Michael Latouche
2a2cea0b7d Update fr.xml 2018-07-12 13:00:33 +02:00
Sebastiaan Janssen
c56dc63150 Merge pull request #2702 from nathanwoulfe/temp-U4-4732 
U4-4732 Anchor missing in TinyMCE of Umbraco 7.x
 2018-07-12 12:39:23 +02:00
Nathan Woulfe
f2fafbc631 handle manual/external links, add label to input, update placeholder 2018-07-12 11:37:04 +10:00
Michael Latouche
ca13782e2a Update fr.xml 2018-07-10 13:57:40 +02:00
Michael Latouche
9d5b089227 Update fr.xml 2018-07-09 13:05:15 +02:00
Stephan
c1f3de7e5c Umbraco.Web.UI/Umbraco not /umbraco 2018-06-29 19:51:59 +02:00
Sebastiaan Janssen
1e9e13ea6a Merge pull request #2735 from ZizZu94/dev-v7 
Italian translation of prompt, bulk and grid area
 2018-06-29 09:46:57 +02:00
Dave Woestenborghs
d9b10b294e Translated unpublish dialog 
Added translation for key added in PR #2731
 2018-06-29 08:47:20 +02:00
Sebastiaan Janssen
51fc0da379 U4-11187 - Adds friendlier "Enable JavaScript" message (#2568) 2018-06-28 20:30:52 +02:00
Sebastiaan Janssen
0a29ad3d21 Merge pull request #2570 from AndyButland/u4-10502 
U4-10502 - resend of user invitations
 2018-06-28 20:28:24 +02:00
Anders Brohus
9c8d73dcfa U4-11372 - Make history section on Info tab translatable (#2650) 2018-06-28 19:49:28 +02:00
OptimisticCoder
ffd0adb0f3 U4-9544 Added database schema validation health check and language file updates. (#2674) 2018-06-28 19:37:28 +02:00
Sebastiaan Janssen
477245ee71 Merge pull request #2731 from nathanwoulfe/temp-U4-9379 
U4 9379 - add confirmation step to unpublish action
 2018-06-28 19:31:54 +02:00
Sebastiaan Janssen
5fa5f90bfc Merge pull request #2544 from Mivaweb/patch-2 
Update NL.xml with missing translations
 2018-06-28 12:20:54 +02:00
Nathan Woulfe
70aeb1c09d add en variants for unpublish notification 2018-06-28 10:13:01 +10:00
BatJan
476e33bf40 Changed "Denne tekst vil blive brugt..." to "Denne tekst bruges..." 
Lowering the lix count for the sentence :-)
 2018-06-26 20:04:40 +02:00
BatJan
59d68a7fdc Changed "antaller" to "antal 2018-06-26 20:02:25 +02:00
BatJan
b3d2e49f1a Adjusting translations 
I just noticed a few untranslated words and I also took the liberty to change the translation of "grid" to "gitter" and translate it back to english. "Gitter layout" is not something we say in dansih we simply adopt the english word "Grid" :-)
 2018-06-26 19:29:09 +02:00
Ed Parry
f6efbcf99f Added the Danish translations. 2018-06-26 16:26:15 +01:00
ZizZu94
ff5bda551c Done italian translation of grid area 2018-06-25 18:34:17 +02:00
ZizZu94
63a72090a4 Done italian translation of prompt and bulk area 2018-06-25 17:23:32 +02:00
leekelleher
2c28c82b06 Enhanced (basic) styling 
- Inline style for the link, to ensure underlined
- Added logo for branding
- Relocated to inside the #contentcolumn container tag, otherwise we hit a CSS conflict (due to `position:absolute` of the container)
 2018-06-25 11:01:44 +01:00
leekelleher
b3ed3585e4 Using correct BareMinimumServerVariablesScript method 
The previous one had been deprecated.
 2018-06-25 09:42:26 +01:00
leekelleher
bd5e1a2461 Removed the "type" attribute from the <script> tags 
With HTML5, it is no longer required, (the browser assumes "text/javascript"),
see: https://www.w3.org/TR/html5/semantics-scripting.html#script-processing-model
 2018-06-25 09:42:26 +01:00
leekelleher
a4bd2ae4c7 Removed additional whitespace 
Including the leading whitespace for the HTML DOCTYPE,
which should appear on the first line of a HTML document.

Removed unused "using" namespaces.

Also removed the code comment towards the end, I'm not sure how useful it is to a developer?
 2018-06-25 09:42:26 +01:00
leekelleher
55401fffbb U4-11187 - Adds friendlier "Enable JavaScript" message 
Moves the `<noscript>` tags into the main body - within `#mainwrapper` (fullscreen overlay), so to allow the link to work.
Links to https://enable-javascript.com/
 2018-06-25 09:42:26 +01:00