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

10117 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Kriuchykhin c27994ae57
Merge pull request #3721 from okriuchykhin/ok_SCI_6323_v2 
Fix user removal from a team [SCI-6323]
 2021-12-06 14:29:46 +01:00
artoscinote c80cbe34f4
Remove invalid designated users when moving experiment [SCI-6335] (#3722) 2021-12-06 14:27:26 +01:00
Oleksii Kriuchykhin 30031e2f07 Fix user removal from a team [SCI-6323] 2021-12-06 14:24:59 +01:00
artoscinote 561746158e
Further fix scoping of table styles [SCI-6315] (#3720) 2021-12-06 10:40:08 +01:00
Alex Kriuchykhin 245f0aedd7
Fix user removal from a team [SCI-6323] (#3718) 2021-12-03 16:26:19 +01:00
artoscinote 272752ae4f
Fix scoping of table styles [SCI-6315] (#3719) 2021-12-03 16:21:18 +01:00
artoscinote 3f7f576b29
Print protocol fixes [SCI-6318] (#3717) 
* Fix smart annotations [SCI-6318]

* Fix asset rendering [SCI-6316, SCI-6417]

* Copy fix [SCI-6315]

* Fix print protocol name handling [SCI-6318]

* CSS linter fixes

* Add support for handson tables [SCI-6318]

* Use partial for handsontable formulas [SCI-6318]
 2021-12-03 13:44:18 +01:00
Miha Mencin 26b913f444
Merge pull request #3716 from biosistemika/SCI-6322-templates-generation-fix 
[SCI-6322] use correct user when creating templates, create assignmen…
 2021-12-02 17:15:35 +01:00
Miha Mencin cd0dc454f5 Fix the code style 2021-12-02 17:14:01 +01:00
Miha Mencin 9031f5b2c5 replace perform_later with perform_now, so we can catch a possible arror during the transaction 2021-12-02 17:04:28 +01:00
Miha Mencin b964bfd31e [SCI-6322] use correct user when creating templates, create assignment on experiments and tasks 2021-12-02 16:54:43 +01:00
artoscinote c746d6b761
Add missing icon [SCI-6314] (#3714) 2021-12-02 10:09:11 +01:00
artoscinote 19a91fce66
Fix protocol layout issue [SCI-6312] (#3712) 2021-12-01 16:23:46 +01:00
artoscinote 78ab094bf2
Implement public user grouping, deletion and updates to manually assigned [SCI-6228] (#3701) 
* Implement public user grouping, deletion and updates to manually assigned [SCI-6228]

* PR fixes [SCI-6228]

* Permission check improvement [SCI-6228]
 2021-12-01 16:23:24 +01:00
Alex Kriuchykhin 62d4d8e36e
Merge pull request #3567 from okriuchykhin/ok_SCI_6055 
Confirm the invitation when user is invited and lands in with SSO [SCI-6055]
 2021-12-01 13:19:58 +01:00
aignatov-bio 850b164724
Update error handling for experiment move [SCI-6293] (#3703) 
Co-authored-by: Anton <anton@scinote.net>
 2021-12-01 11:24:01 +01:00
artoscinote 9652362c46
Fix remove user from project notification [SCI-6264] (#3708) 2021-12-01 11:17:07 +01:00
artoscinote 9937d1d913
Add print feature to protocols [SCI-6028] (#3700) 
* Add print feature to protocols [SCI-6028]

* Close tab after closing print dialog [SCI-6028]

* CSS linter fixes [SCI-6028]
 2021-12-01 11:16:45 +01:00
artoscinote 16b3ee3d94
Add non-cyclical validation to connections [SCI-6287] (#3702) 
* Add non-cyclical validation to connections [SCI-6287]

* Prevent theoretical infinite loop possiblity [SCI-6287]
 2021-12-01 11:14:01 +01:00
Miha Mencin 7d4f265506
Bump version to 1.23.3 2021-11-29 13:15:53 +01:00
Miha Mencin 4e11edd696
Merge pull request #3705 from artoscinote/ma_SCI_6307 
Fix checklist checkboxes for locked tasks [SCI-6307]
 2021-11-29 12:15:51 +01:00
Martin Artnik ce5eb68106 Fix checklist checkboxes for locked tasks [SCI-6307] 2021-11-29 12:03:01 +01:00
Oleksii Kriuchykhin b5407108ba Bump version to 1.23.2 2021-11-24 18:42:24 +01:00
Miha Mencin 46211ae60d
Merge pull request #3699 from biosistemika/SCI-6302-fix-snapshot-permission-helper-name 
SCI-6302 change snapshot permission helper name
 2021-11-24 15:27:26 +01:00
Miha Mencin c63ae86e4b SCI-6302 change snapshot permission helper name 2021-11-24 15:21:42 +01:00
Oleksii Kriuchykhin 2264bc200d Bump version to 1.23.1 2021-11-24 13:02:06 +01:00
Alex Kriuchykhin 86c1d242ee
Merge pull request #3696 from aignatov-bio/ai-sci-6298-fix-moving-locked-tasks 
Fix moving for a locked tasks [SCI-6298]
 2021-11-24 11:10:23 +01:00
Miha Mencin aff369d852
Merge pull request #3697 from artoscinote/ma_SCI_6300 
Don't include PDF files in PDF reports if no permission [SCI-6300]
 2021-11-24 11:08:44 +01:00
Martin Artnik a3fa63152e Don't include PDF files in PDF reports if no permission [SCI-6300] 2021-11-24 11:01:57 +01:00
Anton 1b3307eb56 Fix moving for locked tasks [SCI-6298] 2021-11-24 10:56:25 +01:00
Miha Mencin 7b65ff44f6
Merge pull request #3695 from artoscinote/ma_SCI_6297 
Add permission check for checkbox items [SCI-6297]
 2021-11-24 09:38:30 +01:00
Martin Artnik a85b16ff2c Add permission check for checkbox items [SCI-6297] 2021-11-24 09:36:53 +01:00
Oleksii Kriuchykhin f684ddd167 Bump version to 1.23.0 2021-11-23 17:18:01 +01:00
Alex Kriuchykhin 8692d7f04b
Merge pull request #3694 from aignatov-bio/ai-sci-6291-fix-project-mobing-for-archived-and-locked-task 
Fix experiment moving with archived tasks [SCI-6291]
 2021-11-23 11:31:28 +01:00
Anton 774aa6cf9c Fix experiment moving with archived tasks [SCI-6291] 2021-11-23 11:25:29 +01:00
Alex Kriuchykhin 5bb26ae6fa
Merge pull request #3693 from artoscinote/ma_SCI_6292 
Make all except public project assignments manual [SCI-6292]
 2021-11-23 11:00:03 +01:00
Martin Artnik 8a78b8376b Make all except public project assignments manual [SCI-6292] 2021-11-23 10:56:28 +01:00
artoscinote 5a7d285264
Fix due/start date label render [SCI-6288] (#3690) 2021-11-22 11:18:05 +01:00
aignatov-bio 06577e2f8b
Skip create assignments during team import [SCI-6280] (#3679) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-22 11:17:39 +01:00
Alex Kriuchykhin 21c97027c1
Merge pull request #3691 from okriuchykhin/ok_SCI_6289 
Fix user assignments migration, all assignments are automatic [SCI-6289]
 2021-11-22 10:59:26 +01:00
Alex Kriuchykhin ca5a81a85c
Add unique validation for user assignements [SCI-6279] (#3680) 2021-11-22 10:47:20 +01:00
Oleksii Kriuchykhin e8f55cb74f Fix user assignments migration, all assignments are automatic [SCI-6289] 2021-11-22 10:45:36 +01:00
aignatov-bio 8545b5787f
Create assignment after experiment move [SCI-6285] (#3689) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-22 10:34:11 +01:00
artoscinote a31bcd6eed
Fixed logging of project user role changes [SCI-6283] (#3687) 2021-11-22 09:50:14 +01:00
artoscinote 4fb9f8836d
Fix my_modules_controller typo [SCI-6278] (#3688) 2021-11-22 09:49:44 +01:00
aignatov-bio 881251fe14
Skip null subjects for activities moving [SCI-6285] (#3686) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-19 14:06:26 +01:00
artoscinote 774ffa60d0
Fix creating new users on projects for team admins [SCI-6273] (#3685) 2021-11-19 13:58:54 +01:00
artoscinote 9b06a24288
Added granular task permissions, permission check fixes [SCI-6278] (#3683) 2021-11-19 13:24:57 +01:00
artoscinote 2d6521db42
Fix delete connection in API [SCI-6087] (#3684) 2021-11-19 13:24:29 +01:00
artoscinote ee8cb033fa
Fix keys in connection serializer, fix destroy method [SCI-6087] (#3677) 2021-11-18 16:10:07 +01:00