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
12530 commits 70 branches 179 tags 165 MiB
Commit graph

12530 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sboursen-scinote 226a89e8bf Fix clear button style in dashboard filter [SCI-7607] 2023-03-29 10:34:13 +02:00
sboursen-scinote e4d5732967 Add border to cancel button [SCI-7607] 2023-03-27 11:14:54 +02:00
Alex Kriuchykhin 678d51692e
Merge pull request #5194 from artoscinote/ma_SCI_8131 
Prevent removing/changing role for last user with user manage permission on protocol [SCI-8131]
 2023-03-24 13:58:57 +01:00
Martin Artnik ed469b8e11 Remove manage users permission from team admin [SCI-8131] 2023-03-24 13:32:46 +01:00
Martin Artnik b1cce70cc6 Preven removing last user manager for protocols/projects [SCI-8131] 2023-03-24 13:32:38 +01:00
aignatov-bio d8083b84b6
Merge pull request #5184 from aignatov-bio/ai-sci-8185-css-fixes 
Fix tables css [SCI-8185]
 2023-03-24 13:14:38 +01:00
Alex Kriuchykhin e7bd133895
Merge pull request #5191 from aignatov-bio/ai-sci-8160-update-front-end-permission-for-version-comment 
Update front end permission check for version comment [SCI-8160]
 2023-03-24 13:14:03 +01:00
Anton 9818e41353 Update front end permission check for version comment [SCI-8160] 2023-03-24 13:11:14 +01:00
aignatov-bio 09a217baca
Merge pull request #5193 from aignatov-bio/ai-sci-8190-fix-protocol-screen-css 
Protocol screen css fixes [SCI-8190]
 2023-03-24 13:04:00 +01:00
