Merge remote-tracking branch 'remotes/github/unified-frame-edit-view-vue-dcz'...
Merge remote-tracking branch 'remotes/github/unified-frame-edit-view-vue-dcz' into unified-frame-edit-view-vue-dcz # Conflicts: # entries/static/entries/js/components/LexicalUnitEdit.js
Showing
- common/templates/base.html 2 additions, 0 deletionscommon/templates/base.html
- dictionary_statistics/views.py 2 additions, 0 deletionsdictionary_statistics/views.py
- entries/static/entries/js/components/Entries.js 3 additions, 4 deletionsentries/static/entries/js/components/Entries.js
- entries/static/entries/js/components/LexicalUnitDisplay.js 0 additions, 1 deletionentries/static/entries/js/components/LexicalUnitDisplay.js
- entries/static/entries/js/components/LexicalUnitEdit.js 43 additions, 47 deletionsentries/static/entries/js/components/LexicalUnitEdit.js
- entries/static/entries/js/components/UnificationComponent.js 3 additions, 4 deletionsentries/static/entries/js/components/UnificationComponent.js
- entries/static/entries/js/unification_entries_for_frames_list.js 2 additions, 2 deletions.../static/entries/js/unification_entries_for_frames_list.js
- entries/static/entries/js/unification_entries_list.js 2 additions, 2 deletionsentries/static/entries/js/unification_entries_list.js
- entries/static/entries/js/unification_frames_list.js 1 addition, 1 deletionentries/static/entries/js/unification_frames_list.js
- entries/views.py 46 additions, 11 deletionsentries/views.py
- phrase_expansions/views.py 3 additions, 2 deletionsphrase_expansions/views.py
- unifier/views.py 2 additions, 0 deletionsunifier/views.py
Please register or sign in to comment