scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-22 16:06:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
9649 commits 70 branches 179 tags 165 MiB
Commit graph

9649 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio 8d033274e4
Add barcode scanners support [SCI-5929] (#3456) 2021-07-27 22:01:08 +02:00
artoscinote 46a9388d8d
Merge pull request #3451 from artoscinote/ma_SCI_5911 
Implemented printer management [SCI-5911]
 2021-07-27 13:19:13 +02:00
aignatov-bio d373c174ee
Add print label button to repository toolbar (#3453) 2021-07-27 12:34:13 +02:00
Martin Artnik 53e072f79e Added error handling to API wrapper [SCI-5939] 2021-07-27 10:36:06 +02:00
Martin Artnik 61919e81b6 Remove FLUICS API client hack [SCI-5939] 2021-07-27 09:41:51 +02:00
Martin Artnik 110ddd872e Added placeholder FLUICS printer setup 2021-07-23 14:56:21 +02:00
Martin Artnik b32b207f3d Added FLUICS API client [SCI-5939] 2021-07-23 13:52:28 +02:00
aignatov-bio be777a8919
Add barcodes to repository item card [SCI-5883][SCI-5884] (#3447) 
* Add barcodes to repository item card [SCI-5883][SCI-5884]

* Fix markup [SCI-5883]
 2021-07-21 21:32:42 +02:00
artoscinote 7551432687
Merge pull request #3443 from artoscinote/ma_SCI_5902 
Implement label templates with default ZPL template [SCI-5902]
 2021-07-21 14:53:27 +02:00
aignatov-bio f2e5dc8b2f
Add printers to addon page [SCI-5904][SCI-5931] (#3450) 
* Add printers to addon page [SCI-5904]

* Fix markup
 2021-07-21 13:48:38 +02:00
Martin Artnik 026bc1eaae Fixed migration [SCI-5902] 2021-07-20 09:35:39 +02:00
Martin Artnik a8f8ab8ba9 Implement label templates with default ZPL template [SCI-5902] 2021-07-19 09:44:14 +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
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
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
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
Martin Artnik fdf9c5f6ae Reset file_processing when new file is upladed [SCI-5870] 2021-07-07 14:57:35 +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
artoscinote 723b594632
Merge pull request #3398 from artoscinote/ma_SCI_5828 
Expose experiment IDs in interface and reports [SCI-5828]
 2021-06-30 12:58:25 +02:00
Martin Artnik 524ea05873 Fix migration rollback [SCI-5828] 2021-06-30 10:37:11 +02:00
Martin Artnik 3e1f0fe109 Migration code style fix [SCI-5828] 2021-06-30 10:28:55 +02:00
Martin Artnik e1b0b65465 Improved code style, fixed bug [SCI-5828] 2021-06-29 15:57:23 +02:00