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

3946 commits

Author SHA1 Message Date
aignatov-bio 86b26cfade
CSS fixes for bmt filters [SCI-6084] (#3764) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-25 10:22:11 +01:00
artoscinote 354bf4b808
Fix for Safari artefacts in TinyMCE [SCI-6154] (#3794) 2022-01-25 10:10:47 +01:00
Martin Artnik 711005425f Merge branch 'features/bmt-search' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:30:33 +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
artoscinote 95a36b6870
Implemented stock management modal [SCI-6417] (#3788) 
* Implement inventory stock management modal [SCI-6417]

* Add generalized validation mechanic, some bugfixes [SCI-6417]

* Fix permission check and method name in RepositoryStockValue [SCI-6417]
 2022-01-20 12:44:57 +01:00
aignatov-bio 05547da457
Add stock table renders [SCI-6412] (#3787) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-19 13:19:56 +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
aignatov-bio 8fcf4e9aa2
Add styling for repository filters [SCI-6232] (#3779) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-17 10:24:57 +01:00
ajugo c570cef06c
Style corrections for printed protocol [SCI-6326] (#3782) 
* Printed protocol display improvements [SCI-6326]

* Fix new line

* Fix hound [SCI-6326]

* Using image_tag helper [SCI-6326]

* Move pictures to asset folder [SCI-6326]
 2022-01-14 15:02:04 +01:00
aignatov-bio 3e85cc0b4a
Add UI for saving filters [SCI-6231] (#3768) 
* Add UI for saving filters [SCI-6231]

* Fix ajax for deleting filters [6231]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
 2022-01-12 14:39:42 +01:00
Anton 304727257e Fix status column emojis [SCI-6407] 2022-01-11 11:27:00 +01:00
artoscinote 277b5f6eec
Fixed reCaptcha causing stack overflows on invite modal [SCI-6052] (#3534) 2022-01-06 10:11:20 +01:00
artoscinote 3f87d250ce
Implement saving repository filters [SCI-6230] (#3748) 
* Implement saving repository filters [SCI-6230]

* Remove unnecessary logging [SCI-6230]

* Refactor filter saving [SCI-6230]

* Remove unnecessary files, linter fixes [SCI_6230]
 2022-01-05 15:02:09 +01:00
Oleksii Kriuchykhin 9f393bdb5a Fix handling of Ctrl+S in TinyMCE editor [SCI-6189] 2022-01-03 13:59:42 +01:00
aignatov-bio d71f231027
Install new TUI Image Editor [SCI-6166] (#3706) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-03 12:37:13 +01:00
aignatov-bio 478df28689
Clear bioEddie molecule on creating new one [SCI-6001] (#3757) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-03 12:36:56 +01:00
Oleksii Kriuchykhin 738da6094f Add advanced filters to repository datatable service [SCI-6210] 2021-12-21 12:38:52 +01:00
Martin Artnik c9e4a9bab7 Merge branch 'master' into features/bmt-search 2021-12-20 13:08:20 +01:00
artoscinote 49ec3edb49
Add apply filters functionality to FE [SCI-6229] (#3742) 2021-12-15 12:48:28 +01:00
aignatov-bio 8ce321456e
Add time filter [SCI-6217] (#3738) 
* Add time filter [SCI-6217]

* Add datetime filter for inventory [SCI-6220]

* Refactor components structure

Co-authored-by: Anton <anton@scinote.net>
 2021-12-15 12:22:24 +01:00
aignatov-bio 00f30b8d6c
Add assigned tasks filters [SCI-6221] (#3726) 
* Add endpoint for repository tasks [SCI-6221]

* Add assigned tasks filter [SCI-6221]

Co-authored-by: Anton <anton@scinote.net>
 2021-12-07 15:28:20 +01:00
artoscinote 1c0a83a76e
Fix propagation and display of role on experiment role reset [SCI-6337] (#3725) 2021-12-07 11:42:14 +01:00
artoscinote 561746158e
Further fix scoping of table styles [SCI-6315] (#3720) 2021-12-06 10:40:08 +01:00
artoscinote 272752ae4f
Fix scoping of table styles [SCI-6315] (#3719) 2021-12-03 16:21:18 +01:00
artoscinote 3f7f576b29
Print protocol fixes [SCI-6318] (#3717) 
* Fix smart annotations [SCI-6318]

* Fix asset rendering [SCI-6316, SCI-6417]

* Copy fix [SCI-6315]

* Fix print protocol name handling [SCI-6318]

* CSS linter fixes

* Add support for handson tables [SCI-6318]

* Use partial for handsontable formulas [SCI-6318]
 2021-12-03 13:44:18 +01:00
artoscinote c746d6b761
Add missing icon [SCI-6314] (#3714) 2021-12-02 10:09:11 +01:00
artoscinote 78ab094bf2
Implement public user grouping, deletion and updates to manually assigned [SCI-6228] (#3701) 
* Implement public user grouping, deletion and updates to manually assigned [SCI-6228]

* PR fixes [SCI-6228]

* Permission check improvement [SCI-6228]
 2021-12-01 16:23:24 +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
Martin Artnik ce5eb68106 Fix checklist checkboxes for locked tasks [SCI-6307] 2021-11-29 12:03:01 +01:00
aignatov-bio 12fadb9c25
Add basic structure for repository filters [SCI-6211] (#3698) 
* Add container for inventory filters [SCI-6211]

* Add basic structure for filters [SCI-6211]

* Add i18n and css for filters dropdown [SCI-6211]

* Fix markup

Co-authored-by: Anton <anton@scinote.net>
 2021-11-25 20:34:22 +01:00
Anton a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00
aignatov-bio 2a135ac120
Fix repository archive title [SCI-6267] (#3671) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-17 14:53:04 +01:00
Anton c00a7b7b8f Update bmt filters default state [SCI-6090] 2021-11-16 15:14:00 +01:00
aignatov-bio 06788bfeb6
Update CSS for BMT filters [SCI-6084] (#3652) 
* Update css for bmt filters [SCI-6084]

* Create shared component for dropdown [SCI-6084]

Co-authored-by: Anton <anton@scinote.net>
 2021-11-16 14:46:08 +01:00
artoscinote d08882e7f2
Style and copy fix [SCI-6272] (#3670) 2021-11-16 11:25:47 +01:00
aignatov-bio 8f9ab4f6c3
Refactor permissions breadcrumbs for users [SCI-6260] (#3665) 
* Refactor permissions breadcrumbs for users [SCI-6260]

* Change creator assignments to automatically [SCI-6260]

Co-authored-by: Anton <anton@scinote.net>
 2021-11-15 15:02:22 +01:00
artoscinote 4ce0c53d36
Implemented reset role functionality [SCI-6261] (#3662) 
* Implemented reset role functionality [SCI-6261]

* Linter fixes [SCI-6261]
 2021-11-15 11:12:31 +01:00
aignatov-bio 50e93fed4e
Remove load from file button from bioeddie [SCI-6091] (#3656) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-11 14:07:27 +01:00
artoscinote 9f92cfab1a
Fixed access modal styling issues [SCI-6241] (#3646) 
* Fixed access modal styling issues [SCI-6241]

* Refactor user access list to use flex [SCI-6241]

* Linter fixes [SCI-6241]
 2021-11-10 11:40:41 +01:00
aignatov-bio dfa79c6996
Fix duplicate requests for project user manage modal [SCI-6249] (#3647) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 16:16:10 +01:00
aignatov-bio 3862e780ee
Fix error on experiments page after role update [SCI-6245] (#3644) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 16:10:20 +01:00
aignatov-bio d3e178e5a2
Small CSS fixes for permissions [SCI-6207] (#3638) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 09:26:22 +01:00
Alex Kriuchykhin f11a4701d0
Merge pull request #3629 from artoscinote/ma_SCI_6193 
Added optional webhook secret key [SCI-6193]
 2021-11-08 21:00:40 +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
aignatov-bio b0c031e4e3
Fix duplicate assignment modals (#3636) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-05 15:42:59 +01:00
aignatov-bio 5081e90fd6
Close access grant modal after submit [SCI-6205] (#3631) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-04 13:31:58 +01:00
Martin Artnik 3406cd9235 Added optional webhook secret key [SCI-6193] 2021-11-03 15:04:13 +01:00
Oleksii Kriuchykhin 47b8347ce6 Add support of Okta SSO provider [SCI-6184] 2021-11-02 16:19:56 +01:00
Anton f7d1541e01 Add scrollbars to filters dropdown [SCI-6085] 2021-11-02 12:18:00 +01:00
aignatov-bio 6dea5f17ff
Fix bioEddie initialization [SCI-6196] (#3624) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-02 10:26:01 +01:00
Oleksii Kriuchykhin a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
artoscinote fc866640be
Improved/removed annoying reloads when managing user access [SCI-6170] (#3618) 2021-10-28 12:49:26 +02:00
aignatov-bio 22034089a6
Update experiment move service [SCI-6149] (#3599) 
* Update experiment move service [SCI-6149]

* Move permission check to helper [SCI-6149]

Co-authored-by: Anton <anton@scinote.net>
 2021-10-27 13:48:52 +02:00
aignatov-bio 1a05c3a40c
Update canvas task cards [SCI-5021] (#3608) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-26 12:06:26 +02:00
aignatov-bio aa4b765407
Update assign/unassign rows to task [SCI-6150] (#3604) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-26 11:41:08 +02:00
Anton 451eb97657 Fix bio eddie iframe loading [SCI-6001] 2021-10-14 13:10:11 +02:00
Zmago Devetak 4a4c344a3a
Task UX: Update assigning a Task to user(s) (#3429) 
* add dynmic select for user assignment on task

* update the user assignment so it looks like tags picker

* fix code style

* Code style fixes [SCI-5871]

* Code style fixes [SCI-5871]

* Destroy and search action fixes [SCI-5871]

Co-authored-by: Martin Artnik <martin@scinote.net>
 2021-10-14 11:49:27 +02:00
aignatov-bio 328f1cfe4d
Add blank tasks to canvas [SCI-6133] (#3588) 2021-10-13 10:08:39 +02:00
Martin Artnik 49b9ee37cc Merge branch 'develop' into features/bmt-search 2021-09-24 11:01:27 +02:00
aignatov-bio a99f9db520
Small CSS fixes [SCI-6017][SCI-6019] (#3548) 2021-09-17 14:15:01 +02:00
aignatov-bio 857ce2d90f
Fix title for archived folders [SCI-6049] (#3541) 2021-09-17 14:12:53 +02:00
Martin Artnik 77aa4a8534 Fixed HTML ampersand display issue [SCI-5590] 2021-09-14 14:42:18 +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
aignatov-bio 6484dfe630 Change printing status modal logic [SCI-6034] 2021-09-07 12:28:11 +02:00
Martin Artnik ade1385392 Merge branch 'develop' into features/bmt-search 2021-09-06 10:51:04 +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 206ba3d79c Reworked how search error works with repository table [SCI-5961] 2021-09-06 10:12:10 +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
Martin Artnik 73241e87bb Fix barcode scanning in modals [SCI-6022] 2021-08-31 14:37:02 +02:00
Martin Artnik 6d92af4b2f Made barcode search globally available [SCI-6022] 2021-08-30 14:41:31 +02:00
Martin Artnik 896f0ce1e3 Implemented applying BMT filters [SCI-5980] 2021-08-30 10:49:15 +02:00
artoscinote ef0e45be04 Implemented frontend for BMT-type repository [SCI-5991] (#3503) 
* Implemented frontend for BMT-type repository [SCI-5991]

* Refactor repository view, fix column reordering [SCI-5991]

* Remove type mapping for default columns in column management [SCI-5991]

* Repository table partial fix, remove non-relevant migration [SCI-5991]
 2021-08-30 10:49:15 +02:00
aignatov-bio 90d4a5f7d1 Add save bmt filters front end [SCI-5962] (#3505) 2021-08-30 10:49:15 +02:00
Martin Artnik a872ea8a47 CSS fixes [SCI-5956] 2021-08-30 10:49:15 +02:00
Martin Artnik 9a87bad740 Implement filters and JSON building [SCI-5956] 2021-08-30 10:49:15 +02:00
aignatov-bio 958ee92db7 Add BMT filters interactions [SCI-5955] (#3478) 
* Add BMT filters interactions [SCI-5955]

* Small fixes [SCI-5955]
 2021-08-30 10:49:14 +02:00
aignatov-bio 7621deeb2a
Small label printers fixes [SCI-6021][SCI-6024] (#3502) 2021-08-23 13:58:16 +02:00
artoscinote c89384cf3c
Merge pull request #3495 from aignatov-bio/ai-sci-6015-clear-errors-on-new-webhook 
Clear errors on cancel new webhook form [SCI-6015]
 2021-08-20 11:05:44 +02:00
aignatov-bio 1b44d49983 Clear errors on cancel new webhook form [SCI-6015] 2021-08-19 13:42:42 +02:00
aignatov-bio a61446acf5
Add close button to label printer modal [SCI-6000] (#3492) 2021-08-19 12:04:41 +02:00
aignatov-bio 6e1d51e2f3
Fix bioeddie errors in console [SCI-5989] (#3487) 2021-08-16 18:29:55 +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
aignatov-bio 87416470f1
Fix empty state for bioEddie [SCI-5987] (#3481) 2021-08-12 15:20:21 +02:00
artoscinote 1fc9027d1a
Merge pull request #3466 from aignatov-bio/ai-sci-5964-cancel-changes-after-exit-webhook-edit-mode 
Cancel changes after exit webhook edit mode [SCI-5964]
 2021-08-11 12:14:12 +02:00
Martin Artnik 861be4bb35 Fix issues with BioEddie integration [SCI-5982] 2021-08-11 09:50:00 +02:00
aignatov-bio cfa7937f88 Cancel changes after exit webhook edit mode [SCI-5964] 2021-08-05 12:44:01 +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 f24207588c
Merge pull request #3463 from biosistemika/features/webhooks 
Features/webhooks
 2021-08-03 13:32:12 +02:00
Martin Artnik a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +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
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
aignatov-bio 8d033274e4
Add barcode scanners support [SCI-5929] (#3456) 2021-07-27 22:01:08 +02:00
aignatov-bio d373c174ee
Add print label button to repository toolbar (#3453) 2021-07-27 12:34:13 +02:00
Martin Artnik d54a743e64 Fixed handling of dropdown-selector max height [SCI-5898] 2021-07-22 09:37:25 +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
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 f55761a491 Invite member search design fixes [SCI-5892] 2021-07-19 15:42:26 +02:00
Martin Artnik 71aa418dc6 Fixed UX issues in user invites modal [SCI-5898] 2021-07-19 12:39:18 +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 40a8f3a434 Switch to using dropdownSelector for emails input [SCI-5099] 2021-07-09 11:20:48 +02:00
Martin Artnik fe06effbd7 Fix linter errors [SCI-5099] 2021-07-09 09:40:06 +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 d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +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 1c98d7cdd2 Fixed missing archived column in experiment table [SCI-5866] 2021-07-02 16:10:35 +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 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
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
Oleksii Kriuchykhin ecec1ce194 Update Invite new user to team modal [SCI-5097] 2021-06-29 13:46: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 53b47412ee Update marvinJS image generation [SCI-5834] 2021-06-24 22:36:51 +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 b6588c2334 Reworked task view sidebar [SCI-5701] 2021-06-18 16:52:19 +02:00
Martin Artnik a9d6c4bb94 Code style fixes [SCI-5828] 2021-06-18 14:19:35 +02:00
Martin Artnik 0866a2e251 Added experiment ID to card and table views [SCI-5828] 2021-06-18 14:12:59 +02:00
Oleksii Kriuchykhin bb458abec6 Remove old reports code [SCI-5650] 2021-06-18 10:40:00 +02:00
Alex Kriuchykhin 945d5ea6c6
Merge pull request #3397 from okriuchykhin/ok_SCI_5831 
Fix repositories selection in report wizard and deleted repositories handling [SCI-5831]
 2021-06-18 10:35:59 +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 4b23ca271c Fixed generating status update when regenerating pdf [SCI-5833] 2021-06-17 09:51:25 +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
artoscinote 2763f5cf89
Merge pull request #3383 from artoscinote/ma_SCI_5780 
Fixed fade-out gradients in Safari [SCI-5780]
 2021-06-16 10:23:23 +02:00
Martin Artnik 1924100b4f Add missing class, so docx report status updates [SCI-5788] 2021-06-14 12:27:25 +02:00
Martin Artnik b5976312ba Fixed fade-out gradients in Safari [SCI-5780] 2021-06-14 09:19:25 +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
aignatov-bio 4a6f6a787a
Update help menu [SCI-5643] (#3368) 2021-06-08 15:34:19 +02:00
Martin Artnik 193bde632f Fix issue with submit event binding multiple times [SCI-5789] 2021-06-08 10:33:31 +02:00
aignatov-bio 9559ed88aa
Add webhooks index page [SCI-5766] (#3366) 2021-06-03 14:00:43 +02:00
Miha Mencin ef77c9d67d
Merge pull request #3363 from okriuchykhin/ok_SCI_5774 
Fix dates formatting in report templates [SCI-5774]
 2021-05-31 14:23:19 +02:00
aignatov-bio 3c7592657c Add activity filters [SCI-5765] 2021-05-31 13:39:10 +02:00
Oleksii Kriuchykhin 92821d7f1e Fix dates formatting in report templates [SCI-5774] 2021-05-31 11:51:04 +02:00
zmagoD debff7bc85 fix code style 2021-05-29 19:25:46 +02:00
zmagoD f1c3bf7cf6 fix failng scenarios and remove uneeded code 2021-05-29 17:25:20 +02:00
Oleksii Kriuchykhin 2bad60d48c Disable edit button for reports of archived projects [SCI-5755] 2021-05-28 16:17:20 +02:00
Alex Kriuchykhin f20b2bd2e8
Merge pull request #3356 from aignatov-bio/ai-sci-5754-add-generate-button-to-old-reports 
Add generate PDF button for old reports [SCI-5754]
 2021-05-28 14:02:18 +02:00
aignatov-bio 519a0534fc Add generate PDF button for old reports [SCI-5754] 2021-05-27 14:55:27 +02:00
aignatov-bio 24f4f6cbb2 Fix report experiments sorting [SCI-5762] 2021-05-27 12:44:45 +02:00
zmagoD be94cb09c2 fix code style 2021-05-22 14:41:56 +02:00
aignatov-bio 4f5939293e Reports close actions dropdown on docx generate click [SCI-5750] 2021-05-21 14:55:11 +02:00
Oleksii Kriuchykhin 29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
aignatov-bio 0200cd4b6e Add indeterminate state to report wizard checkbox [SCI-5714] 2021-05-20 15:54:46 +02:00
Miha Mencin b7f4ac5e67
Merge pull request #3337 from aignatov-bio/ai-sci-5729-grayed-edit-button-on-report-generating 
Disable edit button if report generating [SCI-5729]
 2021-05-20 15:13:12 +02:00
aignatov-bio fce89a8a12 Disable edit button if report generating [SCI-5729] 2021-05-20 13:39:27 +02:00
aignatov-bio 32682efd92
Check report wizard continue button status on page load [SCI-5736] (#3332) 2021-05-20 12:46:23 +02:00
aignatov-bio 7e3a281086 Small fixes for report search [SCI-5551] 2021-05-18 17:00:30 +02:00
aignatov-bio c961b493fc
Small fixes in reports templates [SCI-5723] (#3327) 
* Small fixes in reports templates [SCI-5723]

* Update template name validation [SCI-5723]
 2021-05-18 15:19:51 +02:00
aignatov-bio ff5d8571a3 Add class name to generate docx button [SCI-5722] 2021-05-17 12:06:12 +02:00
aignatov-bio 8f228d866d Add action to generate docx button [SCI-5722] 2021-05-17 12:06:12 +02:00
Alex Kriuchykhin 8e3e72654c
Merge pull request #3324 from aignatov-bio/ai-sci-5551-add-search-field-to-reports 
Add search field to reports page [SCI-5551]
 2021-05-17 11:50:03 +02:00
Miha Mencin 491dc22294
Merge pull request #3321 from okriuchykhin/ok_SCI_5724 
Fix default empty options for report wizard first page [SCI-5724]
 2021-05-17 10:28:57 +02:00
Miha Mencin 65004fa65f
Merge pull request #3325 from okriuchykhin/ok_SCI_5709_v2 
Fix table rendering in PDF reports [SCI-5709]
 2021-05-17 10:17:07 +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
zmagoD de4c28069a fix experiment level styling issues and update the dropdown placeholerds 2021-05-16 11:04:04 +02:00
Oleksii Kriuchykhin 460807b8c3 Fix table rendering in PDF reports [SCI-5709] 2021-05-14 12:01:09 +02:00
aignatov-bio e953666762 Add search field to reports page [SCI-5551] 2021-05-13 21:41:26 +02:00
Oleksii Kriuchykhin 697809ff6a Fix default empty options for report wizard first page [SCI-5724] 2021-05-13 14:24:47 +02:00
Alex Kriuchykhin dde82423f1
Merge pull request #3320 from aignatov-bio/ai-sci-5718-remove-report-name-uniqness 
Remove report name uniqueness [SCI-5718]
 2021-05-13 11:46:34 +02:00
Alex Kriuchykhin 4d30d9dec1
Merge pull request #3317 from okriuchykhin/ok_SCI_5709 
Improve rendering of inventories in reports [SCI-5709]
 2021-05-13 11:45:26 +02:00
aignatov-bio 3ba96be787 Remove report name uniqness [SCI-5718] 2021-05-12 14:56:22 +02:00
Alex Kriuchykhin 5c57056796
Merge pull request #3307 from aignatov-bio/ai-sci-5712-revert-template-on-warning-modal-close 
Revert selected template on warning modal close [SCI-5712]
 2021-05-12 13:12:16 +02:00
aignatov-bio 285e424ab7 Fix markup [SCI-5712] 2021-05-12 12:31:37 +02:00
aignatov-bio e16b3b0d61
Report wizard add red border to report name [SCI-5703] (#3309) 2021-05-12 12:22:40 +02:00
Alex Kriuchykhin d02f4a7ff9
Merge pull request #3308 from aignatov-bio/ai-sci-5706-fix-ordering-tasks-in-report-and-wizard 
Fix ordering tasks in report and wizard [SCI-5706]
 2021-05-12 12:04:43 +02:00
aignatov-bio 8f8e685793
Change report warning modals size [SCI-5717] (#3315) 2021-05-11 21:31:44 +02:00
aignatov-bio 114a590a22
Report wizard fix task and experiments long names [SCI-5711] (#3311) 2021-05-11 21:31:12 +02:00
aignatov-bio 3bd774f8db
Small fixes for report index page [SCI-5695] (#3310) 2021-05-11 21:30:58 +02:00
aignatov-bio 131ff79034
Fix collased arrow in report wizard [SCI-5697] (#3306) 2021-05-11 21:29:59 +02:00
Oleksii Kriuchykhin ca0f5348a1 Improve rendering of inventories in reports [SCI-5709] 2021-05-11 17:09:39 +02:00
Oleksii Kriuchykhin a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +02:00
aignatov-bio dcd299f250 Fix handson table in pdf report [SCI-5720] 2021-05-11 12:20:16 +02:00
aignatov-bio 44a17dc014 Fix ordering tasks in report and wizard [SCI-5706] 2021-05-11 09:40:51 +02:00
zmagoD 5ee38966a0 Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui 2021-05-11 08:36:39 +02:00
aignatov-bio 3b55afb908 Revert selected template on warning modal close [SCI-5712] 2021-05-10 14:03:08 +02:00
zmagoD d145dd6d36 add my module assigments modals 2021-05-09 16:59:10 +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
zmagoD 331a68e9b6 fix new experiment creation 2021-05-08 10:05:22 +02:00
Alex Kriuchykhin 7bc6abd9bb
Merge pull request #3290 from okriuchykhin/ok_SCI_5614 
Improve report saving performance and error handling [SCI-5614]
 2021-05-07 11:51:57 +02:00
Alex Kriuchykhin 7a256838c1
Merge pull request #3292 from aignatov-bio/ai-sci-5638-add-missing-activities-for-new-reports 
Add new activities to reports [SCI-5638]
 2021-05-07 11:26:21 +02:00
Alex Kriuchykhin 4e5e58c66a
Merge pull request #3285 from aignatov-bio/ai-sci-5684-add-warning-modal-for-template-and-project-change 
Add warning modal on project and template change [SCI-5684]
 2021-05-07 10:06:18 +02:00
aignatov-bio 2fc5bd2521
Fix report processing state after create and update [SCI-5678] (#3276) 2021-05-06 14:22:02 +02:00
aignatov-bio bb5f985630 Add new activities to reports [SCI-5638] 2021-05-06 14:03:45 +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
Oleksii Kriuchykhin c0ef2eef3c Improve report saving performance and error handling [SCI-5614] 2021-05-06 10:53:40 +02:00
aignatov-bio 689967f82c Add Scinote Report Template [SCI-5686] 2021-05-05 15:13:06 +02:00
aignatov-bio 4d685f193b Fix save as bew report [SCI-5684] 2021-05-05 12:25:13 +02:00
aignatov-bio 3fc4ab9892 Add warning modal on project and template change [SCI-5684] 2021-05-05 12:13:52 +02:00
Oleksii Kriuchykhin a307a16033 Fix handsontable assets inclusion in report templates [SCI-5692] 2021-05-04 16:05:19 +02:00
Oleksii Kriuchykhin e98ccd2860 Add confirmation modal for report regeneration action [SCI-5622] 2021-05-03 16:10:14 +02:00
aignatov-bio 3d80deb51a
Add pagination to report title page [SCI-5667] (#3275) 2021-05-03 15:27:17 +02:00
aignatov-bio 705fb1e43d
Add report front-end validations and close wizard modals [SCI-5666] (#3273) 
* Add report front-end validations and close wizard modals

* Add constant to report name validation [SCI-5666]
 2021-05-03 15:24:27 +02:00
aignatov-bio e25bd039d5
Small css fix for report action dropdown (#3279) 2021-05-03 15:17:46 +02:00
aignatov-bio 01dfd305ab
Add warning modal to report edit mode [SCI-5621] (#3266) 
* Add warning modal to report edit mode [SCI-5621]

* Move report editing modal to partial [SCI-5621]
 2021-05-03 15:17:23 +02:00
aignatov-bio 7752267808
Add styling for template values [SCI-5630] (#3264) 2021-05-03 15:17:09 +02:00
zmagoD 47cb1b31dc fix code style 2021-05-02 11:36:10 +02:00
zmagoD c1d98f421d update scenarios and UI logic to handle project page reload after modal close 2021-05-02 11:22:59 +02:00
zmagoD 63bbc609ef style modal 2021-04-30 16:02:59 +02:00
zmagoD f1ced42ae6 add filtering logic 2021-04-30 15:25:08 +02:00
zmagoD 11e5662c47 add fe logic for disable/enable fields 2021-04-30 13:26:06 +02:00
aignatov-bio 86854b015d Add third template to reports [SCI-5618] 2021-04-29 15:21:58 +02:00
zmagoD 8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +02:00
aignatov-bio 7c75f170d0
Add repositories settings to report wizard [SCI-5648] (#3269) 
* Add repositories settings to report wizard [SCI-5648]

* Move repositories from report settings to content [SCI-5648]
 2021-04-28 09:54:00 +02:00
zmagoD c136d953d0 create form object for role assigment, create helper object for project member, added new user_projects modal 2021-04-24 18:43:28 +02:00
Oleksii Kriuchykhin a67cc619ec Add additional custom fields for reports [SCI-5609] 2021-04-20 13:57:09 +02:00
aignatov-bio d18a54c874
Update create and update action for reports controller [SCI-5641] (#3260) 
Update create and update action [SCI-5641]
 2021-04-20 13:35:40 +02:00
zmagoD 04ef7a4478 add show and edit permissions modal 2021-04-18 17:19:16 +02:00
Oleksii Kriuchykhin fe8f006f6e Fix save report PDF to Inventory [SCI-5613] 2021-04-14 16:06:59 +02:00
Oleksii Kriuchykhin 0a9a656313 Add flash message and notification for generated reports [SCI-5552] 2021-04-14 15:45:51 +02:00
Oleksii Kriuchykhin a2a0aabb62 Implement pooling for Report document creation status [SCI-5557] 2021-04-14 15:16:08 +02:00
aignatov-bio bccd474cc6 Add edit mode for report [SCI-5620] 2021-04-14 11:51:03 +02:00
aignatov-bio d991b631fb
Merge pull request #3252 from aignatov-bio/ai-sci-5593-add-logic-for-preparing-wizard-data-for-report 
Add logic for preparing wizard data for report [SCI-5593]
 2021-04-14 11:04:55 +02:00
Alex Kriuchykhin 1df86c36d9
Merge pull request #3254 from okriuchykhin/ok_SCI_5637 
Implement PDF report generation in delayed job [SCI-5637]
 2021-04-13 16:37:16 +02:00
Oleksii Kriuchykhin f864f551d5 Implement PDF report generation in delayed job [SCI-5637] 2021-04-12 13:04:02 +02:00
aignatov-bio 101d46956c Add logic for preparing wizard data for report [SCI-5593] 2021-04-12 12:42:22 +02:00
Oleksii Kriuchykhin 67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +02:00
aignatov-bio 14f8e97b5f Add I18n for reports wizard second step [SCI-5572] 2021-04-08 12:04:34 +02:00
aignatov-bio e6edbf55f3 Add report wizard step 2 [SCI-5572] 2021-04-08 12:00:08 +02:00
aignatov-bio a1d6c30ef7 Add report wizard step 3 [SCI-5611] 2021-04-07 16:37:08 +02:00
Alex Kriuchykhin aa21d7e415
Merge pull request #3247 from okriuchykhin/ok_SCI_5591 
Add dynamic form elements in report wizard step 1 [SCI-5591]
 2021-04-07 12:05:10 +02:00
aignatov-bio a46b9cb8ea Add document preview to reports [SCI-5559] 2021-04-07 11:15:22 +02:00
Oleksii Kriuchykhin a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +02:00
aignatov-bio 5c4099af80 Fix css for repository header [SCI-5628] 2021-04-01 12:55:58 +02:00
aignatov-bio 82be23db81 Add project and template selector [SCI-5570] 2021-03-31 15:32:03 +02:00
Alex Kriuchykhin c9688a58f7
Merge pull request #3241 from aignatov-bio/ai-sci-5571-add-template-partial-to-report 
Add template partials to reports [SCI-5571]
 2021-03-31 11:36:56 +02:00
aignatov-bio d04858d26e Fix markup [SCI-5571] 2021-03-30 23:47:34 +02:00
aignatov-bio ecca155fab Added layout for footer and header [SCI-5571] 2021-03-30 23:43:34 +02:00
Oleksii Kriuchykhin 2f6194a99f Remove canvas-to-blob library [SCI-5595] 2021-03-29 14:02:30 +02:00
aignatov-bio b5cb46908c
Merge pull request #3225 from aignatov-bio/ai-sci-5563-add-reload-action-to-inline-asset 
Add reload action for assets [SCI-5563]
 2021-03-25 15:40:36 +01:00
aignatov-bio 0920d0a5cd Add reports wizzard layout [SCI-5569] 2021-03-25 13:21:54 +01:00
aignatov-bio 9e58380991
Merge pull request #3220 from aignatov-bio/ai-sci-5574-fix-infinite-scroll-for-dashboard 
Fix infinite scroll in current tasks on dashboard [SCI-5574]
 2021-03-24 11:42:26 +01:00
Miha Mencin 4fa1f350e4
Merge pull request #3221 from aignatov-bio/ai-sci-5564-small-breadcrumbs-fixes 
Small breadcrumbs fixes [SCI-5564]
 2021-03-24 09:46:09 +01:00
Miha Mencin 39f8cca364
Merge pull request #3230 from okriuchykhin/ok_SCI_5586 
Fix experiment workflow image loading [SCI-5586]
 2021-03-24 09:45:34 +01:00
Oleksii Kriuchykhin f4abb4a6df Fix experiment workflow image loading [SCI-5586] 2021-03-23 23:13:26 +01:00
aignatov-bio 7c573a1ee9 Add reload action for assets [SCI-5563] 2021-03-22 13:02:13 +01:00
aignatov-bio c1f0896670 Convert office icons to base64 [SCI-5513] 2021-03-19 15:10:23 +01:00
aignatov-bio d3d79f4288 Small breadcrumbs fixes [SCI-5564] 2021-03-18 14:24:33 +01:00
aignatov-bio 4436876282 Fix infinite scroll in current tasks on dashboard [SCI-5574] 2021-03-18 13:17:30 +01:00
aignatov-bio 3e5c2e83c7 Update toolbar, add docx and pdf columns [SCI-5549][SCI-5550] 2021-03-17 12:54:25 +01:00
Alex Kriuchykhin ee73088a81
Merge pull request #3214 from okriuchykhin/ok_SCI_5555 
Fix filtering on current tasks widget [SCI-5555]
 2021-03-17 10:40:53 +01:00
aignatov-bio c99e8f19fd Add basic layout [SCI-5548] 2021-03-16 13:11:51 +01:00
aignatov-bio e8310f9b2e
Merge pull request #3212 from aignatov-bio/ai-sci-5431-implement-flyout-for-long-breadcrumbs 
Add dropdown to breadcrumbs [SCI-5431]
 2021-03-12 14:33:19 +01:00
Urban Rotnik c20a1f9bb6
Merge pull request #3195 from urbanrotnik/ur-sci-5513-missing-icons 
Fix CSS for missing icons [SCI-5513]
 2021-03-12 13:58:11 +01:00
Oleksii Kriuchykhin 413187e6da Fix filtering on current tasks widget [SCI-5555] 2021-03-12 13:33:37 +01:00
aignatov-bio d97225026c Fix gap after experiment name [SCI-5486] 2021-03-12 12:30:00 +01:00
aignatov-bio 63744b6a04 Add dropdown to breadcrumbs [SCI-5431] 2021-03-12 12:21:10 +01:00
Urban Rotnik 07ba11c140 Fix icons in export_all and print mode 2021-03-10 12:42:12 +01:00
aignatov-bio 9a88e9d030 Fix typo in experiments stylesheet 2021-03-09 13:15:01 +01:00
Urban Rotnik 919eeb2783 Fix titles to one line 
SCI-5518
 2021-03-08 22:04:19 +01:00
Urban Rotnik e1db291729
Merge pull request #3200 from urbanrotnik/ur-sci-5525 
Add breadcrumbs on Experiments and Tasks pages [SCI-5525]
 2021-03-08 14:13:44 +01:00
Urban Rotnik 96ef0c10da
Merge pull request #3148 from urbanrotnik/ur-sci-5450-remamber-user-view-mode 
Store Table/Cards view setting per user [SCI-5450]
 2021-03-08 11:48:33 +01:00
aignatov-bio ea424e4a12
Merge pull request #3161 from mlorb/ml-sci-5323 
Implement styling for the inventories empty state [SCI-5323]
 2021-03-08 11:42:48 +01:00
aignatov-bio a4227874e3 Add empty office files placeholder [SCI-5490] 2021-03-08 11:35:15 +01:00
aignatov-bio 7ff6cc17ad
Merge pull request #3197 from aignatov-bio/ai-sci-5483-fix-click-zone-for-manage-users-buttons 
Fix click zone for manage users buttons [SCI-5483]
 2021-03-08 11:31:41 +01:00
aignatov-bio df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
aignatov-bio aa695e0c1b
Merge pull request #3203 from aignatov-bio/ai-sci-5486-fix-experimnet-card-css 
Small CSS fixes for experiment card [SCI-5486]
 2021-03-08 10:16:45 +01:00
aignatov-bio 96b712c90e
Merge pull request #3175 from aignatov-bio/ai-sci-5462-fix-dashboard-infinite-scroll 
Fix dashboard infinite scroll [SCI-5462]
 2021-03-08 10:15:26 +01:00
aignatov-bio 16c2130d0f Fix gap after experiment title [SCI-5486] 2021-03-05 14:32:25 +01:00
aignatov-bio ab9d0c018b Small CSS fixes for experiment card [SCI-5486] 2021-03-05 13:41:44 +01:00
Urban Rotnik 235f19cf25 Store Table/Cards view setting per user 
SCI-5450
 2021-03-04 14:56:59 +01:00
Urban Rotnik 401224ae11 Add breadcrumbs on Experiments and Tasks pages 2021-03-04 09:00:58 +01:00
aignatov-bio dcea1b558b Fix click zone for manage users buttons [SCI-5483] 2021-03-02 15:32:53 +01:00
Urban Rotnik 6b5d07e1a4 Fix projects filter 2021-02-23 13:21:09 +01:00
Oleksii Kriuchykhin bdd717b21b Refactor view project users modal [SCI-5387] 2021-02-22 22:37:32 +01:00
Miha Mencin 3639e63954
Merge pull request #3181 from urbanrotnik/ur-sci-5519 
Fix Projects filters history items [SCI-5519]
 2021-02-22 20:14:51 +01:00
Urban Rotnik 17d68bf65f Fix Projects filters history items 2021-02-22 20:11:08 +01:00
aignatov-bio 84d61252d8
Merge pull request #3180 from aignatov-bio/ai-sci-5512-fix-datetime-selector-for-filters 
Fix datetime for projects and experiments filters [SCI-5512]
 2021-02-22 13:25:00 +01:00
aignatov-bio a131056279 Fix datetime for projects and experiments filters [SCI-5512] 2021-02-22 12:51:04 +01:00
Urban Rotnik 757bed3cbf Prevent filters close when click on checkbox after input 
SCI-5511
 2021-02-22 10:50:09 +01:00
aignatov-bio 0609e9699d Fix dashboard infinite scroll [SCI-5462] 2021-02-18 15:31:31 +01:00
Urban Rotnik 6ea39c9363 Add experiment thumbnail, update archived view for experiments 
SCI-5481
 2021-02-18 12:03:13 +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
Urban Rotnik 41cd8edf29 Fix 'bellow' typo across scinote 2021-02-17 11:56:30 +01:00
Urban Rotnik 5199bbff84 Fix Polymerase chain reaction experiment 2021-02-17 11:55:35 +01:00
aignatov-bio 060d5c1c2e
Merge pull request #3159 from aignatov-bio/ai-sci-5249-update-dashboard-widget-size 
Fix dashboard CSS [SCI-5249][SCI-5489]
 2021-02-16 12:43:36 +01:00
aignatov-bio 0368579799 Update experiment card css [SCI-5469] 2021-02-16 12:42:09 +01:00
Mojca Lorber 456d9c713f Implement styling for the inventories empty state 2021-02-15 21:01:31 +01:00
aignatov-bio e02136e664 Add scrollbar to filter dropdown on experement page [SCI-5472] 2021-02-15 13:30:02 +01:00
aignatov-bio cc2edaf71a Fix dahsboard CSS [SCI-5249][SCI-5489] 2021-02-15 12:40:26 +01:00
aignatov-bio e09f5a0604
Merge pull request #3157 from aignatov-bio/ai-sci-5476-fix-empty-toolbar-state 
Fix toolbar empty state [SCI-5476]
 2021-02-15 10:29:27 +01:00
mlorb 20dc9967f5
Merge pull request #3113 from mlorb/ml-sci-5311 
Implement the option of deleting empty folders [SCI-5311]
 2021-02-15 10:27:05 +01:00
mlorb 78a76ea3a1
Merge pull request #3154 from mlorb/ml-sci-5470 
Add no results page on experiments page [SCI-5470]
 2021-02-15 10:26:26 +01:00
Urban Rotnik 8c80484445
Merge pull request #3155 from urbanrotnik/ur-sci-5471 
Fix dots, checkbox and duplicate button visibility on Experiment cards [SCI-5471]
 2021-02-15 10:24:25 +01:00
aignatov-bio e10c7fc6c9 Fix toolbar empty state [SCI-5476] 2021-02-12 14:45:09 +01:00
Urban Rotnik 1ae0b42c2c Fix Dots and Checkbox visibility on experiment cards 2021-02-12 13:25:12 +01:00
Mojca Lorber b600f22248 Add no results page on experiment page 2021-02-12 12:12:26 +01:00
Urban Rotnik b831d5fa14 Fix duplicate button permissions 2021-02-12 07:12:26 +01:00
Urban Rotnik 7e463c77c0 Fix typo in CSS 2021-02-12 06:55:23 +01:00
aignatov-bio 41cdc47702
Merge pull request #3151 from urbanrotnik/ur-sci-5475-move-experiment-bug 
Fix Move button on Experiment card [SCI-5475]
 2021-02-11 21:14:47 +01:00
Urban Rotnik 4cd2bce83f Fix Move button on Experiment card 2021-02-11 18:38:23 +01:00
Mojca Lorber 52cbc036fc Fix hound 2021-02-11 18:29:03 +01:00
Mojca Lorber 7071f4a6c5 Send selected folders param to modal 2021-02-11 18:27:16 +01:00
aignatov-bio 1eff3494fb Fix archived experiments page routes and clean old archive page [SCI-5479] 2021-02-11 14:21:15 +01:00
Mojca Lorber ce451f86a8 Fix projects breadcrumbs style [SCI-5349] 2021-02-10 23:33:16 +01:00
Mojca Lorber 19733ba7d9 Refactor deleting of empty folders 2021-02-10 22:11:42 +01:00
aignatov-bio 486dae7559 Add task counter to experiment card [SCI-5467] 2021-02-10 14:50:42 +01:00
aignatov-bio 9d3d1f8eac Connect toolbar actions to buttons [SCI-5465] 2021-02-09 15:47:15 +01:00
mlorb 45da42b924
Merge branch 'develop' into ml-sci-5311 2021-02-07 19:20:09 +01:00
Mojca Lorber 0d9b38a843 Add archived experiments card style 2021-02-07 19:04:30 +01:00
aignatov-bio a339d821bd
Merge pull request #3105 from aignatov-bio/ai-sci-5255-update-marvin-js-model-styling 
Update marvinJS modal CSS [SCI-5255]
 2021-02-05 15:36:14 +01:00
aignatov-bio 554c0b964a Remove commented value [SCI-5255] 2021-02-05 15:26:01 +01:00
Mojca Lorber ad61e59593 Change the title Projects to folder/subfolder title [SCI-5456] 2021-02-05 11:04:58 +01:00
Miha Mencin be6796c95a
Merge pull request #3137 from aignatov-bio/ai-sci-5365-add-experiments-list-view 
Add list view for experiments [SCI-5365]
 2021-02-05 09:58:52 +01:00
Miha Mencin b35e15fdd5
Merge pull request #3101 from aignatov-bio/ai-sci-5263-add-new-file-icons-to-report 
Add new asset icons to report [SCI-5263]
 2021-02-05 08:21:05 +01:00
aignatov-bio a843aac769 Add list view for experiments [SCI-5365] 2021-02-04 16:45:31 +01:00
Oleksii Kriuchykhin c5b286c764 Fix corrupted SCSS file 2021-02-04 16:40:05 +01:00
Oleksii Kriuchykhin c62c464902 Implement editing options and modals for experiment card [SCI-5367] 2021-02-04 12:06:51 +01:00
Alex Kriuchykhin 1466ae114f
Merge pull request #3027 from okriuchykhin/ok_SCI_5246 
Remove Demo project and Samples inventory [SCI-5246][SCI-5248]
 2021-02-04 11:28:09 +01:00
Oleksii Kriuchykhin 8a0a0cbacc Add view only project users modal for project card [SCI-5337] 2021-02-04 11:25:35 +01:00
aignatov-bio b4a6644f13
Merge pull request #3133 from aignatov-bio/ai-sci-5457-update-experiments-view-screen 
Connect front-end with back-end for experiments page [SCI-5457]
 2021-02-04 11:00:17 +01:00
Mojca Lorber d897e20426 Implement new experiment card layout 2021-02-04 09:02:23 +01:00
aignatov-bio a7a948abaf Add archive/restore toolbar buttons and backend [SCI-5457] 2021-02-03 14:29:50 +01:00
aignatov-bio 7726eae4da Add experiments page load logic and connect filters [SCI-5457] 2021-02-03 14:29:50 +01:00
Oleksii Kriuchykhin 324c268594 Remove Demo project and Samples repository [SCI-5246][SCI-5248] 2021-02-01 15:02:06 +01:00
Oleksii Kriuchykhin 8b593bc3aa Add new experiment template from demo project [SCI-5246] 2021-02-01 14:59:10 +01:00
aignatov-bio 8be9d3b14c
Merge pull request #3126 from biosistemika/features/new-experiments-page 
Features/new experiments page
 2021-01-29 13:28:11 +01:00
aignatov-bio 29cf9be1f6
Add filters to experiments pages [SCI-5366] (#3119) 
* Move filters to shared folder [SCI-5366]
 2021-01-29 13:24:02 +01:00
aignatov-bio 1df44f8383
Try load pdf preview again on error [SCI-5449] (#3121) 
* Try load pdf preview again on error [SCI-5449]

* Add attempts counter [SCI-5449]
 2021-01-29 11:34:53 +01:00
aignatov-bio 9a86cd9184
Update dashboard widgets height [SCI-5206][SCI-5249] (#3123) 2021-01-29 11:01:49 +01:00
Mojca Lorber 1080c22b30 Update Experiments page layout and the toolbar row 2021-01-28 22:47:08 +01:00
Alex Kriuchykhin 24d3ce3606
Merge pull request #3118 from okriuchykhin/ok_SCI_5369 
Add breadcrumbs to project experiments page [SCI-5369]
 2021-01-28 14:50:21 +01:00
aignatov-bio 8396c086f5
Add sticky toolbar for projects page [SCI-5401] (#3108) 
* Add sticky toolbar for projects page [SCI-5401]
 2021-01-25 15:36:23 +01:00
aignatov-bio cea61a6bd2
Add hover effect to project table [SCI-5372] (#3111) 
* Add hover effect to projects table [SCI-5372]

* Fix markup [SCI-5372]
 2021-01-25 10:26:10 +01:00
Urban Rotnik d54090fe0d Fix missing asset in report 
Use 40px asset in override so it will be properly compiled SCI-5446
 2021-01-25 07:49:19 +01:00
Mojca Lorber c58d5734ad Implement the option of deleting empty folders [SCI-5311] 2021-01-21 19:42:25 +01:00
Urban Rotnik e3388b880c
Merge pull request #3109 from aignatov-bio/ai-sci-5438-fix-empty-search-state-for-tables 
Fix css for no results on projects page [SCI-5438]
 2021-01-21 15:45:34 +01:00
Urban Rotnik b3e646fcea Clean up css 2021-01-21 15:40:53 +01:00
aignatov-bio cfc8383004 Fix css for no results on projects page [SCI-5438] 2021-01-21 15:29:37 +01:00
Urban Rotnik 4e0d4f4280 Remove flash message, keep only form errors 
SCI-5406
 2021-01-20 16:12:41 +01:00
aignatov-bio 908678fcff Update marvinJS modal css [SCI-5255] 2021-01-20 12:37:41 +01:00
Urban Rotnik 7cbea1facd
Fix card Restore/Archive actions (#3103) 2021-01-19 17:21:22 +01:00
Alex Kriuchykhin 8ab7b94443
Fix error message at login with false credential [SCI-5412] (#3102) 2021-01-19 17:19:40 +01:00
aignatov-bio 07831c0294 Add new asset icons to report [SCI-5263] 2021-01-19 12:53:49 +01:00
Alex Kriuchykhin f15d984d47
Fix navigation between archived and active projects [SCI-5419] (#3100) 
* Fix navigation between archived and active projects [SCI-5419]
 2021-01-19 11:28:59 +01:00
Urban Rotnik 0a1abf83c6
Merge pull request #3099 from urbanrotnik/ur-sci-5351 
Fix folders exports, add error message [SCI-5351]
 2021-01-19 11:01:08 +01:00
Urban Rotnik 706ca4b118
Merge pull request #3093 from urbanrotnik/ur-sci-5388 
Set height on wholerow-clicked element [SCI-5388]
 2021-01-19 10:24:39 +01:00
aignatov-bio f594a44cdb
Add initialization for select all checkbox in projects table [SCI-5409] (#3098) 
* Add initialization for select all checkbox in projects table [SCI-5409]
 2021-01-19 09:53:56 +01:00
Urban Rotnik ddbc22b274 Fix folders exports, add error message 
SCI-5351
 2021-01-19 09:47:42 +01:00
mlorb f7fd59d295
Merge pull request #3095 from mlorb/ml-sci-5420 
Fix red dot icon for projects filters [SCI-5420]
 2021-01-19 09:35:51 +01:00
Urban Rotnik dbdfe4177d
Merge pull request #3092 from urbanrotnik/ur-sci-5406-error-at-saving-project 
Fix error message for name in EditProject modal [SCI-5406]
 2021-01-18 16:38:06 +01:00
Mojca Lorber 0837c73794 Fix red dot icon for projects filters 2021-01-18 14:02:28 +01:00
Urban Rotnik 5ada4da370 Fix permissions check for cards 
SCI-5415
 2021-01-18 14:02:16 +01:00
Urban Rotnik 3cf6047dbd Set height on wholerow-clicked element 2021-01-18 12:56:26 +01:00
Alex Kriuchykhin 64c0875b09
Merge pull request #3091 from aignatov-bio/ai-sci-5392-fixed-archived-experiment-dropdown-options_2 
Fix archived experiment dropdown and archived view for projects page [SCI-5392]
 2021-01-18 10:32:27 +01:00
Urban Rotnik 02592178f3 Fix error message for name in EditProject modal 
[SCI-5406]
 2021-01-18 09:46:53 +01:00
aignatov-bio d355b4806b
Fix new project modal initialization [SCI-5381] (#3068) 2021-01-15 15:29:12 +01:00
aignatov-bio 6011bb36b6 Fix archived experiment dropdown and archived view for projects page [SCI-5392] 2021-01-15 15:08:27 +01:00
Urban Rotnik 998d66b8b9 Add data attribute for moveable permissions 
SCI-5405
 2021-01-15 13:54:18 +01:00
Urban Rotnik 517026a252
Merge pull request #3083 from urbanrotnik/ur-sci-5393-fix-filters 
Trigger search on filters flyout close, fix render when filters are clear [SCI-5393]
 2021-01-15 11:34:03 +01:00
aignatov-bio 823b9175bd
Small projects pages fixes [SCI-5330] (#3085) 2021-01-14 16:24:28 +01:00
Urban Rotnik 7cd85d8e9d
Merge pull request #3080 from urbanrotnik/ur-sci-5388 
Fix border radius [SCI-5388]
 2021-01-14 14:05:20 +01:00
Urban Rotnik e099827b1b Trigger search on filters flyout close, fix render when filters are clear [SCI-5393] 2021-01-14 13:36:45 +01:00
Oleksii Kriuchykhin 8d3a605571 Fix projects index page JS initialization [SCI-5380] 2021-01-14 13:08:29 +01:00
Urban Rotnik 0e17cde499 Fix line height 2021-01-14 08:54:17 +01:00
Urban Rotnik 8d076d8c58 Fix border radius [SCI-5388] 2021-01-13 09:07:35 +01:00
Alex Kriuchykhin 5f506b7459
Merge pull request #3072 from okriuchykhin/ok_SCI_5383 
Fix folder creation for archived view [SCI-5383]
 2021-01-12 13:50:20 +01:00
Oleksii Kriuchykhin 78ec862a2c Fix folder creation for archived view [SCI-5383] 2021-01-12 13:06:43 +01:00
mlorb 8fbdfa28d5
Merge pull request #3070 from mlorb/ml-sci-5333 
Add no results page for search on project page [SCI-5333]
 2021-01-12 12:02:37 +01:00
Urban Rotnik c04f427c9e
Merge pull request #3065 from urbanrotnik/ur-sci-5377-missing-arrows 
Fix arrows for JS Tree [SCI-5377]
 2021-01-12 11:08:05 +01:00
Alex Kriuchykhin 04f68facd3
Merge pull request #3064 from okriuchykhin/ok_SCI_5344 
Add Restore button to the archived Projects screen [SCI-5344]
 2021-01-12 10:59:39 +01:00
Mojca Lorber 54a5528495 Add no results page for serach on project page [SCI-5333] 2021-01-12 09:18:19 +01:00
Urban Rotnik 244995cb3d Fix assets location and url references [SCI-5377] 2021-01-11 17:56:51 +01:00
aignatov-bio e88848cd75
Fix comments counter [SCI-5371] (#3063) 2021-01-11 10:03:13 +01:00
Oleksii Kriuchykhin 684674952c Add Restore button to the archived Projects screen [SCI-5344] 2021-01-09 21:27:19 +01:00
Urban Rotnik f478ad91c3
Merge pull request #3058 from urbanrotnik/ur-sci-5312 
Folder name uniqueness validation on folder level and renaming [SCI-5312]
 2021-01-08 10:40:52 +01:00
Urban Rotnik 427b5d7107
Merge pull request #3059 from biosistemika/features/folders 
Features/folders into develop
 2021-01-08 06:26:44 +01:00
Urban Rotnik 6f155913ff
Merge pull request #3056 from urbanrotnik/ur-sci-5334-move-project-folders-feature 
Move projects/folders modal [SCI-5334]
 2021-01-07 17:45:19 +01:00
Urban Rotnik 5d79eaa843 Pass projects mode(archived/active) to move_to modal for list [SCI-5334] 2021-01-07 17:42:05 +01:00
Urban Rotnik 3dc76a3e57 Fix typo, update carets 2021-01-07 17:42:04 +01:00
Urban Rotnik 3a52f62d85 Implement folders tree for move action 2021-01-07 17:42:01 +01:00
Urban Rotnik ba13a0b14b Add jstree lib 2021-01-07 17:41:32 +01:00
aignatov-bio 0d7da90b15
Small fixes for projects folder cards [SCI-5345] (#3049) 2021-01-07 17:02:25 +01:00
Urban Rotnik 88ed583a0c Fix error rendering on new proejct_folder modal 2021-01-07 16:41:10 +01:00
Alex Kriuchykhin 962b3a532e
Merge pull request #3057 from okriuchykhin/ok_SCI_5317 
Add project permissions check to projects toolbar [SCI-5317]
 2021-01-07 13:25:34 +01:00
aignatov-bio 1f6fff812a
Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048) 
* Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]
 2021-01-07 13:16:05 +01:00
Oleksii Kriuchykhin 9882539213 Add project permissions check to projects toolbar [SCI-5317] 2021-01-06 22:23:48 +01:00
Mojca Lorber b1eb4003ed Fix bug with users edit link not working 2021-01-06 14:55:27 +01:00
Oleksii Kriuchykhin 53be6a95c4 Fix projects filter mark, titles and comments mark [SCI-5332] 2021-01-06 11:28:39 +01:00
mlorb e8b48e51f4
Merge pull request #3050 from mlorb/ml-sci-5336 
Fix table view of project page display of users [SCI-5336]
 2021-01-06 10:14:08 +01:00
aignatov-bio ef57489cd9
Update repositories sidebar [SCI-5329] (#3031) 
* Update repositories sidebar [SCI-5329]
 2021-01-06 10:13:10 +01:00
Mojca Lorber 5298a91b48 Fix table view of project page display of users [SCI-5336] 2021-01-06 09:52:13 +01:00
Urban Rotnik 8f11376285
Merge pull request #3045 from urbanrotnik/ur-sci-5320-tooptip-for-avatars 
Tooltip for users on project cards [SCI-5320]
 2021-01-06 09:18:00 +01:00
Mojca Lorber 283bfc8759 Update css for users on project cards 2021-01-05 18:31:33 +01:00
Oleksii Kriuchykhin c83327b720 Fix project buttons visibility [SCI-5318] 2021-01-05 14:29:20 +01:00
Oleksii Kriuchykhin 696b8d19f0 Fix new project creation and archiving [SCI-5321][SCI-5326] 2021-01-05 14:14:01 +01:00
Alex Kriuchykhin a8991356b5
Merge pull request #3033 from okriuchykhin/ok_SCI_5341 
Fix restore action for experiments and tasks [SCI-5341]
 2021-01-05 10:09:39 +01:00
aignatov-bio f795d5180d
Fix file previews bugs [SCI-5284] (#3026) 2021-01-05 09:11:22 +01:00
aignatov-bio 2fe55250b9
Update settings navigation [SCI-5316] (#3028) 2021-01-05 09:11:05 +01:00
aignatov-bio 0d1939e405
Initialize pdf preview on galery swtich [SCI-5342] (#3044) 2021-01-04 13:40:05 +01:00
Urban Rotnik 216db90e4a
Merge pull request #3013 from urbanrotnik/ur-sci-5084-smart-annotation-missing-icon 
Fix cursor on SmartAnnotation [SCI-5084]
 2021-01-04 11:18:13 +01:00
mlorb dafe8a072a
Merge pull request #3035 from mlorb/ml-sci-5095 
[SCI-5095] Change color of sidebar icons and labels
 2021-01-04 10:23:52 +01:00
Oleksii Kriuchykhin 738f668ba9 Disable comment adding for archived objects [SCI-5339] 2020-12-30 11:46:56 +01:00
Mojca Lorber bd49e277cc [SCI-5059] Change font size for manage columns list 2020-12-29 11:27:52 +01:00
Mojca Lorber 80b472aba0 [SCI-5095] Change color of sidebar icons and labels 2020-12-29 11:15:22 +01:00
Oleksii Kriuchykhin f76eb170a1 Fix restore action for experiments and tasks [SCI-5341] 2020-12-28 22:21:38 +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
mlorb a999fb0c80
Change the layout of the archived projects cards and the list view [SCI-5267] (#3021) 
* change the layout of the archived projects cards and the list view

* change order in css
 2020-12-18 13:05:23 +01:00
Urban Rotnik d3e38c89f8 Update BE sorting for archived fodlers&projects 
SCI-5306
 2020-12-18 11:27:17 +01:00
Urban Rotnik 7c0ad021de Update sorting dropdown 2020-12-18 11:08:38 +01:00
Urban Rotnik 63a41b123d Fix dropdown JS bug, fix folders_search, apply all new filters to search 
SCI-5306
 2020-12-18 09:43:11 +01:00
Urban Rotnik 87ca79717c Add separate sorting for active/archived view 
[SCI-5306]
 2020-12-18 08:41:51 +01:00
Urban Rotnik 4f657ab343 Fix CSS 
SCI-5306
 2020-12-18 08:37:57 +01:00
mlorb f6f7211d77
Update styling for projects filters and fix some js bugs [SCI-5210] (#3012) 
* Update styling for projects filters and fix some js bugs

* Fix hound
 2020-12-17 23:13:45 +01:00
Urban Rotnik ad4ee65f6b
Merge pull request #3007 from urbanrotnik/ur-sci-5300 
Connect manage users modal with new projects cards [SCI-5300]
 2020-12-17 13:48:10 +01:00
Urban Rotnik 3eb667b6ba
Merge pull request #3005 from urbanrotnik/ur-sci-5274-archived-task-cards 
Archived tasks cards [SCI-5274] [SCI-5275]
 2020-12-17 13:17:11 +01:00
Urban Rotnik d4c84a38e5 Fix css 
[SCI-5274]
 2020-12-17 13:11:30 +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
Urban Rotnik 9a7ffb0645 Add Tags modal to archived tags screen 
[SCI-5274]
 2020-12-17 13:08:57 +01:00
Urban Rotnik 2ae075e893 Use canvas task card for archived task card 
[SCI-5274]
 2020-12-17 13:08:53 +01:00
aignatov-bio 2ca7b81cea
Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011) 
* Change experiment archived card [SCI-5270]
 2020-12-17 13:07:30 +01:00
Oleksii Kriuchykhin 0c65f3f7c2 Implement sorting on the project screen (when filterin/searching) [SCI-5281] 2020-12-17 12:43:09 +01:00
aignatov-bio 329a5bff0b
Fix repository text field rendering [SCI-5304] (#3015) 2020-12-15 12:23:19 +01:00
Urban Rotnik c7c6e2d0f2 Fix cursor on SmartAnnotation 2020-12-14 17:29:30 +01:00
aignatov-bio 30cfe78805
Add edit modal for project folders [SCI-5265] (#3002) 
Add edit modal for project folders [SCI-5265]
 2020-12-14 15:54:18 +01:00
Urban Rotnik 398978c69a Connect users modal to projects index page 2020-12-11 13:07:45 +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 207659a2c1 Fix markup [SCI-5266] 2020-12-10 13:36:38 +01:00
Urban Rotnik 152990b4d6 Add archived mode for Projects 
[SCI-5266]
 2020-12-09 08:51:55 +01:00
aignatov-bio 6a44e23697
Add projects sidebar [SCI-5178] (#2995) 
* Add projects sidebar navigation [SCI-5178]
 2020-12-08 16:07:26 +01:00
Alex Kriuchykhin 7a4f60f25e
Merge pull request #2989 from mlorb/ml-sci-5240 
[SCI-5240] Implement Create new folder function
 2020-12-04 09:57:05 +01:00
mlorb 9693f84bbd
Implement actions dropdown on project card [SCI-5132] [SCI-5179] (#2968) 
* Implement actions dropdown on project card
* make comments counter to work
 2020-12-04 09:38:34 +01:00
Mojca Lorber d9fdb20a99 Fix hound 2020-12-03 12:57:45 +01:00
Mojca Lorber 9253cf5ade Change javascript for modal handeling and some other small fixes 2020-12-03 12:53:19 +01:00
mlorb 74f0f0474a
Merge branch 'features/folders' into ml-sci-5240 2020-12-03 12:50:19 +01:00
Urban Rotnik 478d43f9ce
Merge pull request #2987 from urbanrotnik/ur-sci-5208 
Projects cards and list view with filters  [SCI-5208]
 2020-12-03 12:30:37 +01:00
Urban Rotnik 3700faa04a Update proejcts grid, include breadcrumbs, fix JS 
[SCI-5208]
 2020-12-03 12:29:28 +01:00
Oleksii Kriuchykhin 9546b8f71d Prepare backend for the improved navigation [SCI-5177] 2020-12-03 10:19:11 +01:00
Mojca Lorber d7e3b57d0d [SCI-5240] Implement Create new folder function 2020-12-01 09:59:08 +01:00
Oleksii Kriuchykhin 78e050ccc0 Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171] 2020-11-27 14:27:24 +01:00
Urban Rotnik fcb82fd0d2
Merge pull request #2984 from okriuchykhin/ok_SCI_5204 
Project filters: add text field to the filters [SCI-5204]
 2020-11-27 12:04:46 +01:00
Oleksii Kriuchykhin 1553d32c6e Project filters: add text field to the filters [SCI-5204] 2020-11-26 21:29:45 +01:00
aignatov-bio d162fb6d35
Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete 
Add delete asset confirmation modal [SCI-5241]
 2020-11-26 15:35:40 +01:00
aignatov-bio c6f4d23a78 Fix protocol preview file background 2020-11-26 15:35:06 +01:00
aignatov-bio 60359b595c Add button disabling 2020-11-26 14:37:12 +01:00
aignatov-bio b0ebdceb08 Fix typo 2020-11-26 14:04:26 +01:00
Urban Rotnik 85b22cd486 Fix syntax 2020-11-26 12:31:45 +01:00
Urban Rotnik efd4f8abde Add members dropdown on project filters flyout 2020-11-26 12:29:43 +01:00
Urban Rotnik 34fbcb8f56 Add clear functionallity to projects filters 2020-11-26 09:23:22 +01:00
aignatov-bio 3078e60867 Small css fixes 2020-11-25 16:25:17 +01:00
aignatov-bio c212d514d5 Fix delete asset in protocol repository 2020-11-25 13:13:06 +01:00
aignatov-bio 1979883004 Add delete asset confirmation modal 2020-11-25 12:50:34 +01:00
mlorb e4001dd406
Merge pull request #2977 from mlorb/ml-sci-5048 
Implement ESC button to exit full-screen modals [SCI-5048]
 2020-11-25 09:55:16 +01:00
Mojca Lorber 2a8c98b7ec Implement ESC button to exit full-screen modals 2020-11-24 23:20:53 +01:00
aignatov-bio f2ca55dbf8 Add new icons for assets 2020-11-24 15:37:45 +01:00
aignatov-bio dc62e2780a
Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout 
Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]
 2020-11-24 11:25:36 +01:00
aignatov-bio 966bb7c9ed
Merge pull request #2972 from aignatov-bio/ai-sci-5229-replce-loading-spinner-with-new 
Replace loading spinner [SCI-5229]
 2020-11-23 16:32:49 +01:00
aignatov-bio ba39d8d31b Fix markup 2020-11-23 15:02:50 +01:00
aignatov-bio 624e9b1f82 Small fixes on current task dashboard 2020-11-23 14:29:04 +01:00
aignatov-bio 84d681ecce Replace loading spinner 2020-11-23 14:14:54 +01:00
aignatov-bio 833c327e3a Fix empty state during loading 2020-11-23 12:44:23 +01:00
Mojca Lorber c57da3380f Remove complete step button from protocol step and fix step number in Firefox 2020-11-23 10:18:27 +01:00
aignatov-bio 2449f2b500 Fix smart annotation for comments 2020-11-21 12:34:36 +01:00
aignatov-bio 77b7b1b231 Add errors handling and i18n 2020-11-21 12:31:49 +01:00
aignatov-bio 60ce51149d Add CRUD to comments 2020-11-20 20:25:28 +01:00
aignatov-bio da4b8aaf2f Add comments list 2020-11-20 12:29:40 +01:00
Alex Kriuchykhin f5860397f5
Merge pull request #2953 from okriuchykhin/ok_SCI_5183 
Make folders selectable for 'Export all' functionality [SCI-5183]
 2020-11-20 09:54:53 +01:00
Oleksii Kriuchykhin 4dc3473c5e Fix showing/hiding export button on folder selection [SCI-5183] 2020-11-19 15:50:43 +01:00
aignatov-bio 96bf3dcea2
Merge pull request #2958 from aignatov-bio/ai-sci-5224-update-title-font-color-for-asset-dropdown 
Update title font color for asset dropdown [SCI-5224]
 2020-11-19 12:20:20 +01:00
aignatov-bio 483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews 
Features/office file previews merge branch
 2020-11-19 11:11:39 +01:00
Urban Rotnik aba0034854 Convert some values to ems 2020-11-19 09:25:26 +01:00
Urban Rotnik e893d40eea Add filters flyout for projects 2020-11-19 09:23:35 +01:00
aignatov-bio 2294d396f9 Add comments sidebar layout 2020-11-18 16:26:01 +01:00
aignatov-bio 14ccb5c6a6 Update title font color for asset dropdown 2020-11-17 12:47:45 +01:00
Mojca Lorber ceb0923ce6 Fix tooltip display when editing inventory row 2020-11-16 16:16:47 +01:00
Oleksii Kriuchykhin 6dfeae2283 Make folders selectable for 'Export all' functionality [SCI-5183] 2020-11-13 14:39:10 +01:00
aignatov-bio 6c305011ca Update dashboard placeholders 2020-11-12 12:49:00 +01:00
aignatov-bio 7fd7c2de6a Add download link to reports 2020-11-11 15:48:00 +01:00
Mojca Lorber aadbff94ae Fix double init 2020-11-11 11:07:43 +01:00
Mojca Lorber 1618d79144 Merge branch 'develop' into ml-sci-5152 2020-11-11 10:47:43 +01:00
Miha Mencin 1cfb205df7
Merge pull request #2939 from aignatov-bio/ai-sci-5122-fix-navigation-on-small-screens 
Fix navigation on small screens [SCI-5122]
 2020-11-11 10:22:12 +01:00
aignatov-bio 71ddf680b2 Add highlight to report table 2020-11-10 15:15:18 +01:00
mlorb a71e8ef9cf
Merge pull request #2940 from mlorb/ml-sci-5034 
Expose the new step button on task [SCI-5034]
 2020-11-10 13:10:55 +01:00
Urban Rotnik 0f5bf45cf6 Rebase, add toolbar, minor fixes css and JS 2020-11-06 13:56:21 +01:00
Urban Rotnik 9f12c5f343 New cards and list layout 2020-11-06 13:01:52 +01:00
Mojca Lorber 9893e8d5c8 Add 403 error handling to current tasks dashboard widget 2020-11-06 10:39:04 +01:00
Urban Rotnik d6eef4699b
Merge pull request #2938 from aignatov-bio/ai-sci-5153-fix-dashboard-widget-overlap 
Fix dashboard small screen overlap [SCI-5153]
 2020-11-06 09:59:52 +01:00
Mojca Lorber 8ee8f7b4d2 Expose the new step button on task 2020-11-05 16:14:40 +01:00
aignatov-bio 2c64481cda Fix navigation on small screens 2020-11-05 15:20:34 +01:00
aignatov-bio 5b22f7d301 Fix dashboard small screen overlap 2020-11-05 14:47:19 +01:00
aignatov-bio 99b52e5d80 Fix markup 2020-11-05 08:44:48 +01:00
Oleksii Kriuchykhin 40ab03c38d Fix cucumber tests for table results [SCI-5047] 2020-11-04 16:46:18 +01:00
Oleksii Kriuchykhin 327baafcd7 Improve CSS structure for project toolbar [SCI-5129] 2020-11-04 16:10:40 +01:00
aignatov-bio 12fdea8d89 Add context menu to attahcments 2020-11-04 13:08:40 +01:00
aignatov-bio e8e9244d96 Fix I18n and double loading 2020-11-03 09:07:49 +01:00
Oleksii Kriuchykhin 8eec4e4b59 Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047] 2020-11-02 22:19:33 +01:00
aignatov-bio 0f80786433 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step 2020-11-02 18:52:46 +01:00
aignatov-bio 84a7d49023 Fix markup 2020-11-02 18:51:21 +01:00
aignatov-bio f85a3493cd
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports 
Add filer previews to reports [SCI-5110]
 2020-11-02 18:48:45 +01:00
aignatov-bio eca39a00b5 Add attachments dropdown to step 2020-11-02 18:47:08 +01:00
Mojca Lorber 8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
Oleksii Kriuchykhin 258c57870f Implement the toolbar on the Team Projects page [SCI-5129] 2020-11-02 13:28:37 +01:00
Mojca Lorber 04e3b67968 Change the way buttons are toggled 2020-10-30 18:47:01 +01:00
Mojca Lorber a52315fc79 Merge branch 'develop' into ml-sci-5033 2020-10-29 18:28:25 +01:00
aignatov-bio 12991e8fd3 Commit add asset preview mode switcher to step 2020-10-29 16:42:05 +01:00
aignatov-bio f51416d83a Update permission markup 2020-10-29 14:59:14 +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 131d487e69 Add file preview to list view 2020-10-29 14:30:26 +01:00
aignatov-bio d99e279ecc Add gallery to file preview 2020-10-29 14:30:26 +01:00
aignatov-bio c56f7912ef Update file preview 2020-10-29 14:23:32 +01:00
Urban Rotnik bb5c703696
Merge pull request #2878 from urbanrotnik/ur-sci-5040 
Support multiple file upload in TinyMCE fields [SCI-5040]
 2020-10-29 14:14:38 +01:00
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
aignatov-bio 23f9fb212d
Merge pull request #2915 from aignatov-bio/ai-sci-5105-update-image-edit-modal 
Update image edit modal [SCI-5105]
 2020-10-29 09:15:32 +01:00
Urban Rotnik 54f38c8ded Move validation before request 2020-10-29 08:45:55 +01:00
aignatov-bio 16249201f3 Fix markup 2020-10-28 16:44:28 +01:00
aignatov-bio 2f1217688c Add filer previews to reports 2020-10-28 16:32:22 +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 bb983af42f
Merge pull request #2911 from aignatov-bio/ai-sci-4579-update-checkbox-style 
Update checkbox style at repository and protocol datatable [SCI-4579]
 2020-10-27 10:22:56 +01:00
Urban Rotnik cb9db57645
Merge pull request #2909 from urbanrotnik/ur-sci-5006 
Add lock icon to current task section on dashboard [SCI-5006]
 2020-10-27 08:20:55 +01:00
aignatov-bio bddd1956ab Fix font size and font weight for status label 2020-10-26 12:35:40 +01:00
Mojca Lorber ec41bdd414 Move open mobile app button to main navigation 2020-10-26 09:28:44 +01:00
aignatov-bio aefaf4d0c1 Update image edit modal 2020-10-25 16:57:50 +01:00
Urban Rotnik b23f110184
Merge pull request #2905 from urbanrotnik/ur-sci-5085-active-filters 
Add mark for active filters [SCI-5085]
 2020-10-25 16:06:59 +01:00
Urban Rotnik c5a1d34c36
Merge pull request #1967 from jbargu/jg_sci_2228 
[SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase
 2020-10-23 15:33:22 +02:00
Urban Rotnik 75351a3aed px to em 2020-10-23 14:11:56 +02:00
aignatov-bio d6f8e156c1 Update checkbox style at repository and protocol datatable 2020-10-22 16:42:12 +02:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Urban Rotnik 58013e215d Add lock icon to current task section on dashboard 2020-10-22 08:09:51 +02:00
Mojca Lorber 6d7b55301f Fix pwa url and change when banner is displayed 2020-10-21 14:56:20 +02:00
Urban Rotnik 2f99e3a464 Remove border, update copy 2020-10-21 09:58:35 +02:00
Urban Rotnik e7d2d78935 Add mark for active filters 2020-10-20 16:45:54 +02:00
aignatov-bio 2968e677b8 Update image for doorkeeper auth 2020-10-19 16:23:20 +02:00
Mojca Lorber 23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
aignatov-bio 3fe3c2087f Fix hound issues 2020-10-16 11:27:23 +02:00
aignatov-bio 566ef7aef7 Add list view to atachments 2020-10-16 11:00:57 +02:00
aignatov-bio 016fc8a632 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews 2020-10-15 15:25:54 +02:00
aignatov-bio 0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
Mojca Lorber 5013f224ee Fix ems 2020-10-14 13:16:38 +02:00
Mojca Lorber a944525d25 Change px to em 2020-10-12 16:59:33 +02:00
Mojca Lorber cf367baefa Merge branch 'develop' into ml-sci-4841 2020-10-12 14:43:03 +02:00
aignatov-bio 5d6c9e78fd Refactor dashboard layout 2020-10-06 16:09:26 +02:00
Mojca Lorber 4e4a4a2c4e Change Complete step button on task step 2020-10-02 15:02:42 +02:00
Oleksii Kriuchykhin 21fab4198c Merge branch 'develop' into features/local 2020-10-01 11:52:59 +02:00
Urban Rotnik fc8704b520 Add fileUtils for sizeCheck, add url to textarea data attribute 2020-09-30 13:20:11 +02:00
Urban Rotnik dc0072e707 Support multiple file upload in TinyMCE fields 2020-09-29 08:21:31 +02:00
Oleksii Kriuchykhin 25a9f5c685 Add typeface-lato for shipping Lato fonts 2020-09-28 18:02:47 +02:00
aignatov-bio 7c3a3e4490 Small smart annotation fixes 2020-09-28 12:03:01 +02:00
aignatov-bio 1ed65eddfa Move ordering to front-end 2020-09-25 15:06:09 +02:00
Mojca Lorber 94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
aignatov-bio 780db9d134 Add assets view switcher 2020-09-24 17:10:36 +02:00
Alex Kriuchykhin d02d48f10f
Merge pull request #2869 from aignatov-bio/ai-sci-5038-fix-smart-annotaion-link-for-inventory-items 
Improve smart annotation in TinyMCE fields [SCI-5038]
 2020-09-24 14:11:59 +02:00
aignatov-bio 4f7814cff4 Fix markup 2020-09-24 13:32:43 +02:00
aignatov-bio ff33cb45e0 Improve smart annotation in TinyMCE fields 2020-09-24 13:29:20 +02:00
Mojca Lorber f0a07acaf4 Some protocol repository CSS corrections 2020-09-23 20:54:49 +02:00
aignatov-bio b6f038ff09
Merge pull request #2863 from aignatov-bio/ai-sci-5037-update-regexp-for-smart-annotation 
Update regexp for smart annotation [SCI-5037]
 2020-09-23 16:39:24 +02:00
aignatov-bio e4b94b582a Add dynamic render of wopi files in viewport 2020-09-23 12:32:46 +02:00
aignatov-bio d719c26b6c Add error handling for MarvinJS 2020-09-23 12:26:26 +02:00
aignatov-bio 21dcf1157c Update regexp for smart annotation 2020-09-23 11:13:59 +02:00
aignatov-bio 7fa98de1da
Merge pull request #2859 from aignatov-bio/ai-sci-5036-fix-smart-annotation-cursor-position 
Fix smart annotation cursor position [SCI-5036]
 2020-09-23 10:11:13 +02:00
mlorb 547af538b3
Merge pull request #2856 from mlorb/ml-sci-5009 
Update empty states for smart annotation results and dismiss button [SCI-5009]
 2020-09-22 15:31:22 +02:00
Mojca Lorber 8b3fce9656 Move it again 2020-09-22 11:38:32 +02:00
Mojca Lorber 0ad93d1288 Move close modal function to global event 2020-09-22 11:30:05 +02:00
aignatov-bio 2d667acdd1 Prevent tinymce edit mode when link click 2020-09-22 10:56:40 +02:00
aignatov-bio fd7773a3dc Fix smart annotation cursor position 2020-09-22 10:15:01 +02:00
Mojca Lorber 23d6d93074 Fix css 2020-09-21 17:13:42 +02:00
Mojca Lorber d9a78d20d7 Update empty states for smart annotation results and dismiss button 2020-09-18 08:50:01 +02:00
aignatov-bio 644f30fb10 Fix syntax for uglifier 2020-09-17 15:35:12 +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
aignatov-bio 8dbc69aa31 Remove console.log 2020-09-17 14:48:26 +02:00
aignatov-bio f11f54db33 Small fixes 2020-09-17 13:11:54 +02:00
aignatov-bio b4102f3cfd Add try/cath for JSON.parse 2020-09-17 11:43:08 +02:00
aignatov-bio 9cb26a1cb9 Fix markup 2020-09-17 11:43:08 +02:00
aignatov-bio 3691d21215 Fix multiple smart annotation selected 2020-09-17 11:43:08 +02:00
aignatov-bio 86667feb6b Add remembered state for smart annotation 2020-09-17 11:43:07 +02:00
mlorb 4acd0c4cb9
Merge pull request #2841 from mlorb/ml-sci-4984 
Add saving state for filters on dashboard [SCI-4984]
 2020-09-17 09:53:16 +02:00
aignatov-bio c26f8e7193 Add before send condition for status change 2020-09-16 15:23:53 +02:00
Urban Rotnik c9de9e857f Fix constant initialization 2020-09-16 12:15:23 +02:00
Mojca Lorber 9cd8e3b7ac Change default status values, add project and experiment to saved state and fix parsing error handeling 2020-09-16 09:48:06 +02:00
Mojca Lorber 3c30ee904e Merge branch 'features/task-flows' into ml-sci-4984 2020-09-15 13:27:34 +02:00
mlorb bf707a11a9
Merge branch 'features/task-flows' into ml-sci-4976 2020-09-15 12:59:49 +02:00
Alex Kriuchykhin 04686d4ffc
Merge pull request #2842 from okriuchykhin/ok_SCI_5004 
Add Completion and Uncompletion consequences [SCI-5004]
 2020-09-15 12:56:27 +02:00
aignatov-bio 67d3a1ad12 Fix markup 2020-09-15 12:06:20 +02:00
aignatov-bio 6dc4422d82 Fix markup 2020-09-15 11:56:44 +02:00
Mojca Lorber fe7d922cc5 Refactor complete step button 2020-09-15 11:18:15 +02:00
Oleksii Kriuchykhin 73cf620960 Add Completion and Uncompletion consequences [SCI-5004] 2020-09-14 20:06:48 +02:00
Mojca Lorber 13f719a9e1 Add saving state for filters on dashboard 2020-09-14 18:15:57 +02:00
aignatov-bio c10e2d231e Update frontend permission check 2020-09-14 15:59:09 +02:00
Oleksii Kriuchykhin a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +02:00
aignatov-bio 008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
aignatov-bio 18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +02:00
mlorb 3d2aaed791
Merge pull request #2820 from mlorb/ml-sci-4580 
Fix buttons visability on reports page according to new styleguide [SCI-4580]
 2020-09-10 09:32:16 +02:00
Mojca Lorber d055d6e241 Fix quotes again 2020-09-09 14:43:12 +02:00
Mojca Lorber eeb8f4a97a Disable 'complete step' button on locked task 2020-09-09 14:32:37 +02:00
aignatov-bio 7a86bb47c5 Add styling and highligh 2020-09-09 14:17:19 +02:00
Urban Rotnik 0ae39678d4
Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state 
Add error message for locked task, update some permission checks[SCI-4982]
 2020-09-09 14:04:08 +02:00
Urban Rotnik 8b10cde6b4 Fix DeepScan error 2020-09-09 13:51:11 +02:00
aignatov-bio 946b961b1a
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses 
Add front-end checks for statuses [SCI-4975]
 2020-09-09 13:21:04 +02:00
aignatov-bio 661220890f Update error handling 2020-09-09 12:25:34 +02:00
aignatov-bio f4a13a73cb Refactor smart annotation front-end 2020-09-09 12:25:34 +02:00
aignatov-bio 5d9d7d6a12
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions 
Add description for conditions [SCI-4983]
 2020-09-09 11:33:48 +02:00
Urban Rotnik aa88b6bdb4 Move redirect to controller 2020-09-09 11:26:43 +02:00
Mojca Lorber ea1510bcdd Fix quotes 2020-09-09 10:27:32 +02:00
aignatov-bio 84682c6346
Merge pull request #2823 from mlorb/ml-sci-4575 
Replace old arrow with new one [SCI-4575]
 2020-09-09 09:05:39 +02:00
aignatov-bio 9a771da7f7
Merge pull request #2821 from mlorb/ml-sci-4578 
Fix buttons visability on protocols page according to new styleguide [SCI-4578]
 2020-09-09 09:05:26 +02:00
aignatov-bio ae1bec2a95
Merge pull request #2818 from mlorb/ml-sci-4572 
Change step checklist and table edit mode [SCI-4572]
 2020-09-09 09:02:56 +02:00
aignatov-bio bdb3caf5cf Add i18n 2020-09-09 08:50:24 +02:00
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
Mojca Lorber 7e9ef9496f Update smart annotation appearance in the text 2020-09-07 18:30:54 +02:00
Oleksii Kriuchykhin dea75553a3 Fix handling of duplicated step positions [SCI-4880] 2020-09-07 10:44:00 +02:00
Mojca Lorber 9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
Mojca Lorber 24745203e1 Fix buttons visability on protocols page according to new styleguide 2020-09-03 17:05:25 +02:00
Mojca Lorber 1f0d9f3ad7 Fix buttons visability on reports page according to new styleguide 2020-09-03 16:19:02 +02:00
aignatov-bio d85703113a Add front-end checks 2020-09-03 14:34:34 +02:00
aignatov-bio 4c1e120f23
Merge pull request #2810 from aignatov-bio/ai-sci-4968-add-error-handling-for-state-change 
Add error handling for state change [SCI-4968]
 2020-09-03 11:47:48 +02:00
aignatov-bio 39105a807a
Merge pull request #2816 from aignatov-bio/ai-sci-4960-fix-css-issue-for-status-flow 
Fix css for status flows [SCI-4970]
 2020-09-03 09:46:19 +02:00
Mojca Lorber 06d75fb07e Change step checklist and table edit mode 2020-09-02 18:04:37 +02:00
aignatov-bio 257329ce80 Fix css for status flows 2020-09-02 15:41:07 +02:00
Mojca Lorber 634dd2ae5e Add css variable 2020-09-02 12:00:52 +02:00
Mojca Lorber d57eb68f93 Fix tables header corners 2020-09-01 16:25:30 +02:00
Urban Rotnik ed5869ff8e Show status on task card 2020-09-01 14:56:48 +02:00
aignatov-bio 9ff5e8bd7d Add task state change error handling and validation 2020-09-01 12:41:00 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik 4eebfa5461 Controller action for card inline preview 2020-08-28 11:05:52 +02:00
aignatov-bio c07ebe90fa Add migration for task states 2020-08-27 11:34:59 +02:00
Oleksii Kriuchykhin ed2eb81c68 Switch to position swapping when updating step position [SCI-4880] 2020-08-25 15:46:23 +02:00
Oleksii Kriuchykhin a206890a8c Fix step position adjusting on move and destroy [SCI-4880] 2020-08-25 15:46:21 +02:00
Urban Rotnik 5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
aignatov-bio c3ddfd5bed
Merge pull request #2786 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard 
Fix dropdrown selector [SCI-4899]
 2020-08-25 14:51:55 +02:00
aignatov-bio 21e4dcd96a Add wopi preview for office files 2020-08-25 13:22:36 +02:00
Urban Rotnik b6495becdb Set stateDuration to 0 2020-08-24 15:51:35 +02:00
Alex Kriuchykhin 5006173d59
Merge pull request #2780 from aignatov-bio/ai-sci-4856-add-new-statuses-to-dashboard 
Add new statuses to dashboard [SCI-4856]
 2020-08-24 11:09:57 +02:00
Mojca Lorber 059c8c88d9 Fix css for modal-body 2020-08-20 14:12:45 +02:00
aignatov-bio 19a0d05467 Fix for checklist ordering 2020-08-14 12:32:39 +02:00
Mojca Lorber a91aa6ce46 Fix Collapse and expand buttons position 2020-08-13 13:18:50 +02:00
aignatov-bio 5360db76be Fix dropdrown selector 2020-08-12 14:00:10 +02:00
aignatov-bio 56ff4e7702 Add new statuses to dashboard 2020-08-10 09:10:56 +02:00
Urban Rotnik 073979534c
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 16:43:05 +02:00
Urban Rotnik e221d960e7 Revert "Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard" 
This reverts commit 8b6d57058c, reversing
changes made to 957ac92669.
 2020-08-04 15:07:22 +02:00
Urban Rotnik 7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Urban Rotnik 6853caa0c8
Merge pull request #2760 from aignatov-bio/ai-sci-4894-small-2fa-fixes 
Small 2fa fixes [SCI-4894]
 2020-08-04 11:23:08 +02:00
Urban Rotnik cce76f6f0f
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults 
Add ordering for result page [SCI-4895]
 2020-08-04 11:17:43 +02:00
Alex Kriuchykhin e965844a9e
Merge pull request #2755 from aignatov-bio/ai-sci-4837-implement-new-statuses-in-preports 
Add new statuses to reports [SCI-4837]
 2020-08-04 09:49:55 +02:00
Alex Kriuchykhin a9bc5b664a
Merge pull request #2750 from aignatov-bio/ai-sci-4835-add-status-flow-modal 
Add modal for status flow [SCI-4835]
 2020-08-04 09:47:40 +02:00
Urban Rotnik aaae33e603
Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard 
Add start date to current task dashboard filter [SCI-4766]
 2020-08-03 11:56:24 +02:00
Urban Rotnik 868f2e8242
Merge pull request #2765 from aignatov-bio/ai-sci-4878-fix-activities-on-task-tab 
Fix CSS for activities on task page [SCI-4878]
 2020-08-03 11:31:47 +02:00
Urban Rotnik ac3c06d882
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items 
Add export for assigned items [SCI-4748]
 2020-08-03 11:30:31 +02:00
aignatov-bio 536367362c Add statuses to dashboard filters 2020-07-31 10:59:10 +02:00
aignatov-bio 73911cf7ce Fix CSS for activities on task page 2020-07-30 13:30:23 +02:00
aignatov-bio 2f5231e832 Add start date to current task dashboard filter 2020-07-29 16:09:23 +02:00
aignatov-bio 15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
aignatov-bio 68fc6ec58a Add sorting my module statuses 2020-07-27 16:36:21 +02:00
aignatov-bio 6bd12e0397 Add modal for status flow 2020-07-27 13:48:21 +02:00
aignatov-bio 33e3e3d301 Small 2fa fixes 2020-07-27 13:42:51 +02:00
Urban Rotnik 025378cd0e Fix translations and JS 2020-07-23 15:53:46 +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
aignatov-bio a0d19b5d98 Add new statuses to reports 2020-07-23 14:24:30 +02:00
Urban Rotnik 077f5eefdb
Merge pull request #2753 from urbanrotnik/ur-sci-4890-inventory-empty-text-value 
Fix undefined text cell [SCI-4890]
 2020-07-23 12:56:43 +02:00
Alex Kriuchykhin cb9fe04584
Merge pull request #2745 from aignatov-bio/ai-sci-4785-fix-inventories-activity-filters 
Fix global activities filters [SCI-4785]
 2020-07-23 10:09:36 +02:00
aignatov-bio b214d2df77
Merge pull request #2746 from aignatov-bio/ai-sci-4815-fix-margins-on-view-switch 
Fix switch view margins [SCI-4815]
 2020-07-23 08:57:20 +02:00
Urban Rotnik 51ca828399 Fix undefined text cell 2020-07-22 17:27:36 +02:00
Urban Rotnik 512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
Urban Rotnik aacee14fc6 Add Status button 2020-07-22 15:30:47 +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 7019e42736
Merge pull request #2743 from urbanrotnik/ur-sci-4816-change-font-size-email 
Fix font size in dropdown [SCI-4816]
 2020-07-20 15:50:10 +02:00
aignatov-bio 691b8ec327 Fix switch view margins 2020-07-20 15:17:24 +02:00
aignatov-bio 75930b99c3 Fix global activities filters 2020-07-20 15:01:00 +02:00
Urban Rotnik 748dd7912b Fix font size in dropdown 2020-07-20 11:36:25 +02:00
aignatov-bio e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +02:00
Mojca Lorber 10e607c281 Implement Status labels on a Task card 2020-07-17 14:48:45 +02:00
aignatov-bio 7c4bfad09b Add pagination to results page 2020-07-16 15:47:19 +02:00
Mojca Lorber 9464d2753d Fix naming of filter field for repositories tables 2020-07-15 10:52:47 +02:00
Alex Kriuchykhin 8dd478ad61
Merge pull request #2730 from aignatov-bio/ai-sci-4874-improve-pdf-reports 
Improve pdf reports [SCI-4874]
 2020-07-13 17:02:10 +02:00
Mojca Lorber 212ba76c16 Fix Settings pages titles 2020-07-13 14:51:51 +02:00
aignatov-bio a7fac38fcb Improve pdf reports 2020-07-13 14:29:59 +02:00
Mojca Lorber cea9e6f956 Add check for search state 2020-07-10 15:39:01 +02:00
Alex Kriuchykhin 594d8031ce
Merge pull request #2726 from mlorb/ml-sci-4855 
Remove search state load from repositories table [SCI-4855]
 2020-07-10 13:07:44 +02:00
Mojca Lorber 39ae1ed25e Fix search status 2020-07-10 12:52:07 +02:00
aignatov-bio 50714eb59d Disable inventories table initialization on turbolinks preview 2020-07-10 11:05:27 +02:00
Mojca Lorber 21f0d431b0 Remove search state load from repositories table 2020-07-10 11:05:22 +02:00
aignatov-bio fef6e5f1db Add recovery strategy for 2fa 2020-07-09 17:01:00 +02:00
Urban Rotnik 7aa40a284e
Merge pull request #2724 from urbanrotnik/ur-sci-4771-improve-report-layout 
Text wrap for page numbers [SCI-4771]
 2020-07-09 16:52:41 +02:00
Urban Rotnik 1f220f70ee Text wrap for page numbers 2020-07-09 16:24:14 +02:00
mlorb 0f43f6a479
Merge pull request #2721 from mlorb/ml-sci-4788-v2 
Fix bug with not hidden navigation on inventory page [SCI-4788]
 2020-07-09 15:12:44 +02:00
mlorb 3f44f44cbe
Merge pull request #2711 from mlorb/ml-sci-4810 
Hide inventory buttons and fix css of disabled button [SCI-4810]
 2020-07-09 15:11:02 +02:00
Miha Mencin 2cb3720602
Merge pull request #2720 from aignatov-bio/ai-sci-4842-snapshot-archived-label-wrong-position 
Add archived label to correct column [SCI-4842]
 2020-07-09 14:49:54 +02:00
Mojca Lorber cb8070c012 Fix pointer event 2020-07-09 14:25:54 +02:00
Mojca Lorber 1a2b321523 Fix bug with not hidden navigation on inventory page 2020-07-09 14:09:55 +02:00
aignatov-bio c240474f76 Add archived label to correct column 2020-07-09 13:39:26 +02:00
aignatov-bio 6245e19069
Merge pull request #2718 from biosistemika/master 
Merge master to develop
 2020-07-09 12:56:31 +02:00
mlorb 73e2654d78
Merge pull request #2701 from mlorb/ml-sci-4793 
Add empty states to inventories datatable and fix filtering bug [SCI-4793]
 2020-07-09 11:49:16 +02:00
Urban Rotnik 950f65b90e
Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout 
Improve report layout [SCI-4771]
 2020-07-09 11:48:33 +02:00
mlorb d9038e6f7f
Merge branch 'develop' into ml-sci-4810 2020-07-09 11:46:54 +02:00
Mojca Lorber 19c5b7e5a2 Remove redundant css class 2020-07-09 11:44:36 +02:00
Miha Mencin c68aa5c875
Merge pull request #2716 from mlorb/ml-sci-4567 
Change title size to h1 [SCI-4567]
 2020-07-09 11:19:02 +02:00
Mojca Lorber f64172f787 Revert repository archived items title 2020-07-09 09:17:02 +02:00
aignatov-bio b2a42c182b
Merge pull request #2717 from aignatov-bio/ai-sci-4844-fix-dropdown-options-for-active-repository 
Small archived repositories fixes [SCI-4844]
 2020-07-09 08:56:21 +02:00