Commit graph

3333 commits

Author SHA1 Message Date
Alex Kriuchykhin
63a1b35a45
Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2
Unify tags loading order [SCI-6943]
2022-10-17 10:21:13 +02:00
Alex Kriuchykhin
15813166fe
Merge pull request #4537 from okriuchykhin/ok_SCI_7343
Allow team owners to manage project users [SCI-7343]
2022-10-17 10:16:50 +02:00
Alex Kriuchykhin
eba3fc574b
Merge pull request #4536 from okriuchykhin/ok_SCI_7330
Fix permission checking in reports controller [SCI-7330][SCI-7331]
2022-10-17 10:16:15 +02:00
Oleksii Kriuchykhin
bded75ac2c Allow team owners to manage project users [SCI-7343] 2022-10-14 15:51:37 +02:00
Oleksii Kriuchykhin
8e838fe09f Fix permission checking in reports controller [SCI-7330][SCI-7331] 2022-10-14 14:26:02 +02:00
Andrej
f3fdcc1204 Remove old label printer modal code [SCI-7305] 2022-10-13 16:49:06 +02:00
Oleksii Kriuchykhin
e43aa30193 Unify tags loading order [SCI-6943] 2022-10-13 13:55:36 +02:00
Alex Kriuchykhin
1e6c6da964
Merge pull request #4517 from okriuchykhin/ok_SCI_7298
Add option to disable local password log in [SCI-7298]
2022-10-12 12:54:34 +02:00
Martin Artnik
b67bea81b8 Remove legacy protocol links [SCI-7323] 2022-10-12 11:01:16 +02:00
Oleksii Kriuchykhin
f0ea7ea2a4 Add option to disable local password log in [SCI-7298] 2022-10-12 10:30:09 +02:00
ajugo
e96ccdb1d5
Fix start date on locked task and correct format of number [SCI-7098] (#4366) 2022-10-11 11:31:53 +02:00
Alex Kriuchykhin
3a9b568358
Merge pull request #4508 from rekonder/aj_SCI_7318
Fix view permission at label template table [SCI-7318]
2022-10-10 15:59:02 +02:00
Andrej
42193bbe81 Fix view permission at label template table [SCI-7318] 2022-10-07 17:16:40 +02:00
Alex Kriuchykhin
5158b3e155
Merge pull request #4505 from okriuchykhin/ok_SCI_7308
Fix user invitation modal [SCI-7308]
2022-10-07 14:53:34 +02:00
Oleksii Kriuchykhin
0e95b7ea66 Connect update fluics template button with controller action [SCI-7261] 2022-10-07 14:52:23 +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
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
Andrej
884fe58525 Fix label print open issue [SCI-7296] 2022-10-03 17:33:42 +02:00
Andrej
e05ad97498 Enable label print modal for smart annotations [SCI-7270] 2022-10-03 13:39:18 +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
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
Anton
9d9f6e26bb Fix css label templates table view [SCI-7265] 2022-09-29 14:29:25 +02:00
artoscinote
d08838bf48
Merge branch 'develop' into master_1_26_0_5 2022-09-29 10:12:29 +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
ajugo
0e8ad6abf1
Implement toggle for zebra printers searching feature [SCI-7242] (#4470) 2022-09-27 15:57:23 +02:00
Anton
3773fff093 Add label validation and preview in print modal [SCI-7255][SCI-7256] 2022-09-27 15:46:48 +02:00
Alex Kriuchykhin
db0a5ede84
Merge pull request #4462 from okriuchykhin/ok_SCI_7240
Fix user adding/removing from a team [SCI-7240]
2022-09-27 10:30:35 +02:00
Alex Kriuchykhin
0c41ee9dec
Merge pull request #4466 from okriuchykhin/ok_SCI_7263
Fix sorting in label templates datatable [SCI-7263]
2022-09-27 10:30:08 +02:00
Giga Chubinidze
8608e61513 fixed duplicate titles in empty index repositories [SCI-7162] 2022-09-27 12:25:39 +04:00
ajugo
aa10259d40
Fix loading of zebra printers to modal and some other small fixes [SCI-7244] (#4463)
* Fix loading of zebra printers to modal and some other small fixes [SCI-7244]

* Fix zebra printing [SCI-7244]
2022-09-27 09:58:22 +02:00
Oleksii Kriuchykhin
0d656f8976 Fix sorting in label templates datatable [SCI-7263] 2022-09-26 22:21:45 +02:00
Oleksii Kriuchykhin
b675fb14eb Fix user adding/removing from a team [SCI-7240] 2022-09-26 12:14:03 +02:00
Anton
d3886c9bf7 Small fixes [SCI-7193] 2022-09-26 10:02:41 +02:00
Anton
40022a7012 Add initial VUE container for print dialog [SCI-7193] 2022-09-23 14:07:52 +02:00
Andrej
c60ca19c62 Fix archived task button [SCI-7250] 2022-09-23 12:42:17 +02:00
ajugo
a3ea6e608c
Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] (#4448)
* Add validation to print modal [SCI-7052]

* Fix dropdown on label modal print [SCI-7052]

* Fix hound [SCI-7052]

* Rename validation endpoint [SCI-7052]

* Add zpl label printing and fix fluics printing [SCI-7221]

* Fix hound [SCI-7221]
2022-09-22 15:06:36 +02:00
Anton
9bc4610cae Fix checkbox in safari [SCI-7239] 2022-09-22 11:24:02 +02:00
artoscinote
50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]" 2022-09-21 10:07:44 +02:00
ajugo
6f3a32f09f
Add label template dropdown to print dialog [SCI-7104] (#4387)
* Add label template dropdown to print dialog [SCI-7051]

* Add zebra printers in printing progress and modal [SCI-7104]

* Fix hound [SCI-7104]

* Fix hound [SCI-7104]

* Fix hound [SCI-7104]

* Clean code for zebra printer [SCI-7104]
2022-09-20 14:10:34 +02:00
artoscinote
cf3a233f4e
Merge branch 'develop' into ma_SCI_7177 2022-09-19 13:58:33 +02: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
Anton
0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
Anton
d7990cb058 Add new permissions for label templates [SCI-7088] 2022-09-14 15:13:13 +02:00
aignatov-bio
4182194b31
Merge branch 'features/label-templates' into features/team-permissions 2022-09-14 14:34:02 +02:00