Commit graph

9319 commits

Author SHA1 Message Date
zmagoD 67cf09e030 log activities on experiment and my_module assignment change 2021-05-22 13:59:27 +02:00
Zmago Devetak 2cc38442ca
Merge pull request #2 from ZmagoD/new_permissions-cleanup-legacy-endpoints
Remove legacy user_projects endpoints
2021-05-16 12:08:19 +02:00
zmagoD 6910eafa37 remove uneeded spec 2021-05-16 12:03:59 +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
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
Miha Mencin f26261fd72
Merge pull request #3302 from ZmagoD/features/new_permissions_dev_sync_1
Features/new permissions dev sync 1
2021-05-11 08:30:06 +02:00
zmagoD ab47c8695f add read permission and controller tests for new endpoints 2021-05-09 18:23:50 +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
zmagoD 331a68e9b6 fix new experiment creation 2021-05-08 10:05:22 +02:00
Miha Mencin 0ed8b8614c Bump version to 1.21.10 2021-05-06 14:53:44 +02:00
Oleksii Kriuchykhin 6a1c073024 Fix file icons in export all [SCI-5685] 2021-05-06 14:53:44 +02:00
dependabot[bot] b93978cbd0 Bump rexml from 3.2.4 to 3.2.5
Bumps [rexml](https://github.com/ruby/rexml) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.2.4...v3.2.5)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 14:53:44 +02:00
dependabot[bot] bc25d29b2e Bump yargs-parser from 5.0.0 to 5.0.1
Bumps [yargs-parser](https://github.com/yargs/yargs-parser) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/yargs/yargs-parser/releases)
- [Changelog](https://github.com/yargs/yargs-parser/blob/v5.0.1/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs-parser/compare/v5.0.0...v5.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 14:53:44 +02:00
Joh Dokler 79966869a0 Fix DATABASE_URL in the Makefile production config generator 2021-05-06 14:53:44 +02:00
Joh Dokler 3e8db930c6 Add missing PostgreSQL variables to the docker-compose.production.yml 2021-05-06 14:53:44 +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
zmagoD 47cb1b31dc fix code style 2021-05-02 11:36:10 +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 63bbc609ef style modal 2021-04-30 16:02: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
zmagoD 8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +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 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
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
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