Commit graph

890 commits

Author SHA1 Message Date
artoscinote
98d66a3276
Implement reordering activities [SCI-6851] (#4129)
* Implement reordering activities [SCI-6851]

* Added asset activity types [SCI-SCI-6853]
2022-06-01 12:30:09 +02:00
Oleksii Kriuchykhin
c120a357cd Add permissions for Report model [SCI-6834] 2022-05-24 10:59:21 +02:00
Oleksii Kriuchykhin
39cfcd5522 Add migration for user team roles, including protocols and inventories [SCI-6820] 2022-05-23 16:28:53 +02:00
Oleksii Kriuchykhin
c397616106 Add teams, protocols and inventories specific permission definitions [SCI-6819] 2022-05-16 11:10:19 +02:00
Anton
24d68da455 Fix tinymce assets for steps [SCI-6809] 2022-05-11 13:01:23 +02:00
ajugo
54474b2bba
API GET repository stock column output fix [SCI-6550] (#4030)
* Add include stock unit items to Stock column get [SCI-6550]

* Fix stock column test [SCI-6550]

* Fix hound [SCI-6550]
2022-04-19 16:05:17 +02:00
aignatov-bio
4a232ac391
Merge pull request #4020 from biosistemika/features/projects-experiments-pagination
Features/projects experiments pagination
2022-04-14 10:45:27 +02:00
Anton
d091c56e9f Add pagination for experiments [SCI-6656] 2022-04-12 15:16:02 +02:00
ajugo
0a5e93a018
API: add endpoint for creating stock column [SCI-6550] (#3956)
* Add test for repositoty stock column api [SCI-6550]

* Create and update stock column [SCI-6550]

* Change stock unit [SCI-6550]

* Fix hound [SCI-6550]

* Fix on delete [SCI-6550]

* Fix houd [SCI-6550]
2022-04-08 14:09:00 +02:00
artoscinote
5effe34221
Add reminder preset to date(time) reminders [SCI-6693] (#3996) 2022-04-07 12:27:21 +02:00
artoscinote
8d25f456d1
Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) 2022-04-04 12:09:41 +02:00
Martin Artnik
45a325e824 Merge branch 'develop' into features/stock-management 2022-03-30 11:10:40 +02:00
ajugo
5cc97122e5
Viewer role does not see any tasks in archived project [SCI-6616] (#3958)
* Fix viewer role not see any tasks in archived project [SCI-6616]

* Fix rollback for add read archive permission migration [SCI-6616]
2022-03-30 11:01:26 +02:00
aignatov-bio
004aeda601
Add stock filters [SCI-6547] (#3938)
Co-authored-by: Anton <anton@scinote.net>
2022-03-23 10:05:07 +01:00
Anton
8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
ajugo
959b86b40c
Task inventory activity for assigned item consumption [SCI-6453] (#3830)
* Add task inventory activity [SCI-6453]
2022-03-09 18:43:38 +01:00
Alex Kriuchykhin
ed8ba13525
Fix advanced search for file type columns [SCI-6518] (#3839) 2022-02-11 10:47:32 +01:00
artoscinote
bc5822de7b
Added error messges for missing search columns/values [SCI-6483] (#3824)
* Added error messges for missing search columns/values [SCI-6483]
2022-02-11 10:24:29 +01:00
Alex Kriuchykhin
4627d15fc3
Implement import for repository stock values [SCI-6461] (#3818) 2022-02-04 10:29:48 +01:00
artoscinote
cdbf1f5fa0
Implement stock management activities [SCI-6452] (#3810)
* Implement stock management activities [SCI-6452]

* PR code fixes [SCI-6452]
2022-02-02 10:33:02 +01:00
Alex Kriuchykhin
3c165996fa
Fix table names in advanced filters configuration [SCI-6467] (#3814) 2022-02-02 10:26:43 +01:00
aignatov-bio
0d6b2ad4b4
Add searchable list for advanced filters [SCI-6466] (#3808)
Co-authored-by: Anton <anton@scinote.net>
2022-02-01 14:39:04 +01:00
Alex Kriuchykhin
c1972e4fb2
Fix advanced filtering with multiple filters [SCI-6471] (#3807) 2022-01-31 11:10:39 +01:00
aignatov-bio
c8784d1f66
Add advanced filters for date/datetime/time range [SCI-6462] (#3806)
Co-authored-by: Anton <anton@scinote.net>
2022-01-31 09:21:08 +01:00
Oleksii Kriuchykhin
dd5f8c2793 Add stock management columns to snapshots [SCI-6448] 2022-01-28 13:19:37 +01:00
aignatov-bio
2c88843924
Task stock consumption modal[SCI-6444][SCI-6445] (#3798)
Add main logic for consumption on task [SCI-6444]

Co-authored-by: Anton <anton@scinote.net>
2022-01-28 11:10:56 +01:00
aignatov-bio
371d5f0636
Add current/new amount section to stock [SCI-6416] (#3791)
Co-authored-by: Anton <anton@scinote.net>
2022-01-26 10:28:43 +01:00
Alex Kriuchykhin
e55c9ec1cc
Merge pull request #3785 from okriuchykhin/ok_SCI_6423
Fix filtering for repository snapshots [SCI-6423]
2022-01-25 12:59:46 +01:00
artoscinote
4ede001cf1
Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781)
* Fix invalid return in reports jobs [SCI-6409] (#3777)

* Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418]
2022-01-25 12:41:16 +01:00
Martin Artnik
abac837cd4 Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:26:08 +01:00
aignatov-bio
01f1b5bd10
Add stock column type (#3786)
* Add stock column type

* Create new stock column [SCI-6410]

* Small fixed for stock column [SCI-6410]

* Add stock column validations [SCI-6410]

Co-authored-by: Anton <anton@scinote.net>
2022-01-18 13:17:05 +01:00
Oleksii Kriuchykhin
34554e57e3 Fix filtering for repository snapshots [SCI-6423] 2022-01-17 21:53:13 +01:00
Oleksii Kriuchykhin
738da6094f Add advanced filters to repository datatable service [SCI-6210] 2021-12-21 12:38:52 +01:00
Oleksii Kriuchykhin
c56a088ad9 Improve database and Okta config [SCI-6184] 2021-12-13 10:29:28 +01:00
artoscinote
561746158e
Further fix scoping of table styles [SCI-6315] (#3720) 2021-12-06 10:40:08 +01:00
artoscinote
9652362c46
Fix remove user from project notification [SCI-6264] (#3708) 2021-12-01 11:17:07 +01:00
artoscinote
9937d1d913
Add print feature to protocols [SCI-6028] (#3700)
* Add print feature to protocols [SCI-6028]

* Close tab after closing print dialog [SCI-6028]

* CSS linter fixes [SCI-6028]
2021-12-01 11:16:45 +01:00
Anton
a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00
artoscinote
9b06a24288
Added granular task permissions, permission check fixes [SCI-6278] (#3683) 2021-11-19 13:24:57 +01:00
aignatov-bio
c22ff3acc8
Fix technician role permission for results [SCI-6276] (#3681)
Co-authored-by: Anton <anton@scinote.net>
2021-11-18 15:01:29 +01:00
Oleksii Kriuchykhin
f73f9dd2c1 Fix activities for assigning to experiments and tasks [SCI-6254] 2021-11-11 21:30:30 +01:00
Alex Kriuchykhin
0a8af99368
Merge pull request #3627 from okriuchykhin/ok_SCI_6184
Add support of Okta SSO provider [SCI-6184]
2021-11-08 15:01:16 +01:00
artoscinote
3e3e2cc24e
Revert "Implement experiment and task access removal" [SCI-6218] (#3635)
* Revert "Implement experiment and task access removal [SCI-6156] (#3614)"

This reverts commit 2abefd78e6.

* Rename assign to module activity to designate to my module [SCI-6218]
2021-11-05 15:44:14 +01:00
aignatov-bio
1ef9ea2cbb
Fix roles permission and helper [SCI-6198][SCI-6181] (#3630)
Co-authored-by: Anton <anton@scinote.net>
2021-11-04 13:29:34 +01:00
Oleksii Kriuchykhin
47b8347ce6 Add support of Okta SSO provider [SCI-6184] 2021-11-02 16:19:56 +01:00
Oleksii Kriuchykhin
a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
artoscinote
1bb30b2c49
Also move activities when moving experiment to another project [SCI-6047] (#3535)
* Also move activities when moving experiment to another project [SCI-6047]

* Changed update to update! [SCI-6047]
2021-10-28 16:35:47 +02:00
artoscinote
2abefd78e6
Implement experiment and task access removal [SCI-6156] (#3614) 2021-10-28 16:32:05 +02:00
artoscinote
6f2d883706
Added permissions specs for API, minor changes to permissions [SCI-6152] (#3609) 2021-10-28 14:48:28 +02:00
Alex Kriuchykhin
047f47a46a
Merge pull request #3617 from aignatov-bio/ai-sci-6181-update-permissions-on-task
Small fixes on task permissions [SCI-6181]
2021-10-28 14:46:57 +02:00
Alex Kriuchykhin
f8e433a0ca
Merge branch 'features/new_permissions' into ok_SCI_6151 2021-10-28 14:31:47 +02:00
aignatov-bio
bc7ee0da75
Fix type in permission name [SCI-6182] (#3616)
Co-authored-by: Anton <anton@scinote.net>
2021-10-28 13:58:41 +02:00
Alex Kriuchykhin
1bde37db78
Merge branch 'develop' into ok_SCI_5579 2021-10-28 13:26:27 +02:00
Anton
5d517fc2b8 Small fixes on task permissions [SCI-6181] 2021-10-27 11:41:47 +02:00
aignatov-bio
e8e84a7c99
Add tags manage to normal user [SCI-6178] (#3612)
Co-authored-by: Anton <anton@scinote.net>
2021-10-27 11:39:11 +02:00
Alex Kriuchykhin
f6a30cac6c
Merge pull request #3593 from okriuchykhin/ok_SCI_6134
Change Dashboard::RecentWorkService to use new user roles [SCI-6134]
2021-10-26 11:43:54 +02:00
artoscinote
7e96cc1272
Removed ExperimentPermissions::USERS_MANAGE permission for normal user role [SCI-6172] (#3606) 2021-10-22 13:05:31 +02:00
Oleksii Kriuchykhin
2051ea5360 Update the search to abide the permissions [SCI-6151] 2021-10-22 11:43:20 +02:00
Oleksii Kriuchykhin
bc806f0c86 Change Dashboard::RecentWorkService to use new user roles [SCI-6134] 2021-10-13 14:12:24 +02:00
aignatov-bio
d594778fa8
Add project comment manage own permission [SCI-6115] (#3574) 2021-10-04 15:43:50 +02:00
Martin Artnik
6f920f1a3a Add experiment_read_canvas permission to all predefined roles [SCI-5924] 2021-10-04 11:50:08 +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
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
Martin Artnik
49b9ee37cc Merge branch 'develop' into features/bmt-search 2021-09-24 11:01:27 +02:00
Oleksii Kriuchykhin
f806a56cac Update existing roles with new permissions/abilities [SCI-6076] 2021-09-24 10:29:24 +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
aignatov-bio
6206f8a6e9 Update permissions for my_module_comments controller [SCI-6065] 2021-09-22 12:11:36 +02:00
Martin Artnik
04413c6cc6 Make permission names consistent with spreadsheet [SCI-6056] 2021-09-17 10:41:28 +02:00
Martin Artnik
e8f57e9e99 Reworked MyModule permissions [SCI-6056] 2021-09-14 11:08:35 +02:00
Oleksii Kriuchykhin
3cab5751e7 Add rake task for creation and syncing structure of BMT inventory [SCI-6010] 2021-09-07 12:17:09 +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
Oleksii Kriuchykhin
d4ef2b1bd4 Add BMT inventory model [SCI-6009] 2021-08-30 10:49:15 +02:00
Oleksii Kriuchykhin
0b74f34de7 Add external IDs to repositories [SCI-5990] 2021-08-30 10:49:14 +02:00
Oleksii Kriuchykhin
d706c32d8c Fix experiment activity filter [SCI-5997] 2021-08-25 20:07:40 +02:00
artoscinote
07a458bab6
Merge pull request #3489 from artoscinote/ma_SCI_5999
Move molecule edited on step activity to Task protocol group [SCI-5999]
2021-08-18 10:16:24 +02:00
Martin Artnik
308e565d58 Move molecule edited on step activity to Task protocol group [SCI-5999] 2021-08-18 09:54:05 +02:00
artoscinote
6f0a65f02f
Merge pull request #3484 from artoscinote/ma_SCI_5999
Rework molecule registration activities [SCI-5999]
2021-08-16 14:33:24 +02:00
Martin Artnik
5cc966e11e Remove delete molecule activities [SCI-5999] 2021-08-16 13:58:54 +02:00
aignatov-bio
852d2cc03c
CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] (#3486)
* CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970]

* Small fixes [SCI-5972]
2021-08-16 10:51:46 +02:00
Martin Artnik
56576960b0 Rework molecule registration activities [SCI-5999] 2021-08-13 15:15:45 +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
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
Martin Artnik
67f4e81a3a Merge branch 'develop' into features/new_permissions 2021-07-28 15:16:47 +02:00
Martin Artnik
e57132dbd0 Added print job queue system, job status endpoint [SCI-5903] 2021-07-27 15:26:18 +02:00
Oleksii Kriuchykhin
c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
Martin Artnik
662370d2bd Removed auto-disable, fixed ActiveJob + DelayedJob retry handling [SCI-5800] 2021-07-22 13:43:36 +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
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
Martin Artnik
96a5b97bdb Implement Save & Register molecule [SCI-5879] 2021-07-15 12:37:04 +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
Oleksii Kriuchykhin
ecec1ce194 Update Invite new user to team modal [SCI-5097] 2021-06-29 13:46:02 +02:00
zmagoD
a678f07b47 update extends and remove format from links 2021-06-27 09:45:32 +02:00
zmagoD
ad10befcc4 add new manage access permission to PET levels 2021-06-19 17:17:57 +02:00
Oleksii Kriuchykhin
bb458abec6 Remove old reports code [SCI-5650] 2021-06-18 10:40:00 +02:00
Miha Mencin
46e2adf2e3
Merge pull request #3334 from okriuchykhin/ok_SCI_5730
Improve filtering for inventories [SCI-5730]
2021-06-09 09:50:56 +02:00
Oleksii Kriuchykhin
16bad9eb9c Fix export all functionality [SCI-5776] 2021-06-08 14:21:34 +02:00
aignatov-bio
9559ed88aa
Add webhooks index page [SCI-5766] (#3366) 2021-06-03 14:00:43 +02:00
zmagoD
67cf09e030 log activities on experiment and my_module assignment change 2021-05-22 13:59:27 +02:00
Oleksii Kriuchykhin
29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Oleksii Kriuchykhin
0ff1277dbf Improve filtering for inventories [SCI-5730] 2021-05-19 22:48:52 +02:00
Miha Mencin
d952edd389
Merge pull request #3316 from okriuchykhin/ok_SCI_5702
Add generation error states to reports [SCI-5702]
2021-05-17 10:16:06 +02:00
Alex Kriuchykhin
34c79d66b8
Merge pull request #3278 from okriuchykhin/ok_SCI_5664
Add report templates loader and move out templates from the main source tree [SCI-5664]
2021-05-13 15:51:24 +02:00
Oleksii Kriuchykhin
a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +02:00
zmagoD
c0eb38b564 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/new_permissions 2021-05-08 10:33:43 +02:00
Alex Kriuchykhin
eb773d94c5
Merge pull request #3294 from okriuchykhin/ok_SCI_5619
Add default settings to existing reports [SCI-5619][SCI-5672]
2021-05-07 11:38:41 +02:00
Oleksii Kriuchykhin
b67f2a21f5 Add default settings to existing reports [SCI-5619][SCI-5672] 2021-05-06 17:33:58 +02:00
aignatov-bio
bb5f985630 Add new activities to reports [SCI-5638] 2021-05-06 14:03:45 +02:00
Oleksii Kriuchykhin
96f85aeb3c Add report templates loader and move out templates from the main source tree [SCI-5664] 2021-05-06 11:27:05 +02:00
Alex Kriuchykhin
57c90a60c4
Merge pull request #3287 from aignatov-bio/ai-sci-5686-add-default-scinote-report-template
Add Scinote Report Template [SCI-5686]
2021-05-06 10:59:33 +02:00
aignatov-bio
689967f82c Add Scinote Report Template [SCI-5686] 2021-05-05 15:13:06 +02:00
Oleksii Kriuchykhin
a307a16033 Fix handsontable assets inclusion in report templates [SCI-5692] 2021-05-04 16:05:19 +02:00
aignatov-bio
86854b015d Add third template to reports [SCI-5618] 2021-04-29 15:21:58 +02:00
aignatov-bio
6b023603f9
Add second template for reports [SCI-5617] (#3268) 2021-04-29 10:42:17 +02:00
Oleksii Kriuchykhin
bca88188de Limit created report relations depth to tasks [SCI-5665] 2021-04-28 15:33:30 +02:00
Oleksii Kriuchykhin
8a915c8acf Fix assets inclusion into report [SCI-5680] 2021-04-28 14:37:16 +02:00
Oleksii Kriuchykhin
5c63ee55e7 Comment out wicked_pdf initializer patch 2021-04-22 13:59:04 +02:00
Oleksii Kriuchykhin
a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +02:00
miha
961fa9ab4e [SCI-5631] Add ordering to index endpoint so pagination works, limit maximum page size for kaminari 2021-04-06 09:59:24 +02:00
Miha Mencin
6ad3f7b92f
Merge pull request #3239 from okriuchykhin/ok_SCI_5595_v2
Remove canvas-to-blob library [SCI-5595]
2021-03-29 14:03:35 +02:00
Oleksii Kriuchykhin
2f6194a99f Remove canvas-to-blob library [SCI-5595] 2021-03-29 14:02:30 +02:00
miha
a82479cd49 unfreeze extents 2021-03-29 11:31:04 +02:00
miha
e20191a865 fix code style 2 2021-03-29 11:13:32 +02:00
miha
11284d3b87 [SCI-5577] filter notifications 2021-03-29 09:52:57 +02:00
Oleksii Kriuchykhin
943c01cada Remove simple_token_authentication [SCI-5595] 2021-03-25 14:55:22 +01:00
Oleksii Kriuchykhin
ab9fd65a19 Add basic API client for BMT [SCI-5531] 2021-03-12 10:53:10 +01:00
aignatov-bio
df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
aignatov-bio
8509d86c48
Merge pull request #3196 from aignatov-bio/ai-sci-5484-update-images-extensions
Fix upercase file extensions [SCI-5484]
2021-03-08 10:16:59 +01:00
Oleksii Kriuchykhin
2b5709e75f Improve behavior of the scheduler, add caching to system notifications sync service [SCI-5526] 2021-03-02 17:28:07 +01:00
aignatov-bio
468afaaa5a Fix upercase file extensions [SCI-5484] 2021-03-02 15:04:43 +01:00
Oleksii Kriuchykhin
d8cffe53c7 Add migration for new user assignments to projects [SCI-5478] 2021-03-01 14:28:21 +01:00
Oleksii Kriuchykhin
49194d1a45 Prepare initial user roles in the database [SCI-5435] 2021-02-22 11:58:40 +01:00
Oleksii Kriuchykhin
3b90225c5a Add new permission checking logic [SCI-5436] 2021-02-22 11:55:48 +01:00
aignatov-bio
1cfd9dd85e
Merge pull request #3163 from aignatov-bio/ai-sci-5469-update-experiment-card-css
Update experiment card css [SCI-5469]
2021-02-18 10:45:43 +01:00
Oleksii Kriuchykhin
afbd763125 Update Doorkeeper configuration [SCI-5497] 2021-02-17 12:54:28 +01:00
Urban Rotnik
a628cada6f
Merge pull request #3162 from urbanrotnik/ur-sci-5473-remove-zendesk
Update knowledge base url [SCI-5473]
2021-02-16 15:30:15 +01:00
aignatov-bio
0368579799 Update experiment card css [SCI-5469] 2021-02-16 12:42:09 +01:00
Urban Rotnik
335f7b7f9f Update knowledge base url 2021-02-16 12:08:29 +01:00
Urban Rotnik
ebbbfa657c
Fix folders activities [SCI-5402] [SCI-5403] (#3112)
* Fix activities and make folders clickable

* Remove archive project activity and action

* Save nil value for root folder

* Add empty values to hash
2021-01-22 11:24:08 +01:00
Mojca Lorber
c58d5734ad Implement the option of deleting empty folders [SCI-5311] 2021-01-21 19:42:25 +01:00
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018)
* Add PDF Preview [SCI-5299]
2020-12-22 15:25:30 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Urban Rotnik
19f16555c6 Add checkbox and restore button
[SCI-5275]
2020-12-17 13:11:20 +01:00
Urban Rotnik
cd7b94b434 Fix users/comments tab showing
[SCI-5274]
2020-12-17 13:08:58 +01:00
Oleksii Kriuchykhin
2a666a3718 Implement additional preview type PDF of the whole document [SCI-5297] 2020-12-16 12:51:10 +01:00
Mojca Lorber
5cdab422df Update layout of the navigation for experiments, tasks list and task page 2020-12-10 15:15:36 +01:00
Urban Rotnik
7773afbcdb Add activities for Project Folders [SCI-5181] 2020-12-04 12:03:49 +01:00
aignatov-bio
bb52743567 Fix merge cells for pdf reports 2020-11-23 16:29:22 +01:00
aignatov-bio
56a58e08eb Fix markup 2020-11-23 14:22:10 +01:00
aignatov-bio
deaecf57c9 Add activity for project moving 2020-11-16 12:21:03 +01:00
Oleksii Kriuchykhin
038cd8d5d7 Fix repository state columns handling [SCI-5190] 2020-11-10 17:24:04 +01:00
Urban Rotnik
e923128c0e
Merge pull request #2927 from biosistemika/features/signature-requests
Features/signature requests into develop
2020-10-29 14:48:25 +01:00
aignatov-bio
111a5338af
Merge pull request #2895 from aignatov-bio/ai-sci-5031-refactor-export-all-method
Refactor export all my module generator [SCI-5031]
2020-10-29 13:05:34 +01:00
Miha Mencin
235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2
Release/1.20.2
2020-10-28 13:58:25 +01:00
aignatov-bio
3b0f35aef3 Fix markup 2020-10-22 14:33:17 +02:00
aignatov-bio
f4bf2ab75f Remove empty children from extents 2020-10-22 14:29:35 +02:00
Urban Rotnik
aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Mojca Lorber
6d7b55301f Fix pwa url and change when banner is displayed 2020-10-21 14:56:20 +02:00
Mojca Lorber
23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
aignatov-bio
bdcc7939ad Update export all generator 2020-10-16 18:25:01 +02:00
Urban Rotnik
dac8dda6bc Update comment 2020-10-14 14:54:29 +02:00
aignatov-bio
36bab10de7 Update export all to tree structure 2020-10-14 12:08:04 +02:00
Alex Kriuchykhin
d5499168f3
Merge pull request #2896 from biosistemika/features/pwa
Merge features/pwa to develop
2020-10-13 16:34:57 +02:00
aignatov-bio
a7da7b0de3 Refactor export all my module generator 2020-10-12 15:55:06 +02:00
aignatov-bio
5d6c9e78fd Refactor dashboard layout 2020-10-06 16:09:26 +02:00
aignatov-bio
7c3a3e4490 Small smart annotation fixes 2020-09-28 12:03:01 +02:00
aignatov-bio
e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
aignatov-bio
6ed8757eb1 Merge branch 'features/task-flows' into develop 2020-09-17 14:52:05 +02:00
Alex Kriuchykhin
6269802be4
Merge pull request #2843 from okriuchykhin/ok_SCI_4881
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-09-15 12:53:01 +02:00
Oleksii Kriuchykhin
db3de835f8 Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881] 2020-09-15 11:58:35 +02:00
Oleksii Kriuchykhin
73cf620960 Add Completion and Uncompletion consequences [SCI-5004] 2020-09-14 20:06:48 +02:00
aignatov-bio
661220890f Update error handling 2020-09-09 12:25:34 +02:00
Oleksii Kriuchykhin
7668e16419 Enable CORS for PWA [SCI-4979] 2020-09-04 11:47:45 +02:00
Urban Rotnik
581cd69963 Add activities for status change 2020-09-01 11:48:04 +02:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik
a5fb873d19 Add default workflow 2020-08-27 10:54:39 +02:00
Urban Rotnik
5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
Alex Kriuchykhin
121644decf
Merge pull request #2770 from okriuchykhin/ok_SCI_4881
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-08-21 11:01:49 +02:00
Urban Rotnik
3c1c562e4c Override password reset action, sign_in user only if 2fa disabled 2020-08-10 09:24:15 +02:00
Oleksii Kriuchykhin
ce8d12e1c4 Create new activities for exporting assigned items (live & snapshots) [SCI-4881] 2020-08-05 09:59:58 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
aignatov-bio
3a9d97e85e
Merge pull request #2756 from aignatov-bio/ai-sci-4891-add-2fa-after-forgot-password
Redirect to sign in after recover password [SCI-4891]
2020-07-28 09:57:09 +02:00
aignatov-bio
6bd12e0397 Add modal for status flow 2020-07-27 13:48:21 +02:00
aignatov-bio
d044f7616b Redirect to sign in after recover password 2020-07-23 15:48:51 +02:00
Alex Kriuchykhin
8b24a0f704
Merge pull request #2754 from urbanrotnik/ur-sci-4730-protocol-error
Add blacklist for dashboard activities [SCI-4730]
2020-07-23 15:21:51 +02:00
Alex Kriuchykhin
d4408f6af7
Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results
Add pagination to results page [SCI-4732]
2020-07-23 14:45:10 +02:00
Urban Rotnik
9bcf1a5df5 Add blacklist for dashboard activities 2020-07-23 14:22:58 +02:00
Urban Rotnik
aecd6b228b
Merge pull request #2744 from urbanrotnik/ur-sci-4764-increase-characters-limit-for-rte
Increase chars limit for RTE [SCI-4764]
2020-07-23 12:58:36 +02:00
aignatov-bio
04a6a2a250 Small fixes 2020-07-23 11:35:22 +02:00
aignatov-bio
1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
aignatov-bio
ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Urban Rotnik
9dffc27428 Increase chars limit for RTE 2020-07-20 13:33:38 +02:00
aignatov-bio
6ceb4abfb5 Add constant for results limit 2020-07-17 11:12:39 +02:00
Mojca Lorber
f7083a000a Add devise lockable to user 2020-07-14 14:49:51 +02:00