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

11470 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Oleksii Kriuchykhin
d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
Miha Mencin
34a5464a92
Merge pull request #3261 from ZmagoD/new_perimssions-managing-project-ui 
New permissions managing project UI
 2021-07-07 13:15:51 +02:00
Miha Mencin
4934b4eb8e
Merge pull request #3420 from artoscinote/ma_SCI_5856 
Made 2fa enable modal accessible globally [SCI-5856]
 2021-07-07 12:52:14 +02:00
Martin Artnik
42ed28676d Added pdf viewer js pack to my_module archive view [SCI-5870] 2021-07-07 11:34:28 +02:00
Martin Artnik
0c63013d8b Made 2fa enable modal accessible globally [SCI-5856] 2021-07-05 16:50:37 +02:00
artoscinote
52946d18e0
Merge pull request #3416 from artoscinote/ma_SCI_5099 
Rework the team invite modal functionality on members page [SCI-5099]
 2021-07-05 12:41:04 +02:00
Martin Artnik
5f528fcdb5 Rework the team invite modal functionality on members page [SCI-5099] 2021-07-05 12:39:54 +02:00
Martin Artnik
5f61c6568d Fix report specs [SCI-5859] 2021-07-05 12:34:39 +02:00
Alex Kriuchykhin
677d937e45
Merge pull request #3417 from artoscinote/ma_SCI_5866 
Fixed missing archived column in experiment table [SCI-5866]
 2021-07-05 10:10:15 +02:00
Martin Artnik
1c98d7cdd2 Fixed missing archived column in experiment table [SCI-5866] 2021-07-02 16:10:35 +02:00
Alex Kriuchykhin
0e813791fe
Merge pull request #3413 from aignatov-bio/ai-sci-5832-issue-in-reports-with-pip-file 
Fix file icons in report [SCI-5832]
 2021-07-02 10:20:18 +02:00
Alex Kriuchykhin
6450e221a9
Merge pull request #3412 from aignatov-bio/ai-sci-5568-add-missed-activity-for-tag-removing 
Add missed activity for tag removing [SCI-5568]
 2021-07-02 10:18:26 +02:00
Alex Kriuchykhin
38912b1b38
Merge pull request #3406 from aignatov-bio/ai-sci-5834-update-marvinjs-image-generation 
Update marvinJS image generation [SCI-5834]
 2021-07-02 10:12:48 +02:00
Alex Kriuchykhin
baa71d6918
Merge pull request #3404 from biosistemika/dependabot/bundler/bindata-2.4.10 
Bump bindata from 2.4.8 to 2.4.10
 2021-07-02 10:12:09 +02:00
Alex Kriuchykhin
786e072bd7
Merge pull request #3408 from artoscinote/ma_SCI_5822 
Fix typos [SCI-5822]
 2021-07-02 10:11:46 +02:00
aignatov-bio
d0b4a75095 Fix file icons in report 2021-06-30 14:35:23 +02:00
Alex Kriuchykhin
f835f88e64
Merge pull request #3410 from okriuchykhin/ok_SCI_5097 
Update Invite new user to team modal [SCI-5097]
 2021-06-30 13:34:06 +02:00
aignatov-bio
bef57eacac Add missed activtiy for tag removing [SCI-5568] 2021-06-30 13:34:02 +02:00
Martin Artnik
3662365cac Small code style tweak SCI-5800 2021-06-30 13:15:08 +02:00