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

5857 Commits

Author SHA1 Message Date
Dave Woestenborghs
eca5b6e4e6 U4-11150 added culture property of tour to the docs 2018-04-16 08:35:05 +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
Kyle Weems
617bdb2bd1 Merge branch 'dev-v7' of git://github.com/umbraco/Umbraco-CMS into dev-v7 2018-03-07 10:21:11 -08:00
Kyle Weems
2c91f9bf14 Reduce the first load impact of Moment by moving from using moment-with-locales.js to moment.min.js and loading in the specific locale files when the app authorizes. http://issues.umbraco.org/issue/U4-11044 2018-03-07 10:19:11 -08:00
Robert
1a5fe63638 Switching to ng-if to hide the template dropdown in the info tab 2018-03-07 14:51:24 +01:00
Robert
dfb0efbc98 Removed option to assign templates from the info tab 2018-03-07 14:43:30 +01:00
Robert
d399ad6e51 Removed option to assign templates from the document type 2018-03-07 14:13:53 +01:00
Robert
eb06e62937 Removing the option to create document type with a template 2018-03-07 14:10:25 +01:00
Niels Hartvig
ca74100e12 TLC for multiple pre values editor 2018-03-06 16:11:44 +01:00
Niels Hartvig
3061dc4e6f Adds support for *not* closing an overlay on enter 2018-03-06 15:37:52 +01:00
Niels Hartvig
05a9c44e9e Needs to check if single value is an array and then pick first value 2018-03-06 11:51:32 +01:00
Niels Hartvig
ceb3ae361a Adds flexible dropdown editor to replace the four current ones 2018-03-06 11:07:08 +01:00
Niels Hartvig
4cee7b831a Merge branch 'dev-v7' into temp-U4-11032 2018-03-06 10:08:04 +01:00
Robert
f146262031 Merge pull request #2476 from barryokane/U4-9996 
(uDuf) Prevent unsaved dialogue appearing when no changes made on FileUpload
 2018-03-06 09:17:17 +01:00
Sebastiaan Janssen
4bc9d96bce Merge pull request #2488 from hemraker/temp-U4-10993 
Fixed open doc type button
 2018-03-01 18:09:48 +01:00