Commit graph

2259 commits

Author SHA1 Message Date
zmagoD 784e43e328 create user_assignments for all child objects when the user is attached to the project 2021-06-06 09:54:47 +02:00
aignatov-bio 9559ed88aa
Add webhooks index page [SCI-5766] (#3366) 2021-06-03 14:00:43 +02:00
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 ffaf141abf fix failing scenarios 2021-05-29 18:40:26 +02:00
zmagoD 28cb7ee81d add user roles enpoint and update scenarios 2021-05-29 15:28:10 +02:00
zmagoD 7e6789200a fix new API endpoints and add test cases 2021-05-23 17:31:02 +02:00
zmagoD 300c1521fd add new API endpoints and fix/update ExperimentMember and MyModuleMember modules 2021-05-22 18:36:30 +02:00
zmagoD 67cf09e030 log activities on experiment and my_module assignment change 2021-05-22 13:59:27 +02:00
Oleksii Kriuchykhin 29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Alex Kriuchykhin a5ff0dc928
Merge pull request #3335 from okriuchykhin/ok_SCI_5724
Fix translations for report project selector [SCI-5724]
2021-05-20 14:58:29 +02:00
Oleksii Kriuchykhin cb11bbdebd Fix translations for report project selector [SCI-5724] 2021-05-19 23:24:39 +02:00
Oleksii Kriuchykhin 0ff1277dbf Improve filtering for inventories [SCI-5730] 2021-05-19 22:48:52 +02:00
aignatov-bio 7e3a281086 Small fixes for report search [SCI-5551] 2021-05-18 17:00:30 +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 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
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
aignatov-bio f465c491c2
Report wizard step 1 update wording [SCI-5716] (#3314) 2021-05-11 21:31:33 +02:00
aignatov-bio 3bd774f8db
Small fixes for report index page [SCI-5695] (#3310) 2021-05-11 21:30:58 +02:00
Oleksii Kriuchykhin a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +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 c0eb38b564 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/new_permissions 2021-05-08 10:33:43 +02:00
Alex Kriuchykhin 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 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
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 3fc4ab9892 Add warning modal on project and template change [SCI-5684] 2021-05-05 12:13:52 +02:00
miha 136f0cd17f SCI-5693 refactor of 2fa procedure 2021-05-04 20:51:34 +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 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
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 c1d98f421d update scenarios and UI logic to handle project page reload after modal close 2021-05-02 11:22: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
Oleksii Kriuchykhin 5c63ee55e7 Comment out wicked_pdf initializer patch 2021-04-22 13:59:04 +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
Oleksii Kriuchykhin a2a0aabb62 Implement pooling for Report document creation status [SCI-5557] 2021-04-14 15:16:08 +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 bccd474cc6 Add edit mode for report [SCI-5620] 2021-04-14 11:51:03 +02:00
miha e610683d5c [SCI-5623] added external_id setting to user 2021-04-14 09:44:09 +02:00
aignatov-bio 101d46956c Add logic for preparing wizard data for report [SCI-5593] 2021-04-12 12:42:22 +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
miha 961fa9ab4e [SCI-5631] Add ordering to index endpoint so pagination works, limit maximum page size for kaminari 2021-04-06 09:59:24 +02:00
aignatov-bio 82be23db81 Add project and template selector [SCI-5570] 2021-03-31 15:32:03 +02:00
Miha Mencin 6ad3f7b92f
Merge pull request #3239 from okriuchykhin/ok_SCI_5595_v2
Remove canvas-to-blob library [SCI-5595]
2021-03-29 14:03:35 +02:00
Oleksii Kriuchykhin 2f6194a99f Remove canvas-to-blob library [SCI-5595] 2021-03-29 14:02:30 +02:00
miha a82479cd49 unfreeze extents 2021-03-29 11:31:04 +02:00
miha e20191a865 fix code style 2 2021-03-29 11:13:32 +02:00
miha 11284d3b87 [SCI-5577] filter notifications 2021-03-29 09:52:57 +02:00
Alex Kriuchykhin e9c1c27087
Merge pull request #3234 from okriuchykhin/ok_SCI_5594
Update NewRelic config for production [SCI-5594]
2021-03-25 19:04:53 +01:00
Oleksii Kriuchykhin 22ca7e5ea6 Update NewRelic config for production [SCI-5594] 2021-03-25 16:02:28 +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
Oleksii Kriuchykhin 943c01cada Remove simple_token_authentication [SCI-5595] 2021-03-25 14:55:22 +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 7c573a1ee9 Add reload action for assets [SCI-5563] 2021-03-22 13:02:13 +01:00
Oleksii Kriuchykhin d315b1327b Implement missing missing user smart annotation notifications [SCI-5575] 2021-03-19 17:11:19 +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
Oleksii Kriuchykhin ab9fd65a19 Add basic API client for BMT [SCI-5531] 2021-03-12 10:53:10 +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 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 df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
aignatov-bio 8509d86c48
Merge pull request #3196 from aignatov-bio/ai-sci-5484-update-images-extensions
Fix upercase file extensions [SCI-5484]
2021-03-08 10:16:59 +01:00
Urban Rotnik 235f19cf25 Store Table/Cards view setting per user
SCI-5450
2021-03-04 14:56:59 +01:00
Oleksii Kriuchykhin 2b5709e75f Improve behavior of the scheduler, add caching to system notifications sync service [SCI-5526] 2021-03-02 17:28:07 +01:00
aignatov-bio 468afaaa5a Fix upercase file extensions [SCI-5484] 2021-03-02 15:04:43 +01:00
Oleksii Kriuchykhin d8cffe53c7 Add migration for new user assignments to projects [SCI-5478] 2021-03-01 14:28:21 +01:00
Urban Rotnik 1bb2393655 Use translations
SCI-4140
2021-02-25 11:59:26 +01:00
Oleksii Kriuchykhin bdd717b21b Refactor view project users modal [SCI-5387] 2021-02-22 22:37:32 +01:00
Oleksii Kriuchykhin 49194d1a45 Prepare initial user roles in the database [SCI-5435] 2021-02-22 11:58:40 +01:00
Oleksii Kriuchykhin 3b90225c5a Add new permission checking logic [SCI-5436] 2021-02-22 11:55:48 +01:00
aignatov-bio 1cfd9dd85e
Merge pull request #3163 from aignatov-bio/ai-sci-5469-update-experiment-card-css
Update experiment card css [SCI-5469]
2021-02-18 10:45:43 +01:00
Urban Rotnik 23409520cc
Merge pull request #3166 from urbanrotnik/ur-sci-5488
Fix typos and update copies in templates[SCI-5488]
2021-02-17 14:53:49 +01:00
Oleksii Kriuchykhin afbd763125 Update Doorkeeper configuration [SCI-5497] 2021-02-17 12:54:28 +01:00
Urban Rotnik 41cd8edf29 Fix 'bellow' typo across scinote 2021-02-17 11:56:30 +01:00
Urban Rotnik a628cada6f
Merge pull request #3162 from urbanrotnik/ur-sci-5473-remove-zendesk
Update knowledge base url [SCI-5473]
2021-02-16 15:30:15 +01:00
aignatov-bio 0368579799 Update experiment card css [SCI-5469] 2021-02-16 12:42:09 +01:00
Urban Rotnik 335f7b7f9f Update knowledge base url 2021-02-16 12:08:29 +01:00
Mojca Lorber 456d9c713f Implement styling for the inventories empty state 2021-02-15 21:01:31 +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
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 19733ba7d9 Refactor deleting of empty folders 2021-02-10 22:11: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
aignatov-bio 7c99eaed8f Add folder links to global search [SCI-5407] 2021-02-05 12:39:26 +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
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
Urban Rotnik ebbbfa657c
Fix folders activities [SCI-5402] [SCI-5403] (#3112)
* Fix activities and make folders clickable

* Remove archive project activity and action

* Save nil value for root folder

* Add empty values to hash
2021-01-22 11:24:08 +01:00
Mojca Lorber c58d5734ad Implement the option of deleting empty folders [SCI-5311] 2021-01-21 19:42:25 +01:00
Urban Rotnik 95b22a2658 Update flash message when 0 projects for export
SCI-5351
2021-01-20 16:21:30 +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
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 92d8199381 Add parent_folder validation
SCI-5422
2021-01-19 10:40:29 +01:00
Urban Rotnik ddbc22b274 Fix folders exports, add error message
SCI-5351
2021-01-19 09:47:42 +01:00
aignatov-bio 823b9175bd
Small projects pages fixes [SCI-5330] (#3085) 2021-01-14 16:24:28 +01:00
Oleksii Kriuchykhin 8d3a605571 Fix projects index page JS initialization [SCI-5380] 2021-01-14 13:08:29 +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
Mojca Lorber 54a5528495 Add no results page for serach on project page [SCI-5333] 2021-01-12 09:18:19 +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 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 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 5aae35d700
Update archived experiments navigation (#3053) 2021-01-07 14:58:56 +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
aignatov-bio ef57489cd9
Update repositories sidebar [SCI-5329] (#3031)
* Update repositories sidebar [SCI-5329]
2021-01-06 10:13:10 +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
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
mlorb 7b48869557
Merge pull request #3024 from mlorb/ml-sci-5293
[SCI-5293] Remove Archived results tab on archived Task
2021-01-04 10:25:18 +01:00
Oleksii Kriuchykhin ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +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
Mojca Lorber 5910d56903 [SCI-5280] Rename Academy to Courses 2020-12-21 12:19:14 +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
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 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 cd7b94b434 Fix users/comments tab showing
[SCI-5274]
2020-12-17 13:08:58 +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
Oleksii Kriuchykhin 2a666a3718 Implement additional preview type PDF of the whole document [SCI-5297] 2020-12-16 12:51:10 +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
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
Urban Rotnik 1332ad2fcd Fix project creation activity [SCI-5181] 2020-12-04 14:13:43 +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
mlorb 74f0f0474a
Merge branch 'features/folders' into ml-sci-5240 2020-12-03 12:50:19 +01:00
Oleksii Kriuchykhin 9546b8f71d Prepare backend for the improved navigation [SCI-5177] 2020-12-03 10:19:11 +01:00
Alex Kriuchykhin 92d579ab8e
Merge pull request #2935 from okriuchykhin/ok_SCI_5135
Generate backend for moving the projects and folders [SCI-5135]
2020-12-02 14:59:01 +01:00
Urban Rotnik 87b5552b27 Add equals team validations for project and folder 2020-12-02 14:53:46 +01:00
Urban Rotnik 088fa79874 Add Project Folders API endpoints 2020-12-02 13:15:48 +01:00
Oleksii Kriuchykhin dfce57d481 Generate backend for moving the projects and folders [SCI-5135] 2020-12-02 12:11:01 +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
Alex Kriuchykhin b45692ab1f
Merge pull request #2954 from aignatov-bio/ai-sci-5182-add-activity-for-project-moving
Add activity for project moving [SCI-5182]
2020-11-27 09:47:49 +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
Urban Rotnik efd4f8abde Add members dropdown on project filters flyout 2020-11-26 12:29:43 +01:00
aignatov-bio 3078e60867 Small css fixes 2020-11-25 16:25:17 +01:00
aignatov-bio 1979883004 Add delete asset confirmation modal 2020-11-25 12:50:34 +01:00
aignatov-bio 0b2e5063a8
Merge pull request #2973 from aignatov-bio/ai-sci-5044-fix-merge-cells-pdf-report
Fix merge cells for pdf reports [SCI-5044]
2020-11-24 12:33:40 +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 bb52743567 Fix merge cells for pdf reports 2020-11-23 16:29:22 +01:00
aignatov-bio 624e9b1f82 Small fixes on current task dashboard 2020-11-23 14:29:04 +01:00
aignatov-bio 56a58e08eb Fix markup 2020-11-23 14:22:10 +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
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 4c8d8c176f Improve routes for folders [SCI-5136] 2020-11-20 11:12:36 +01:00
Oleksii Kriuchykhin 86e5078622 Add project folders to global search [SCI-5180] 2020-11-20 11:10:03 +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 deaecf57c9 Add activity for project moving 2020-11-16 12:21:03 +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
Oleksii Kriuchykhin 038cd8d5d7 Fix repository state columns handling [SCI-5190] 2020-11-10 17:24:04 +01:00
Oleksii Kriuchykhin ee1bcd7aac Implement search endpoint for Projects & folders search [SCI-5136] 2020-11-09 16:16:09 +01:00
Urban Rotnik 9f12c5f343 New cards and list layout 2020-11-06 13:01:52 +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
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 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 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 d99e279ecc Add gallery to file preview 2020-10-29 14:30:26 +01:00
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
aignatov-bio 111a5338af
Merge pull request #2895 from aignatov-bio/ai-sci-5031-refactor-export-all-method
Refactor export all my module generator [SCI-5031]
2020-10-29 13:05:34 +01:00
Miha Mencin 235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2
Release/1.20.2
2020-10-28 13:58:25 +01:00
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
Mojca Lorber ec41bdd414 Move open mobile app button to main navigation 2020-10-26 09:28:44 +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
aignatov-bio 3b0f35aef3 Fix markup 2020-10-22 14:33:17 +02:00
aignatov-bio f4bf2ab75f Remove empty children from extents 2020-10-22 14:29:35 +02:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Mojca Lorber 6d7b55301f Fix pwa url and change when banner is displayed 2020-10-21 14:56:20 +02:00
Urban Rotnik 2f99e3a464 Remove border, update copy 2020-10-21 09:58:35 +02:00
Mojca Lorber 23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
aignatov-bio bdcc7939ad Update export all generator 2020-10-16 18:25:01 +02:00
aignatov-bio 0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
aignatov-bio a2bfb1cfeb Merge branch 'develop' of https://github.com/biosistemika/scinote-web into develop 2020-10-15 15:09:05 +02:00
Urban Rotnik e1e7496307
Merge pull request #2884 from urbanrotnik/ur-sci-5043
DOCX lists [SCI-5043]
2020-10-15 11:53:58 +02:00
Urban Rotnik dac8dda6bc Update comment 2020-10-14 14:54:29 +02:00
mlorb 83ba40d135
Merge pull request #2870 from mlorb/ml-sci-4841
Fix at long inventory name snapshot in title is not visible [SCI-4841]
2020-10-14 14:38:04 +02:00
aignatov-bio 36bab10de7 Update export all to tree structure 2020-10-14 12:08:04 +02:00
Alex Kriuchykhin d5499168f3
Merge pull request #2896 from biosistemika/features/pwa
Merge features/pwa to develop
2020-10-13 16:34:57 +02:00
Urban Rotnik ae8b2cbf8f Add text to I18n 2020-10-13 08:37:32 +02:00
aignatov-bio a7da7b0de3 Refactor export all my module generator 2020-10-12 15:55:06 +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
aignatov-bio 7c3a3e4490 Small smart annotation fixes 2020-09-28 12:03:01 +02:00
Mojca Lorber 94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
Oleksii Kriuchykhin 2cda80dc5f Add Endpoins for Project Membership manipulation [SCI-5001] 2020-09-23 11:03:29 +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
Alex Kriuchykhin 136ce06022
Merge pull request #2851 from okriuchykhin/ok_SCI_4999
Add Create and Update endpoints for experiments [SCI-4999]
2020-09-22 10:20:00 +02:00
Alex Kriuchykhin e19efe3975
Merge pull request #2850 from okriuchykhin/ok_SCI_4997
Add Create and Update endpoints for projects [SCI-4997]
2020-09-21 13:22:12 +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
Oleksii Kriuchykhin 0147e1aee1 Add Create and Update endpoints for experiments [SCI-4999] 2020-09-16 23:15:36 +02:00
Oleksii Kriuchykhin dd4a62bb45 Add Create and Update endpoints for projects [SCI-4997] 2020-09-16 17:03:39 +02:00
aignatov-bio 14acf2b624 Add i18n 2020-09-15 14:47:57 +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
Alex Kriuchykhin 6269802be4
Merge pull request #2843 from okriuchykhin/ok_SCI_4881
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-09-15 12:53:01 +02:00
Oleksii Kriuchykhin db3de835f8 Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881] 2020-09-15 11:58:35 +02:00
Oleksii Kriuchykhin 73cf620960 Add Completion and Uncompletion consequences [SCI-5004] 2020-09-14 20:06:48 +02:00
aignatov-bio 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
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
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
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
aignatov-bio 687093e110
Merge pull request #2817 from aignatov-bio/ai-sci-4972-fix-complete-state-for-tasks
Add completed/uncompleted methods to my_module [SCI-4972]
2020-09-09 08:20:36 +02:00
Alex Kriuchykhin c413ac21a1
Merge pull request #2798 from aignatov-bio/ai-sci-4831-update-api-for-new-statuses
Add API endpoints for workflows [SCI-4831]
2020-09-08 16:23:05 +02:00
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
aignatov-bio bd1d6a772b Add completed/uncompleted methods to my_module 2020-09-08 09:45:09 +02:00
Oleksii Kriuchykhin 7668e16419 Enable CORS for PWA [SCI-4979] 2020-09-04 11:47:45 +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
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
aignatov-bio 9a8e53c4bc
Fix routes 2020-09-02 12:08:43 +02:00
aignatov-bio 4c7312faf9 Add tests for new workflow endpoints 2020-09-02 11:43:00 +02:00
aignatov-bio 68f31ce7ec Add api endpoints for workflows 2020-09-01 15:01:38 +02:00
aignatov-bio 9ff5e8bd7d Add task state change error handling and validation 2020-09-01 12:41:00 +02:00
Urban Rotnik 581cd69963 Add activities for status change 2020-09-01 11:48:04 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik 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
Urban Rotnik a5fb873d19 Add default workflow 2020-08-27 10:54:39 +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
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
Alex Kriuchykhin 121644decf
Merge pull request #2770 from okriuchykhin/ok_SCI_4881
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-08-21 11:01:49 +02:00
Mojca Lorber faf2d4c533 Fix export icon 2020-08-14 17:02:03 +02:00