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

10600 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zmagoD 8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +02:00
Alex Kriuchykhin e711c783af
Merge pull request #3271 from okriuchykhin/ok_SCI_5665 
Limit created report relations depth to tasks [SCI-5665]
 2021-04-28 15:34:36 +02:00
Oleksii Kriuchykhin bca88188de Limit created report relations depth to tasks [SCI-5665] 2021-04-28 15:33:30 +02:00
Alex Kriuchykhin ce0f57e3f3
Merge pull request #3272 from okriuchykhin/ok_SCI_5680 
Fix assets inclusion into report [SCI-5680]
 2021-04-28 14:49:26 +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 5c63ee55e7 Comment out wicked_pdf initializer patch 2021-04-22 13:59:04 +02:00
Oleksii Kriuchykhin 3cfcae1003 Update mimemagic to 0.3.10 2021-04-22 11:58:19 +02:00
Joh Dokler 1383c0ce3d Fix DATABASE_URL in the Makefile production config generator 2021-04-21 07:56:55 +02:00
Oleksii Kriuchykhin 544c168c4a Merge branch 'develop' 2021-04-20 17:40:27 +02:00
Oleksii Kriuchykhin da2cea061a Bump version to 1.21.9 2021-04-20 17:38:42 +02:00
Miha Mencin 2b96d59d74
Merge pull request #3267 from okriuchykhin/ok_SCI_5541_v2 
Fix file name sanitization in PDF previewer [SCI-5541]
 2021-04-20 17:24:21 +02:00
Oleksii Kriuchykhin fab013b19b Fix file name sanitization in PDF previewer [SCI-5541] 2021-04-20 17:20:16 +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
Joh Dokler 86239e0782 Add missing PostgreSQL variables to the docker-compose.production.yml 2021-04-20 10:29:31 +02:00
Miha Mencin 151bec4321
Merge pull request #3262 from biosistemika/develop 
Release 1.21.8
 2021-04-19 09:13:22 +02:00
Miha Mencin a6b2b23800
Bump version to 1.21.8 2021-04-19 08:53:34 +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
zmagoD 37f3f41d06 Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui 2021-04-18 11:10:58 +02:00
Miha Mencin 840651a7d6
Merge pull request #3192 from okriuchykhin/ok_SCI_5478 
Add migration for new user assignments to projects [SCI-5478]
 2021-04-18 11:10:08 +02:00
zmagoD 2876bae052 update minimagic gem 2021-04-18 10:49:22 +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 f13f3691b1 Fix blob permissions check to support multiple attachments [SCI-5613] 2021-04-14 16:07:01 +02:00
Oleksii Kriuchykhin fe8f006f6e Fix save report PDF to Inventory [SCI-5613] 2021-04-14 16:06:59 +02:00
Alex Kriuchykhin e003e01ba4
Merge pull request #3222 from okriuchykhin/ok_SCI_5552 
Add flash message and notification for generated reports [SCI-5552]
 2021-04-14 15:48:16 +02:00
Oleksii Kriuchykhin 0a9a656313 Add flash message and notification for generated reports [SCI-5552] 2021-04-14 15:45:51 +02:00
Alex Kriuchykhin 6695c00d4f
Merge pull request #3219 from okriuchykhin/ok_SCI_5557 
Implement pooling for Report document creation status [SCI-5557]
 2021-04-14 15:33:23 +02:00
Oleksii Kriuchykhin a2a0aabb62 Implement pooling for Report document creation status [SCI-5557] 2021-04-14 15:16:08 +02:00
Alex Kriuchykhin 1a88ec3220
Merge pull request #3216 from okriuchykhin/ok_SCI_5560 
Move the docx creation to the Delayed job [SCI-5560]
 2021-04-14 14:20:09 +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 2aae7046d0
Merge pull request #3256 from aignatov-bio/ai-sci-5620-add-edit-view-for-report 
Add edit mode for report [SCI-5620]
 2021-04-14 11:51:24 +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
Alex Kriuchykhin 454a70605b
Merge pull request #3255 from biosistemika/SCI-5635 
[SCI-5635] Report not generated in case of tasks from more experiments
 2021-04-13 10:34:46 +02:00
miha 4c29de62be [SCI-5635] Use update_column in the migration in order to avoid callbacks 2021-04-13 10:28:41 +02:00
Miha Mencin 1713674f74
Merge pull request #3253 from biosistemika/SCI-5635 
SCI-5635  Report not generated in case of tasks from more experiments
 2021-04-12 14:39:59 +02:00
miha b6a4a5326f replace .find with .find_each 2021-04-12 13:57:03 +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
miha 4f7f257b78 Remove cascading save from step 2021-04-12 12:20:05 +02:00