Merge branch 'master' into ckeditor

This commit is contained in:
azivner
2017-12-09 11:56:36 -05:00
34 changed files with 504 additions and 136 deletions

View File

@@ -27,7 +27,7 @@ const noteHistory = (function() {
historyItems = await server.get('notes-history/' + noteId);
for (const item of historyItems) {
const dateModified = getDateFromTS(item.date_modified_to);
const dateModified = getDateFromTS(item.date_modified_from);
$("#note-history-list").append($('<option>', {
value: item.note_history_id,