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

24321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sebastiaan Janssen
fd993f733f Merge pull request #2798 from LottePitcher/temp8 
In build.ps1, use .Path if .Source returns nothing
 2018-07-27 12:57:14 +02:00
Sébastien Sougnez
f7e097be8e Minor update to the grid settings/style section (#2797) 2018-07-27 12:50:30 +02:00
Lotte Pitcher
e920d3f4b2 In build.ps1, use .Path if .Source returns nothing 2018-07-27 11:39:27 +01:00
BatJan
9b9173d64f Use the umbConfirmAction directive when deleting tags (#2795) 2018-07-27 11:24:29 +02:00
Sebastiaan Janssen
e0c0eecaac Merge pull request #2796 from umbraco/temp-U4-11536 
fixes U4-11536 Migration is breaking upgrade path to v. 7.12
 2018-07-27 10:29:35 +02:00
Sebastiaan Janssen
ed4ded79ee Merge pull request #2794 from dawoe/temp-U4-10502 
U4-10502 added dutch translations for user management
 2018-07-27 10:29:22 +02:00
Claus
f11c71599b fixes U4-11536 Migration is breaking upgrade path to v. 7.12 2018-07-27 09:10:46 +02:00
Dave Woestenborghs
7109338f68 U4-10502 added dutch translations for user management 2018-07-27 08:01:59 +02:00
Sebastiaan Janssen
26a49fbe9f Fixes U4-9244 2018-07-26 15:55:33 +02:00
Sebastiaan Janssen
6deb97e356 Merge branch 'TimGeyssens-dev-v7' into dev-v7 2018-07-26 15:34:54 +02:00
Sebastiaan Janssen
ff0af2f227 Merge branch 'dev-v7' of https://github.com/TimGeyssens/Umbraco-CMS into TimGeyssens-dev-v7 
# Conflicts:
#	src/Umbraco.Web/Trees/TreeController.cs
 2018-07-26 15:33:52 +02:00
Sebastiaan Janssen
2bb5d0b30e Merge pull request #2775 from bjarnef/dev-v7-U4-9025-2 
U4-9025 - Add sortable to color picker prevalues
 2018-07-26 13:47:53 +02:00
Sebastiaan Janssen
dffe33569a Merge branch 'dev-v7' into dev-v7-U4-9025-2 2018-07-26 13:47:36 +02:00
Bjarne Fyrstenborg
567863079e Update a few names and descriptions for prevalues 2018-07-26 12:03:31 +02:00
Bjarne Fyrstenborg
c571284f40 Adjust a bit more styling 2018-07-26 11:50:31 +02:00
Stephan
52bb935604 Merge pull request #2684 from jamescoxhead/U4-6231 
U4-6231 Refactored Umbraco.Web.WebServices classes
 2018-07-26 11:30:34 +02:00
Bjarne Fyrstenborg
89c84c7a30 Set same width as for multivalues 2018-07-26 11:28:24 +02:00
Bjarne Fyrstenborg
d2e8b084f5 Remove width on label 2018-07-26 11:25:38 +02:00
Bjarne Fyrstenborg
99181d5bf4 Adjust thumbnail styling 2018-07-26 11:23:24 +02:00
Stephan
1f353da33c Cleanup IShortStringHelper if controller is gone 2018-07-26 11:23:06 +02:00
Stephan
8c88f8709b Fix merge 2018-07-26 11:22:53 +02:00
Bjarne Fyrstenborg
0f3a8bff5d Add consistency and a few localizations 2018-07-26 11:17:53 +02:00
Sebastiaan Janssen
0811baef9b Merge pull request #1620 from bjarnef/dev-v7-U4-9186 
U4-9186 - Fix positioning of file icon extension label
 2018-07-26 10:55:55 +02:00
Sebastiaan Janssen
7d76e2efbc Merge branch 'dev-v7-U4-9186' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-9186 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
 2018-07-26 10:53:40 +02:00
Stephan
eadd79771d Merge branch temp8 into temp8-6231 2018-07-26 10:42:35 +02:00
Stephan
8a3232bd23 Renormalize 2018-07-26 10:39:13 +02:00
Owain Williams
0eddf6b755 Implementing new colour picker for document types (#2792) 2018-07-26 10:04:55 +02:00
Stephan
3c8a5c3a0d Remove obsolete code 2018-07-26 09:56:23 +02:00
Stephan
6f4ad059ef Cleanup 2018-07-26 09:41:43 +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
Sebastiaan Janssen
b39b724303 Merge pull request #2241 from marcemarc/temp-u4-10537 
U4-10537 - Enable editor to skip Macro Selection step, when there is only one macro, and it has parameters
 2018-07-25 21:56:11 +02:00
Sebastiaan Janssen
4ca88e48c2 Merge pull request #2259 from AndyFelton/U4-10577 
Use the underlying Peta Poco DB type to get the Type
 2018-07-25 17:25:13 +02:00
Sebastiaan Janssen
53aed514fa Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-07-25 17:12:29 +02:00
Sebastiaan Janssen
6afb28088d Merge branch 'Attackmonkey-U4-10334' into dev-v7 2018-07-25 17:11:34 +02:00
Sebastiaan Janssen
33fdfbbad5 Merge branch 'U4-10334' of https://github.com/Attackmonkey/Umbraco-CMS into Attackmonkey-U4-10334 2018-07-25 17:02:54 +02:00
Sebastiaan Janssen
a9d6a842b6 Merge pull request #2326 from bjarnef/dev-v7-U4-10694 
Change types of listview properties
 2018-07-25 16:44:27 +02:00
Sebastiaan Janssen
cbe4154013 Merge pull request #2344 from matthew-darby/U4-8879 
U4-8879 - Create button on member and media list view
 2018-07-25 16:41:15 +02:00
Bjarne Fyrstenborg
02ac44e214 U4-10792 - highlight error when trying to add duplicate in listview columns (#2362) 2018-07-25 16:29:20 +02:00
Anders Bjerner
187a32cdc0 Added fallback URLs for the "umbNodePreview" directive (#2369) 2018-07-25 16:01:36 +02:00
Bjarne Fyrstenborg
2bd9e24cc2 U4-9803 - Update styles of Repeatable textstrings (#2446) 2018-07-25 15:19:57 +02:00
Dave Woestenborghs
2669a51fe1 Only show umbraco.tv and our.umbraco.org content to admin users in the help drawer (#2513) 2018-07-25 15:01:33 +02:00
Sebastiaan Janssen
fd2137ec8d Merge pull request #2519 from bjarnef/dev-v7-U4-11111 
U4-11111 - Hide tooltip of slider property editor in document type editor preview
 2018-07-25 14:49:41 +02:00
Sebastiaan Janssen
9f1dfb2684 Merge pull request #2520 from bjarnef/dev-v7-U4-11113 
U4-11113 - Remove umb-pane from dialog to avoid additional padding
 2018-07-25 14:48:18 +02:00
Bjarne Fyrstenborg
4442afc1fd U4-10769 - Fix listviewhelper to work without key property on objects (#2521) 2018-07-25 14:46:39 +02:00
Sebastiaan Janssen
f63456a18f Merge pull request #2552 from marcemarc/temp-U4-11163 
Consider the 'case' of the Member Group/Role Name when comparing...
 2018-07-25 14:40:08 +02:00
Sebastiaan Janssen
065de778f0 Merge pull request #2729 from russellshome/patch-1 
Fix for TinyMCE inserts __mcenew in id attribute for images
 2018-07-25 13:38:53 +02:00
Sebastiaan Janssen
1b5c553a05 Merge branch 'patch-1' of https://github.com/russellshome/Umbraco-CMS into russellshome-patch-1 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
 2018-07-25 13:33:55 +02:00
Sebastiaan Janssen
113b8d825e Merge pull request #2730 from mvanhelmont/U4-7463 
Media library thumbnail does not reload if a new image with the same name is uploaded
 2018-07-25 13:14:42 +02:00
Sebastiaan Janssen
3ec31bb64d Merge pull request #2756 from kows/hackathon-export-doc-type-to-angular 
Rewrite exportdocumenttype.aspx to Angular [v8hackaton]
 2018-07-25 12:13:52 +02:00