github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5645 from overleaf/em-history-origin

Browse source 
Identify resyncs in the history panel

GitOrigin-RevId: 5c96f0f1be68bfb05954457a7d5b72b4cec6c607
This commit is contained in:
Eric Mc Sween 2021-11-02 09:01:14 -04:00 committed by Copybot
parent 0ee93793e3
commit 0449e6c2a2
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
services/web/app/views/project/editor/history/entriesListV2.pug
View file

@ -176,7 +176,19 @@ script(type="text/ng-template", id="historyEntryTpl")
ng-if="::update_user == null"
ng-style="$ctrl.getUserCSSStyle(update_user);"
) #{translate("anonymous")}
li.history-entry-metadata-user(ng-if="::$ctrl.entry.meta.users.length == 0")
li.history-entry-metadata-user(
ng-if="::$ctrl.entry.meta.origin"
ng-switch on="::$ctrl.entry.meta.origin.kind"
)
span.name(
ng-switch-when="history-resync"
ng-style="$ctrl.getUserCSSStyle()"
) #{translate("history_resync")}
span.name(
ng-switch-default
ng-style="$ctrl.getUserCSSStyle()"
) #{translate("anonymous")}
li.history-entry-metadata-user(ng-if="::!$ctrl.entry.meta.origin && $ctrl.entry.meta.users.length == 0")
span.name(
ng-style="$ctrl.getUserCSSStyle();"
) #{translate("anonymous")}

3
services/web/locales/en.json
View file

@ -1522,5 +1522,6 @@
"showing_x_results_of_total": "Showing __x__ results of __total__",
"showing_x_results": "Showing __x__ results",
"showing_1_result": "Showing 1 result",
"showing_1_result_of_total": "Showing 1 result of __total__"
"showing_1_result_of_total": "Showing 1 result of __total__",
"history_resync": "History Resync"
}