Commits · 4b5a0ea8798448a7f78ed3e41db9d91470780553 · minerva / core · GitLab

Snippets Groups Projects

Feb 08, 2019
- Merge remote-tracking branch 'remotes/origin/devel_12.1.x' into 659-updateUser-fix · 4b5a0ea8
  Sascha Herzinger authored 6 years ago
  
  # Conflicts: # frontend-js/src/main/js/ServerConnector.js
  4b5a0ea8
- fixed privilege check to map back-end checks · dda185dc
  Sascha Herzinger authored 6 years ago
  
  dda185dc
Feb 06, 2019
- Merge branch 'changelog' into 'devel_12.1.x' · 69929e66
  Piotr Gawron authored 6 years ago
  
  changelog See merge request !619
  v12.1.7
  
  69929e66
- changelog · 08ab0736
  Piotr Gawron authored 6 years ago
  
  08ab0736
- Merge branch '659-privileges-not-saved' into 'devel_12.1.x' · d6c3fa41
  Piotr Gawron authored 6 years ago
  
  fixing regression bug See merge request !609
  d6c3fa41
Feb 04, 2019
- fixing test · f4e20add
  Sascha Herzinger authored 6 years ago
  
  f4e20add
- fixing regression bug · bf776824
  Sascha Herzinger authored 6 years ago
  
  bf776824
Jan 29, 2019
- Merge branch 'drug-issue' into 'devel_12.1.x' · 0f014818
  Piotr Gawron authored 6 years ago
  
  Drug issue See merge request !602
  v12.1.6
  
  0f014818
Jan 28, 2019
- changelog updated · c4d7bc22
  Piotr Gawron authored 6 years ago
  
  c4d7bc22
- sometimes there are issues with pubmed annotations (they have whitespaces) · 0a1b7b08
  Piotr Gawron authored 6 years ago
  
  0a1b7b08
- changelog updated · 13fa24eb
  Piotr Gawron authored 6 years ago
  
  13fa24eb
- Merge branch '623-user-login-denied-in-proper-branch' into 'devel_12.1.x' · 148531c7
  Piotr Gawron authored 6 years ago
  
  Resolve "New user 1-st log in throw access denied" See merge request !601
  148531c7
- method should always return the same type · 50134305
  Piotr Gawron authored 6 years ago
  
  50134305
- do not attempt to update privileges if not authorized · ccaa3905
  Piotr Gawron authored 6 years ago
  
  ccaa3905
- Merge branch '653-change-warning-message-in-proper-branch' into 'devel_12.1.x' · 4da44009
  Piotr Gawron authored 6 years ago
  
  changed warning text See merge request !600
  4da44009
- changed warning text · 6c976c8f
  Piotr Gawron authored 6 years ago
  
  6c976c8f
Jan 22, 2019
- Merge branch '638-if-custom-overlay' into 'devel_12.1.x' · f1fe0b2d
  Piotr Gawron authored 6 years ago
  
  Resolve "If Custom Overlay = 0, error 403 displays" See merge request !588
  f1fe0b2d
- changelog updated · add1af4c
  Piotr Gawron authored 6 years ago
  
  add1af4c
- upload of files doesn't check privileges on overlays and projects · e516a2b0
  Piotr Gawron authored 6 years ago
  
  e516a2b0
- Merge branch '640-setting-reactants' into 'devel_12.1.x' · dc6408ee
  Piotr Gawron authored 6 years ago
  
  Resolve "Setting reactants, modifiers and products sometimes fails in getCompleteReactionById" See merge request !587
  dc6408ee
- changelog updated · 96ba013b
  Piotr Gawron authored 6 years ago
  
  96ba013b
- parallel calls to fetch reaction could cause a problem · 072ac62c
  Piotr Gawron authored 6 years ago
  
  072ac62c
- Merge branch '642-logo-on-login-page' into 'devel_12.1.x' · c7172518
  Piotr Gawron authored 6 years ago
  
  Resolve "logo on login page doesn't work" See merge request !586
  c7172518
- changelog updated · 355e2922
  Piotr Gawron authored 6 years ago
  
  355e2922
- when logo is provided as full url the image is not broken on the login page · 8dfb8d2d
  Piotr Gawron authored 6 years ago
  
  8dfb8d2d
Jan 10, 2019
- Merge branch '611-custom-overlays' into 'devel_12.1.x' · 57d429dd
  Piotr Gawron authored 6 years ago
  
  Resolve "disable "Add overlay" button or improve error message `403` when number of custom layout is greater equal `CUSTOM_LAYOUTS`" See merge request !572
  v12.1.5
  
  57d429dd
- changelog · f2ae74c7
  Piotr Gawron authored 6 years ago
  
  f2ae74c7
- error message improved · 2f0223f2
  Piotr Gawron authored 6 years ago
  
  2f0223f2
- Merge branch '633-table-header' into 'devel_12.1.x' · 4be85dca
  Piotr Gawron authored 6 years ago
  
  word wrapping for Firefox fixed; word wrapping is disabled for xolumns that don't require it See merge request !571
  4be85dca
- word wrapping for Firefox fixed; word wrapping is disabled for xolumns that don't require it · b5898d2a
  Piotr Gawron authored 6 years ago
  
  b5898d2a
Jan 09, 2019
- Merge branch '635-change-in-drugbank' into 'devel_12.1.x' · d7020eae
  Piotr Gawron authored 6 years ago
  
  db script cleaning cached values after drugbank change See merge request !570
  d7020eae
- db script cleaning cached values after drugbank change · b1491b6c
  Piotr Gawron authored 6 years ago
  
  b1491b6c
- Merge branch '635-change-in-drugbank' into 'devel_12.1.x' · 1d938aa4
  Piotr Gawron authored 6 years ago
  
  drugbank responses changed See merge request !568
  1d938aa4
- drugbank responses changed · 1b945e66
  Piotr Gawron authored 6 years ago
  
  1b945e66
Dec 28, 2018
- Merge branch '621-cannot-interact-with-overlay-with-long-filename' into 'devel_12.1.x' · 34fbf66d
  Piotr Gawron authored 6 years ago
  
  Resolve "cannot interact with overlay with long filename" See merge request !559
  v12.1.4
  
  34fbf66d
- changelog updated · 72647958
  Piotr Gawron authored 6 years ago
  
  72647958
- enforced word wrapping added for overlay columns · 390bf495
  Piotr Gawron authored 6 years ago
  
  390bf495
Dec 27, 2018
- Merge branch '611-custom-overlays' into 'devel_12.1.x' · 3ad4baec
  Piotr Gawron authored 6 years ago
  
  Resolve "disable "Add overlay" button or improve error message `403` when number of custom layout is greater equal `CUSTOM_LAYOUTS`" See merge request !558
  3ad4baec
- Merge branch '600-disable-add-project' into 'devel_12.1.x' · 92e45bd6
  Piotr Gawron authored 6 years ago
  
  Resolve "disable "ADD PROJECT" button or improve error message `403` when `ADD_MAP = 0`" See merge request !557
  92e45bd6
- changlog updated · 2cc23c11
  Piotr Gawron authored 6 years ago
  
  2cc23c11