scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 17:36:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
10032 commits 69 branches 179 tags 165 MiB
Commit graph

10032 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
miha 2e45093856 fix a stupid2 2021-04-12 10:31:35 +02:00
miha b917a0c3e0 fix a stupid 2021-04-12 10:30:37 +02:00
miha 56ebc3dc07 [SCI-5635] add a migration to fix broken steps, fix the api so it sets last_modified_by_id, minor step model refactor 
migration fix

remove the conditoin for set_last_modified_by callback

set the last_modified_by_id in before_save callback (in case it is not set yet)

remove trailing spaces

Set last modified in protocl import service
 2021-04-12 09:59:00 +02:00
Alex Kriuchykhin 57b133d0fc
Merge pull request #3251 from okriuchykhin/ok_SCI_5612 
Add settings to reports [SCI-5612]
 2021-04-09 13:30:05 +02:00
Oleksii Kriuchykhin 67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +02:00
Alex Kriuchykhin 16da4394a2
Merge pull request #3248 from aignatov-bio/ai-sci-5572-add-report-wizzard-second-step 
Add report wizard step 2 [SCI-5572]
 2021-04-08 12:58:51 +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
Alex Kriuchykhin 304d0b4303
Merge pull request #3250 from aignatov-bio/ai-sci-5611-add-step-3-for-report-wizard 
Add report wizard step 3 [SCI-5611]
 2021-04-07 19:38:52 +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 ec9b986b95
Merge pull request #3229 from aignatov-bio/ai-sci-5559-add-document-preview-to-report 
Add document preview to reports [SCI-5559]
 2021-04-07 11:16:54 +02:00
aignatov-bio a46b9cb8ea Add document preview to reports [SCI-5559] 2021-04-07 11:15:22 +02:00
Miha Mencin c70588a473
Merge pull request #3249 from biosistemika/develop 
Release of 1.21.7, April 2021
 2021-04-07 07:48:23 +02:00
Miha Mencin 79cae3536d
Bump version to 1.2.7 2021-04-07 07:39:43 +02:00
Miha Mencin e3ca50d2d0
Merge pull request #3246 from biosistemika/SCI-5631-order-the-inventory-results 
[SCI-5631] Add ordering to inventory item api endpoint
 2021-04-06 18:40:38 +02:00
Alex Kriuchykhin 020067a3f2
Merge pull request #3242 from biosistemika/dependabot/npm_and_yarn/y18n-3.2.2 
Bump y18n from 3.2.1 to 3.2.2
 2021-04-06 14:00:21 +02:00
Oleksii Kriuchykhin a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +02:00