Andrej
|
ac7c873385
|
Session end implementation [SCI-7027]
|
2022-09-16 09:57:40 +02:00 |
|
Giga Chubinidze
|
102eed8241
|
Expose project IDs in tables & cards view [SCI-7172] [SCI-7173]
|
2022-09-15 22:27:23 +04:00 |
|
Giga Chubinidze
|
b31f60026a
|
Expose project IDs in tables & cards view [SCI-7172] [SCI-7173]
|
2022-09-15 22:20:04 +04:00 |
|
artoscinote
|
500adb346e
|
Merge pull request #4426 from G-Chubinidze/gc_SCI_7115
added scrollbar to task paper dropdown [SCI-7115]
|
2022-09-15 15:29:25 +02:00 |
|
Giga Chubinidze
|
7c0407af7a
|
refactored scrollbar to fit style guides
|
2022-09-15 16:44:40 +04:00 |
|
aignatov-bio
|
e1ce81280e
|
Merge pull request #4430 from aignatov-bio/ai-sci-7171-duplicate-protocols-in-activities
Fix duplicate protocols in activities search [SCI-7171]
|
2022-09-15 14:07:23 +02:00 |
|
aignatov-bio
|
cb57810370
|
Merge pull request #4437 from aignatov-bio/ai-sci-fix-merge-issues
Fix merge issues for templates
|
2022-09-15 14:07:09 +02:00 |
|
Anton
|
7ccce8a6d8
|
Fix merge issues for templates
|
2022-09-15 13:48:41 +02:00 |
|
aignatov-bio
|
5abffc1412
|
Merge pull request #4372 from aignatov-bio/ai-sci-7108-add-duplication-functionality-to-steps
Add duplication to components [SCI-7108]
|
2022-09-15 11:25:36 +02:00 |
|
aignatov-bio
|
c0339b17be
|
Merge branch 'develop' into ai-sci-7108-add-duplication-functionality-to-steps
|
2022-09-15 11:25:25 +02:00 |
|
aignatov-bio
|
19c20f2549
|
Merge pull request #4363 from aignatov-bio/ai-sci-7089-include-label-templates-to-team-import-export
Add labels template to team import/export [SCI-7089]
|
2022-09-15 11:20:28 +02:00 |
|
aignatov-bio
|
7d23f3c8a6
|
Merge branch 'develop' into ai-sci-7089-include-label-templates-to-team-import-export
|
2022-09-15 11:20:20 +02:00 |
|
aignatov-bio
|
3e47391849
|
Merge pull request #4436 from scinote-eln/features/label-templates
merge Features/label templates to develop
|
2022-09-15 11:17:50 +02:00 |
|
Anton
|
0c596bb701
|
Merge branch 'develop' into features/label-templates
|
2022-09-15 10:40:17 +02:00 |
|
aignatov-bio
|
701125573b
|
Merge pull request #4435 from aignatov-bio/ai-sci-7088-add-new-permissions-for-team-level
Add new permission to label templates [SCI-7088]
|
2022-09-14 15:45:15 +02:00 |
|
Anton
|
d7990cb058
|
Add new permissions for label templates [SCI-7088]
|
2022-09-14 15:13:13 +02:00 |
|
Anton
|
6ef7fa1f12
|
Merge branch 'features/label-templates' of github.com:scinote-eln/scinote-web into features/label-templates
|
2022-09-14 14:35:25 +02:00 |
|
aignatov-bio
|
94ad2ce986
|
Merge pull request #4434 from scinote-eln/features/team-permissions
merge features/team permissions
|
2022-09-14 14:34:29 +02:00 |
|
aignatov-bio
|
4182194b31
|
Merge branch 'features/label-templates' into features/team-permissions
|
2022-09-14 14:34:02 +02:00 |
|
aignatov-bio
|
873ed9d70a
|
Merge pull request #4212 from okriuchykhin/ok_SCI_6947
Update inventory global sharing logic to use new user assignments [SCI-6947]
|
2022-09-14 14:31:57 +02:00 |
|
aignatov-bio
|
33f210638a
|
Merge branch 'features/team-permissions' into ok_SCI_6947
|
2022-09-14 14:31:45 +02:00 |
|
aignatov-bio
|
9e63dcab22
|
Merge pull request #4207 from okriuchykhin/ok_SCI_6918
Update repository sharing actions [SCI-6918]
|
2022-09-14 14:23:52 +02:00 |
|
Anton
|
3e4aa9d020
|
Merge branch 'features/label-templates' of github.com:scinote-eln/scinote-web into features/label-templates
|
2022-09-13 18:47:05 +02:00 |
|
aignatov-bio
|
4ec4eb869e
|
Merge pull request #4433 from aignatov-bio/ai-sci-merge-team-permissions-to-labels
Merge Team permissions to template labels
|
2022-09-13 18:44:35 +02:00 |
|
Anton
|
75a15310ac
|
Merge branch 'features/team-permissions' into features/label-templates
|
2022-09-13 14:26:15 +02:00 |
|
Anton
|
0d1b4cb01a
|
Merge branch 'features/team-permissions' into features/label-templates
|
2022-09-13 14:20:57 +02:00 |
|
Giga Chubinidze
|
22aa04a5ac
|
exposed prefixed ids for projects table [SCI_7172]
|
2022-09-13 15:57:17 +04:00 |
|
Giga Chubinidze
|
133302964c
|
exposed prefixed ids for projects table [SCI_7172]
|
2022-09-13 15:53:41 +04:00 |
|
Giga Chubinidze
|
0a1b879c3d
|
exposed prefixed ids for projects table [SCI_7172]
|
2022-09-13 15:49:12 +04:00 |
|
artoscinote
|
b36a91ef85
|
Merge pull request #4432 from scinote-eln/develop
September cleanup, version 1.26.0.4
|
2022-09-13 13:37:57 +02:00 |
|
artoscinote
|
e8add30225
|
Bump version to
1.26.0.4
|
2022-09-13 13:24:43 +02:00 |
|
Martin Artnik
|
3d1bdac1f4
|
Added task code to task details [SCI-7178]
|
2022-09-13 13:17:18 +02:00 |
|
Martin Artnik
|
b836b9a12b
|
Add task IDs to canvas view [SCI-7177]
|
2022-09-13 12:42:12 +02:00 |
|
Anton
|
d68bb6ddf4
|
Fix dupicate protocols in activities search [SCI-7171]
|
2022-09-13 12:38:26 +02:00 |
|
Giga Chubinidze
|
2c393a1bef
|
exposed prefixed ids for projects table [SCI_7172]
|
2022-09-13 13:31:04 +04:00 |
|
Giga Chubinidze
|
fbbe394029
|
exposed prefixed ids for projects table [SCI_7172]
|
2022-09-13 13:24:06 +04:00 |
|
Anton
|
7d02b9f26d
|
Fix repository selection in reports [SCI-7167]
|
2022-09-13 09:59:11 +02:00 |
|
aignatov-bio
|
06548c247f
|
Merge pull request #4407 from aignatov-bio/ai-sci-7148-make-zebra-printers-switchable
Add ability to disable zebra printers [SCI-7148]
|
2022-09-12 13:54:52 +02:00 |
|
aignatov-bio
|
4a0135aaee
|
Merge pull request #4425 from aignatov-bio/ai-sci-7182-fix-tinymce-errors
Fix tinymce errors [SCI-7182]
|
2022-09-12 13:54:43 +02:00 |
|
Martin Artnik
|
2e3956aaf9
|
Skip previews for non-supported images in team zip export [SCI-7163]
|
2022-09-12 12:31:17 +02:00 |
|
Giga Chubinidze
|
271867710f
|
added scrollbar to task paper dropdown [SCI-7115]
|
2022-09-09 23:28:37 +04:00 |
|
Alex Kriuchykhin
|
f62e4e8509
|
Merge pull request #4423 from okriuchykhin/ok_SCI_7180
Improve speed of group unassignment job as it is executed in foreground [SCI-7180]
|
2022-09-09 15:58:44 +02:00 |
|
Anton
|
73917ec4c0
|
Fix tinymce errors [SCI-7182]
|
2022-09-09 15:50:59 +02:00 |
|
Oleksii Kriuchykhin
|
b8dc0617b2
|
Improve speed of group unassignment job as it is executed in foreground [SCI-7180]
|
2022-09-09 13:31:16 +02:00 |
|
artoscinote
|
fa7e39c6a9
|
Fix experiment page infinite scroll [SCI-7160] (#4422)
|
2022-09-09 11:42:37 +02:00 |
|
artoscinote
|
6a2037dc00
|
Fix smart annotations in locked elements [SCI-7135] (#4421)
|
2022-09-09 11:15:33 +02:00 |
|
Alex Kriuchykhin
|
c0d3d04747
|
Merge pull request #4417 from okriuchykhin/ok_SCI_7151
Reimplement custom TinyMCE plugin: customImageUploader [SCI-7151]
|
2022-09-09 11:00:55 +02:00 |
|
Oleksii Kriuchykhin
|
557c4b205a
|
Reimplement custom TinyMCE plugin: customImageUploader [SCI-7151]
|
2022-09-09 10:59:20 +02:00 |
|
Oleksii Kriuchykhin
|
d5205843f4
|
Enable Fluics sync only if env variable is present [SCI-7047]
|
2022-09-08 17:22:29 +02:00 |
|
Alex Kriuchykhin
|
b5d60499d5
|
Merge pull request #4373 from okriuchykhin/ok_SCI_7086
Add activities for label template actions [SCI-7086]
|
2022-09-08 16:41:14 +02:00 |
|