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

5819 Commits

Author SHA1 Message Date
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
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
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
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
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
Rune Hem Strand
45fd54d046 Fixed open doc type button 2018-03-01 18:06:46 +01:00
Sebastiaan Jansssen
4f062306a6 U4-10891 Color Picker Cannot read property 'hasOwnProperty' of null 
(cherry picked from commit 4a8730b925)
 2018-03-01 16:47:28 +01:00
Sebastiaan Janssen
e783308cf0 Merge pull request #2487 from umbraco/temp-hartvig-ocd 
Aligns installer/login background photo
 2018-03-01 14:54:56 +01:00
Sebastiaan Jansssen
01f49bb07e Revert "Merge pull request #2426 from JeffreyPerplex/U4-9991-KeyboardShortcuts" 
This reverts commit 325cefa349, reversing
changes made to d4cf4cd700.
 2018-03-01 14:52:17 +01:00
Niels Hartvig
a3d08c19c5 Aligns photo 2018-03-01 14:05:34 +01:00
Shannon
78489237d9 U4-11019- default isApproved to true 2018-03-01 18:21:14 +11:00
Shannon
8768947519 U4-11019 Member 'Locked out' marked as sensitive throws an error - fixes special values 2018-03-01 18:05:44 +11:00
Shannon
0c2c12fdd9 ensures that the template cache is cleared on startup if it hasn't been tracked in local storage 2018-02-27 01:38:53 +11:00
Shannon
161a19a82b Adds cache busting for TinyMCE 2018-02-27 01:12:17 +11:00
Shannon
fd5bc49c87 Audits the member being exported, moves the export method to the service (again) but returns a proper model this time and raises an event, adds error checking to the export http request 2018-02-27 00:40:43 +11:00
Shannon
6adaa1f70c adds a notification when the member gets exported 2018-02-26 23:37:20 +11:00
Shannon
397ab0e979 Merge branch 'dev-v7.9' into temp-U4-10900-2 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/member/export.html
 2018-02-26 23:13:58 +11:00
Shannon
34506664df Moves the member export to happen on action click, adds a helper method to download a file via XHR 2018-02-26 23:09:29 +11:00
Shannon Deminick
22b9941822 rename to match file naming conventions 2018-02-26 22:28:41 +11:00
Mads Rasmussen
449e464a14 Merge branch 'mathiasrando-U4-10883' into dev-v7.9 2018-02-26 09:47:13 +01:00
Mads Rasmussen
5f72eb74db use attr to control button size + remove disabled state 2018-02-26 09:26:14 +01:00
Barry
08965982fd Prevent unsaved dialogue appearing when no changes made on FileUpload property editor 
Addresses this issue in media section (U4-9996) and content (U4-7484)
 2018-02-25 05:50:10 +00:00
Barry
732d3ef326 Prevent "unsaved" warning when no changes on MarkDown Editor 
http://issues.umbraco.org/issue/U4-7484#
 2018-02-25 03:18:00 +00:00
Sebastiaan Jansssen
e1821697d4 Merge remote-tracking branch 'origin/dev-v7.8' into dev-v7.9 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2018-02-24 11:53:28 +01:00
Sebastiaan Jansssen
fcd3bb2eee Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
 2018-02-24 11:48:20 +01:00
Robert
fa68f7fafe Merge pull request #2445 from bjarnef/dev-v7-U4-10966 
U4-10966 -  Single/Multiple Media Picker is messed up when dragging images
 2018-02-23 15:15:36 +01:00
Mads Rasmussen
898e39dac5 Merge branch 'U4-10883' of git://github.com/mathiasrando/Umbraco-CMS into mathiasrando-U4-10883 2018-02-23 14:49:50 +01:00
Sebastiaan Jansssen
849cd4d315 Merge remote-tracking branch 'origin/dev-v7.8' into dev-v7.9 2018-02-23 13:49:57 +01:00
Sebastiaan Jansssen
10141bf4f6 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
 2018-02-23 13:49:20 +01:00
Alan Mac Kenna
2caad3f2d0 change newsletter subscribe to default for installation process 2018-02-23 11:24:15 +00:00
Robert
4850b01097 Added checks in place to stop users that has no access to sensitive data to export member data, removed some unused usings 2018-02-23 12:23:23 +01:00
Robert
8ef3ecd714 Forgot to commit the translation keys :| 2018-02-23 09:11:42 +01:00
Sebastiaan Janssen
1f66ebff1f Merge pull request #2470 from MMasey/dev-v7 
U4-11005 Examine Search tools form does not submit when pressing Enter key
 2018-02-22 18:49:17 +01:00
Sebastiaan Janssen
6e9a9d6444 Merge pull request #2464 from lukaaaaaaaay/dev-v7.8 
Hackathon: U4-10941 Name should be before Label when adding grid row configurations
 2018-02-22 18:17:18 +01:00
Migaroez
c4850199f7 U4-10999 Fixed wrong description on mediaresource.search 
(cherry picked from commit af476e1536)
 2018-02-22 17:36:39 +01:00
Sebastiaan Janssen
679333b9c9 Merge pull request #2456 from Migaroez/U4-10999 
U4-10999 Fixed wrong description on mediaresource.search
 2018-02-22 17:33:37 +01:00
Mike Masey
22fc9c617c Upate search button in examin search tools to use type="submit" 2018-02-22 16:18:59 +00:00
Robert
f0dd32ea19 Removed export placeholder button and added "Action" button instead. 2018-02-22 16:52:16 +01:00