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 |
|
artoscinote
|
e8add30225
|
Bump version to
1.26.0.4
|
2022-09-13 13:24:43 +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 |
|
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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
bb6e638528
|
Add activities for label template actions [SCI-7086]
|
2022-09-08 16:35:53 +02:00 |
|
G-Chubinidze
|
e179182d21
|
fix archived repositories show button not showing [SCI-7162] (#4408)
* fix archived repositories show button not showing [SCI-7162]
* fix archived repositories show button not showing [SCI-7162]
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
|
2022-09-08 11:51:47 +02:00 |
|
Alex Kriuchykhin
|
c5f0fa3e7f
|
Merge pull request #4415 from okriuchykhin/ok_SCI_7164
Do not change team if inventory is shared with current one [SCI-7164]
|
2022-09-07 11:06:51 +02:00 |
|
Oleksii Kriuchykhin
|
3d3fa6e871
|
Do not change team if inventory is shared with current one [SCI-7164]
|
2022-09-07 11:01:53 +02:00 |
|
artoscinote
|
95105b86af
|
Fix ininite scroll [SCI-7160] (#4414)
|
2022-09-07 10:01:00 +02:00 |
|
aignatov-bio
|
2407b95e37
|
Merge pull request #4411 from aignatov-bio/ai-sci-7169-remove-scroll-before-page-leave
Remove scroll before page leave [SCI-7169]
|
2022-09-06 12:44:20 +02:00 |
|
artoscinote
|
d2b022a17d
|
Remove obsolete code [SCI-7160] (#4412)
|
2022-09-06 12:10:20 +02:00 |
|
artoscinote
|
21f91089e9
|
Prevent loading empty next page in P/E infinite scroll [SCI-7160] (#4410)
|
2022-09-06 11:57:34 +02:00 |
|
Anton
|
90e962ccbf
|
Remove scroll before page leave [SCI-7169]
|
2022-09-06 11:15:28 +02:00 |
|
artoscinote
|
9126b7fca4
|
Add missing protocol description activity [SCI-7140] (#4401)
|
2022-09-06 11:03:13 +02:00 |
|
Alex Kriuchykhin
|
8a0656ce21
|
Merge pull request #4147 from okriuchykhin/ok_SCI_6834
Update tests with new team user assignments [SCI-6843]
|
2022-09-05 14:34:16 +02:00 |
|
Anton
|
47e20d1b27
|
Add ability to disable zebra printers [SCI-7148]
|
2022-09-05 12:37:03 +02:00 |
|
aignatov-bio
|
b585219be2
|
Merge pull request #4402 from aignatov-bio/ai-sci-7127-fix-error-handling-for-tinymce
Fix error handling for tinymce [SCI-7127]
|
2022-09-05 12:36:36 +02:00 |
|
Alex Kriuchykhin
|
bf7582fe1d
|
Merge pull request #4406 from okriuchykhin/ok_SCI_7158
Make experiment card dropdown menu async [SCI-7158]
|
2022-09-02 18:16:07 +02:00 |
|
Oleksii Kriuchykhin
|
f85a6b5a2e
|
Make experiment card dropdown menu async [SCI-7158]
|
2022-09-02 18:15:01 +02:00 |
|
Alex Kriuchykhin
|
d5a3b622c6
|
Merge pull request #4405 from okriuchykhin/ok_SCI_7157
Make permission checks for card selection async [SCI-7157]
|
2022-09-02 18:13:39 +02:00 |
|
Oleksii Kriuchykhin
|
e27d063b61
|
Make permission checks for card selection async [SCI-7157]
|
2022-09-02 18:10:16 +02:00 |
|
Alex Kriuchykhin
|
0fcedc32ba
|
Merge pull request #4403 from artoscinote/ma_SCI_7159
Make project action dropdowns async [SCI-7159]
|
2022-09-02 17:05:35 +02:00 |
|
Martin Artnik
|
a2a5e8c4c8
|
Add caching and improve dynamic reload [SCI-7159]
|
2022-09-02 16:54:41 +02:00 |
|
artoscinote
|
27b4f398a4
|
Merge pull request #4404 from G-Chubinidze/gc_SCI_7161
Fix underline in docx report generator [SCI-7161]
|
2022-09-02 15:13:13 +02:00 |
|
Giga Chubinidze
|
f8842cd066
|
Fix underline in docx report generator [SCI-7161]
|
2022-09-02 17:11:36 +04:00 |
|
Anton
|
34b87ae92f
|
Fix files loading during copy [SCI-7149]
|
2022-09-02 15:09:56 +02:00 |
|
Giga Chubinidze
|
85873213b8
|
Fix underline in docx report generator [SCI-7161]
|
2022-09-02 16:44:51 +04:00 |
|