Commit graph

682 commits

Author SHA1 Message Date
Alex Kriuchykhin
34c79d66b8
Merge pull request #3278 from okriuchykhin/ok_SCI_5664
Add report templates loader and move out templates from the main source tree [SCI-5664]
2021-05-13 15:51:24 +02:00
Oleksii Kriuchykhin
a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +02:00
zmagoD
c0eb38b564 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/new_permissions 2021-05-08 10:33:43 +02:00
Alex Kriuchykhin
eb773d94c5
Merge pull request #3294 from okriuchykhin/ok_SCI_5619
Add default settings to existing reports [SCI-5619][SCI-5672]
2021-05-07 11:38:41 +02:00
Oleksii Kriuchykhin
b67f2a21f5 Add default settings to existing reports [SCI-5619][SCI-5672] 2021-05-06 17:33:58 +02:00
aignatov-bio
bb5f985630 Add new activities to reports [SCI-5638] 2021-05-06 14:03:45 +02:00
Oleksii Kriuchykhin
96f85aeb3c Add report templates loader and move out templates from the main source tree [SCI-5664] 2021-05-06 11:27:05 +02:00
Alex Kriuchykhin
57c90a60c4
Merge pull request #3287 from aignatov-bio/ai-sci-5686-add-default-scinote-report-template
Add Scinote Report Template [SCI-5686]
2021-05-06 10:59:33 +02:00
aignatov-bio
689967f82c Add Scinote Report Template [SCI-5686] 2021-05-05 15:13:06 +02:00
Oleksii Kriuchykhin
a307a16033 Fix handsontable assets inclusion in report templates [SCI-5692] 2021-05-04 16:05:19 +02:00
aignatov-bio
86854b015d Add third template to reports [SCI-5618] 2021-04-29 15:21:58 +02:00
aignatov-bio
6b023603f9
Add second template for reports [SCI-5617] (#3268) 2021-04-29 10:42:17 +02:00
Oleksii Kriuchykhin
bca88188de Limit created report relations depth to tasks [SCI-5665] 2021-04-28 15:33:30 +02:00
Oleksii Kriuchykhin
8a915c8acf Fix assets inclusion into report [SCI-5680] 2021-04-28 14:37:16 +02:00
Oleksii Kriuchykhin
5c63ee55e7 Comment out wicked_pdf initializer patch 2021-04-22 13:59:04 +02:00
Oleksii Kriuchykhin
a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +02:00
miha
961fa9ab4e [SCI-5631] Add ordering to index endpoint so pagination works, limit maximum page size for kaminari 2021-04-06 09:59:24 +02:00
Miha Mencin
6ad3f7b92f
Merge pull request #3239 from okriuchykhin/ok_SCI_5595_v2
Remove canvas-to-blob library [SCI-5595]
2021-03-29 14:03:35 +02:00
Oleksii Kriuchykhin
2f6194a99f Remove canvas-to-blob library [SCI-5595] 2021-03-29 14:02:30 +02:00
miha
a82479cd49 unfreeze extents 2021-03-29 11:31:04 +02:00
miha
e20191a865 fix code style 2 2021-03-29 11:13:32 +02:00
miha
11284d3b87 [SCI-5577] filter notifications 2021-03-29 09:52:57 +02:00
Oleksii Kriuchykhin
943c01cada Remove simple_token_authentication [SCI-5595] 2021-03-25 14:55:22 +01:00
Oleksii Kriuchykhin
ab9fd65a19 Add basic API client for BMT [SCI-5531] 2021-03-12 10:53:10 +01:00
aignatov-bio
df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
aignatov-bio
8509d86c48
Merge pull request #3196 from aignatov-bio/ai-sci-5484-update-images-extensions
Fix upercase file extensions [SCI-5484]
2021-03-08 10:16:59 +01:00
Oleksii Kriuchykhin
2b5709e75f Improve behavior of the scheduler, add caching to system notifications sync service [SCI-5526] 2021-03-02 17:28:07 +01:00
aignatov-bio
468afaaa5a Fix upercase file extensions [SCI-5484] 2021-03-02 15:04:43 +01:00
Oleksii Kriuchykhin
d8cffe53c7 Add migration for new user assignments to projects [SCI-5478] 2021-03-01 14:28:21 +01:00
Oleksii Kriuchykhin
49194d1a45 Prepare initial user roles in the database [SCI-5435] 2021-02-22 11:58:40 +01:00
Oleksii Kriuchykhin
3b90225c5a Add new permission checking logic [SCI-5436] 2021-02-22 11:55:48 +01:00
aignatov-bio
1cfd9dd85e
Merge pull request #3163 from aignatov-bio/ai-sci-5469-update-experiment-card-css
Update experiment card css [SCI-5469]
2021-02-18 10:45:43 +01:00
Oleksii Kriuchykhin
afbd763125 Update Doorkeeper configuration [SCI-5497] 2021-02-17 12:54:28 +01:00
Urban Rotnik
a628cada6f
Merge pull request #3162 from urbanrotnik/ur-sci-5473-remove-zendesk
Update knowledge base url [SCI-5473]
2021-02-16 15:30:15 +01:00
aignatov-bio
0368579799 Update experiment card css [SCI-5469] 2021-02-16 12:42:09 +01:00
Urban Rotnik
335f7b7f9f Update knowledge base url 2021-02-16 12:08:29 +01:00
Urban Rotnik
ebbbfa657c
Fix folders activities [SCI-5402] [SCI-5403] (#3112)
* Fix activities and make folders clickable

* Remove archive project activity and action

* Save nil value for root folder

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