Mads Rasmussen
4bfb2d219b
Merge branch 'dev-v7' into dev-v7.8
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2017-11-16 12:01:26 +01:00
Mads Rasmussen
80c61110df
make sure you can't restore to items already in the recycle bin
2017-11-15 15:13:58 +01:00
Sebastiaan Janssen
837bb83d48
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7
2017-11-15 14:40:19 +01:00
Sebastiaan Janssen
054ac78970
Revert "Position changed from "target" to "center""
...
This reverts commit c1769aa299
2017-11-15 14:39:09 +01:00
Mads Rasmussen
8e47f91ba5
show "restore"-button instead of "save and publish"-button for trashed items
2017-11-15 13:36:10 +01:00
Mads Rasmussen
31f6bd4c02
fixes: U4-10665 7.8 - Log info on two lines is a bit off
2017-11-14 15:57:13 +01:00
Mads Rasmussen
3e5744dbb7
fixes: U4-10663 7.8 - Save and Publish button styling - Firefox
2017-11-14 13:38:18 +01:00
Mads Rasmussen
cb0d8320e6
rename parameter
2017-11-14 10:47:34 +01:00
Mads Rasmussen
df0fe62fca
Merge branch 'dev-v7.8' into patch-27
2017-11-14 09:50:05 +01:00
Mads Rasmussen
483a2c7c02
Merge pull request #2320 from abjerner/patch-26
...
"by" in the new Info tab is now localized
2017-11-13 15:44:17 +01:00
Mads Rasmussen
084fde885a
Merge pull request #2319 from abjerner/patch-25
...
"Set date" and "Clear date" in the new Info tab can now be localized
2017-11-13 15:34:30 +01:00
Mads Rasmussen
6b6a7fe231
Merge branch 'dev-v7' into dev-v7.8
2017-11-13 14:47:52 +01:00
Mads Rasmussen
6fd197d1bf
fixes: U4-10667 7.8 Item not published is still a hyperlink
2017-11-13 13:32:03 +01:00
Anders Bjerner
00aa59c9c6
Dates in the "History" box is now also localized (1/2)
2017-11-11 20:15:27 +01:00
Anders Bjerner
06254ba462
Dates in the "History" box are now also localized (1/2)
2017-11-11 20:14:45 +01:00
Anders Bjerner
684cb19a7c
Localized dates for the new "Info" tab
2017-11-11 19:57:11 +01:00
Anders Bjerner
9c5da12653
Updated the "umbContentNodeInfo" directive with localized dates
2017-11-11 19:53:48 +01:00
Anders Bjerner
83f229abc6
"by" in the new Info tab is now localized
2017-11-11 18:45:37 +01:00
Anders Bjerner
0ccf798f14
"Set date" and "Clear date" in the new Info tab can now be localized
2017-11-11 18:23:47 +01:00
Shannon
ece5fecf12
fixes doc type conflict name so the tour uses "My Home Page"
2017-11-09 22:15:05 +11:00
Shannon
1d52f59657
Puts tours on the file system and loads them from an api controller
2017-11-09 00:41:59 +11:00
Claus
dc67d82671
adding trim.
2017-11-08 12:08:30 +01:00
Claus
c7d9683fc4
Merge pull request #2277 from umbraco/temp-U4-10589
...
U4-10589 Login should be sanitized and/or cause validation errors if trying to save with
2017-11-08 12:07:34 +01:00
Mads Rasmussen
3c7c6b4ad7
Update thumbnails.less
...
Use new color variables
2017-11-08 11:38:32 +01:00
Mads Rasmussen
838d7975c9
Update healthcheck.less
...
prevent UI from "jumping" on hover
2017-11-08 11:36:23 +01:00
Mads Rasmussen
5af9712d51
Merge branch 'dev-v7' into U4-9144
2017-11-08 10:43:58 +01:00
Shannon
e6de9e0004
Merge branch 'dev-v7' into dev-v7.8
2017-11-08 19:25:22 +11: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
Shannon
08aff2654a
updates installer image
2017-11-08 15:51:14 +11:00
Shannon
0f3a76809b
Merge branch 'dev-v7.8' into temp-U4-10305
...
# Conflicts:
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
2017-11-08 14:52:21 +11:00
Shannon
4f88da2c26
Merge branch 'dev-v7' into dev-v7.8
...
# Conflicts:
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
2017-11-08 14:51:27 +11:00
Marcin Zajkowski
e14aba3875
More no-dirty-checks and code polishment
2017-11-07 23:21:50 +01:00
Daniël Knippers
b1ceeb23b3
Only show characters left is a number of characters is configured on the datatype, hide otherwise
2017-11-07 23:13:59 +01:00
Sebastiaan Janssen
46d0807fa4
Merge pull request #2287 from PerplexDaniel/U4-6985
...
Switching between sections - select last node
2017-11-07 20:26:25 +01:00
Claus
c816558936
cleanup.
2017-11-07 15:14:45 +01:00
Mads Rasmussen
4ce0553630
add allowDisable flag on welcome tour
2017-11-07 14:53:44 +01:00
Mads Rasmussen
c773714e2d
fix folder name validation
2017-11-07 14:11:57 +01:00
Mads Rasmussen
2a90478ba7
fixing typos and the properties tab
2017-11-07 14:00:39 +01:00
Matt Darby
77162e4b51
Move val-email attribute before required attribute
2017-11-07 19:17:42 +07:00
Rune Hem Strand
93756a62f4
Update popover width
2017-11-07 11:37:23 +01:00
Rune Hem Strand
2343004be1
Manual merge to init.js tour steps
2017-11-07 11:30:21 +01:00
Rune Hem Strand
d6fe350a4a
Merge branch temp-U4-10305 into temp-tour-review-rune
2017-11-07 11:28:26 +01:00
Rune Hem Strand
71902f3b9b
Update Media library tour
2017-11-07 10:53:02 +01:00
Rune Hem Strand
13b544521d
Update Media library tour
2017-11-07 10:52:39 +01:00
Rune Hem Strand
2cf8c1207d
Update View Home Page step
2017-11-07 10:34:24 +01:00
Daniël Knippers
a1fd73cdb0
Feature Request: Double Click Content Node to Expand
...
Doube-clicking a tree item now expands or collapses a node. It basically does the exact same as clicking the triangle left of the node.
(cherry picked from commit bd2a794b59
2017-11-07 10:30:08 +01:00
Sebastiaan Janssen
a53866953e
Merge pull request #2296 from PerplexDaniel/U4-6259
...
Feature Request: Double Click Content Node to Expand
2017-11-07 10:29:10 +01:00
Bjarne Fyrstenborg
e72758e04a
Ensure box is square when picker is multiple picker
2017-11-06 22:01:35 +01:00
Bjarne Fyrstenborg
9d373c194d
Show thumbnails if any images/files has been selected
2017-11-06 21:42:01 +01:00
Bjarne Fyrstenborg
856e123ec2
Oops - remove duplicated disableFolderSelect
2017-11-06 19:23:41 +01:00
