scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-28 02:46:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
11936 commits 69 branches 179 tags 165 MiB
Commit graph

3517 commits

Author SHA1 Message Date
artoscinote 362658021e
Permission typo fixes [SCI-6120] (#3582) 2021-10-11 10:19:16 +02:00
aignatov-bio 34b0aec5b7
Update permission checks for reports [SCI-6105] (#3570) 2021-10-01 14:25:52 +02:00
artoscinote f68d724202
Rework experiment permissions [SCI-6054] (#3538) 
* Rework experiment permissions [SCI-6054]
 2021-09-30 11:32:11 +02:00
aignatov-bio a93f2889b7 Fix 2fa redirecting [SCI-6103] 2021-09-28 12:34:41 +02:00
aignatov-bio c248e87adb
Add permissions checks for results controllers [SCI-6071] (#3555) 
* Add permission tests for results controller [SCI-6071]

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

* Small fixes to results controllers [SCI-6071]

* Update result permission helpers [SCI-6071]
 2021-09-24 13:11:41 +02:00
Alex Kriuchykhin 313eaf7276
Merge pull request #3539 from aignatov-bio/ai-sci-6050-fix-sidebar-navigation-for-archived-task 
Fix sidebar navigation for archived task [SCI-6050]
 2021-09-24 11:47:59 +02:00
Martin Artnik 49b9ee37cc Merge branch 'develop' into features/bmt-search 2021-09-24 11:01:27 +02:00
aignatov-bio 60b261feb8 Small fixes [SCI-6050] 2021-09-23 12:31:40 +02:00
artoscinote 895509a26c
Merge pull request #3543 from artoscinote/ma_SCI_6056 
Reworked MyModule permissions [SCI-6056]
 2021-09-17 15:19:01 +02:00
aignatov-bio a99f9db520
Small CSS fixes [SCI-6017][SCI-6019] (#3548) 2021-09-17 14:15:01 +02:00
Oleksii Kriuchykhin 61d4a96a3f Update/implement permission checks in the experiments controller [SCI-6057] 2021-09-16 09:55:59 +02:00
Martin Artnik 534ab25e5d Sort experiments alphabetically in move task modal [SCI-6048] 2021-09-14 15:11:47 +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
Martin Artnik e8f57e9e99 Reworked MyModule permissions [SCI-6056] 2021-09-14 11:08:35 +02:00
aignatov-bio 6a1223c498 Fix sidebar navigation for archived task [SCI-6050] 2021-09-10 12:05:40 +02:00
aignatov-bio 3036a38bfd
Fix rspec tests [SCI-6044] (#3537) 2021-09-09 15:41:42 +02:00
aignatov-bio 6484dfe630 Change printing status modal logic [SCI-6034] 2021-09-07 12:28:11 +02:00
Martin Artnik 975a8910a8 Updated project permission helpers [SCI-6041] 2021-09-07 11:27:52 +02:00
Martin Artnik 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
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 3a70aadea4 Added specific html class to printer settings section [SCI-6039] 2021-09-02 09:52:52 +02:00
Martin Artnik 73241e87bb Fix barcode scanning in modals [SCI-6022] 2021-08-31 14:37:02 +02:00
Martin Artnik 5f21e3296e Added error message on search failure [SCI-5961] 2021-08-30 12:02:02 +02:00
Martin Artnik e08b406185 Added additionalDataFilter [SCI-6026] 2021-08-30 10:49:15 +02:00
Martin Artnik 896f0ce1e3 Implemented applying BMT filters [SCI-5980] 2021-08-30 10:49:15 +02:00
aignatov-bio b269f3f612 Add saved filters backend [SCI-5977] (#3509) 
* Add saved filters backend [SCI-5977]

* Rework filter saving [SCI-5977]

Co-authored-by: Martin Artnik <martin@scinote.net>
 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
Oleksii Kriuchykhin 0b74f34de7 Add external IDs to repositories [SCI-5990] 2021-08-30 10:49:14 +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 1929959038 Add dropdown for btm filters [SCI-5953] (#3469) 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 5856778e69
Merge pull request #3494 from aignatov-bio/ai-sci-6018-fix-edit-icon-for-bioeddie 
Add edit bio eddie button to asset card [SCI-6018]
 2021-08-20 11:06:17 +02:00
artoscinote c977decd8a
Merge pull request #3496 from aignatov-bio/ai-sci-5950-fix-webhook-position-in-menu 
Fix webhook sidebar position and fix texting in inventory [SCI-5950]
 2021-08-20 11:05:15 +02:00
aignatov-bio dc192ddbfb Fix webhook sidebar position and fix texting in invnetory [SCI-5950] 2021-08-19 14:23:53 +02:00
aignatov-bio 5ed4d9e65e Add edit bio eddie button to asset card [SCI-6018] 2021-08-19 13:28:35 +02:00
aignatov-bio bbb6cd226b
Add permission check for webhooks sidebar button [SCI-6016] (#3493) 2021-08-19 12:04:52 +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 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
artoscinote a65d8ad365
Merge pull request #3477 from artoscinote/ma_SCI_5985 
Fixed handling deletion for asset activity display [SCI-5985]
 2021-08-12 12:23:23 +02:00
Martin Artnik c3fef50d3e Fixed handling deletion for asset activity display [SCI-5985] 2021-08-12 12:18:12 +02:00
artoscinote 67330ab27f
Merge pull request #3475 from artoscinote/ma_SCI_5979 
Fix disabled refresh printers button [SCI-5979]
 2021-08-11 13:22:51 +02:00
Martin Artnik 9a8a9c7b34 Fix disabled refresh printers button [SCI-5979] 2021-08-11 12:23:18 +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
aignatov-bio 5eb2c4a28b
Fix image extension in empty printers modal [SCI-5971] (#3470) 2021-08-11 11:43:16 +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 c41247a5fd
Merge pull request #3439 from artoscinote/ma_SCI_5879 
Implement Save & Register molecule [SCI-5879]
 2021-08-03 12:15:46 +02:00
Martin Artnik a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +02:00
Martin Artnik a19f109e65 Add printer description [SCI-5942] 2021-08-02 15:50:26 +02:00
Martin Artnik ae174b276a Code review fixes and error handling improvements [SCI-5942] 2021-08-02 15:42:53 +02:00
Martin Artnik 123e415a4f Print status backend + FE integration [SCI-5942] 2021-08-02 15:42:53 +02:00
aignatov-bio 43571b5692
Print labels changes [SCI-5943] (#3461) 2021-08-02 15:38:37 +02:00
aignatov-bio a782ce50d1
Add bio eddie files to export all [SCI-5877] (#3426) 2021-08-02 13:27:02 +02:00
Martin Artnik e63a665140 Merge branch 'develop' into features/barcodes 2021-08-02 11:15:48 +02:00
Martin Artnik 0f417f9730 Merge branch 'develop' into features/barcodes 2021-07-29 13:32:17 +02:00
aignatov-bio 02408ae885
Add printing status modal [SCI-5910] (#3454) 2021-07-29 12:24:46 +02:00
artoscinote 21d780e4ca
Merge pull request #3446 from artoscinote/ma_SCI_5893 
Fix style of experiment id in dropdown [SCI-5893]
 2021-07-29 11:44:52 +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
artoscinote 46a9388d8d
Merge pull request #3451 from artoscinote/ma_SCI_5911 
Implemented printer management [SCI-5911]
 2021-07-27 13:19:13 +02:00
aignatov-bio d373c174ee
Add print label button to repository toolbar (#3453) 2021-07-27 12:34:13 +02:00
Martin Artnik 110ddd872e Added placeholder FLUICS printer setup 2021-07-23 14:56:21 +02:00
Martin Artnik b32b207f3d Added FLUICS API client [SCI-5939] 2021-07-23 13:52:28 +02:00
Oleksii Kriuchykhin c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
aignatov-bio d4f974ac64
Add inline editing for folder name [SCI-5896] (#3430) 2021-07-21 21:33:13 +02:00
aignatov-bio 7b0ea6f701
Show experiment id for users with read only permission [SCI-5895] (#3434) 2021-07-21 21:33:00 +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
aignatov-bio 067758808e
Add download heml button to file preview [SCI-5876] (#3423) 
* Add download heml button to file preview [SCI-5876]

* Remove safe navigation
 2021-07-20 13:22:42 +02:00
aignatov-bio 4de35c983a
Open HELM files in bio eddie [SCI-5890] (#3442) 2021-07-20 13:06:47 +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
artoscinote 5f9c04844f
Added prefixed IDs to repository rows (items) [SCI-5909] (#3441) 
* Added prefixed IDs to repository rows (items) [SCI-5909]

* Fix prefixed id queries to work with joins, use subquery in repository search [SCI-5909]

* Fixed accessing repository_row parent code [SCI-5909]

* Better handling of repository_row code display [SCI-5909]

* Fix index warning for id prefixed models issue setting up project [SCI-5909]
 2021-07-19 14:23:36 +02:00
Martin Artnik c4b106f2b8 Fix style of experiment id in dropdown [SCI-5893] 2021-07-19 12:53:15 +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
zmagoD 277da3abcf fix merge issues 2021-07-10 15:20:55 +02:00
artoscinote d78e4713c8
Merge pull request #3425 from artoscinote/ma_SCI_5099 
Fix styling, functionality issues with invite users modal [SCI-5099]
 2021-07-09 11:26:19 +02:00
Martin Artnik 40a8f3a434 Switch to using dropdownSelector for emails input [SCI-5099] 2021-07-09 11:20:48 +02:00
Martin Artnik fb040bee07 Fix styling, functionality issues with invite users modal [SCI-5099] 2021-07-08 16:10:20 +02:00
Miha Mencin d240c9f769
Merge pull request #3421 from artoscinote/ma_SCI_5870 
Added pdf viewer js pack to my_module archive view, fixed issue with files getting stuck in processing [SCI-5870]
 2021-07-08 12:01:31 +02:00
Oleksii Kriuchykhin d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
Martin Artnik 42ed28676d Added pdf viewer js pack to my_module archive view [SCI-5870] 2021-07-07 11:34:28 +02:00
Martin Artnik 0c63013d8b Made 2fa enable modal accessible globally [SCI-5856] 2021-07-05 16:50:37 +02:00
Martin Artnik 5f528fcdb5 Rework the team invite modal functionality on members page [SCI-5099] 2021-07-05 12:39:54 +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
artoscinote 73c86c8423
Merge pull request #3409 from artoscinote/ma_SCI_5851 
Report generation fixes [SCI-5851]
 2021-06-29 14:55:26 +02:00
Martin Artnik b623e2f40f Report generation fixes [SCI-5851] 2021-06-29 13:46:45 +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
zmagoD a678f07b47 update extends and remove format from links 2021-06-27 09:45:32 +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 a32219b1aa Amend how PDF report generation works [SCI-5837] 2021-06-21 14:20:30 +02:00
zmagoD ad10befcc4 add new manage access permission to PET levels 2021-06-19 17:17:57 +02:00
Martin Artnik b6588c2334 Reworked task view sidebar [SCI-5701] 2021-06-18 16:52:19 +02:00
Oleksii Kriuchykhin 7d31b99386 Revert to fontawesome CDN link in reports and update wicked_pdf [SCI-5650] 2021-06-18 15:03:17 +02:00
Martin Artnik afc1b2d8b6 Added experiment code to PDF and DOCX [SCI-5830] 2021-06-18 14:14:02 +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
Oleksii Kriuchykhin 1e3197875c Fix repositories selection in report wizard and deleted repositories handling [SCI-5831] 2021-06-17 16:23:27 +02:00
Martin Artnik 47071e23a1 Added specs for webhooks 2021-06-17 14:54:30 +02:00
Alex Kriuchykhin 4caa5f9ac1
Merge pull request #3394 from okriuchykhin/ok_SCI_5776_v2 
Fix repository snapshots for export all [SCI-5776]
 2021-06-17 11:35:16 +02:00
Oleksii Kriuchykhin 85a5cca98a Fix repository snapshots for export all [SCI-5776] 2021-06-16 16:17:12 +02:00
aignatov-bio 12d8b84cfd
Fix snapshots for deleted inventory [SCI-5826] (#3393) 2021-06-16 15:23:34 +02:00
Alex Kriuchykhin b053c25757
Merge pull request #3388 from okriuchykhin/ok_SCI_5815 
Fix user preferences date format selector [SCI-5815]
 2021-06-16 12:26:50 +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
Oleksii Kriuchykhin b132a13698 Fix user preferences date format selector [SCI-5815] 2021-06-15 11:15:46 +02:00
Miha Mencin b7513c6d5f
Merge pull request #3381 from aignatov-bio/ai-sci-5799-add-dynamic-logo-to-reports 
Add dynamic logo to default report [SCI-5799]
 2021-06-15 07:36:48 +02:00
Miha Mencin d25fc077dc
Merge pull request #3386 from artoscinote/ma_SCI_5814 
Fixed emails for successful report file generation [SCI-5814]
 2021-06-15 07:36:10 +02:00
Martin Artnik 380473c825 Fixed emails for successful report file generation [SCI-5814] 2021-06-14 13:25:50 +02:00
Martin Artnik 20484cfe5c Handle old reports with no templates properly [SCI-5810] 2021-06-14 10:53:46 +02:00
zmagoD 9f3195aa76 hide experiment actions dropdown when the user can't manage the experiment (SCI-5790) 2021-06-12 11:15:44 +02:00
aignatov-bio ea94ce19b1 Add dynamic logo to default report [SCI-5799] 2021-06-10 15:29:28 +02:00
Miha Mencin dc72bfc527
Merge pull request #3379 from okriuchykhin/ok_SCI_5776 
Remove forgotten byebug assertion [SCI-5776]
 2021-06-10 13:08:39 +02:00
Oleksii Kriuchykhin 8b1a9a1b7c Remove forgotten byebug assertion [SCI-5776] 2021-06-10 13:06:31 +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
Miha Mencin 48202c88d1
Merge pull request #3350 from aignatov-bio/ai-sci-5601-add-pdf-preview-for-docx-report 
Add pdf preview for docx reports [SCI-5601]
 2021-06-09 11:27:45 +02:00
aignatov-bio 16f83a3e60 Remove docx preview processing flag [SCI-5601] 2021-06-09 10:58:27 +02:00
Miha Mencin 471f6daae7
Merge pull request #3374 from okriuchykhin/ok_SCI_5776 
Fix export all functionality [SCI-5776]
 2021-06-09 08:52:21 +02:00
aignatov-bio 34eaaf6eeb
Update new report link on dashboard page [SCI-5772] (#3369) 2021-06-08 16:00:44 +02:00
aignatov-bio 4a6f6a787a
Update help menu [SCI-5643] (#3368) 2021-06-08 15:34:19 +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
aignatov-bio 3c7592657c Add activity filters [SCI-5765] 2021-05-31 13:39:10 +02:00
Alex Kriuchykhin 48f3777bdb
Merge pull request #3362 from aignatov-bio/ai-sci-5700-fix-nil-check-for-team-description 
Fix nit issue in team description [SCI-5700]
 2021-05-31 11:54:18 +02:00
aignatov-bio f98aad5853 Fix nit issue in team description [SCI-5700] 2021-05-29 23:10:48 +02:00
Alex Kriuchykhin d9b7526f11
Merge pull request #3359 from aignatov-bio/ai-sci-5775-fix-snapshots-in-reports 
Fix snapshots render in reports [SCI-5775]
 2021-05-28 14:24:35 +02:00
aignatov-bio f7849cf677 Fix snapshots render in reports [SCI-5775] 2021-05-28 13:13:56 +02:00
aignatov-bio 2be59bf8b2 Add pdf preview for docx reports [SCI-5601] 2021-05-25 15:14:50 +02:00
aignatov-bio f586865696 Small report wizard fixes [SCI-5758] 2021-05-25 13:14:57 +02:00
aignatov-bio 2651e8ff35 Fast fix for export all [SCI-5753] 2021-05-24 13:16:43 +02:00
zmagoD be94cb09c2 fix code style 2021-05-22 14:41:56 +02:00
Oleksii Kriuchykhin 29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Miha Mencin 6142c2d89d
Merge pull request #3336 from aignatov-bio/ai-sci-5740-default-template-selection 
Add default template selection [SCI-5740]
 2021-05-20 15:11:33 +02:00
Oleksii Kriuchykhin 7bfde7dc1e Render report element children container only if children are present [SCI-5739] 2021-05-20 14:16:39 +02:00
aignatov-bio 1b56190116 Add default template selection [SCI-5740] 2021-05-20 13:18:57 +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 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 c23c01c01c remove user projects enpoints, fix the role name display 2021-05-16 12:03:16 +02:00
zmagoD de4c28069a fix experiment level styling issues and update the dropdown placeholerds 2021-05-16 11:04:04 +02:00
Alex Kriuchykhin 5e06768fa6
Merge pull request #3322 from okriuchykhin/ok_SCI_5726 
Fix default selection of results in reports wizard [SCI-5726]
 2021-05-14 12:02:49 +02:00
aignatov-bio e953666762 Add search field to reports page [SCI-5551] 2021-05-13 21:41:26 +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 167ebd3d58 Fix default selection of results in reports wizard [SCI-5726] 2021-05-13 15:44:06 +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 9675dafd25
Merge pull request #3319 from aignatov-bio/ai-sci-5679-fix-report-wizard-results-collapsing-arrows 
Fix report wizard results collapsing [SCI-5679]
 2021-05-13 11:45:49 +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 64279f7193 Fix report wizard results collapsing [SCI-5679] 2021-05-12 14:28:54 +02:00
Oleksii Kriuchykhin 4bbf968c18 Fix code formatting in report project content [SCI-5707] 2021-05-12 13:10:01 +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 36f680a444
Add bold to confirmation text in report warning modals [SCI-5710] (#3312) 2021-05-11 21:31:23 +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
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 999b6b26a3
Fix results render in pdf report [SCI-5696] (#3305) 2021-05-11 10:12:03 +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
zmagoD 8f9c55d6e4 update locales 2021-05-11 08:30:39 +02:00
zmagoD d145dd6d36 add my module assigments modals 2021-05-09 16:59:10 +02:00
zmagoD ac91d9c2c4 add assign user permission to experiment level 2021-05-08 18:06:07 +02:00
zmagoD 331a68e9b6 fix new experiment creation 2021-05-08 10:05:22 +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
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
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
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
aignatov-bio 9ca7b76a1f Fix report assigned repository items 2021-05-04 12:49:38 +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 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
Oleksii Kriuchykhin 1b8265343e Add full-page display to PDF Report of all pages of the attached Word and PDF files in the Results [SCI-5636] 2021-05-03 11:45:45 +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
aignatov-bio 6b023603f9
Add second template for reports [SCI-5617] (#3268) 2021-04-29 10:42:17 +02:00
zmagoD 8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +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
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
Alex Kriuchykhin fe48e35cf0
Merge pull request #3263 from okriuchykhin/ok_SCI_5609 
Add additional custom fields for reports [SCI-5609]
 2021-04-23 10:53:59 +02:00
Oleksii Kriuchykhin ecbf747499 Switch to base64 encoded assets in wiked_pdf templates 2021-04-22 14:52:41 +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
zmagoD 3333241c9a add CTA for project members modal SCI-5645 2021-04-18 12:23:29 +02:00
Miha Mencin f95e9402bd
Merge pull request #3258 from okriuchykhin/ok_SCI_5613 
Fix save report PDF to Inventory [SCI-5613]
 2021-04-15 09:30:04 +02:00
Alex Kriuchykhin 80827ce761
Merge pull request #3257 from biosistemika/SCI-5623-add-external-id-to-user 
SCI-5623 add external id to user
 2021-04-14 16:15:43 +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
miha ac18cb7225 rename partial to include html 2021-04-14 14:07:55 +02:00
Oleksii Kriuchykhin df8354bde3 Move the docx creation to the Delayed job [SCI-5560] 2021-04-14 12:39:36 +02:00
aignatov-bio 85a13b7182 Update condition for project content [SCI-5620] 2021-04-14 11:51:03 +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
miha e610683d5c [SCI-5623] added external_id setting to user 2021-04-14 09:44:09 +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 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 ecca155fab Added layout for footer and header [SCI-5571] 2021-03-30 23:43:34 +02:00
aignatov-bio ad8e404bca Add template partials to reports [SCI-5571] 2021-03-30 13:40:36 +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
aignatov-bio 1c93131ff1 Fix folders breadcrumbs [SCI-5597] 2021-03-26 11:58:18 +01:00
aignatov-bio 0ba6eec73c
Merge pull request #3232 from aignatov-bio/ai-sci-5564-fix-breadcrumbs-for-experiments-page 
Remove the project from experiments page breadcrumbs [SCI-5564]
 2021-03-25 15:41:49 +01: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 9281a5631c Remove project from experiments page breadcrumbs [SCI-5564] 2021-03-25 14:32:05 +01:00
aignatov-bio 32b1db629a Change button_to to link_to [SCI-5563] 2021-03-25 14:21:24 +01:00
aignatov-bio 0920d0a5cd Add reports wizzard layout [SCI-5569] 2021-03-25 13:21:54 +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
aignatov-bio e4256342d9 Fix smart annotation in experiment details modal [SCI-5583] 2021-03-22 15:36:10 +01:00
aignatov-bio 7c573a1ee9 Add reload action for assets [SCI-5563] 2021-03-22 13:02:13 +01:00
aignatov-bio d3d79f4288 Small breadcrumbs fixes [SCI-5564] 2021-03-18 14:24:33 +01:00
aignatov-bio 3e5c2e83c7 Update toolbar, add docx and pdf columns [SCI-5549][SCI-5550] 2021-03-17 12:54:25 +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
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
Urban Rotnik 8202181095
Merge pull request #3186 from urbanrotnik/ur-sci-4140-fix-notifications 
Bring back old notifications [SCI-4140]
 2021-03-09 14:54:08 +01:00
Urban Rotnik ee39224f73
Merge pull request #3206 from urbanrotnik/ur-sci-5518 
Fix titles hovering breadcrumbs [SCI-5518]
 2021-03-09 13:59:20 +01:00
Urban Rotnik 8bacc74c17
Merge pull request #3187 from urbanrotnik/ur-sci-5439 
Fix report completed_on time and username [SCI-5439]
 2021-03-09 13:27:24 +01:00
Urban Rotnik 419b69ef60 Fix syntax error 
SCI-5518
 2021-03-08 22:04:28 +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 dd302142eb
Merge pull request #3194 from urbanrotnik/ur-sci-5498 
Fix grayed links when subjects gets deleted [SCI-5498]
 2021-03-08 14:12:05 +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 ab33f51a59
Merge pull request #3184 from aignatov-bio/ai-sci-5460-add-long-names-navigation-tootip 
Add titles to navigation items [SCI-5460]
 2021-03-08 10:17:52 +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 fd6165bc55 Fix grayed links when subjects gets deleted 2021-03-02 11:13:08 +01:00
aignatov-bio 89ac76a766 Fix duplcated new step button [SCI-5474] 2021-02-26 12:29:31 +01:00
Urban Rotnik 8ca8c84efd Fix report completed_on time and username (partially) 
SCI-5439
We cannot realy on last_modified_by, because it can be changed after step completion
 2021-02-25 13:24:21 +01:00
Urban Rotnik 1bb2393655 Use translations 
SCI-4140
 2021-02-25 11:59:26 +01:00
aignatov-bio 24134174fc Add titles to navigation items [SCI-5460] 2021-02-23 15:00:11 +01:00
Oleksii Kriuchykhin bdd717b21b Refactor view project users modal [SCI-5387] 2021-02-22 22:37:32 +01:00
Oleksii Kriuchykhin e8b4a30b87 Improve inventory table loading speed [SCI-5509] 2021-02-22 10:34:06 +01:00
Urban Rotnik 3bca05fc94 Prevent showing empty files for experiments without Tasks 
SCI-5481
 2021-02-18 12:03:28 +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 d2c03f27c3
Merge pull request #3170 from aignatov-bio/ai-sci-5492-fix-shared-inventories 
Fix shared inventories [SCI-5492]
 2021-02-18 11:05:18 +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
aignatov-bio 99c3e1430b Fix shared inventories [SCI-5492] 2021-02-17 15:14:32 +01:00
aignatov-bio 171468444d Fix method on experiment archive action 2021-02-16 12:55:41 +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 cc2edaf71a Fix dahsboard CSS [SCI-5249][SCI-5489] 2021-02-15 12:40:26 +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
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
aignatov-bio 8191306411 Fix experiment archive page route [SCI-5479] 2021-02-12 09:55:26 +01:00
Urban Rotnik b831d5fa14 Fix duplicate button permissions 2021-02-12 07:12:26 +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 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
aignatov-bio 1a3c715d72
Merge pull request #3149 from aignatov-bio/ai-sci-5468-connect-details-modal-to-more-button 
Add action to more button [SCI-5468]
 2021-02-11 13:56:54 +01:00
aignatov-bio f6422a50ac Add action to more button 2021-02-11 12:41:22 +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 2fad6f5f8e
Merge pull request #3146 from aignatov-bio/ai-sci-5477-fix-archived-project-routes 
Fix archived project routes and experiment archived date [SCI-5477]
 2021-02-10 18:38:13 +01:00
aignatov-bio 8adbd11197 Fix archived project routes and experiment archived date [SCI-5477] 2021-02-10 15:05:53 +01:00
aignatov-bio 486dae7559 Add task counter to experiment card [SCI-5467] 2021-02-10 14:50:42 +01:00
aignatov-bio 8853d297ed
Merge pull request #3143 from urbanrotnik/ur-sci-5455-search-results-breadcrumbs 
Add breadcrumbs to GlobalSearch results [SCI-5455]
 2021-02-09 21:44:54 +01:00
aignatov-bio 9d3d1f8eac Connect toolbar actions to buttons [SCI-5465] 2021-02-09 15:47:15 +01:00
Urban Rotnik 367ade2e32 Add breadcrumbs to GlobalSearch results 2021-02-09 13:07:40 +01:00
mlorb 45da42b924
Merge branch 'develop' into ml-sci-5311 2021-02-07 19:20:09 +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 2972fac96e
Merge pull request #3140 from aignatov-bio/ai-sci-5407-add-folders-link-to-search 
Add folder links to global search [SCI-5407]
 2021-02-05 15:24:23 +01:00
aignatov-bio 7c99eaed8f Add folder links to global search [SCI-5407] 2021-02-05 12:39:26 +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 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 6b2a94f045 Add empty repositories index page [SCI-5248] 2021-02-01 15:02:08 +01:00
Mojca Lorber 9ca89ce9d9 Fix rendering error 2021-02-01 13:16:21 +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
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
Oleksii Kriuchykhin b872c6fd14 Add breadrumbs to project experiments page [SCI-5369] 2021-01-25 16:06:48 +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 7232983d59 Hide checkbox on task card if task is in experiment archived branch 
SCI-5410
 2021-01-22 09:47:00 +01:00
Mojca Lorber c58d5734ad Implement the option of deleting empty folders [SCI-5311] 2021-01-21 19:42:25 +01:00
Alex Kriuchykhin adb9442677
Small bugfixes [SCI-5432] (#3107) 2021-01-21 11:24:25 +01:00
aignatov-bio 908678fcff Update marvinJS modal css [SCI-5255] 2021-01-20 12:37:41 +01:00
Urban Rotnik 33b68b8aa7 Fix permissions for result deletion 2021-01-20 09:00:45 +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
aignatov-bio bba1165c7b
Fix edit button for folder in archive mode [SCI-5418] (#3096) 
* Fix edit button for folder in archive mode [SCI-5418]

* Remove archive folder from routes [SCI-5418]
 2021-01-19 11:22:53 +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 496c106497
Merge pull request #3088 from urbanrotnik/ur-sci-5395-breadcrumbs-order 2021-01-15 17:04:31 +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 dca0e5f188
Merge pull request #3090 from urbanrotnik/ur-sci-5405-missing-move-button 
Add data attribute for moveable permissions [SCI-5405]
 2021-01-15 14:23:27 +01:00
Urban Rotnik 97371f8216 Reorder ProjectFolder inner foldres 2021-01-15 14:22:48 +01:00
Urban Rotnik 998d66b8b9 Add data attribute for moveable permissions 
SCI-5405
 2021-01-15 13:54:18 +01:00
Urban Rotnik 2fa54d7898
Merge pull request #3087 from urbanrotnik/ur-sci-5397-folder-link-in-activities 
Fix folder's activities links [SCI-5397]
 2021-01-15 13:52:55 +01:00
Alex Kriuchykhin 902a47490d
Merge pull request #3082 from okriuchykhin/ok_SCI_5383_v2 
Show folder creation button on archived page [SCI-5383]
 2021-01-15 11:38:58 +01:00
aignatov-bio adb9084787
Fix comments red dot and ordering of comments [SCI-5384] (#3084) 
* Fix comments red dot and ordering of comments [SCI-5384]
 2021-01-14 16:28:11 +01:00
aignatov-bio 823b9175bd
Small projects pages fixes [SCI-5330] (#3085) 2021-01-14 16:24:28 +01:00
Urban Rotnik 531b6cd554 Fix folder's activities links 2021-01-14 15:06:56 +01:00
Oleksii Kriuchykhin 8d3a605571 Fix projects index page JS initialization [SCI-5380] 2021-01-14 13:08:29 +01:00
Oleksii Kriuchykhin ec7d1bf813 Show folder creation button on arhived page [SCI-5383] 2021-01-13 15:26:02 +01:00
Urban Rotnik 1c5337e6ab Fix for move_modal partial rendering 2021-01-12 15:45:21 +01:00
Alex Kriuchykhin 62b1aaf033
Merge pull request #3077 from okriuchykhin/ok_SCI_5386 
Fix flash messages on sign-in [SCI-5386]
 2021-01-12 15:44:24 +01:00
Urban Rotnik 91ea82a21d
Merge pull request #3062 from urbanrotnik/ur-sci-5362-missing-archived-on-date 
Add fallback archived_on and archived_by for MyModule and Experiment [SCI-5362]
 2021-01-12 15:36:51 +01:00
Urban Rotnik 1070e813fc Add helper for archived_on date 2021-01-12 15:35:35 +01:00
Oleksii Kriuchykhin cf3b0916f6 Fix flash messages on sign-in [SCI-5386] 2021-01-12 15:28:30 +01:00
Mojca Lorber 0b9daaa7d5 Change button style again 2021-01-12 14:37:22 +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
aignatov-bio 8533e54adb
Add permission check for open manage user modal and experiment actions dropdown [SCI-5382] (#3073) 2021-01-12 12:16:33 +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
aignatov-bio 8099c4ed4c
Fix error on task page without due date [SCI-5375] (#3066) 2021-01-12 11:11:40 +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
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 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 3a52f62d85 Implement folders tree for move action 2021-01-07 17:42:01 +01:00
aignatov-bio 276d6abe19
Update archive navigation for tasks page [SCI-5347] (#3052) 
* Update archive navigation for tasks page [SCI-5347]
 2021-01-07 17:18:52 +01:00
aignatov-bio 0d7da90b15
Small fixes for projects folder cards [SCI-5345] (#3049) 2021-01-07 17:02:25 +01:00
aignatov-bio 5aae35d700
Update archived experiments navigation (#3053) 2021-01-07 14:58:56 +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
mlorb ca955b27a8
Merge pull request #3051 from mlorb/ml-sci-5335 
Change buttons style in projects toolbar [SCI-5335]
 2021-01-06 15:09:33 +01:00
Oleksii Kriuchykhin 53be6a95c4 Fix projects filter mark, titles and comments mark [SCI-5332] 2021-01-06 11:28:39 +01:00
Mojca Lorber 96e387d06d Change buttons style in projects toolbar [SCI-5335] 2021-01-06 11:13:28 +01:00
aignatov-bio ef57489cd9
Update repositories sidebar [SCI-5329] (#3031) 
* Update repositories sidebar [SCI-5329]
 2021-01-06 10:13:10 +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 2fe55250b9
Update settings navigation [SCI-5316] (#3028) 2021-01-05 09:11:05 +01:00
Oleksii Kriuchykhin 58cce0f153 Improve task restoring and refactor flash messages [SCI-5341] 2021-01-04 17:00:23 +01:00
Urban Rotnik cd43973952 Add tooltips for users on project cards 2021-01-04 16:44:31 +01:00
Alex Kriuchykhin 163a2d1e60
Merge pull request #3042 from okriuchykhin/ok_SCI_5340 
Make active projects view default [SCI-5340]
 2021-01-04 11:56:22 +01:00
Alex Kriuchykhin e0e796c5e7
Merge pull request #3040 from okriuchykhin/ok_SCI_5328 
Fix project card menu visibility [SCI-5328]
 2021-01-04 11:55:54 +01:00
Urban Rotnik a53bfbdd33
Merge pull request #3014 from urbanrotnik/ur-sci-5283-smart-annotation-archived-link 
Add 'archived' to smart annotation for repository item [SCI-5283]
 2021-01-04 11:53:47 +01:00
Alex Kriuchykhin 4638e74e1e
Merge pull request #3041 from okriuchykhin/ok_SCI_5327 
Fix links in sidebar navigation [SCI-5327]
 2021-01-04 10:53:38 +01:00
Oleksii Kriuchykhin ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Oleksii Kriuchykhin 8f0a3fb61c Fix links in sidebar navigation [SCI-5327] 2020-12-30 22:49:02 +01:00
Oleksii Kriuchykhin 49dc56caf2 Fix project card menu visibility [SCI-5328] 2020-12-30 22:17:04 +01:00
Oleksii Kriuchykhin f76eb170a1 Fix restore action for experiments and tasks [SCI-5341] 2020-12-28 22:21:38 +01:00
Mojca Lorber 62af5cc723 [SCI-5287] Show step collapse/expand on task 2020-12-22 15:50:27 +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
Mojca Lorber 21c0ea4f8d [SCI-5293] Remove Archived results tab on archived Task 2020-12-21 11:56:33 +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 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
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
Miha Mencin f284ef1592
Merge pull request #3009 from okriuchykhin/ok_SCI_5276 
Archiving: update archived TASK screen layout [SCI-5276]
 2020-12-17 13:46:35 +01:00
Oleksii Kriuchykhin 7bb334e737 Archiving: update archived TASK screen layout [SCI-5276] 2020-12-17 13:26:44 +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 19f16555c6 Add checkbox and restore button 
[SCI-5275]
 2020-12-17 13:11:20 +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
Miha Mencin ba3db65437
Merge pull request #3008 from okriuchykhin/ok_SCI_5273 
Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]
 2020-12-17 09:44:40 +01:00
Miha Mencin ea9f3dcada
Merge pull request #2996 from okriuchykhin/ok_SCI_5253 
Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]
 2020-12-17 09:17:44 +01:00
Urban Rotnik a4fd69c292 Add 'archived' to smart annotation for repository item 2020-12-15 07:36:49 +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
Oleksii Kriuchykhin 94b6c96e48 Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273] 2020-12-12 22:46:30 +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
aignatov-bio 188013dd56 Change permission for sorting in steps and asset view [SCI-5289] 2020-12-08 10:45:43 +01:00
Oleksii Kriuchykhin 62374bee0a Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253] 2020-12-07 11:04:33 +01:00
aignatov-bio 568fcb20df Fix protocol revert from repository [SCI-5285] 2020-12-04 12:07:25 +01:00
Urban Rotnik 7773afbcdb Add activities for Project Folders [SCI-5181] 2020-12-04 12:03:49 +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
aignatov-bio edd774b045
Merge pull request #2992 from aignatov-bio/ai-sci-fix-asset-link-partial-in-item-card 
Fix asset link partial in item card
 2020-12-03 13:19:30 +01:00
aignatov-bio e6e9c84a7c Fix asset link partial in item card 2020-12-03 12:58:54 +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
aignatov-bio c43851a2f4 Fix download links in reports [SCI-5279] 2020-12-03 12:16:48 +01:00
Oleksii Kriuchykhin dc15accc86 Update sidebar usages in partials [SCI-5177] 2020-12-03 10:21:53 +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
aignatov-bio 48184df312
Merge pull request #2985 from aignatov-bio/ai-sci-5250-add-preview-to-export-all 
Add preview files to export all [SCI-5250]
 2020-11-30 12:21:43 +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
aignatov-bio 8cdf09f244 Add preview files to export all 2020-11-27 11:07:37 +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 fbc7822bfe Add ability to close modal by esc 2020-11-26 14:51:10 +01:00
Urban Rotnik efd4f8abde Add members dropdown on project filters flyout 2020-11-26 12:29:43 +01:00
Alex Kriuchykhin 5a1f169846
Merge pull request #2978 from urbanrotnik/ur-sci-5244-folders-projects-sorting 
Project and folders sorting [SCI-5244]
 2020-11-26 11:42:29 +01:00
Urban Rotnik 34fbcb8f56 Add clear functionallity to projects filters 2020-11-26 09:23:22 +01:00
Urban Rotnik afc6d12b49 Project and folders sorting 2020-11-25 18:34:39 +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
Oleksii Kriuchykhin 0de237cece Implement project search with grouping by folder [SCI-5207] 2020-11-25 11:59:02 +01:00
Mojca Lorber 81798a96ad Add new SciNote avatars 2020-11-25 10:43:59 +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
Alex Kriuchykhin 1380d5873d
Merge pull request #2946 from okriuchykhin/ok_SCI_5136 
Implement search endpoint for Projects & folders search [SCI-5136]
 2020-11-23 13:09:33 +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 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
Oleksii Kriuchykhin 86e5078622 Add project folders to global search [SCI-5180] 2020-11-20 11:10:03 +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
aignatov-bio bc5221d4a7
Merge pull request #2959 from aignatov-bio/ai-sci-5225-fix-links-in-report 
Add scinote link to PDF reports [SCI-5225]
 2020-11-19 12:20:32 +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 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 6bb4af1d95
Merge pull request #2961 from aignatov-bio/ai-sci-5231-fix-protocol-import-from-protocol-io 
Fix protocol import from protocol.io [SCI-5231]
 2020-11-18 10:06:06 +01:00
aignatov-bio 3a2b36369a Fix protocol import from protocol.io 2020-11-18 09:57:50 +01:00
aignatov-bio 2947426b44 Add scinote link to pdf reports 2020-11-17 13:54:13 +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
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
Oleksii Kriuchykhin ee1bcd7aac Implement search endpoint for Projects & folders search [SCI-5136] 2020-11-09 16:16:09 +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
Alex Kriuchykhin b51e92d5be
Merge pull request #2933 from okriuchykhin/ok_SCI_5047 
Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047]
 2020-11-06 09:06:37 +01:00
Mojca Lorber 8ee8f7b4d2 Expose the new step button on task 2020-11-05 16:14:40 +01:00
Urban Rotnik 2c347af7bf Add data attribute to change status dropdown 2020-11-05 13:19:45 +01:00
aignatov-bio d29a62dad1 Improve markup 2020-11-05 10:41:06 +01:00
aignatov-bio 8145a292fd Clear code and add missed I18n translation 2020-11-05 10:03:15 +01:00
aignatov-bio 99b52e5d80 Fix markup 2020-11-05 08:44:48 +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 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
Urban Rotnik 042231469c Fix syntax 2020-10-30 13:37:59 +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
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 b0fe68553a Fix tests 2020-10-29 14:30:26 +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
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
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
Urban Rotnik b94a3a6cb8 Clean up controller 2020-10-26 16:17:39 +01:00
aignatov-bio 6edcf4b099 Add size label 2020-10-26 15:10:06 +01:00
Urban Rotnik 1ffc3449bf Clean up index view 2020-10-26 13:42:32 +01:00
Urban Rotnik 431b9161b6 Code cleanup 2020-10-26 11:03:43 +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
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
Mojca Lorber 2639810e1a Fix no step bug 2020-10-22 13:21:05 +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
Mojca Lorber 23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +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 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
Miha Mencin 3a4a166856
Merge pull request #2888 from okriuchykhin/ok_SCI_5082 
Fix index page for users without a team [SCI-5082]
 2020-10-05 10:16:04 +02:00
Oleksii Kriuchykhin dd64206b25 Fix index page for users without a team [SCI-5082] 2020-10-02 16:57:46 +02:00
Mojca Lorber 4e4a4a2c4e Change Complete step button on task step 2020-10-02 15:02:42 +02:00
Oleksii Kriuchykhin 6c367428a1 Fix team switcher [SCI-5080] 2020-10-02 14:25:44 +02:00
Oleksii Kriuchykhin 21fab4198c Merge branch 'develop' into features/local 2020-10-01 11:52:59 +02:00
aignatov-bio d21aee1843 Remove complete step button from protocol managment 2020-09-29 15:08:01 +02:00
Oleksii Kriuchykhin 25a9f5c685 Add typeface-lato for shipping Lato fonts 2020-09-28 18:02:47 +02:00
aignatov-bio 1ed65eddfa Move ordering to front-end 2020-09-25 15:06:09 +02:00
Alex Kriuchykhin fb28fa557b
Merge pull request #2872 from okriuchykhin/ok_SCI_5062 
Improve performance of fetching of statuses [SCI-5062]
 2020-09-25 15:00:30 +02:00
Alex Kriuchykhin 3eb448c39b
Merge pull request #2862 from okriuchykhin/ok_SCI_5001 
Add Endpoins for Project Membership manipulation [SCI-5001]
 2020-09-25 14:25:20 +02:00
Oleksii Kriuchykhin 134e549ed5 Improve performance of fetching of statuses [SCI-5062] 2020-09-25 10:14:57 +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 70a0da17b2 Fix markup 2020-09-24 17:12:53 +02:00
aignatov-bio 780db9d134 Add assets view switcher 2020-09-24 17:10:36 +02:00
Urban Rotnik 7bc31905b5 Fix protocol import modal 2020-09-23 12:54:16 +02:00
aignatov-bio e4b94b582a Add dynamic render of wopi files in viewport 2020-09-23 12:32:46 +02:00
Oleksii Kriuchykhin 2cda80dc5f Add Endpoins for Project Membership manipulation [SCI-5001] 2020-09-23 11:03:29 +02:00
mlorb feda5622d8
Merge pull request #2860 from mlorb/ml-sci-5007 
Add info of the locked task to the View status flow modal [SCI-5007]
 2020-09-23 10:19:48 +02:00
Mojca Lorber affae15ccf Simplification 2020-09-22 17:19:15 +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 fe779f9146 Add info of the locked task to the View status flow modal 2020-09-22 10:21:55 +02:00
aignatov-bio f8a28f378e Add shared inventories to smart annotation 2020-09-21 14:36:34 +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 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