Commits · d89c75b63088f5a59d66c32ba8b8d866cc5853d2 · IPIPAN / ValUnifer · GitLab

Snippets Groups Projects

Jun 14, 2022
- Merge remote-tracking branch 'remotes/github/unified-frame-edit-view-vue' into... · d89c75b6
  dcz authored 2 years ago
```
Merge remote-tracking branch 'remotes/github/unified-frame-edit-view-vue' into unified-frame-edit-view-vue-dcz

# Conflicts:
#	entries/templates/unification_lexical_unit_display.html
```
  d89c75b6
- Edit view in Vue - first version · c5857f45
  dcz authored 2 years ago
  
  c5857f45
Jun 13, 2022
- Migrate LU display to Vue.js · 5dde6dfd
  Piotr Bieńkowski authored 2 years ago
  
  5dde6dfd
Jun 11, 2022
- Cleanup toggling display and edit components · e13a9a78
  Piotr Bieńkowski authored 2 years ago
  
  e13a9a78
Jun 09, 2022
- POC with Vue.js · d78616da
  dcz2 authored 2 years ago
  
  d78616da
- Importing data with original primary keys · e20a6dcd
  dcz authored 2 years ago
  
  e20a6dcd
Jun 08, 2022
- Resolve merge conflicts. · 8e3fb9f7
  dcz authored 2 years ago
```
Bugfix for slowal frame verification status.
```
  8e3fb9f7
- Correct slowal frame argument display (unification view). · 266378e6
  dcz authored 2 years ago
```
Replace slowal frame argument position.
Slowal frame status change implementation.
```
  266378e6
Jun 07, 2022
- Selecting arguments of unified frame · a0efc65b
  dcz2 authored 2 years ago
  
  a0efc65b
- Extracting LU from unified frame. · 3e797193
  dcz authored 2 years ago
```
Revert __init__.py files
```
  3e797193
Jun 06, 2022
- Merge pull request #7 from dareqx/unified-frame-edit-view-pt2 · 0148c6f4
  dareqx authored 2 years ago
```
LU details page, UI changes for UnifiedFrame
```
  0148c6f4
- LU details page, UI changes for UnifiedFrame · 75a7754c
  dcz2 authored 2 years ago
  
  75a7754c
May 27, 2022
- Second version of unified frame edit view · 65f4a77a
  dcz authored 2 years ago
  
  65f4a77a
- Merge branch 'master' into unified-frame-edit-view · 0a1e10f4
  dcz authored 2 years ago
```
# Conflicts:
#	unifier/models.py
```
  0a1e10f4
- Merge pull request #6 from dareqx/notes · 58676fc0
  dareqx authored 2 years ago
```
Small fixes and notes module
```
  58676fc0
- first stage of unified frame edit view · 4885e545
  dcz authored 2 years ago
  
  4885e545
May 26, 2022
- Small fixes and notes module · e973e232
  dcz2 authored 2 years ago
  
  e973e232
May 25, 2022
- first version of func getting unified frame · 729283db
  dcz authored 2 years ago
  
  729283db
- Listing unified frames · 7d7533ef
  dcz authored 2 years ago
  
  7d7533ef
- Moving selectional preference popup code from Slowal project. Making some... · 0ac4de1b
  dcz authored 2 years ago
```
Moving selectional preference popup code from Slowal project. Making some adjustments to database models and  API.
```
  0ac4de1b
May 24, 2022
- Importing unified frames · 22148d8f
  dcz authored 2 years ago
  
  22148d8f
May 18, 2022
- oMerge branch 'master' into new-db-structures · e4e154ec
  dcz authored 2 years ago
  
  e4e154ec
- unifier first models · 9251999b
  dcz authored 2 years ago
  
  9251999b
- Merge pull request #5 from dareqx/unification-view · 887af81f
  dareqx authored 2 years ago
```
Add a separate entries list for unification purposes
```
  887af81f
May 10, 2022
- Add a separate entries list for unification purposes · 45dc0a18
  dcz2 authored 2 years ago
  
  45dc0a18
Apr 09, 2022
- Merge pull request #4 from dareqx/user-management · e785df5b
  dareqx authored 2 years ago
```
Setting, resetting password, e-mail conf, standarize quotes
```
  e785df5b
Apr 08, 2022
- Setting, resetting password, e-mail conf, standarize quotes · 0d4eb81b
  dcz2 authored 2 years ago
  
  0d4eb81b
Apr 07, 2022
- Merge pull request #3 from dareqx/user-management · db5bbe1f
  dareqx authored 2 years ago
```
User management, pt 1
```
  db5bbe1f
- Auth views, creating Permissions and Groups, static files cache bump · 5d5c05e5
  dcz2 authored 2 years ago
  
  5d5c05e5
Apr 06, 2022
- Merge pull request #2 from dareqx/reset-db-fixes · 6e102b04
  dareqx authored 2 years ago
```
Bring reset_db back to life
```
  6e102b04
- Make reset_db great again · ab61355a
  dcz2 authored 2 years ago
  
  ab61355a
- Merge pull request #1 from dareqx/user-management · d520dc78
  dareqx authored 2 years ago
```
Dockerize the project and load settings from environment variables
```
  d520dc78
Apr 05, 2022
- Dockerize the project and load settings from environment variables · 50e42deb
  dcz2 authored 2 years ago
  
  50e42deb
- +zależności · dea7b8c7
  dcz authored 2 years ago
  
  dea7b8c7
- +dane poptrzebne do ładowania bazy · e624a023
  dcz authored 2 years ago
  
  e624a023
- +settings.py · 772bf5a8
  dcz authored 2 years ago
  
  772bf5a8
Apr 04, 2022
- Zmiany poptrzebne do ładowania bazy · bef33217
  dcz authored 2 years ago
  
  bef33217
Jan 10, 2022
- fix: moved num prefs field from frame to arg · f4e940a0
  Kasia Krasnowska authored 3 years ago
  
  f4e940a0
- fix: or/other now forbidden only as siblings · d683a96a
  Kasia Krasnowska authored 3 years ago
  
  d683a96a
Dec 02, 2021
- temporarily removed argument->position form field · 96c5ec1f
  Kasia Krasnowska authored 3 years ago
  
  96c5ec1f