yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,712 Commits 4 Branches 7 Tags
2af2a9b77fd9d74d50dba598cd076edccf59920b
Commit Graph

7312 Commits

Author SHA1 Message Date
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
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
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
Tim Payne
f394af20d0 Update umbsections.directive.js 
Update the number of sections to the actual number of sections available at the present time, add a fix to the calculateWidth method so that if less items are allowed than available but there is technically enough room to show them the overflow tray still shows up.

On prior version, try adding translation to your allowed user group sections and reload, you can't see the translation section in the top menu, but the overflow menu button won't show until you shrink the screen.
 2018-10-14 18:04:39 +02:00
Carole Rennie Logan
1f072a383e ContentApp Show/Hide per user Role 
Making content app work show hide in manifest work for user roles. for example:

 "show": [
                "+role/admin"
            ]
 2018-10-14 15:56:22 +01:00
Kim Holzmann
7a474c6fa4 #3219 Validation error on templates when clicking "save" 
Error with use of savebutton fixed, use the suppressNotification value to check state.
 2018-10-14 15:23:31 +02:00
Jamie Townsend
fb277d80e7 Fix for old password not showing/hiding correctly on admin users page #3069 (#3273) 2018-10-14 13:34:16 +02:00
Mike Masey
fe906f0e81 Update lazyload.js reference on install pages. 2018-10-13 17:59:43 +01:00
Warren Buckley
bbc28b132d Merge pull request #3260 from umbraco/temp8-remove-bower 
Temp8 remove bower
 2018-10-11 14:38:45 +01:00
Mads Rasmussen
9800f1bd9c fix paths in karma test 2018-10-11 15:31:39 +02:00
Mads Rasmussen
4f00082dd5 fix angular mocks 2018-10-11 15:06:12 +02:00
Mads Rasmussen
6071be79be set private to true in package.json. We don't need to publish on npm 2018-10-11 14:50:34 +02:00
Mads Rasmussen
e390d28e29 fix jquery-ui 2018-10-11 14:34:02 +02:00
Warren Buckley
ac5ee9053f Update & match momentjs version 2018-10-11 13:32:15 +01:00
Warren Buckley
ecaedc547a Fixes moment locale copying 2018-10-11 13:31:54 +01:00
Mads Rasmussen
a00875089c get the right version of ace 2018-10-11 14:10:18 +02:00