yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,788 Commits 4 Branches 7 Tags
026ad4f2a8b0e6c3df50cbe2b89183409d6f08c2
Commit Graph

28788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert
026ad4f2a8 fixes - TinyMCE does not sync data to angular store when dragged away in grid-editor (#5048) 2019-03-25 11:07:50 +01:00
Sebastiaan Janssen
929fc415bb Merge branch 'dev-v7' into dev-v8 
# Conflicts:
#	src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
 2019-03-23 10:31:50 +01:00
Nathan Woulfe
4e1634754b fix URL redirection creation - was failing when save and save+publish as save creates new URL, which is compared to itself in save+publish (#5036) 2019-03-23 10:29:46 +01:00
Brandon Osborne
080f433140 Updated Upload method (#4850) 2019-03-23 09:59:04 +01:00
Robert
3761d2e483 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 2019-03-22 15:06:44 +01:00
Robert
d107289a08 Fixes not being able to add languages 2019-03-22 15:06:09 +01:00
Robert
1d8ed6e507 Merge pull request #5045 from umbraco/v8/bugfix/4683-Change-text-in-culture-and-hostnames 
V8: Translation in the culture and hostnames panel.
 2019-03-22 14:37:21 +01:00
Robert
4ea169a636 Merge pull request #5049 from umbraco/v8/bugfix/4990-use-skip-and-take-parameters 
V8: Use the skip and take parameters in GetVersionsSlim
 2019-03-22 14:32:51 +01:00
Bjarke Berg
b16bf78c44 Merge pull request #4957 from kjac/v8-fix-region-and-regionless-languages 
V8: Allow mixing languages with and without region
 2019-03-22 14:03:10 +01:00
Bjarke Berg
acf59dc1d0 Formatting 2019-03-22 13:55:46 +01:00
Bjarke Berg
f99d3f7419 https://github.com/umbraco/Umbraco-CMS/issues/4990 - Added skip and take 2019-03-22 13:53:40 +01:00
Bjarke Berg
8ab89f5e1c https://github.com/umbraco/Umbraco-CMS/issues/4683 - Translation in the culture and hostnames panel. Our recommendation in V8 is opposite to V7, therefore a new key is introduced 2019-03-22 12:01:08 +01:00
Bjarke Berg
1587e13b23 Merge pull request #5043 from umbraco/temp8-4695-umb-sticky-bar-position-infinity-mode 
top: 70px; in infinity mode
 2019-03-22 11:42:00 +01:00
Bjarke Berg
0acc8e1f14 Merge pull request #4961 from umbraco/temp8-rename-color-variable-disgrete-to-discreet 
Renamed LESS variables with disgrete to discreet
 2019-03-22 09:45:50 +01:00
Bjarke Berg
99ebe13ebb Merge pull request #4974 from umbraco/temp8-fix-conditional-sync-of-checkboxlist 
Fixing code in sync functionality of checkbox-list
 2019-03-22 09:35:31 +01:00
Niels Lyngsø
e16777fc28 remove debugger; 2019-03-22 09:21:37 +01:00
Niels Lyngsø
23f36b9d4e top: 70px; in infinity mode 2019-03-22 09:20:50 +01:00
Bjarke Berg
9a6798953b Merge pull request #5026 from umbraco/temp8-ui-hover-state-for-selectable-items 
Hover state for selectable items in Lists and Grids
 2019-03-21 15:19:53 +01:00
Bjarke Berg
c6e6a9d4cc Merge pull request #5023 from umbraco/temp8-ui-unpublished-state-in-list-view 
Make unpublished items in list view show with grey text-color on name
 2019-03-21 15:10:02 +01:00
Sebastiaan Janssen
77692037f6 Merge branch 'dev-v7' into dev-v8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
 2019-03-21 09:56:12 +01:00
Kenn Jacobsen
da6b541112 Show duplicate URLs instead of letting them cause an angular error (#3969) 2019-03-21 09:06:01 +01:00
Kenn Jacobsen
0a3f893f22 V8: Improve plugin language handling (#4454) 2019-03-20 23:44:29 +01:00
Sebastiaan Janssen
ee911a579f Merge branch 'dev-v7' into dev-v8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web/UmbracoHelper.cs
 2019-03-20 23:29:04 +01:00
Sebastiaan Janssen
1a4a3504d0 Remove unused variable 2019-03-20 23:27:42 +01:00
Tom Fulton
5d3b623173 Fix for RTE never being dirty after initial save (#4140) 2019-03-20 23:26:12 +01:00
Marcin Bigoraj
2c271d3ef4 Allow RTE to set form dirty again after saving content item 2019-03-20 23:18:36 +01:00
Mario Lopez
9a6d938004 fixed xmldoc 2019-03-20 23:10:32 +01:00
Mario Lopez
125423947c add Udi[] to TypedContent helper 2019-03-20 23:10:32 +01:00
Sebastiaan Janssen
263ee5c297 Merge branch 'dev-v7' into dev-v8 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2019-03-20 23:03:18 +01:00
Kenn Jacobsen
99b80e0f56 Ensure that media in RTEs are always rendered with up-to-date sources 2019-03-20 22:46:42 +01:00
Robert
d7ad19d6c9 Merge pull request #4822 from kjac/v8-grid-hide-empty-sticky-bar 
V8: Hide empty sticky bar in Grid
 2019-03-20 15:17:26 +01:00
Bjarke Berg
13fd177325 Merge remote-tracking branch 'origin/dev-v8' into dev-v8 2019-03-20 13:30:03 +01:00
Bjarke Berg
c589ef1995 https://github.com/umbraco/Umbraco-CMS/issues/5024 - Fixed issue, when using the culture overload of the Children. Now we use ChildrenOfType if alias is set. 2019-03-20 13:29:39 +01:00
Sebastiaan Janssen
ff33e0d969 Fix merge mistake 2019-03-20 13:22:22 +01:00
Sebastiaan Janssen
559debc079 Merge branch 'dev-v7' into dev-v8 
# Conflicts:
#	src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs
 2019-03-20 13:10:32 +01:00
Robert
32c0e02563 Merge pull request #4995 from umbraco/v8/bugfix/4992-nucache-panic 
bugfix nucache panic
 2019-03-20 12:31:09 +01:00
Bjarke Berg
64bc0cf973 Renamed SendingDashboardModelV2 to SendingDashboardSlimModel 2019-03-20 07:35:00 +01:00
Paul Seal
bb23fbbf8d increased length of line under the word umbraco 2019-03-19 22:59:28 +01:00
Paul Seal
30b47ff15f Update the umbraco ascii art 
I thought it would be a good idea to update the ascii art to a font similar to the one in the umbraco logo on the umbraco.com website.
 2019-03-19 22:59:28 +01:00
Sebastiaan Janssen
1c9d1718e7 More readme updates 2019-03-19 22:53:31 +01:00
Sebastiaan Janssen
23656f017c More readme updates 2019-03-19 22:02:52 +01:00
Sebastiaan Janssen
685c4e351b Update readme 2019-03-19 21:31:57 +01:00
Niels Lyngsø
30eb097f9c hover state for media grid + corrected hover state opacity + rounded corner for media info tooltip 2019-03-19 19:03:02 +01:00
Niels Lyngsø
fa042194b7 hover state for umb-content-grid-item 2019-03-19 16:50:05 +01:00
Niels Lyngsø
bd8f950ba1 hover state for umb-table and umb-mini-list-view 2019-03-19 16:30:18 +01:00
Niels Lyngsø
560367debe hover state for umb-table item 2019-03-19 16:15:01 +01:00
Niels Lyngsø
59a62688c5 Make unpublished items in list view show with grey text-color on name and icon 2019-03-19 16:01:36 +01:00
Kenn Jacobsen
d637a7951b V8: Remember choice of layout in Users section (#4779) 
* Support arbitrary identifiers in "last used listview layout"
* Save and use last selected view layout for the users section
 2019-03-19 14:50:00 +01:00
Kenn Jacobsen
3a0dd2399a V8: Make "Open in split view" look better in narrow viewports (#4619) 
* Make "Open in split view" look better in narrow viewports
* Add white background to inactive split view button
* Better support for long culture names
 2019-03-19 14:24:32 +01:00
Niels Lyngsø
532f69e9b7 Show checkmark when list has selection 2019-03-19 13:53:13 +01:00