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

24322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sebastiaan Janssen
3b771bf0f7 Download using the umbraco built-in download method and adds notification for success/error 2018-07-25 12:09:46 +02:00
Sebastiaan Janssen
b5c3b85298 Merge branch 'hackathon-export-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-export-doc-type-to-angular 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
#	src/Umbraco.Web.UI/Umbraco/dialogs/exportDocumenttype.aspx
#	src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx.cs
 2018-07-25 11:40:29 +02:00
Sebastiaan Janssen
b744962066 Cleaning up the mess I made 🙈 2018-07-25 11:13:27 +02:00
BatJan
882fa42e2d U4-11497 - Make JSON storage default on the Tags property editor (#2773) 2018-07-25 11:10:35 +02:00
Sebastiaan Janssen
2d79188433 Correct some mistakes I made in queries 2018-07-25 11:08:34 +02:00
Jan Skovgaard
9a4c022ea3 Remove stuff that has been commented out 2018-07-25 11:08:34 +02:00
Jan Skovgaard
808fc14b32 Set the default storageType for the Umbraco.Tags datatype to "Json", which is now going to be the default 2018-07-25 11:08:33 +02:00
Jan Skovgaard
92f0d0d2ea Add a new migration to set the default storageType for Umbraco.Tags datatype to CSV if it has not been set previously 2018-07-25 11:08:33 +02:00
Jan Skovgaard
9180ab4442 Reset commit to not break backwards compatibility mode 2018-07-25 11:08:33 +02:00
Jan Skovgaard
4e1e9e0687 Switch JSON to be the default storage option and changing the storage type text to say JSON is default and CSV is legacy 2018-07-25 11:08:32 +02:00
skidmow
c264368042 U4-11528 Problem with length of culture in database (#2791) 2018-07-25 10:06:29 +02:00
Sébastien Sougnez
ff8ea3ec6b Link to template from "document types" or "content" screen (#2784) 2018-07-25 08:36:09 +02:00
Kenn Jacobsen
c85185bdb0 Visual improvements to Nested Content (U4-10742) (#2457) 2018-07-24 16:19:26 +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
794c7fc389 Merge pull request #2790 from agrath/U4-11531 
U4-11531 When the grid editor initializes it can set the form state to dirty
 2018-07-24 09:25:52 +02:00
Sebastiaan Janssen
e0b1507056 Show/hide label field when label is toggled 
Adds dib class to parent div to make the click target smaller
 2018-07-23 23:22:52 +02:00
Stephan
c7fabf84ba Merge branch origin/temp8 into temp8 2018-07-20 11:01:10 +02:00
Stephan
d7e97ac771 Remove unused CodeAnnotations attributes, obsolete stuff 2018-07-20 10:59:25 +02:00
Stephan
ef7be48cc5 Fix SqlTemplates concurrency 2018-07-20 10:41:22 +02:00
Gareth Evans
88b6f4e436 Guard gridController.addRow from setting form state to dirty if invoked from initSection 2018-07-20 11:42:52 +12:00
Shannon
5fdaa451b8 fixes null check on linkpicker changes with anchors, fixes ng-true-value constant value 2018-07-19 22:35:05 +10:00
Stephan
d36ec60039 Fix IPropertyValueConverter determining HasValue 2018-07-19 11:02:51 +02:00
Sebastiaan Janssen
b9d7046bbc Merge pull request #2788 from nathanwoulfe/temp-U4-6946 
Updating #2742 - U4 6946 - Existing template file is overwritten when creating a new template in the backoffice
 2018-07-19 10:28:24 +02:00
Sebastiaan Janssen
09dd5cf879 Merge pull request #2781 from Mundairson/temp8-U4-11428 
U4-11428 CodeAnnotations classes have inconsistent constructor parameter order
 2018-07-19 09:18:17 +02:00
Nathan Woulfe
06f014df61 remove TryGetViewPath as not needed 2018-07-19 08:28:07 +10:00
Sebastiaan Janssen
f622a9154b Merge pull request #2763 from OptimisticCoder/U4-7030-Using-radiobuttonlist-prevalue-editor 
U4-7030 enable use of radiobuttonlist pre editor
 2018-07-18 15:29:20 +02:00
Mundairson
d7d36c34be Removed empty block comments. 2018-07-18 14:29:10 +01:00
Sebastiaan Janssen
6f6c29ce43 Merge pull request #2782 from agrath/u4-11522 
U4-11522 Add ~/.well-known to umbracoReservedUrls
 2018-07-18 15:14:54 +02:00
Sebastiaan Janssen
26a004210e Merge pull request #2787 from leekelleher/U4-10561-1 
U4-10561 - Bug fix for IsAncestor/IsDescendant extension methods
 2018-07-18 14:50:06 +02:00
Sebastiaan Janssen
d9459661eb Merge pull request #2785 from nathanwoulfe/temp-U4-11524 
U4 11524 - icon alignment in help drawer
 2018-07-18 14:49:31 +02:00
leekelleher
2da5a522b0 Updated PublishedContent unit-test 
to support the fix in commit 7a9a4a2fab

However this meant that I had to update a bunch of other unit-tests, due to hardcoded counts/references on the content XML.
 2018-07-18 10:56:31 +01:00
leekelleher
7a9a4a2fab Fixes bug with comparing partial content paths 
Raised here in a comment by @coolmikkel
https://github.com/umbraco/Umbraco-CMS/pull/2253#issuecomment-405751083
 2018-07-18 10:54:19 +01:00
Stephan
6c526b24a0 Post-merge fixes 2018-07-18 10:32:50 +02:00
Shannon
1f1bb37a57 merges lang files 2018-07-18 16:08:38 +10:00