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

5870 Commits

Author SHA1 Message Date
Dave Woestenborghs
21a8395142 U4-11216 Multiple Content Picker allows only one item when used as macro parameter (#2593) 
U4-11216 set min and max number when used as parameter editor

(cherry picked from commit f25233ac2b)
 2018-04-18 10:22:09 +02:00
Sebastiaan Janssen
d63061fade Merge pull request #2564 from leekelleher/U4-11184 
U4-11184 - Nested Content PropertyValueEditor - return converted value, not update reference value
 2018-04-17 15:33:14 +02:00
Shannon Deminick
e25d648f44 Merge pull request #2556 from dawoe/temp-U4-11167 
U4-11167 Fixes rare syncTree error
 2018-04-06 14:46:23 +10:00
leekelleher
7225ec29fe Nested Content - enabled support for property-editors: 
- Umbraco.CheckBoxList
- Umbraco.DropDownMultiple
- Umbraco.MacroContainer
- Umbraco.RadioButtonList
- Umbraco.MultipleTextstring
 2018-04-05 17:17:34 +01:00
Warren Buckley
43e32e66b6 Merge pull request #2550 from dawoe/temp-U4-11161 
U4-11161 fix for adding multiple items in a single content picker
 2018-04-05 10:15:39 +01:00
Dave Woestenborghs
859cb6ce1a U4-11167 removed the time out..only check if the syncTree method exists 2018-04-04 09:44:29 +02:00
Warren
bdaa70592f Adds in missing $scope dependency for Dynamic Dashboard Controller 2018-04-04 08:28:41 +01:00
Dave Woestenborghs
27b19a0a33 U4-11167 only wrap in time out when syncTree method is undefined 2018-04-03 07:37:37 +02:00
Shannon
e77ebc0c1c Fixes all references to assetsService.load* that do not pass in a required scope object and changes assets.service to always use the $rootScope of an explicit scope is not passed 2018-04-03 11:27:53 +10:00
Shannon
a27ea994b7 updates the loadMomentLocaleForCurrentUser to always return a promise 2018-04-03 10:59:55 +10:00
Dave Woestenborghs
f6263aad5b U4-11167 wrap syncTree method to handle rare occasions where it is not defined yet 2018-03-31 15:09:30 +02:00
Dave Woestenborghs
28a0e30315 U4-11164 fixed blank screen for about 30 seconds after logging in. Because of q.all we don't need to wait until promise is resolved, because all promises are resolved when this is hit 2018-03-30 11:20:41 +02:00
Dave Woestenborghs
d1eb6b1aa8 U4-11161 don't show help text when it's not a multipicker 2018-03-28 17:07:56 +02:00
Dave Woestenborghs
458d023ff4 U4-11161 set min and max number in default config 2018-03-28 17:03:35 +02:00
Shannon
b361cfebb7 updates npm build dependencies 2018-03-21 13:55:01 +11:00
Shannon
ebea5e8170 fixes boolean pre-value editor Html Id 2018-03-21 13:53:54 +11:00
Shannon
2ad79956d9 Re-apply Drop Down Flexible "Merge pull request #2502 from umbraco/temp-U4-11032"" 2018-03-21 12:37:26 +11:00
Shannon
96c6a17d03 Merge branch 'dev-v7' into dev-v7.10 2018-03-21 12:36:55 +11:00
Shannon
1a590664e7 Revert "Merge pull request #2502 from umbraco/temp-U4-11032" 
This reverts commit 2aa0dfb2c5, reversing
changes made to 2c6e7e46c2.
 2018-03-21 12:32:27 +11:00
Shannon
084af43dab Merge remote-tracking branch 'origin/dev-v7' into dev-v7.10 2018-03-21 10:20:20 +11:00
Sebastiaan Janssen
79ecaecc9e Merge pull request #2503 from umbraco/temp-U4-11070 
Adds support for *not* closing an overlay on enter
 2018-03-20 11:14:57 +01:00
Sebastiaan Janssen
f604117c6d Merge pull request #2504 from umbraco/temp-U4-11071 
U4-11071 Prevalue editor for multiple values TLC
 2018-03-20 11:14:42 +01:00
Robert
3aed889e2a Merge branch 'dev-v7' into temp-U4-11032 2018-03-19 14:14:51 +01:00
Robert
2c6e7e46c2 Merge pull request #2517 from dawoe/patch-1 
Fixed documentation of umb-overlay directive
 2018-03-19 08:58:23 +01:00
Dave Woestenborghs
0c868fb72d Remove console.log from slider property editor 
removed console.log statement from slider property editor controller
 2018-03-16 18:43:54 +01:00
Dave Woestenborghs
a96cbce9b1 Fixed documentation of umb-overlay directive 
- Removed lorem ipsum text 
- Fixed casing of subtitle
 2018-03-16 18:12:46 +01:00
Sebastiaan Janssen
e3e425695f U4-8724 tinyMceConfig.config customConfig bool not correct deserialized 2018-03-16 16:34:58 +01:00
Shannon
82820284f3 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.10 
# Conflicts:
#	src/Umbraco.Web/Features/DisabledFeatures.cs
#	src/Umbraco.Web/Features/EnabledFeatures.cs
 2018-03-16 14:30:55 +11:00
Sebastiaan Janssen
5f3090c81e grunt was discontinued in 7.7 and shouldn't exist here any more to avoid confusion 2018-03-15 10:40:40 +01:00
Sebastiaan Janssen
f66e239584 PhantomJs doesn't understand fancy ES6 notation 2018-03-15 10:32:25 +01:00
Sebastiaan Janssen
a465ed415d Rename to javascriptLibraryService 2018-03-15 10:08:00 +01:00
Sebastiaan Janssen
eac9785c45 Apply PR #2507 2018-03-15 10:02:20 +01:00
Sebastiaan Janssen
054a8b48fa Revert PR #2507 - needs to go in 7.10 2018-03-15 09:59:04 +01:00
Sebastiaan Janssen
dfbc3c477a Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into pr/2507 2018-03-15 09:38:44 +01:00
Niels Hartvig
57426ae895 Feedback from review. Makes the moment service more generic and changes promises chaining 2018-03-14 11:10:01 +01:00
Shannon
b4aad19573 Revert "Merge pull request #2508 from umbraco/temp-U4-11076" 
This reverts commit 4161d244c1, reversing
changes made to eea87e411f.
 2018-03-14 13:23:33 +11:00
Shannon
1b6c070752 Merge remote-tracking branch 'origin/dev-v7' into temp-UAASSCRUM-1405 2018-03-14 12:56:07 +11:00
Shannon
0e08a56ada Merge branch 'dev-v7' into temp-UAASSCRUM-1405 
# Conflicts:
#	src/Umbraco.Web/Features/DisabledFeatures.cs
#	src/Umbraco.Web/Features/EnabledFeatures.cs
 2018-03-14 12:25:37 +11:00
Sebastiaan Janssen
03012cf54d Merge pull request #1435 from neilgaietto/U4-8822 
U4-8822- Fixes Unpublish error with empty RTE
 2018-03-14 00:10:49 +01:00
Sebastiaan Janssen
7ff339e18a Merge pull request #1306 from shiroganee/Fix-8533 
removes a overflow: hidden which decrease update-tree-layer performance
 2018-03-13 23:34:59 +01:00
Sebastiaan Janssen
45d292e196 Merge branch 'dev-v7-U4-6616' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-6616 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/variables.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html
 2018-03-13 22:18:28 +01:00
Niels Hartvig
6bafd3a254 Removes ugly non-existing comment :) 2018-03-13 16:39:01 +01:00
Niels Hartvig
564074a2bd Adds check for existing moment locales before attempting to download them 2018-03-13 16:19:51 +01:00
Shannon Deminick
4161d244c1 Merge pull request #2508 from umbraco/temp-U4-11076 
Fix - U4-11076 Remove all references to templates from the backoffice
 2018-03-12 20:32:29 -07:00
Shannon
171e0d87db Updates some of the variable names, removes the EnabledFeatures since we don't really need that 2018-03-13 14:31:30 +11:00
Shannon
89edfe5782 refactors a bit - merges the 2 new resolvers into one and renames with code comments. Updates the ContentPropertyBasic to include a new IsSensitive property for mapping, updates the UI to check for this, updats the mapping to map with UmbracoContext, 2018-03-13 11:23:44 +11:00
Robert
709dab6afd Hooked sensitive data checks on member list view 2018-03-12 12:06:23 +01:00
Robert
304e574bbc Merge pull request #2509 from umbraco/temp-U4-11058 
fixes: U4-11058 Add guidance to the multinode treepicker UI for min. …
 2018-03-08 14:01:14 +01:00
Robert
723644ace5 Merge pull request #2475 from barryokane/U4-7484-markdown 
(uDuf) Prevent "unsaved" warning when no changes on MarkDown Editor
 2018-03-08 13:23:46 +01:00
Mads Rasmussen
f2a3a269ba fixes: U4-11058 Add guidance to the multinode treepicker UI for min. and max. allowed items 2018-03-08 11:22:31 +01:00