Commit Graph

7561 Commits

Author SHA1 Message Date
Kenn Jacobsen
00cf8dcf05 Reload the node when publishing all unpublished children 2018-10-21 11:01:45 +02:00
Rasmus John Pedersen
ef343f04a8 Only hide icons if hideIcons is set to 'true' 2018-10-21 10:51:35 +02:00
Jamie Townsend
0f2381a94d Merge multiple ng-if attributes 2018-10-19 15:19:22 +02:00
Ed Parry
201a2cd7b1 Added the user ID and GUID to the user details view. (#3279) 2018-10-19 15:13:07 +02:00
Bjarne Fyrstenborg
8e1065a2b6 Fix missing semicolons and remove comma at end 2018-10-19 15:08:17 +02:00
Mike Chambers
ecf9c0adb4 Update datepickerController to add onValueChanged function
adding onValueChanged method to capture serverside Model Changes, clearing flag using c# System.DateTime.MinValue.
2018-10-19 15:07:03 +02:00
Andy Robinson
6b90d62bd1 update to issue #3292 to fix 4 col grid cards. 2018-10-19 14:51:44 +02:00
Andy Robinson
c5ea0ea3a9 fixing issue in #3292 2018-10-19 14:51:44 +02:00
Mads Rasmussen
b75f41b3f6 fix user cards grid 2018-10-19 14:25:15 +02:00
Kenn Jacobsen
8036af958f Allow video feeds to load over HTTPS + fix a few feeds (#3256) 2018-10-19 14:19:47 +02:00
elitsa
40424b805b Merge remote-tracking branch 'origin/temp8' into temp8-sendToPublish 2018-10-19 11:40:56 +02:00
Poornima Nayar
df2ee8e3e1 Moved the css rules for the rollback modal to a new stylesheet 2018-10-19 11:29:49 +02:00
Mads Rasmussen
82f7b099d5 change styling 2018-10-19 10:43:39 +02:00
Mads Rasmussen
4c638565b7 special treatment for property editors which store the value as json 2018-10-19 09:41:52 +02:00
Shannon
cc4ee6527d Gets the correct variant logging put in to the audit trail, cleans up audit trail messages to make sense, makes sure audit trail is reloaded when changing variants 2018-10-19 13:24:36 +11:00
Mads Rasmussen
0f528a7a89 disable roll back button when no version is selected 2018-10-18 15:25:17 +02:00
Mads Rasmussen
09a7443701 dont show diff if a versionId is not set 2018-10-18 15:16:37 +02:00
Mads Rasmussen
a12d736b6b show user in version dropdown 2018-10-18 14:56:00 +02:00
Mads Rasmussen
b2138d6376 reload content after rollback 2018-10-18 14:06:21 +02:00
Shannon
c3e2d2a821 Cleaning up the log/audit trail usage, removing duplicate and unecessary entries and adding new cols 2018-10-18 22:52:49 +11:00
Mads Rasmussen
fd08316189 wire up rollback button 2018-10-18 11:10:27 +02:00
Warren Buckley
816b5ba598 Merge branch 'temp8-3298-move-rollback' of https://github.com/umbraco/Umbraco-CMS into temp8-3298-move-rollback 2018-10-18 09:24:53 +01:00
Mads Rasmussen
813f3f8d84 a language should always be selected when a node has variants 2018-10-18 10:21:13 +02:00
Warren Buckley
3f82cd7677 Update get rollback version to use a culture in the resource 2018-10-18 09:13:27 +01:00
Warren Buckley
f0d12f7915 Merge remote-tracking branch 'origin/temp8' into temp8-3298-move-rollback 2018-10-18 08:42:43 +01:00
Mads Rasmussen
ab34deb726 add diff 2018-10-17 20:37:15 +02:00
Mads Rasmussen
eb8b269846 wire up getRollbackVersion endpoint 2018-10-17 16:02:47 +02:00
Warren Buckley
2baafd9c91 * Renamed API variables to 'culture' to make Stephan happy - updated the AngularJS HTTP Resource call too
* Stubbed out some other WIP code - for getting a specific version & attempting to perform a rollback
2018-10-17 14:39:11 +01:00
Mads Rasmussen
214d6a9834 show correct title and date for current version + update versions when language is changed 2018-10-17 15:17:43 +02:00
Mads Rasmussen
2be2273589 wire up versions end point 2018-10-17 14:33:42 +02:00
Warren Buckley
2e5562c353 Merge branch 'temp8' into temp8-3298-move-rollback 2018-10-17 10:19:42 +01:00
Warren Buckley
5c796b15ad Remove console.log 2018-10-17 11:01:33 +02:00
Shannon
d7b85397e7 Merge remote-tracking branch 'origin/temp8' into temp8-w220 2018-10-17 12:15:33 +11:00
Mads Rasmussen
16282e1007 remove old client side files for rollback 2018-10-16 14:37:00 +02:00
Mads Rasmussen
203ea8019b add language selector 2018-10-16 14:09:57 +02:00
Warren Buckley
c63c114563 Fixes the colors in the icon picker
Checked that the color picker property editor is also OK/happy as well that re-uses the <umb-color-swatches> directive/component
2018-10-16 12:58:21 +01:00
Warren Buckley
b27be1153c Merge pull request #3239 from umbraco/temp8-3092-publish-descendants
Temp8 3092 publish descendants
2018-10-16 12:20:40 +01:00
Mads Rasmussen
1c1057412e move current rollback version to infinite editor 2018-10-16 12:40:40 +02:00
Mads Rasmussen
eceec9ea3e Set rollback button to be xs + fix padding on xs buttons 2018-10-16 11:43:14 +02:00
Warren Buckley
d8f1ec5116 Merge pull request #3200 from umbraco/temp8-3087-tree-grouping
#3087 - Tree Grouping in Settings section
2018-10-16 10:14:22 +01:00
Mads Rasmussen
3d52f2676e Add possibility to extend the umb-box-header + add rollback button 2018-10-16 10:59:04 +02:00
Stephan
6e8411acaa Merge pull request #3287 from crgrieve/v8-content-app-roles
v8 ContentApp Show/Hide per user Role
2018-10-16 10:12:13 +02:00
Shannon
a100d321f6 Fixes group node route 2018-10-16 18:08:57 +11:00
Shannon
10873c1dfc Cleans up all old tree classes. woohoo! 2018-10-16 17:41:02 +11:00
Shannon
286f7b3279 Gets tree syncing working, updates the GetApplicationTrees to still return a single Root since we require this everywhere for JS, fixes full screen section and makes users a full screen section (and reduces unecessary code), removes code to avoid breaking changes from v7 2018-10-16 16:41:06 +11:00
Shannon
466d782db4 Fixes issue with umbsetdirtyonchange.directive 2018-10-16 13:18:21 +11:00
Shannon
339417b977 Merge remote-tracking branch 'origin/temp8' into temp8-3087-tree-grouping
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
2018-10-16 13:11:09 +11:00
Shannon
02eb1aef91 Updates some styles so we get the button state back, cleans up some js 2018-10-16 12:15:48 +11:00
Warren Buckley
bebc3b5f74 Remove inline mode - too many issues for now 2018-10-15 14:57:31 +01:00
Mads Rasmussen
7c1fae7462 add toolbar pinning back in 2018-10-15 15:54:54 +02:00