yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,222 Commits 4 Branches 7 Tags
162b90194de27d3353aba0dbe53bc5bc6cc14a8b
Commit Graph

26222 Commits

This Branch
This Branch
All Branches
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
Stephan
421cbf979c Cleanup rollback in content service 2018-10-19 12:47:04 +02:00
Stephan
89510148ac Merge branch 'temp8' into temp8-3298-move-rollback 2018-10-19 11:55:44 +02:00
elitsa
40424b805b Merge remote-tracking branch 'origin/temp8' into temp8-sendToPublish 2018-10-19 11:40:56 +02:00
Bjarne Fyrstenborg
25d9e432c3 Remove space 2018-10-19 11:32:17 +02:00
Bjarne Fyrstenborg
a23901c07a Enable email address as macro parameter editor 2018-10-19 11:32:17 +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
Søren Kottal
1b0581bfce xml comments for ImageCropMode 2018-10-19 11:26:33 +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
239112a1de notes 2018-10-19 15:45:05 +11:00
Shannon
abeb4e04e5 Enhance implementation of ObservableDictionary so we can re-use this in more places, changes CultureNameCollection to ObservableDictionary, fixes issue with dirty tracking changed property type collections ... this was working by pure fluke before! Fixes more tests. 2018-10-19 15:41:28 +11:00
Shannon
8dfb0dc35c more send to translate cleanup 2018-10-19 13:25:06 +11: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
Shannon
71fd47f452 Fixes issue of observable collections, event binding and deep cloning 2018-10-19 08:45:53 +11:00
Shannon
b30f55ea30 Fixes issue of observable collections, event binding and deep cloning 2018-10-19 08:26:17 +11:00
Warren Buckley
6c459c5117 OK I think we are finally done with C# for Audit 
Wraps with a scope so Audit can be fired & the Rollback events can be emitted
 2018-10-18 15:51:22 +01:00
Warren Buckley
f3ce005cbf Added in some TODOs 
Fix log message for success of save
 2018-10-18 15:25:11 +01:00
Warren Buckley
6850599ce9 Remove the emtpy folders from CSProj in the legacy umbraco.presentation folder 2018-10-18 15:04:40 +01:00
Warren Buckley
1efe90ba1d More rollback .aspx dialogs removed 2018-10-18 14:54:29 +01:00
Warren Buckley
d4bf084b82 Merge branch 'temp8-3298-move-rollback' of https://github.com/umbraco/Umbraco-CMS into temp8-3298-move-rollback 2018-10-18 14:33:12 +01:00
Warren Buckley
321313f134 Remove rollback .aspx dialog 2018-10-18 14:32:44 +01:00
Mads Rasmussen
b78a4c2f88 Merge branch 'temp8-3298-move-rollback' of https://github.com/umbraco/Umbraco-CMS into temp8-3298-move-rollback 2018-10-18 15:26:02 +02:00
Mads Rasmussen
0f528a7a89 disable roll back button when no version is selected 2018-10-18 15:25:17 +02:00
Warren Buckley
4a797781a6 Merge branch 'temp8-3298-move-rollback' of https://github.com/umbraco/Umbraco-CMS into temp8-3298-move-rollback 2018-10-18 14:24:50 +01:00
Warren Buckley
6f7d0c3a45 Move logic out of controller into a Rollback method in the service level 2018-10-18 14:24:32 +01: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
Stephan
2b83b44c9c Fix ContentService.GetPagedChildren 2018-10-18 14:25:35 +02:00
Stephan
510666cd7e ContentService.GetPagedChildren is broken? 2018-10-18 14:25:35 +02:00
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
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
Shannon
a163f79526 Merge remote-tracking branch 'origin/temp8' into temp8-dirty-tracking-on-variants 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/Content.cs
 2018-10-18 22:52:15 +11:00
Shannon
f1ca32ea54 Cleaning up the log/audit trail usage, removing duplicate and unecessary entries and adding new cols 2018-10-18 22:47:12 +11:00
Shannon
6cd9102fac Gets publish names tracking changes, adds unit tests 2018-10-18 21:12:55 +11:00
Robert
15f5e9a98e Typo in lazyload JS path for AuthUpgrade page 2018-10-18 11:25:05 +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