Commit graph

11472 commits

Author SHA1 Message Date
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
artoscinote
6bec0f168c
Merge pull request #4474 from scinote-eln/release/1.26.0.5
October cleanup, 1.26.0.5
2022-09-28 10:16:56 +02:00
artoscinote
249bc05ca4
Bump version to 1.26.0.5 2022-09-28 10:15:54 +02:00
ajugo
0e8ad6abf1
Implement toggle for zebra printers searching feature [SCI-7242] (#4470) 2022-09-27 15:57:23 +02:00
aignatov-bio
691b9abac7
Merge pull request #4469 from aignatov-bio/ai-sci-7253-add-loading-label-to-settings-printers-search
Add loading label to settings printers search [SCI-7253]
2022-09-27 15:48:15 +02:00
Anton
3773fff093 Add label validation and preview in print modal [SCI-7255][SCI-7256] 2022-09-27 15:46:48 +02:00
Anton
d22ec4960d Add loading label to settings printers search [SCI-7253] 2022-09-27 12:02:50 +02:00
artoscinote
16d4a5fecb
Merge pull request #4443 from G-Chubinidze/gc_SCI_7162
fixed duplicate title on empty repository index [SCI_7162]
2022-09-27 11:57:30 +02:00
Giga Chubinidze
da17348f98 Revert "Bump version to 1.26.0.5"
This reverts commit 6cc19badfe.
2022-09-27 12:35:23 +04: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
aignatov-bio
936814b054
Merge pull request #4465 from aignatov-bio/ai-sci-7236-fix-custom-template-column-format-label
Fix column label template format [SCI-7236]
2022-09-27 09:57:34 +02:00
Miha Mencin
7712690c54
Merge pull request #4468 from scinote-eln/release/1.26.0.5
Release/1.26.0.5
2022-09-27 09:46:16 +02:00
Miha Mencin
6cc19badfe
Bump version to 1.26.0.5 2022-09-27 09:41:53 +02:00
Oleksii Kriuchykhin
0d656f8976 Fix sorting in label templates datatable [SCI-7263] 2022-09-26 22:21:45 +02:00
Anton
dbfc3b2e2a Fix column label template format [SCI-7236] 2022-09-26 21:01:31 +02:00
Oleksii Kriuchykhin
b675fb14eb Fix user adding/removing from a team [SCI-7240] 2022-09-26 12:14:03 +02:00