scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
10103 commits 70 branches 179 tags 165 MiB
Commit graph

10103 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Artnik 04413c6cc6 Make permission names consistent with spreadsheet [SCI-6056] 2021-09-17 10:41:28 +02:00
Alex Kriuchykhin 19a8faaf72
Merge pull request #3550 from okriuchykhin/ok_SCI_6058 
Update/implement permission checks in the canvas controller [SCI-6058]
 2021-09-16 13:32:56 +02:00
Alex Kriuchykhin 56af55931c
Merge pull request #3549 from okriuchykhin/ok_SCI_6057 
Update/implement permission checks in the experiments controller [SCI-6057]
 2021-09-16 13:26:33 +02:00
aignatov-bio 2240dc5984
Add new context helper to controllers tests [SCI-6072] (#3546) 2021-09-16 11:52:18 +02:00
Oleksii Kriuchykhin 61d4a96a3f Update/implement permission checks in the experiments controller [SCI-6057] 2021-09-16 09:55:59 +02:00
Oleksii Kriuchykhin 86faf96365 Update/implement permission checks in the canvas controller [SCI-6058] 2021-09-16 09:54:27 +02:00
artoscinote 95946499a5
Merge pull request #3544 from artoscinote/ma_SCI_5590 
Fixed HTML ampersand display issue [SCI-5590]
 2021-09-16 09:44:46 +02:00
artoscinote 03bf81a6ab
Merge pull request #3545 from artoscinote/ma_SCI_6048 
Sort experiments alphabetically in move task modal [SCI-6048]
 2021-09-16 09:44:20 +02:00
artoscinote 066239db51
Merge pull request #3547 from okriuchykhin/ok_SCI_6042 
Update/implement permission checks in the project related controllers [SCI-6042]
 2021-09-16 09:44:02 +02:00
Oleksii Kriuchykhin 0762323337 Update/implement permission checks in the project related controllers [SCI-6042] 2021-09-15 14:39:47 +02:00
Alex Kriuchykhin 3a4ed8f5ee
Merge pull request #3542 from aignatov-bio/ai-sci-6072-add-pet-rspec-context-helper 
Add context helper for project creation [SCI-6072]
 2021-09-14 15:55:48 +02:00
Martin Artnik 534ab25e5d Sort experiments alphabetically in move task modal [SCI-6048] 2021-09-14 15:11:47 +02:00
Martin Artnik 77aa4a8534 Fixed HTML ampersand display issue [SCI-5590] 2021-09-14 14:42:18 +02:00
aignatov-bio 97be267260 Add skip my_module flag [SCI-6072] 2021-09-14 13:30:52 +02:00
aignatov-bio a0fef97fbc Update context helper [SCI-6072] 2021-09-14 12:45:44 +02:00
Alex Kriuchykhin 41e41f790b
Merge pull request #3531 from aignatov-bio/ai-sci-6034-change-printing-status-modal-logic 
Change printing status modal logic [SCI-6034]
 2021-09-14 11:17:17 +02:00
Alex Kriuchykhin 8a1454ddea
Merge pull request #3517 from artoscinote/ma_SCI_6013 
Experiment dropdown layout fixes [SCI-6013]
 2021-09-14 11:16:16 +02:00
Alex Kriuchykhin ed3b98af62
Merge pull request #3536 from biosistemika/dependabot/npm_and_yarn/axios-0.21.2 
Bump axios from 0.21.1 to 0.21.2
 2021-09-14 11:09:31 +02:00
Alex Kriuchykhin 58520aca14
Merge pull request #3508 from okriuchykhin/ok_SCI_5997 
Fix experiment activity filter [SCI-5997]
 2021-09-14 11:08:45 +02:00
Martin Artnik e8f57e9e99 Reworked MyModule permissions [SCI-6056] 2021-09-14 11:08:35 +02:00
Alex Kriuchykhin 3ca593d7f9
Merge pull request #3513 from okriuchykhin/ok_SCI_5663 
Allow project management to it's creator if project has no assigned users [SCI-5663]
 2021-09-14 11:08:25 +02:00
Alex Kriuchykhin 809941d8d1
Merge pull request #3518 from okriuchykhin/ok_SCI_5848 
Add error message in report in case of file preview generation failure [SCI-5848]
 2021-09-14 11:08:03 +02:00
aignatov-bio b4d0a8ff83 Add context helper for project creation [SCI-6072] 2021-09-14 10:10:14 +02:00
aignatov-bio 6a1223c498 Fix sidebar navigation for archived task [SCI-6050] 2021-09-10 12:05:40 +02:00
aignatov-bio 3036a38bfd
Fix rspec tests [SCI-6044] (#3537) 2021-09-09 15:41:42 +02:00
dependabot[bot] 8bd98270ec
Bump axios from 0.21.1 to 0.21.2 
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-09 12:29:47 +00:00
Alex Kriuchykhin 86dd02c6de
Merge pull request #3524 from biosistemika/dependabot/bundler/rdoc-6.3.2 
Bump rdoc from 6.3.0 to 6.3.2
 2021-09-09 14:29:11 +02:00
Oleksii Kriuchykhin e8e1ee3011 Prevent creation of duplicated repository cells [SCI-6036] 2021-09-09 14:24:35 +02:00
aignatov-bio 6484dfe630 Change printing status modal logic [SCI-6034] 2021-09-07 12:28:11 +02:00
Alex Kriuchykhin 268b8d6bf1
Merge pull request #3530 from artoscinote/ma_SCI_6041 
Update project permission helpers [SCI-6041]
 2021-09-07 12:28:00 +02:00
Alex Kriuchykhin fdbeedd5e6
Merge pull request #3520 from okriuchykhin/ok_SCI_5920 
Allow project viewing for team admins [SCI-5920]
 2021-09-07 12:19:17 +02:00
Martin Artnik 975a8910a8 Updated project permission helpers [SCI-6041] 2021-09-07 11:27:52 +02:00
Oleksii Kriuchykhin cbf0b2a2b5 Update default config and compose production file 2021-09-07 11:07:42 +02:00
Martin Artnik 7e6ca3be8a Merge branch 'develop' into features/new_permissions 2021-09-06 10:33:32 +02:00
aignatov-bio ccc2964aff
Add error message on empty BioEddie save [SCI-5993] (#3526) 2021-09-06 10:13:30 +02:00
Martin Artnik ca6dfa2541 Display dropdown item info border using CSS [SCI-6013] 2021-09-02 12:58:25 +02:00
Martin Artnik 35e815449d Experiment dropdown layout fixes [SCI-6013] 2021-09-02 12:42:06 +02:00
artoscinote 0ce6e29614
Merge pull request #3525 from artoscinote/ma_SCI_6039 
Added specific html class to printer settings section [SCI-6039]
 2021-09-02 09:54:00 +02:00
Martin Artnik 3a70aadea4 Added specific html class to printer settings section [SCI-6039] 2021-09-02 09:52:52 +02:00
dependabot[bot] b25a104b11
Bump rdoc from 6.3.0 to 6.3.2 
Bumps [rdoc](https://github.com/ruby/rdoc) from 6.3.0 to 6.3.2.
- [Release notes](https://github.com/ruby/rdoc/releases)
- [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rdoc/compare/v6.3.0...v6.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-02 00:39:18 +00:00
Miha Mencin e874d7507b
Merge pull request #3523 from biosistemika/develop 
Release 1.22.4
 2021-09-01 09:43:41 +02:00
Miha Mencin 8052d4c8d1
Bump version to 1.22.4 2021-09-01 09:40:20 +02:00
Miha Mencin 9df2754a55
Merge pull request #3522 from biosistemika/master 
Master
 2021-09-01 09:39:46 +02:00
Miha Mencin 554fb05738
Bump version to 1.22.3 2021-09-01 09:30:31 +02:00
artoscinote 35874d6a93
Merge pull request #3521 from artoscinote/ma_SCI_6022 
Fix barcode scanning in modals [SCI-6022]
 2021-08-31 14:37:39 +02:00
Martin Artnik 73241e87bb Fix barcode scanning in modals [SCI-6022] 2021-08-31 14:37:02 +02:00
Oleksii Kriuchykhin f591bac3b1 Allow project viewing for team admins [SCI-5920] 2021-08-31 14:21:02 +02:00
artoscinote 19a499b613
Merge pull request #3519 from artoscinote/ma_SCI_6022 
Made barcode search globally available [SCI-6022]
 2021-08-30 15:39:20 +02:00
Alex Kriuchykhin a63f047ae7
Merge pull request #3512 from okriuchykhin/ok_SCI_6031 
Add configuration variable for webhooks, disable by default [SCI-6031]
 2021-08-30 15:35:38 +02:00
Martin Artnik 6d92af4b2f Made barcode search globally available [SCI-6022] 2021-08-30 14:41:31 +02:00