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

9281 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
miha 36788db816 SCI-5698 Make the decision to redirect to 2fa more readable 2021-05-06 08:14:39 +02:00
miha f23ff73610 SCI-5693 skip 2fa if bypass is set 2021-05-05 17:29:21 +02:00
miha 47f64fb711 Update the tests for 2fa 2021-05-05 10:40:52 +02:00
miha 136f0cd17f SCI-5693 refactor of 2fa procedure 2021-05-04 20:51:34 +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
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
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
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
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
Miha Mencin 1b7845b6b5
Merge pull request #3245 from aignatov-bio/ai-sci-5628-fix-css-for-repositories 
Fix css for repository header [SCI-5628]
 2021-04-06 10:28:56 +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 5c4099af80 Fix css for repository header [SCI-5628] 2021-04-01 12:55:58 +02:00
Miha Mencin a6e02ba203
Merge pull request #3243 from biosistemika/develop 
Release 1.21.6, March 2021
 2021-03-31 09:37:35 +02:00
Miha Mencin c0ff2865b5
Bump version to 1.21.6 2021-03-31 09:34:06 +02:00
dependabot[bot] 3bc3e654a7
Bump y18n from 3.2.1 to 3.2.2 
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-30 16:07:09 +00:00
Alex Kriuchykhin 3e0f4e7eb3
Merge pull request #3240 from okriuchykhin/ok_SCI_5604 
Fix for API float parsing in the inventory number type column [SCI-5604]
 2021-03-29 16:22:38 +02:00
Oleksii Kriuchykhin 2b2b6f7774 Fix for API float parsing in the inventory number type column [SCI-5604] 2021-03-29 15: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
Alex Kriuchykhin 511243b197
Merge pull request #3238 from okriuchykhin/ok_SCI_5595_v2 
Fix copyright info for vendor files [SCI-5595]
 2021-03-29 12:19:37 +02:00
Miha Mencin 787f2d58db
Merge pull request #3237 from biosistemika/SCI-5577-filter-notifications 
[SCI-5577] Filter notifications
 2021-03-29 11:55:22 +02:00
Oleksii Kriuchykhin e4d82ea81b Fix copyright info for vendor files [SCI-5595] 2021-03-29 11:49:19 +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 Mencin 8625e99e99
Merge pull request #3236 from aignatov-bio/ai-sci-5597-fix-breadcrumbs-for-folders 
Fix folders breadcrumbs [SCI-5597]
 2021-03-29 11:11:34 +02:00
miha 3cc4326eb7 fix code style 2021-03-29 10:59:38 +02:00
miha 8f0713229a add basic tests 2021-03-29 10:52:02 +02:00
miha 11284d3b87 [SCI-5577] filter notifications 2021-03-29 09:52:57 +02:00
aignatov-bio 1c93131ff1 Fix folders breadcrumbs [SCI-5597] 2021-03-26 11:58:18 +01: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
Miha Mencin 352f3004b3
Update mimemagic to 0.3.8 2021-03-25 18:47:21 +01:00
Alex Kriuchykhin 3790dbe0b3
Merge pull request #3235 from okriuchykhin/ok_SCI_5596 
Switch to graphviz gem [SCI-5596]
 2021-03-25 18:37:30 +01:00
Oleksii Kriuchykhin f7c865974d Switch to graphviz gem [SCI-5596] 2021-03-25 17:42:57 +01:00
Oleksii Kriuchykhin 22ca7e5ea6 Update NewRelic config for production [SCI-5594] 2021-03-25 16:02:28 +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
Alex Kriuchykhin 44e67bdecc
Merge pull request #3233 from okriuchykhin/ok_SCI_5595 
Remove simple_token_authentication [SCI-5595]
 2021-03-25 15:38:07 +01:00