scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-27 18:21:50 +08:00
Code Issues Projects Releases Packages Wiki Activity
10134 commits 41 branches 184 tags 168 MiB
Commit graph

2388 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
d21dd191a6 Confirm the invitation when user is invited and lands in with SSO [SCI-6055] 2021-09-30 17:06:45 +02:00
artoscinote
f68d724202
Rework experiment permissions [SCI-6054] (#3538) 
* Rework experiment permissions [SCI-6054]
 2021-09-30 11:32:11 +02:00
aignatov-bio
a93f2889b7 Fix 2fa redirecting [SCI-6103] 2021-09-28 12:34:41 +02:00
aignatov-bio
c248e87adb
Add permissions checks for results controllers [SCI-6071] (#3555) 
* Add permission tests for results controller [SCI-6071]

* Update results controllers with new permissions [SCI-6071]

* Small fixes to results controllers [SCI-6071]

* Update result permission helpers [SCI-6071]
 2021-09-24 13:11:41 +02:00
Alex Kriuchykhin
313eaf7276
Merge pull request #3539 from aignatov-bio/ai-sci-6050-fix-sidebar-navigation-for-archived-task 
Fix sidebar navigation for archived task [SCI-6050]
 2021-09-24 11:47:59 +02:00
Oleksii Kriuchykhin
607b7f76cf Update/implement permission checks in the my_modules_controller and my_modules_status_flow_controller [SCI-6061][SCI-6063] 2021-09-24 10:23:28 +02:00
Alex Kriuchykhin
51e7f7668a
Merge pull request #3556 from okriuchykhin/ok_SCI_6062 
Update/implement permission checks in the _my_modules_tags_controller [SCI-6062]
 2021-09-23 17:23:22 +02:00
artoscinote
e57f5f8e26
Merge pull request #3551 from aignatov-bio/ai-sci-6065-update-my-module-comments-controller-permission 
Update permissions for my_module_comments controller [SCI-6065]
 2021-09-23 11:47:13 +02:00
aignatov-bio
6206f8a6e9 Update permissions for my_module_comments controller [SCI-6065] 2021-09-22 12:11:36 +02:00
Oleksii Kriuchykhin
5fb163c09a Update/implement permission checks in the _my_modules_tags_ controller [SCI-6062] 2021-09-21 16:21:55 +02:00
Miha Mencin
519dbe8fe9
Merge pull request #3554 from biosistemika/master 
Sept. hotfix
 2021-09-21 10:19:48 +02:00
aignatov-bio
78098f2d8c Add permission check for results download 2021-09-20 14:33:42 +02:00
aignatov-bio
250a018a4c Add permissions tests for my_module_repositories and my_module_repository_snapshots [SCI-6064] 2021-09-20 12:19:28 +02:00
Alex Kriuchykhin
0db9bf46ff
Merge pull request #3528 from okriuchykhin/ok_SCI_6036 
Prevent creation of duplicated repository cells [SCI-6036]
 2021-09-17 16:37:48 +02:00
Martin Artnik
e8f57e9e99 Reworked MyModule permissions [SCI-6056] 2021-09-14 11:08:35 +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
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
Martin Artnik
975a8910a8 Updated project permission helpers [SCI-6041] 2021-09-07 11:27:52 +02:00
Martin Artnik
7e6ca3be8a Merge branch 'develop' into features/new_permissions 2021-09-06 10:33:32 +02:00
Miha Mencin
50d33896e3
Merge pull request #3480 from artoscinote/ma_SCI_5963 
Downcase all user emails, downcase when finding user [SCI-5963]
 2021-08-30 13:00:12 +02:00
artoscinote
afc74b6b8f
Merge pull request #3500 from artoscinote/ma_SCI_6014 
Added edit activities on asset deletion [SCI-6014]
 2021-08-30 10:00:58 +02:00
Martin Artnik
56fa07aa21 Moved max item name length to constant [SCI-6025] 2021-08-24 10:19:30 +02:00
Martin Artnik
289095ecbc Amended label template, truncate item name before print [SCI_6025] 2021-08-24 09:52:29 +02:00
Martin Artnik
b46df537d5 Added edit activities on asset deletion [SCI-6014] 2021-08-20 14:45:33 +02:00
Alex Kriuchykhin
5fa3fa4601
Merge pull request #3491 from okriuchykhin/ok_SCI_5983 
Add timestamps to API serializers, allow inclusion of comments [SCI-5983]
 2021-08-19 10:43:02 +02:00
artoscinote
80dfb04976
Merge pull request #3485 from okriuchykhin/ok_SCI_6002 
Fix permission checks in reports controller [SCI-6002]
 2021-08-18 15:27:49 +02:00
Oleksii Kriuchykhin
33d37d048e Add timestamps to API serializers, allow inclusion of comments [SCI-5983] 2021-08-18 10:00:01 +02:00
Martin Artnik
5cc966e11e Remove delete molecule activities [SCI-5999] 2021-08-16 13:58:54 +02:00
Oleksii Kriuchykhin
2daacdf62c Fix permission checks in reports controller [SCI-6002] 2021-08-13 16:32:02 +02:00
Martin Artnik
56576960b0 Rework molecule registration activities [SCI-5999] 2021-08-13 15:15:45 +02:00
artoscinote
12bb44147c
Merge pull request #3482 from artoscinote/ma_SCI_5984 
Optimize how printing jobs and statuses work [SCI-5984]
 2021-08-13 09:25:42 +02:00
Martin Artnik
1d3e0db904 Optimize how printing jobs and statuses work [SCI-5984] 2021-08-12 16:57:25 +02:00
Martin Artnik
1db06b46f7 Fixed for assets that belong to protocol step [SCI-5996] 2021-08-12 13:45:38 +02:00
Martin Artnik
5d5f406e9a Downcase all user emails, downcase when finding user [SCI-5963] 2021-08-11 13:18:58 +02:00
Martin Artnik
861be4bb35 Fix issues with BioEddie integration [SCI-5982] 2021-08-11 09:50:00 +02:00
Martin Artnik
024f9117e6 fix failing specs 2021-08-03 14:16:22 +02:00
Martin Artnik
57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
artoscinote
f839cb5256
Merge pull request #3464 from biosistemika/features/bioeddie-integration 
Features/bioeddie integration
 2021-08-03 13:32:53 +02:00
artoscinote
c41247a5fd
Merge pull request #3439 from artoscinote/ma_SCI_5879 
Implement Save & Register molecule [SCI-5879]
 2021-08-03 12:15:46 +02:00
Martin Artnik
a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +02:00
Martin Artnik
a19f109e65 Add printer description [SCI-5942] 2021-08-02 15:50:26 +02:00
Martin Artnik
ae174b276a Code review fixes and error handling improvements [SCI-5942] 2021-08-02 15:42:53 +02:00
Martin Artnik
123e415a4f Print status backend + FE integration [SCI-5942] 2021-08-02 15:42:53 +02:00
aignatov-bio
43571b5692
Print labels changes [SCI-5943] (#3461) 2021-08-02 15:38:37 +02:00
Martin Artnik
0f417f9730 Merge branch 'develop' into features/barcodes 2021-07-29 13:32:17 +02:00
artoscinote
3649e2fbe0
Merge pull request #3457 from artoscinote/ma_SCI_5903 
Added print job queue system, job status endpoint [SCI-5903]
 2021-07-29 13:06:34 +02:00
aignatov-bio
02408ae885
Add printing status modal [SCI-5910] (#3454) 2021-07-29 12:24:46 +02:00
Martin Artnik
67f4e81a3a Merge branch 'develop' into features/new_permissions 2021-07-28 15:16:47 +02:00
aignatov-bio
a54f36a486
Add empty state for barcode printers [SCI-5935] (#3455) 2021-07-28 11:12:46 +02:00
Martin Artnik
e57132dbd0 Added print job queue system, job status endpoint [SCI-5903] 2021-07-27 15:26:18 +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
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
Oleksii Kriuchykhin
c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
Martin Artnik
04b94d504d Moved activity logging to controller [SCI-5879] 2021-07-22 09:52:04 +02:00
aignatov-bio
d4f974ac64
Add inline editing for folder name [SCI-5896] (#3430) 2021-07-21 21:33:13 +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
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
Alex Kriuchykhin
dfa2a7775d
Merge pull request #3422 from okriuchykhin/ok_SCI_5847 
Fix repository cell joining and preloading [SCI-5847]
 2021-07-21 13:18:21 +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
artoscinote
888131a465
Merge branch 'features/bioeddie-integration' into ma_SCI_5879 2021-07-20 09:48:13 +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
Oleksii Kriuchykhin
1c8b32dffc Add biomolecular toolkit API proxying endpoint [SCI-5843] 2021-07-16 15:58:40 +02:00
Martin Artnik
96a5b97bdb Implement Save & Register molecule [SCI-5879] 2021-07-15 12:37:04 +02:00
Martin Artnik
ff0ac9f497 Fix free invite users modal [SCI-5900] 2021-07-13 15:51:05 +02:00
Martin Artnik
3cb395db15 Use where_attributes like in team search [SCI-5099] 2021-07-09 10:49:11 +02:00
Martin Artnik
fb040bee07 Fix styling, functionality issues with invite users modal [SCI-5099] 2021-07-08 16:10:20 +02:00
Oleksii Kriuchykhin
549fc8e5a0 Fix repository cell joining and preloading [SCI-5847] 2021-07-07 17:43:51 +02:00
Oleksii Kriuchykhin
d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +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
aignatov-bio
bef57eacac Add missed activtiy for tag removing [SCI-5568] 2021-06-30 13:34:02 +02:00
artoscinote
9804e1bd28
Merge pull request #3400 from artoscinote/ma_SCI_5701 
Reworked task view sidebar [SCI-5701]
 2021-06-29 11:26:56 +02:00
zmagoD
9c812e84bd setup logic to group assign all team members and handle the unassignments logic 2021-06-27 13:22:19 +02:00
aignatov-bio
786e74e4de
Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391) 
* Add backend for bioeddie [SCI-5654]

* Add modal for bioeddie [SCI-5654]

* Add bio eddie editor to steps and results [SCI-5654]

* Fix markup and code styling
 2021-06-23 19:48:44 +02:00
Martin Artnik
c6c5f75262 Remove unncessary newline 2021-06-22 14:53:03 +02:00
zmagoD
ad10befcc4 add new manage access permission to PET levels 2021-06-19 17:17:57 +02:00
Martin Artnik
b6588c2334 Reworked task view sidebar [SCI-5701] 2021-06-18 16:52:19 +02:00
Oleksii Kriuchykhin
bb458abec6 Remove old reports code [SCI-5650] 2021-06-18 10:40:00 +02:00
Oleksii Kriuchykhin
1e3197875c Fix repositories selection in report wizard and deleted repositories handling [SCI-5831] 2021-06-17 16:23:27 +02:00
Martin Artnik
47071e23a1 Added specs for webhooks 2021-06-17 14:54:30 +02:00
Alex Kriuchykhin
b73972dbbf
Merge pull request #3389 from artoscinote/ma_SCI_5819 
Set scinote template if missing when generating reports [SCI-5819]
 2021-06-16 12:27:02 +02:00
aignatov-bio
7313b5fa16
Add archived and deleted repositories to reports [SCI-5781] (#3387) 
* Add archived and deleted repositories to reports [SCI-5781]

* Small markup fix [SCI-5781]
 2021-06-16 10:56:08 +02:00
Martin Artnik
2427086372 Set scinote template if missing when generating reports [SCI-5819] 2021-06-15 12:54:48 +02:00
Miha Mencin
60c309e1cd
Merge pull request #3375 from artoscinote/ma_SCI_5787 
Fix changing report project, fix typo [SCI-5787]
 2021-06-09 13:43:23 +02:00
aignatov-bio
afe2a19c88
Add webhooks management [SCI-5767] (#3376) 
* Add webhooks managment [SCI-5767]

* Markup fixes [SCI-5676]
 2021-06-09 12:53:11 +02:00
Martin Artnik
6d98b7eb2b Fix changing report project, fix typo [SCI-5787] 2021-06-08 15:07:00 +02:00
Oleksii Kriuchykhin
86fcda3c09 Fix date formatting for the API [SCI-5785] 2021-06-07 10:34:58 +02:00
zmagoD
784e43e328 create user_assignments for all child objects when the user is attached to the project 2021-06-06 09:54:47 +02:00
aignatov-bio
9559ed88aa
Add webhooks index page [SCI-5766] (#3366) 2021-06-03 14:00:43 +02:00
zmagoD
3d79dd32ad update endpoint type 2021-05-31 21:48:18 +02:00
aignatov-bio
3c7592657c Add activity filters [SCI-5765] 2021-05-31 13:39:10 +02:00
zmagoD
debff7bc85 fix code style 2021-05-29 19:25:46 +02:00
zmagoD
28cb7ee81d add user roles enpoint and update scenarios 2021-05-29 15:28:10 +02:00
Alex Kriuchykhin
967ec1fdbf
Merge pull request #3349 from aignatov-bio/ai-sci-5758-small-report-wizard-fixes 
Small report wizard fixes [SCI-5758]
 2021-05-27 14:28:21 +02:00
Oleksii Kriuchykhin
7a5c7e0526 Fix reports docx job arguments [SCI-5763] 2021-05-26 14:34:58 +02:00