Anton 0b560f5b05 Protocol screen css fixes [SCI-8190] 2023-03-24 12:01:47 +01:00
ajugo 2734c86ef5
Show/hide duplicate button on team permission change in protocol template repository [SCI-8150] (#5190) 2023-03-24 11:52:48 +01:00
artoscinote 00191e41de
Merge pull request #5192 from scinote-eln/features/token-revocation 
Features/token revocation
 2023-03-24 11:13:38 +01:00
Alex Kriuchykhin 5016034189
Merge pull request #5187 from artoscinote/ma_SCI_8182 
Fix issues with protocol assignments and published attributes [SCI-8182]
 2023-03-24 11:05:12 +01:00
Martin Artnik 2ddbc0ed90 Fix protocol migration/assignment issues [SCI-8182] 2023-03-24 10:58:43 +01:00
ajugo e065098082
Fix protocol templates rows selection flickering [SCI-8105] (#5185) 
* Fix protocol templates rows selection flickering [SCI-8105]

* Fix double initialization of row selection [SCI-8105]
 2023-03-23 13:40:21 +01:00
Oleksii Kriuchykhin 7ef2f68078 Merge branch 'hotfix/1.26.6.3' into develop 2023-03-23 13:26:12 +01:00
Oleksii Kriuchykhin 8f9e028577 Bump version to 1.26.6.3 2023-03-23 13:25:05 +01:00
Anton 4edad3f41c Fix tables css [SCI-8185] 2023-03-23 13:05:37 +01:00
ajugo 4c42748e40
Add protocolsIO import preview [SCI-8187] (#5183) 2023-03-23 12:18:30 +01:00
Alex Kriuchykhin 72186e8e8d
Merge pull request #5178 from okriuchykhin/ok_SCI_7919 
Check permissions on current user during PDF report generation [SCI-7919]
 2023-03-22 16:39:30 +01:00
aignatov-bio 2a5ba47ff2
Merge pull request #5181 from aignatov-bio/ai-sci-8017-protocol-tables-css-fixes 
PET and Protocol tabls fixes [SCI-8176][SCI-8180][SCI-8181]
 2023-03-22 15:01:56 +01:00
Anton e626c53f78 PET and Protocol tabls fixes [SCI-8176][SCI-8180][SCI-8181] 2023-03-22 13:47:59 +01:00
Alex Kriuchykhin b29d4724a2
Merge pull request #5180 from okriuchykhin/ok_SCI_8174 
Fix create step comments permissions [SCI-8174]
 2023-03-22 13:42:54 +01:00
Oleksii Kriuchykhin 3443a6fb85 Fix create step comments permissions [SCI-8174] 2023-03-22 12:52:08 +01:00
ajugo fe37699ba5
Add switch for connected devices [SCI-8112] (#5179) 2023-03-22 12:15:01 +01:00
aignatov-bio 3e7deac858
Merge pull request #5167 from aignatov-bio/ai-sci-8155-css-fixes-for-version-modal 
CSS fixes for version modal [SCI-8155]
 2023-03-22 11:32:57 +01:00
aignatov-bio 0044726425
Merge branch 'develop' into ai-sci-8155-css-fixes-for-version-modal 2023-03-22 11:32:49 +01:00
Oleksii Kriuchykhin ba5afe0e6b Check permissions on current user during PDF report generation [SCI-7919] 2023-03-22 10:51:45 +01:00
artoscinote 4750d61b77
Merge pull request #5177 from scinote-eln/revert-5029-gc_SCI_7763 
Revert "Search by team does not work [SCI-7763]"
 2023-03-22 10:24:32 +01:00
artoscinote 13413a296b
Merge pull request #5176 from scinote-eln/revert-5120-gc_SCI_8086 
Revert "Archived experiments UI improvements [SCI-8086]"
 2023-03-22 10:24:16 +01:00
G-Chubinidze 44cc9d1c90
Revert "Search by team does not work [SCI-7763]" 2023-03-22 13:22:05 +04:00
G-Chubinidze a1c611ab1e
Revert "Archived experiments UI improvements [SCI-8086]" 2023-03-22 13:21:08 +04:00
ajugo 8eb04c50c2
Add removing connected device [SCI-8146] (#5174) 2023-03-21 16:44:24 +01:00
Alex Kriuchykhin b3889de17b
Merge pull request #5171 from okriuchykhin/ok_SCI_8145 
Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157]
 2023-03-21 16:40:22 +01:00
Oleksii Kriuchykhin cf599a8277 Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157] 2023-03-21 16:25:02 +01:00
artoscinote fb427f7d55
Merge pull request #5173 from scinote-eln/revert-5169-gc_SCI_8098 
Revert "Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]"
 2023-03-21 15:26:20 +01:00
artoscinote 44098ece5d
Revert "Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]" 2023-03-21 15:26:06 +01:00
artoscinote b089453ec7
Merge pull request #5172 from scinote-eln/revert-5170-gc_SCI_8147 
Revert "Cursor position improvements, focused fields - part 2 (more i…
 2023-03-21 15:25:47 +01:00
artoscinote e2dc2e31ee
Revert "Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]" 2023-03-21 15:24:40 +01:00
artoscinote a43c941b50
Merge pull request #5170 from G-Chubinidze/gc_SCI_8147 
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
 2023-03-21 15:18:37 +01:00
artoscinote 634b4145fd
Merge pull request #5169 from G-Chubinidze/gc_SCI_8098 
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
 2023-03-21 15:17:55 +01:00
artoscinote 397e4aeebe
Merge pull request #4935 from G-Chubinidze/gc_SCI_7848 
user_my_modules_controller#index_old action updates [SCI-7848]
 2023-03-21 11:41:38 +01:00
Giga Chubinidze 8e942379ff changed assignee to designated_users 2023-03-21 14:29:23 +04:00
Giga Chubinidze 9dcd2f1500 Cursor position improvements, focused fields - part 2 [SCI-8147] 2023-03-21 13:17:44 +04:00
Giga Chubinidze b7490ebcca Cursor position improvements, focused fields - part 1 [SCI-8098 2023-03-21 11:14:44 +04:00
Oleksii Kriuchykhin 7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin 33d63a58fa Bump version to 1.26.6.2 2023-03-20 14:58:24 +01:00
Alex Kriuchykhin ad358e3939
Merge pull request #5168 from rekonder/aj_SCI_8165 
Fix docx table generator if metadata is unknown [SCI-8165]
 2023-03-20 14:19:21 +01:00
Andrej 8bf9e2425b Fix docx table generator if metadata are nil [SCI-8165] 2023-03-20 14:12:44 +01:00
Alex Kriuchykhin 0bfd7ee9c2
Merge pull request #5165 from aignatov-bio/ai-sci-8160-fix-version-revision 
Fix permission for draft revision comment [SCI-8160]
 2023-03-20 14:03:50 +01:00