scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-16 14:17:00 +08:00
Code Issues Projects Releases Packages Wiki Activity
10639 commits 31 branches 181 tags 167 MiB
Commit graph

10639 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Kriuchykhin
0459602327
Merge pull request #3415 from okriuchykhin/ok_SCI_5844 
Add biomolecular toolkit license endpoint [SCI-5844]
 2021-07-21 13:17:56 +02:00
Oleksii Kriuchykhin
b69ed98e13 Add biomolecular toolkit license endpoint [SCI-5844] 2021-07-21 13:16:27 +02:00
Alex Kriuchykhin
e881bf32ae
Merge pull request #3414 from okriuchykhin/ok_SCI_5843 
Add biomolecular toolkit API proxying endpoint [SCI-5843]
 2021-07-21 13:14:04 +02:00
Alex Kriuchykhin
dbc54278b2
Merge pull request #3211 from okriuchykhin/ok_SCI_5531 
Add basic API client for BMT [SCI-5531]
 2021-07-21 13:13:52 +02:00
Oleksii Kriuchykhin
36708b47cf Fix code styling [SCI-5531] 2021-07-21 13:10:30 +02:00
artoscinote
de3d6871a6
Merge pull request #3449 from biosistemika/build_db_error_fix 
Fixed db error during build
 2021-07-20 13:28:09 +02:00
