yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,351 Commits 4 Branches 7 Tags
29ae78b1a0fad659697266a4767b6058a60de9fc
Commit Graph

22351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
29ae78b1a0 Merge branch 'dev-v7-U4-11540' of https://github.com/Mundairson/Umbraco-CMS into Mundairson-dev-v7-U4-11540 2018-07-30 12:17:52 +02:00
Sebastiaan Janssen
4cefd355ec Merge pull request #2811 from imranhaidercogworks/update-our-umbraco-url-references 
Update our umbraco url references [v8hackaton]
 2018-07-30 11:42:25 +02:00
Sebastiaan Janssen
8404efc521 Adds a few updates from PR #2820 and updates feedProxy to allow both .org and .com 2018-07-30 11:38:51 +02: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
BatJan
60c66823f8 Fix for PR #2792 - Selected color does not show in document type (#2817) 2018-07-30 10:11:57 +02:00
Sebastiaan Janssen
6a946c8a1c Merge pull request #2816 from BatJan/features/temp-U4-11541 
U4-11541 - Change the color pickers "active" appearance
 2018-07-30 10:11:15 +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
Sebastiaan Janssen
ae1c0e3c9b Merge pull request #2814 from dawoe/temp-U4-10681 
U4-10681 Added dutch translations for labels added in PR #2342
 2018-07-30 09:36:01 +02:00
Sebastiaan Janssen
dc8ab7d00a Merge pull request #2813 from BatJan/features/color-picker-prevalue-width-fix 
Fix color-picker prevalue width
 2018-07-30 09:35:24 +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
Jan Skovgaard
9fa148db4f Split the "check-circle" class out into it's own .less file for making it easier to re-use throughout the codebase making the color picker datatype use the same UI for the active state. 2018-07-28 13:35:35 +02:00
Mundairson
902efef481 Warning CS0105 The using directive appeared previously in this namespace 2018-07-28 10:53:57 +01:00
Dave Woestenborghs
9b8943f80c U4-10681 Added dutch translations for labels added in PR #2342 2018-07-28 11:37:23 +02:00
Jan Skovgaard
1c1a4778f9 Make sure to set min-width: auto - Otherwise the defined width will never be applied 2018-07-27 23:25:32 +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
ashallcross
7559fab5ce Update readme (#2806) 2018-07-27 16:01:34 +02:00
Richard Thompson
60910efc53 U4-10681 Restore option in media recycle bin (#2342) 2018-07-27 15:56:18 +02:00
Sebastiaan Janssen
c0cdf727ca Merge pull request #2804 from ashallcross/Update-Readme 
Updated the umbraco.org URL's to be umbraco.com
 2018-07-27 15:15:23 +02:00
Adam Shallcross
675ce08469 Updated the umbraco.org URL's to be umbraco.com 2018-07-27 14:09:51 +01:00
Sebastiaan Janssen
8c1f236e3f Fix unit test 2018-07-27 15:08:48 +02:00
BatJan
bd3f7ffcd4 U4-11538 Color picker thumbnail is to wide (#2801) 2018-07-27 14:35:04 +02:00
Sebastiaan Janssen
940bc0c7de Merge pull request #2799 from BatJan/features/temp-U4-11537 
U4-11537 - Add title attributes to the umbConfirmAction directive's "buttons"
 2018-07-27 13:51:32 +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
Sébastien Sougnez
f7e097be8e Minor update to the grid settings/style section (#2797) 2018-07-27 12:50:30 +02: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
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
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
Owain Williams
0eddf6b755 Implementing new colour picker for document types (#2792) 2018-07-26 10:04:55 +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