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

25514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warren Buckley
aa86f5b135 Merge branch 'temp8-3298-move-rollback' of https://github.com/umbraco/Umbraco-CMS into temp8-3298-move-rollback 2018-10-18 13:13:20 +01:00
Warren Buckley
a40a6e8f35 WIP: Adds logging & audit message 
Fixes the filtering & dates to display in the version list
 2018-10-18 13:13:11 +01: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
bdf474f111 Typo in lazyload JS path for AuthUpgrade page 2018-10-18 09:06:46 +01:00
Warren Buckley
f0d12f7915 Merge remote-tracking branch 'origin/temp8' into temp8-3298-move-rollback 2018-10-18 08:42:43 +01:00
Robert
ace5c07987 Merge pull request #3152 from umbraco/temp8-w220 
Fixes: List view searching needs to search on variant names
 2018-10-18 08:51:32 +02:00
Mads Rasmussen
ab34deb726 add diff 2018-10-17 20:37:15 +02:00
Stephan
15968bc99b Fix dates in document versions 2018-10-17 17:27:39 +02:00
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
Stephan
581658086f Fix KeyValueService for proper initialization 2018-10-17 15:11:00 +02:00
Stephan
e80ea9830c Fix bad LockDto primary key w/migration 2018-10-17 15:11:00 +02:00
Stephan
71cec84f78 Fix MigrationExpressionBase, minor typo 2018-10-17 15:11:00 +02:00
Stephan
d324466fe1 Fix LockDto, had wrong primary key + missing rows 2018-10-17 15:11:00 +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
Stephan
7c1c6f6806 Fix AlterTableBuilder, was ignoring primary keys 2018-10-17 13:57:35 +02: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
Shannon
69640515cf fixes issue with sorting on published 2018-10-17 13:44:24 +11:00
Shannon
d7b85397e7 Merge remote-tracking branch 'origin/temp8' into temp8-w220 2018-10-17 12:15:33 +11: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