Oleksii Kriuchykhin
0e95b7ea66
Connect update fluics template button with controller action [SCI-7261]
2022-10-07 14:52:23 +02:00
artoscinote
8ca02ec619
Merge pull request #4507 from G-Chubinidze/gc_SCI_7251
...
fixed can not set due date on task card issue [SCI-7251]
2022-10-07 12:40:56 +02:00
G-Chubinidze
47e4244d9e
Update _manage_due_date_modal.html.erb
2022-10-07 14:38:59 +04:00
Giga Chubinidze
8b5ff3955b
fixed can not set due date on task card issue [SCI-7251]
2022-10-07 14:14:29 +04:00
Oleksii Kriuchykhin
173e3b09cd
Fix user invitation modal [SCI-7308]
2022-10-06 17:55:51 +02:00
Alex Kriuchykhin
c5fb97cb0c
Merge pull request #4487 from artoscinote/ma_SCI_7283
...
Fix team folder permission [SCI-7283]
2022-10-06 15:48:45 +02:00
Alex Kriuchykhin
07d470b2ff
Merge pull request #4479 from okriuchykhin/ok_SCI_7271
...
Fix label printing status modal [SCI-7271]
2022-10-06 15:46:36 +02:00
Alex Kriuchykhin
0f394b34ce
Merge pull request #4495 from okriuchykhin/ok_SCI_7289
...
Fix search in team members table [SCI-7289]
2022-10-06 15:46:03 +02:00
Alex Kriuchykhin
9152cee31f
Merge pull request #4496 from okriuchykhin/ok_SCI_7290
...
Fix user role loading for Team in permission checking concern [SCI-7290]
2022-10-06 15:45:48 +02:00
Alex Kriuchykhin
d648492bad
Merge pull request #4500 from okriuchykhin/ok_SCI_7293
...
Fix project visibility for team admins [SCI-7293]
2022-10-06 15:45:29 +02:00
Alex Kriuchykhin
5ab361123e
Merge pull request #4501 from okriuchykhin/ok_SCI_7295
...
Assign user to public projects after adding to a team [SCI-7295]
2022-10-06 15:45:17 +02:00
artoscinote
77b91b467a
Merge pull request #4485 from rekonder/aj_SCI_7270
...
Add label printer modal to task [SCI-7270][7296]
2022-10-06 15:01:31 +02:00
ajugo
5f38464369
Fix open label template in new tab [SCI-7302] ( #4503 )
2022-10-06 14:57:45 +02:00
artoscinote
e89266d337
Merge pull request #4504 from rekonder/aj_SCI_7312
...
Add name to zebra printer initialization [SCI-7312]
2022-10-06 14:55:14 +02:00
Andrej
16a7dd261f
Add name to zebra printer initialization [SCI-7312]
2022-10-06 14:52:15 +02:00
ajugo
88d9ece237
Fix zebra printer library load [SCI-7310] ( #4502 )
2022-10-06 13:52:49 +02:00
ajugo
f87b42d042
Remove icon from the status repository column at label print time [SCI-7267] ( #4471 )
...
* Remove icon from the status repository column at label print time [SCI-7267]
* Fix status repository column at label print time [SCI-7267]
* Fix status repository column at label print time [SCI-7267]
2022-10-06 11:53:12 +02:00
ajugo
eef93c42d8
Disable print modal button for offline printer statuses [SCI-7276] ( #4493 )
...
* Disable print modal button for offline printer statuses [SCI-7276]
* Disable print modal button for offline printer statuses [SCI-7276]
2022-10-06 11:19:51 +02:00
aignatov-bio
bd535dc9ad
Add dimension saving to label templates [SCI-7268] ( #4489 )
2022-10-06 11:09:10 +02:00
Alex Kriuchykhin
ae8f5526be
Merge pull request #4490 from aignatov-bio/ai-sci-7287-fix-validation-on-print-modal
...
Fix validation on print modal [SCI-7287]
2022-10-06 10:42:36 +02:00
Oleksii Kriuchykhin
9a05bf04bd
Assign user to public projects after adding to a team [SCI-7295]
2022-10-05 22:40:46 +02:00
Oleksii Kriuchykhin
b87ed7db8e
Fix project visibility for team admins [SCI-7293]
2022-10-05 19:40:45 +02:00
Oleksii Kriuchykhin
0a8ebef095
Update teams table with new user assignments system [SCI-7291]
2022-10-05 18:28:40 +02:00
Oleksii Kriuchykhin
cf34ddcbd1
Fix user role loading for Team in permission checking concern [SCI-7290]
2022-10-04 13:53:45 +02:00
ajugo
7fbac92f9c
Add status for Zebra printers in label print modal [SCI-7269] ( #4492 )
2022-10-04 09:57:47 +02:00
Andrej
884fe58525
Fix label print open issue [SCI-7296]
2022-10-03 17:33:42 +02:00
Oleksii Kriuchykhin
830248ada9
Fix search in team members table [SCI-7289]
2022-10-03 16:56:15 +02:00
Andrej
e05ad97498
Enable label print modal for smart annotations [SCI-7270]
2022-10-03 13:39:18 +02:00
Alex Kriuchykhin
d70428c6fe
Merge pull request #4477 from okriuchykhin/ok_SCI_7258
...
Fix label printers dropdown on print modal [SCI-7258]
2022-10-03 10:37:42 +02:00
Oleksii Kriuchykhin
b20c2b13a3
Fix label printers dropdown on print modal [SCI-7258]
2022-10-03 10:37:04 +02:00
aignatov-bio
aba760f1a4
Merge pull request #4486 from aignatov-bio/ai-sci-7285-fix-duplicate-label-in-dropdown-component
...
Fix duplicate labels in dropdown components [SCI-7285]
2022-09-30 19:51:34 +02:00
Anton
85248a0426
Fix validation on print modal [SCI-7287]
2022-09-30 19:48:13 +02:00
artoscinote
b65422b74d
Merge pull request #4488 from artoscinote/ma_SCI_7288
...
Add extension to icon image path, to fix it in production [SCI-7288]
2022-09-30 14:31:43 +02:00
Martin Artnik
846690401d
Add extension to icon image path, to fix it in production [SCI-7288]
2022-09-30 14:26:32 +02:00
aignatov-bio
13f24cac08
Merge pull request #4483 from aignatov-bio/ai-sci-7262-css-fixes-label-templates
...
CSS fixes for label templates [SCI-7262]
2022-09-30 09:47:39 +02:00
Martin Artnik
2e9a876257
Fix team folder permission [SCI-7283]
2022-09-30 09:29:38 +02:00
Anton
0107368b67
Fix duplicate labels in dropdown components [SCI-7285]
2022-09-29 21:11:00 +02:00
aignatov-bio
096c285235
Merge pull request #4484 from aignatov-bio/ai-sci-7265-fix-css-label-templates-table-view
...
Fix css label templates table view [SCI-7265]
2022-09-29 20:58:51 +02:00
Andrej
e8528e6120
Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7270
2022-09-29 16:36:44 +02:00
Andrej
eebdee5129
Add label printer modal to task [SCI-7270]
2022-09-29 16:35:51 +02:00
ajugo
103bdff654
Select default label template based on selected pritner type [SCI-7268][7257] ( #4475 )
2022-09-29 14:47:59 +02:00
ajugo
69bc48fef8
Add cancel button and fix number input [SCI-7274] ( #4478 )
2022-09-29 14:45:10 +02:00
Anton
9d9f6e26bb
Fix css label templates table view [SCI-7265]
2022-09-29 14:29:25 +02:00
Anton
9dc667f8e1
CSS fixes for label templates [SCI-7262]
2022-09-29 14:09:16 +02:00
aignatov-bio
d9dc76c0f9
Merge pull request #4476 from aignatov-bio/ai-sci-7259-label-printer-modal-add-icons-template
...
Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260]
2022-09-29 13:56:39 +02:00
artoscinote
99ef569006
Merge pull request #4482 from scinote-eln/master_1_26_0_5
...
October cleanup 1.26.0.5
2022-09-29 10:13:36 +02:00
artoscinote
d08838bf48
Merge branch 'develop' into master_1_26_0_5
2022-09-29 10:12:29 +02:00
Oleksii Kriuchykhin
ac11d41359
Fix label printing status modal [SCI-7271]
2022-09-28 17:01:07 +02:00
Anton
7e06f29a75
Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260]
2022-09-28 11:34:24 +02:00
aignatov-bio
31554d0fd9
Merge pull request #4472 from aignatov-bio/ai-sci-7255-add-label-validation-to-print-modal
...
Add label validation and preview in print modal [SCI-7255][SCI-7256]
2022-09-28 11:32:39 +02:00
