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

25482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warren Buckley
b358fd5e2d Merge branch 'temp8-3298-move-rollback' of https://github.com/umbraco/Umbraco-CMS into temp8-3298-move-rollback 2018-10-17 15:10:06 +01:00
Warren Buckley
fff7891e53 Filter rollback version to display the VariantDisplay model instead 2018-10-17 15:09:29 +01: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
27ce1f34bb Make the JSON model over the API control be the correct casing & make Mads happy :) 2018-10-17 13:24:23 +01:00
Warren Buckley
d9864eb6d6 * Make the culturename nullable for invariant content 
* fallback to update date and writer id if its not published
 2018-10-17 13:19:09 +01:00
Warren Buckley
c05495f358 WIP: Adds a new API endpoint in the editor/webapi for ContenController to list rollback versions available for a culture 2018-10-17 12:15:57 +01: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
Mads Rasmussen
fd6f9fc83b remove rollback context menu item 2018-10-16 15:11:47 +02:00
Stephan
6346710b97 Fix tests 2018-10-16 15:05:17 +02: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
Warren Buckley
982fb46e7d Fix failing unit test - number of trees gone down as we have removed the user tree (as this is now a fullscreen/wide section/app only) 2018-10-16 11:16:45 +01: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
f868172f48 Cleanup 2018-10-16 10:58:17 +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
831657537f tree webforms cleanup 2018-10-16 16:56:28 +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
Stephan
7757c7060e Refactor ManifestContentAppDefinition for roles 2018-10-15 15:48:26 +02:00
Stephan
575d7a3ae7 Cleanup 2018-10-15 14:44:26 +02:00
Carole Rennie Logan
64d7caee78 Update src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs 
Rework logic on content app permissoins. Roles should override all other.
 2018-10-14 19:24:18 +01:00
Carole Rennie Logan
3a6f2545f6 Update src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs 
making it case insensitive
 2018-10-14 17:38:38 +01: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
Lotte Pitcher
a3de30934d Re-adding the language keys for login greeting on a Sunday (greeting0) that were accidentally removed 2018-10-14 16:56:18 +02:00
Sebastiaan Janssen
c23f01e74d Merge pull request #3278 from tcmorris/patch-2 
Update v8 getting started
 2018-10-14 13:07:32 +02:00
Thomas Morris
00afea61f0 Update v8 getting started 
Update link so that it doesn't 404 and replace with relevant link.
 2018-10-14 10:49:50 +01:00
Sebastiaan Janssen
b78f13bd9b Merge pull request #3274 from MMasey/fix-lazyload-reference 
Update lazyload.js reference on install pages.
 2018-10-14 10:49:22 +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
91a64c9ea9 Merge branch 'temp8-remove-bower' of https://github.com/umbraco/Umbraco-CMS into temp8-remove-bower 2018-10-11 14:51:09 +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
Warren Buckley
e902bb08f6 Removes installing bower from the build powershell 2018-10-11 13:37:20 +01: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