Commits · 9b146c33eee257b6c6c9e0add3ffb65a4e52d44f · minerva / core

Nov 12, 2018
- directory attribute removed · 9b146c33
  Piotr Gawron authored 6 years ago
  
  9b146c33
- layout moved to project and layout contains set of image layers if necessary · b71000ee
  Piotr Gawron authored 6 years ago
  
  b71000ee
Nov 09, 2018
- every dataOverlay is connected to not empty project · a20361dd
  Piotr Gawron authored 6 years ago
  
  a20361dd
- Merge branch '546-inform-about-exceeding-max-number-of-search-results' into 'master' · 92591d63
  Piotr Gawron authored 6 years ago
  
  Resolve "Inform about exceeding max number of search results" Closes #546 See merge request !496
  92591d63
- warning when search result hits maximum · 55c49edc
  Piotr Gawron authored 6 years ago
  
  55c49edc
- common code extracted · 606847cc
  Piotr Gawron authored 6 years ago
  
  606847cc
Nov 08, 2018
- Merge branch '551-custom-semantic-zoom-pathways-and-compartments-are-not-displayed' into 'master' · 15409aa1
  Piotr Gawron authored 6 years ago
  
  Resolve "Custom semantic zoom - pathways and compartments are not displayed" Closes #551 See merge request !495
  15409aa1
- draw artifital compartments in non semantic view · 9fa5afc5
  Piotr Gawron authored 6 years ago
  
  9fa5afc5
Nov 07, 2018
- Merge branch 'conversion-rest-api-scaling' into 'master' · a45edad8
  Piotr Gawron authored 6 years ago
  
  Conversion rest api scaling Closes #552 See merge request !494
  a45edad8
- warning changed to debug info · cb94a04b
  Piotr Gawron authored 6 years ago
  
  cb94a04b
- extending of empty line is handled better · 47e1f561
  Piotr Gawron authored 6 years ago
  
  47e1f561
- changelog updated · a362a948
  Piotr Gawron authored 6 years ago
  
  a362a948
- clean imports · 02de8a9c
  Piotr Gawron authored 6 years ago
  
  02de8a9c
- disable debug logs from jsbml library · e147c691
  Piotr Gawron authored 6 years ago
  
  e147c691
- storke width is accessed only when it's set · 049da1ff
  Piotr Gawron authored 6 years ago
  
  049da1ff
- proper operator type is used for heterodimer association · 688be9a5
  Piotr Gawron authored 6 years ago
  
  688be9a5
- unit test checking if model is the same after translation: CellDesigner->Sbml->CellDesigner · eaecc1df
  Piotr Gawron authored 6 years ago
  
  eaecc1df
- sbml unit factors are exported and imported proeprly · f6d12bb6
  Piotr Gawron authored 6 years ago
  
  f6d12bb6
- operator is proper for heterodimer association + reaction line coordinates are in proper order · 11ea9346
  Piotr Gawron authored 6 years ago
  
  11ea9346
- element are differntaite also on the complex in which they are placed · a43388a6
  Piotr Gawron authored 6 years ago
  
  a43388a6
- when layout is defined try to determine complex-child relation · eaffd32c
  Piotr Gawron authored 6 years ago
  
  eaffd32c
- position to compartment removed · 72bfaa1a
  Piotr Gawron authored 6 years ago
  
  72bfaa1a
- line width of species is exported/imported · ad0743b4
  Piotr Gawron authored 6 years ago
  
  ad0743b4
- export of inital amount added · 0c7d8b37
  Piotr Gawron authored 6 years ago
  
  0c7d8b37
- unit test showing that exporting/importing heterodimer association creates inconsistent model · 6f779b1d
  Piotr Gawron authored 6 years ago
  
  6f779b1d
- missing test file · ce4893f3
  Piotr Gawron authored 6 years ago
  
  ce4893f3
- unit test showing that conversion via sbml doesn't work · 35af2c91
  Piotr Gawron authored 6 years ago
  
  35af2c91
- error message is more verbose when gate data is invalid · 3f9653b7
  Piotr Gawron authored 6 years ago
  
  3f9653b7
- initial concentration is parsed properly · 1143e49e
  Piotr Gawron authored 6 years ago
  
  1143e49e
Nov 06, 2018

test file was generated by old bugged code · f833c73f
Piotr Gawron authored 6 years ago

f833c73f
export to CellDesigner properly resolves inhibition coordinates · d00e9093
Piotr Gawron authored 6 years ago

d00e9093
Failing test CD->SBML->image · 736bd99b
David Hoksza authored 6 years ago

736bd99b
data-binary needed when using curl · 7d4726ea
David Hoksza authored 6 years ago

7d4726ea
Merge branch 'stop-the-madness' into 'master' · dc6a6b4c
Piotr Gawron authored 6 years ago
```
Stop the madness

See merge request !492
```
dc6a6b4c
Reapplying // fix to files that were undone by merging · 76a8e37e
Sascha Herzinger authored 6 years ago

76a8e37e

Merge remote-tracking branch 'remotes/origin/master' into stop-the-madness · 8b5ebcb5

# Conflicts:
#	model/src/main/java/lcsb/mapviewer/model/graphics/ArrowType.java
#	model/src/main/java/lcsb/mapviewer/model/map/MiriamType.java
#	model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementTypeGroup.java
#	model/src/test/java/lcsb/mapviewer/model/AllModelTests.java
#	model/src/test/java/lcsb/mapviewer/model/log/AllLogTests.java
#	persist/src/test/java/lcsb/mapviewer/persist/AllDbTests.java
#	persist/src/test/java/lcsb/mapviewer/persist/dao/AllDaoTests.java
#	persist/src/test/java/lcsb/mapviewer/persist/dao/log/AllLogTests.java
#	service/src/main/java/lcsb/mapviewer/services/utils/data/BuildInLayout.java
#	service/src/main/java/lcsb/mapviewer/services/utils/data/ColorSchemaColumn.java
#	service/src/test/java/lcsb/mapviewer/services/impl/LayoutServiceTest.java
#	service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceTest.java

Comment: Resolved by "Accept Theirs".
Will fix the comments again via regex rather than manual merging.

8b5ebcb5

Nov 05, 2018
- Merge branch '553-change-arrows-for-transcription-starting-sites' into 'master' · ae031939
  Piotr Gawron authored 6 years ago
  
  Resolve "change arrows for Transcription Starting Sites" Closes #553 See merge request !491
  ae031939
- cleaning imports · 2bb916cb
  Piotr Gawron authored 6 years ago
  
  2bb916cb
- name of the transcription factor is drawn · a81228d9
  Piotr Gawron authored 6 years ago
  
  a81228d9
- cleaning unit test · 8b405df4
  Piotr Gawron authored 6 years ago
  
  8b405df4

Admin message