aignatov-bio
067758808e
Add download heml button to file preview [SCI-5876] (#3423) 
* Add download heml button to file preview [SCI-5876]

* Remove safe navigation
 2021-07-20 13:22:42 +02:00
aignatov-bio
4de35c983a
Open HELM files in bio eddie [SCI-5890] (#3442) 2021-07-20 13:06:47 +02:00
Martin Artnik
c43e1cfbe5 Fixed db error during build 2021-07-20 10:20:47 +02:00
artoscinote
888131a465
Merge branch 'features/bioeddie-integration' into ma_SCI_5879 2021-07-20 09:48:13 +02:00
artoscinote
3a281ce9dc
Merge pull request #3433 from artoscinote/ma_SCI_5607 
Also send notification to the user that was unassigned from task [SCI-5607]
 2021-07-20 09:41:46 +02:00
Martin Artnik
026bc1eaae Fixed migration [SCI-5902] 2021-07-20 09:35:39 +02:00
artoscinote
51b483e80c
Merge pull request #3448 from artoscinote/ma_SCI_5547 
Copy fix [SCI-5547]
 2021-07-20 09:28:40 +02:00
aignatov-bio
53456988ba
Add bioEddie activities and user licenses [SCI-5845][SCI-5842] (#3411) 
* Add bio eddie licens to users [SCI-5845]

* Add activities for BioEddie [SCI-5842]
 2021-07-19 21:33:28 +02:00
Martin Artnik
f55761a491 Invite member search design fixes [SCI-5892] 2021-07-19 15:42:26 +02:00
artoscinote
5f9c04844f
Added prefixed IDs to repository rows (items) [SCI-5909] (#3441) 
* Added prefixed IDs to repository rows (items) [SCI-5909]

* Fix prefixed id queries to work with joins, use subquery in repository search [SCI-5909]

* Fixed accessing repository_row parent code [SCI-5909]

* Better handling of repository_row code display [SCI-5909]

* Fix index warning for id prefixed models issue setting up project [SCI-5909]
 2021-07-19 14:23:36 +02:00
Martin Artnik
9bf02a02b9 Copy fix [SCI-5547] 2021-07-19 13:01:55 +02:00
Martin Artnik
c4b106f2b8 Fix style of experiment id in dropdown [SCI-5893] 2021-07-19 12:53:15 +02:00
Martin Artnik
71aa418dc6 Fixed UX issues in user invites modal [SCI-5898] 2021-07-19 12:39:18 +02:00
Miha Mencin
2ff19263fa
Merge pull request #3444 from biosistemika/hotfix/1.22.3 
Hotfix/1.22.3
 2021-07-19 10:32:51 +02:00
miha
4bfc52b583 Bump version to 1.22.3 2021-07-19 10:16:05 +02:00
Oleksii Kriuchykhin
afe376b3a3 Fix sorting by role with filtering in team members table [SCI-5908] 2021-07-19 10:15:12 +02:00
Alex Kriuchykhin
54c07cfd08
Merge pull request #3428 from ZmagoD/fix-merge-issues 
Fx merge issues
 2021-07-19 09:59:38 +02:00
Alex Kriuchykhin
ef6c46a19c
Merge pull request #3431 from biosistemika/dependabot/bundler/addressable-2.8.0 
Bump addressable from 2.7.0 to 2.8.0
 2021-07-19 09:56:07 +02:00
Martin Artnik
a8f8ab8ba9 Implement label templates with default ZPL template [SCI-5902] 2021-07-19 09:44:14 +02:00
Oleksii Kriuchykhin
1c8b32dffc Add biomolecular toolkit API proxying endpoint [SCI-5843] 2021-07-16 15:58:40 +02:00
artoscinote
7940eb8465
Merge pull request #3440 from okriuchykhin/ok_SCI_5908 
Fix sorting by role with filtering in team members table [SCI-5908]
 2021-07-16 11:39:42 +02:00
Oleksii Kriuchykhin
7204e47ba5 Fix sorting by role with filtering in team members table [SCI-5908] 2021-07-16 10:49:41 +02:00
Martin Artnik
96a5b97bdb Implement Save & Register molecule [SCI-5879] 2021-07-15 12:37:04 +02:00
Miha Mencin
f313a88cf4
Merge pull request #3437 from biosistemika/develop 
release 1.22.2
 2021-07-14 09:23:57 +02:00
Miha Mencin
47b04a175d
Bump version to 1.22.2 2021-07-14 09:20:00 +02:00
Miha Mencin
2483b0a79a
Merge pull request #3436 from biosistemika/master 
Master to dev for release 1.22.2
 2021-07-14 09:17:48 +02:00
Miha Mencin
76511ac110
Merge pull request #3435 from artoscinote/ma_SCI_5900 
Fix free invite users modal [SCI-5900]
 2021-07-13 16:02:23 +02:00
Martin Artnik
ff0ac9f497 Fix free invite users modal [SCI-5900] 2021-07-13 15:51:05 +02:00
Martin Artnik
1985b7a7e0 Also send task unassign notification to the person that was unassigned [SCI-5607] 2021-07-13 12:11:49 +02:00
Miha Mencin
7a00adea5d
Merge pull request #3432 from biosistemika/july2021-local-rc 
July 1.22.1 local release
 2021-07-13 10:45:41 +02:00
miha
6f245274be Bump version to 1.22.1 2021-07-13 10:42:08 +02:00
dependabot[bot]
a68dd1a3b8
Bump addressable from 2.7.0 to 2.8.0 
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases)
- [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.7.0...addressable-2.8.0)

---
updated-dependencies:
- dependency-name: addressable
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-12 21:14:12 +00:00
zmagoD
277da3abcf fix merge issues 2021-07-10 15:20:55 +02:00
artoscinote
d78e4713c8
Merge pull request #3425 from artoscinote/ma_SCI_5099 
Fix styling, functionality issues with invite users modal [SCI-5099]
 2021-07-09 11:26:19 +02:00
Martin Artnik
40a8f3a434 Switch to using dropdownSelector for emails input [SCI-5099] 2021-07-09 11:20:48 +02:00
Martin Artnik
3cb395db15 Use where_attributes like in team search [SCI-5099] 2021-07-09 10:49:11 +02:00
Martin Artnik
fe06effbd7 Fix linter errors [SCI-5099] 2021-07-09 09:40:06 +02:00
artoscinote
55f05bcac7
Merge pull request #3419 from artoscinote/ma_SCI_5859 
Fix report specs [SCI-5859]
 2021-07-09 09:29:46 +02:00
Martin Artnik
fb040bee07 Fix styling, functionality issues with invite users modal [SCI-5099] 2021-07-08 16:10:20 +02:00
Martin Artnik
249b21808a Added pdf viewer js pack to my_module archive view [SCI-5870] 2021-07-08 12:03:23 +02:00
Martin Artnik
0fbe45252f Reset file_processing when new file is upladed [SCI-5870] 2021-07-08 12:02:41 +02:00
Miha Mencin
d240c9f769
Merge pull request #3421 from artoscinote/ma_SCI_5870 
Added pdf viewer js pack to my_module archive view, fixed issue with files getting stuck in processing [SCI-5870]
 2021-07-08 12:01:31 +02:00
Oleksii Kriuchykhin
549fc8e5a0 Fix repository cell joining and preloading [SCI-5847] 2021-07-07 17:43:51 +02:00
Martin Artnik
fdf9c5f6ae Reset file_processing when new file is upladed [SCI-5870] 2021-07-07 14:57:35 +02:00