Claus
|
fd8317493e
|
Merge branch 'dev-v7.8' into temp-U4-10707
# Conflicts:
# src/Umbraco.Web/Editors/TourController.cs
# src/Umbraco.Web/Umbraco.Web.csproj
|
2018-01-10 10:10:19 +01:00 |
|
Shannon
|
c3be9004f6
|
U4-10811 Store custom tours as json and load from App_Plugins/{MyPlugin}/backoffice/tours
|
2018-01-10 16:01:46 +11:00 |
|
Mads Rasmussen
|
3858656015
|
clear tours before registering new tours
|
2018-01-09 16:15:38 +01:00 |
|
Mads Rasmussen
|
0cfd5773c3
|
set groupOrder on group so we don't order the tours in each group
|
2018-01-09 14:12:33 +01:00 |
|
Mads Rasmussen
|
070fa11f8c
|
fixes: U4-10707 Config to order tour groups
|
2018-01-08 14:11:53 +01:00 |
|
Robert
|
7e9f55f517
|
Merge pull request #1760 from abjerner/patch-15
LinkPicker overlay: Added property for hiding the target option
|
2018-01-08 13:11:01 +01:00 |
|
Warren Buckley
|
e17f75a18a
|
Update client build NPM dependancy for gulp-connect to use 5.0.0 as next/latest version required you to use CoffeeScript to compile their src code to use the module/component
|
2018-01-03 11:56:39 +00:00 |
|
Shannon
|
773ef1d168
|
Merge branch 'dev-v7' into dev-v7.8
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
|
2018-01-02 15:28:30 +11:00 |
|
Mads Rasmussen
|
bee0642417
|
Merge pull request #2263 from krighi/U4-10323
U4-10323 - FIX - Grid stuck at 12 columns (percentage calculation incorrect)
|
2017-12-27 13:04:31 +01:00 |
|
Mads Rasmussen
|
43abb08e59
|
Merge pull request #2305 from marcemarc/temp-u4-10637
Fixes U4-10637 - textarea Macro Parameters hidden in niche circumstances
|
2017-12-27 11:05:12 +01:00 |
|
Mads Rasmussen
|
17db5709f1
|
Merge pull request #2339 from bjarnef/dev-v7-U4-10720
U4-10720 - Add documentation to umb-table component
|
2017-12-27 10:38:43 +01:00 |
|
Mads Rasmussen
|
2fc6d9b7df
|
Merge pull request #2327 from bjarnef/dev-v7-U4-10703
Wrap text in umb-node-preview component
|
2017-12-27 10:19:23 +01:00 |
|
Claus
|
cac331adbc
|
U4-10640 Multiple Media Picker duplicate image Angular issue in Umbraco 7.7.4
|
2017-12-20 13:38:07 +01:00 |
|
Mads Rasmussen
|
e320840a29
|
fix position of add button in media picker
|
2017-12-19 10:39:52 +01:00 |
|
Mads Rasmussen
|
6029306fe9
|
Merge branch 'dev-v7-U4-10639' of git://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-10639
|
2017-12-19 09:53:52 +01:00 |
|
Shannon
|
8053cea92d
|
Merge branch 'dev-v7' into dev-v7.8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/UdiEntityType.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/umbraco.cms/umbraco.cms.csproj
|
2017-12-14 16:24:25 +11:00 |
|
Bjarne Fyrstenborg
|
3b8a2d7d65
|
Add basic documentation to umbPasswordToggle
|
2017-11-30 23:48:41 +01:00 |
|
Bjarne Fyrstenborg
|
61b9ab5c7b
|
Fix typo
|
2017-11-30 23:47:55 +01:00 |
|
Bjarne Fyrstenborg
|
cfda04b6ed
|
Add documentation of umb-table component
|
2017-11-30 23:47:23 +01:00 |
|
Søren Kottal
|
a20844b55b
|
Destroy tineMceEditors on $destroy
|
2017-11-29 12:16:12 +01:00 |
|
Mads Rasmussen
|
2baec8a129
|
fixes: U4-10704 Restore Node - After restoring the restore button still stays
|
2017-11-24 13:26:54 +01:00 |
|
Mads Rasmussen
|
93a1fc1eba
|
fixes: U4-10670 7.8. Visual indication on the info-tab or page in which state a page is
|
2017-11-24 11:32:34 +01:00 |
|
Mads Rasmussen
|
af369fa6c7
|
when scrolling position element in the center of the scroll container
|
2017-11-21 21:40:22 +01:00 |
|
Mads Rasmussen
|
901036535d
|
fix scrolling in document type
|
2017-11-21 21:39:58 +01:00 |
|
Mads Rasmussen
|
5d6cbee196
|
rename data attribute for editor container
|
2017-11-21 21:39:34 +01:00 |
|
Mads Rasmussen
|
9e9ae09ec2
|
add data attributes
|
2017-11-21 21:38:48 +01:00 |
|
Warren Buckley
|
e49d14d687
|
Merge pull request #2325 from umbraco/temp-U4-10666
fixes: U4-10666 Publish nodes in the recycle bin
|
2017-11-21 13:57:55 +00:00 |
|
Bjarne Fyrstenborg
|
3c98d9d2e1
|
Wrap text in umb-node-preview component
|
2017-11-20 19:18:57 +01:00 |
|
Mads Rasmussen
|
e010ff2a8c
|
fixes: U4-10663 7.8 - Save and Publish button styling - Firefox
|
2017-11-20 13:51:37 +01:00 |
|
bjarnef
|
8d14a3ef2c
|
added number validation in embed overlay
|
2017-11-20 12:36:12 +01:00 |
|
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 |
|