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

22066 Commits

Author SHA1 Message Date
Stephan
9320c1a061 Cleanup variants dirty tracking 2018-10-23 15:38:47 +02:00
Stephan
9699e6cb71 Merge branch 'temp8' into temp8-dirty-tracking-on-variants 2018-10-23 10:51:28 +02:00
Mads Rasmussen
1badcd0b29 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-10-23 10:32:33 +02:00
Mads Rasmussen
76eb809b2c Fix list view property editors. Use "display: block" for instead of "inline block" 2018-10-23 10:31:54 +02:00
Warren Buckley
e3c6cfa63c Merge pull request #3312 from umbraco/temp8-3298-move-rollback 
Temp8 3298 move rollback
 2018-10-23 09:28:41 +01:00
Stephan
d2cfe8f3b9 Fix GetVersionsSlim 2018-10-22 18:21:00 +02:00
Stephan
3468351de8 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-10-22 17:20:19 +02:00
Mads Rasmussen
78fb52f788 fix size of publish state in publish dialog 2018-10-22 17:04:56 +02:00
Mads Rasmussen
7265d329ea Alwyas show ellipsis for unpublish. It will always open a dialog 2018-10-22 15:56:08 +02:00
Stephan
8976a6cce3 Show language ISO code in list 2018-10-22 10:34:14 +02:00
Stephan
d49e06255c Fix upgrade message 2018-10-22 10:34:04 +02:00
Stephan
f46b7ca7b1 Rollback uses GetVersionsSlim 2018-10-22 08:45:30 +02:00
Chris Houston
c401782d5e Added clean-css to the client side build process (#3371) 2018-10-21 16:27:39 +02:00
Chris Houston
4ef9c3f086 When typing to configure some of the data types on a small width screen ( mobile or very narrow browser window ) the editing controls for some of the data types did not wrap underneath the titles and in some cases they disappeared completely. 
This adds a 100% width on small screen sizes and then reverts back to the original 60% width after 800px's.
 2018-10-21 11:23:08 +02:00
Carole Rennie Logan
7071b21db7 Updating example content app manifest 
Including roles
 2018-10-21 10:41:17 +02:00
Warren Buckley
f37f679031 Adds ContentApps to the Composition extension methods 2018-10-19 15:19:37 +01:00
Jamie Townsend
0f2381a94d Merge multiple ng-if attributes 2018-10-19 15:19:22 +02:00
Bjarne Fyrstenborg
8e1065a2b6 Fix missing semicolons and remove comma at end 2018-10-19 15:08:17 +02:00
Mads Rasmussen
126a834ad4 fix installer facts 2018-10-19 14:49:27 +02:00
Mads Rasmussen
b75f41b3f6 fix user cards grid 2018-10-19 14:25:15 +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
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