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 |
|
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 |
|
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 |
|
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 |
|
Alex Kriuchykhin
|
a5fc66a6f3
|
Merge pull request #4388 from okriuchykhin/ok_SCI_7047
Add syncing service and schedule for Fluics templates sync [SCI-7047]
|
2022-09-01 14:13:18 +02:00 |
|
Oleksii Kriuchykhin
|
ba54f42d2f
|
Wrap unsaring actions in transaction [SCI-6918]
|
2022-08-31 17:21:01 +02:00 |
|
Oleksii Kriuchykhin
|
bf8f838214
|
Update repository sharing actions [SCI-6918]
|
2022-08-31 17:21:01 +02:00 |
|
Alex Kriuchykhin
|
e23475fbbe
|
Merge pull request #4183 from okriuchykhin/ok_SCI_6917
Convert team_repository to polymorphic relation [SCI-6917]
|
2022-08-31 16:43:35 +02:00 |
|
Oleksii Kriuchykhin
|
f586c73dc8
|
Convert team_repository to polymorphic relation [SCI-6917]
|
2022-08-31 16:42:08 +02:00 |
|
Oleksii Kriuchykhin
|
eb04bc974d
|
Update tests with new team user assignments [SCI-6843]
|
2022-08-31 16:37:00 +02:00 |
|
aignatov-bio
|
57282069e9
|
Merge pull request #4361 from aignatov-bio/ai-sci-7084-add-sorting-by-default-template
Add sorting by default label template [SCI-7084]
|
2022-08-31 10:36:02 +02:00 |
|
aignatov-bio
|
91f1310338
|
Merge pull request #4364 from aignatov-bio/ai-sci-7060-update-promo-text
Update label template promo text [SCI-7060]
|
2022-08-31 10:13:42 +02:00 |
|
Alex Kriuchykhin
|
c713a993d3
|
Merge pull request #4178 from okriuchykhin/ok_SCI_6916
Migrate TeamRepository to new permissions [SCI-6916]
|
2022-08-30 16:46:44 +02:00 |
|
Alex Kriuchykhin
|
34c8960097
|
Merge pull request #4170 from okriuchykhin/ok_SCI_6915
Add team reference to user assignments model [SCI-6915]
|
2022-08-30 16:46:02 +02:00 |
|
artoscinote
|
e11ae6b5c1
|
Merge pull request #4395 from artoscinote/ma_SCI_7129
Add default measurments to label templates [SCI-7129]
|
2022-08-30 16:22:26 +02:00 |
|
Martin Artnik
|
bd1e30d19b
|
Add default measurments to label templates [SCI-7129]
|
2022-08-30 16:16:02 +02:00 |
|
Oleksii Kriuchykhin
|
b2b059b7e1
|
Add syncing service and schedule for Fluics templates sync [SCI-7047]
|
2022-08-29 09:59:13 +02:00 |
|
ajugo
|
185bf0b197
|
Add label template dropdown to print dialog [SCI-7051] (#4369)
|
2022-08-26 10:53:55 +02:00 |
|
aignatov-bio
|
6706e886e3
|
Merge pull request #4382 from aignatov-bio/ai-sci-7085-update-css-for-view-screen
Fix css for label template view screen [SCI-7085]
|
2022-08-25 14:33:57 +02:00 |
|
Alex Kriuchykhin
|
dac492cfd4
|
Merge pull request #4353 from okriuchykhin/ok_SCI_7045
Add list label templates method to Fluics API client [SCI-7045]
|
2022-08-25 13:40:40 +02:00 |
|
Anton
|
9daa3f6d69
|
Fix css for label view page [SCI-7085]
|
2022-08-25 13:25:34 +02:00 |
|
Anton
|
771c40d4f0
|
CSS fixes for label template screen [SCI-7085]
|
2022-08-24 17:57:34 +02:00 |
|
aignatov-bio
|
34abe2aa7b
|
Merge pull request #4354 from aignatov-bio/ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor
Add column dropdown to label template editor [SCI-7054][SCI-7055]
|
2022-08-24 17:48:55 +02:00 |
|
aignatov-bio
|
6d8908c1f5
|
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor
|
2022-08-24 17:48:48 +02:00 |
|
aignatov-bio
|
9066d9ab04
|
Merge pull request #4380 from artoscinote/ma_SCI_7053
Add missing route [SCI-7053]
|
2022-08-24 14:13:57 +02:00 |
|
Martin Artnik
|
0aa4ff11d4
|
Add missing route [SCI-7053]
|
2022-08-24 14:10:51 +02:00 |
|
artoscinote
|
7a7df03396
|
Implement label preview component [SCI-7050] (#4370)
|
2022-08-24 13:55:54 +02:00 |
|
Anton
|
45bbbfffe4
|
Update label template promo text [SCI-7060]
|
2022-08-18 15:33:19 +02:00 |
|
Anton
|
46990b3df4
|
Add sorting by default label template [SCI-7084]
|
2022-08-18 11:49:22 +02:00 |
|
Anton
|
5677e45e0c
|
Add insert ability for code in content block [SCI-7055]
|
2022-08-17 13:40:35 +02:00 |
|
Anton
|
4f312bf329
|
Finalize insert field dropdown [SCI-7054]
|
2022-08-17 12:58:27 +02:00 |
|
Anton
|
174d33bba8
|
Add column dropdown to label template editor [SCI-7054]
|
2022-08-16 10:16:40 +02:00 |
|
Oleksii Kriuchykhin
|
08e654d5fb
|
Add list label templates method to Fluics API client [SCI-7045]
|
2022-08-12 19:47:29 +02:00 |
|
Alex Kriuchykhin
|
32c32e7b46
|
Merge pull request #4350 from okriuchykhin/ok_SCI_7049
Add client for ZPL preview generation service [SCI-7049]
|
2022-08-12 15:32:01 +02:00 |
|
Oleksii Kriuchykhin
|
f02f625e1e
|
Add client for ZPL preview generation service [SCI-7049]
|
2022-08-12 12:57:19 +02:00 |
|
artoscinote
|
4e768bec04
|
Add endpoint for fetching label template tags [SCI-7053] (#4319)
|
2022-08-10 11:35:38 +02:00 |
|
aignatov-bio
|
6403e2256c
|
Merge pull request #4320 from aignatov-bio/ai-sci-7048-update-label-templates-toolbar
Update labels index page [SCI-7048]
|
2022-08-08 11:50:03 +02:00 |
|