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
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
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
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
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
Oleksii Kriuchykhin
0d656f8976
Fix sorting in label templates datatable [SCI-7263]
2022-09-26 22:21:45 +02:00
aignatov-bio
e96b15b241
Merge pull request #4444 from aignatov-bio/ai-sci-7222-update-fluics-template-screen
...
Update fluics view and permissions for label templates [SCI-7222]
2022-09-26 10:22:01 +02:00
Anton
40022a7012
Add initial VUE container for print dialog [SCI-7193]
2022-09-23 14:07:52 +02:00
ajugo
b7861f5fdb
Add zebra javascript print library [SCI-7245] ( #4455 )
2022-09-23 12:34:43 +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
Anton
07f0142789
Fix links in locked step texts elements [SCI-7224]
2022-09-20 15:44:52 +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
Anton
fed1228adc
Update fluics and permissions for label templates [SCI-7222]
2022-09-20 12:59:58 +02:00
aignatov-bio
e524355207
Merge pull request #4441 from aignatov-bio/ai-sci-7210-add-code-validation-to-label-templates
...
Add validation to label template code [SCI-7210]
2022-09-20 11:59:59 +02:00
artoscinote
cf3a233f4e
Merge branch 'develop' into ma_SCI_7177
2022-09-19 13:58:33 +02:00
Anton
17bf490fef
Add validation to label template code [SCI-7210]
2022-09-19 11:59:36 +02:00
Andrej
ec77c2a076
Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7027
2022-09-16 10:44:07 +02:00
Andrej
231dd40602
Fix hound and add emoji in title [SCI-7027]
2022-09-16 10:41:51 +02:00
Andrej
4fb3f7ff3d
Fix hound and add emoji in title [SCI-7027]
2022-09-16 10:39:39 +02:00
Andrej
ac7c873385
Session end implementation [SCI-7027]
2022-09-16 09:57:40 +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
Anton
0c596bb701
Merge branch 'develop' into features/label-templates
2022-09-15 10:40:17 +02:00
Anton
75a15310ac
Merge branch 'features/team-permissions' into features/label-templates
2022-09-13 14:26:15 +02:00
Martin Artnik
3d1bdac1f4
Added task code to task details [SCI-7178]
2022-09-13 13:17:18 +02:00
Martin Artnik
b836b9a12b
Add task IDs to canvas view [SCI-7177]
2022-09-13 12:42:12 +02:00
Giga Chubinidze
271867710f
added scrollbar to task paper dropdown [SCI-7115]
2022-09-09 23:28:37 +04: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
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
Anton
47e20d1b27
Add ability to disable zebra printers [SCI-7148]
2022-09-05 12:37:03 +02:00
Oleksii Kriuchykhin
f85a6b5a2e
Make experiment card dropdown menu async [SCI-7158]
2022-09-02 18:15:01 +02:00
Oleksii Kriuchykhin
e27d063b61
Make permission checks for card selection async [SCI-7157]
2022-09-02 18:10:16 +02:00
Martin Artnik
a2a5e8c4c8
Add caching and improve dynamic reload [SCI-7159]
2022-09-02 16:54:41 +02:00
Martin Artnik
ef9cd21ecf
Make project action dropdowns async [SCI-7159]
2022-09-02 13:47:45 +02:00
aignatov-bio
491ff286f6
Merge pull request #4390 from aignatov-bio/ai-sci-7113-fix-assigned-repositry-bell-flyout
...
Fix bell flyout in assigned repository [SCI-7113]
2022-09-02 11:21:17 +02:00
aignatov-bio
2e190510c4
Merge pull request #4397 from aignatov-bio/ai-sci-7136-fix-rte-toolbar-position
...
Fix rte toolbar position [SCI-7136]
2022-09-02 11:20:32 +02:00
aignatov-bio
e605471269
Merge pull request #4392 from aignatov-bio/ai-sci-7100-fix-inivitation-modal
...
Invite user modal fixes [SCI-7100]
2022-09-02 11:20:18 +02:00
Anton
312f2a1357
Fix rte toolbar position [SCI-7136]
2022-08-31 13:15:08 +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
17d69131f3
Merge pull request #4383 from aignatov-bio/ai-sci-7124-fix-old-tinymce-big-tables
...
Fix overflow issue on step text [SCI-7124]
2022-08-31 10:13:27 +02:00
aignatov-bio
042e0330a7
Merge pull request #4386 from aignatov-bio/ai-sci-7117-fix-project-scroll-issue
...
Fix project/experiment scroll issue [SCI-7117]
2022-08-31 10:13:10 +02:00
Martin Artnik
d3665a940e
Fix smart annotations for locked tasks [SCI-7135]
2022-08-31 09:49:47 +02:00
Anton
0862221345
Invite user modal fixes [SCI-7100]
2022-08-29 14:01:31 +02:00
Anton
d2639d4633
Fix bell flyout in assigned repository [SCI-7113]
2022-08-29 11:30:39 +02:00
Anton
a1117fbc0e
Fix project/experiment scroll issue [SCI-7117]
2022-08-26 16:29:53 +02:00
ajugo
185bf0b197
Add label template dropdown to print dialog [SCI-7051] ( #4369 )
2022-08-26 10:53:55 +02:00
Anton
0747a495c9
Fix overflow issue on step text [SCI-7124]
2022-08-25 15:32:03 +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
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
artoscinote
7a7df03396
Implement label preview component [SCI-7050] ( #4370 )
2022-08-24 13:55:54 +02:00
artoscinote
c2242b6cc8
Amend how checkboxes work with locking [SCI-7122] ( #4374 )
2022-08-23 10:10:20 +02:00
Andrej
371f5e782b
Remove strikethrough for step name and checklist items [SCI-7116]
2022-08-19 16:02:20 +02:00
Anton
46990b3df4
Add sorting by default label template [SCI-7084]
2022-08-18 11:49:22 +02:00
Anton
4f312bf329
Finalize insert field dropdown [SCI-7054]
2022-08-17 12:58:27 +02:00
Anton
46b2b87654
Fix error on task text field [SCI-7033]
2022-08-16 12:21:59 +02:00
Anton
1a13e1bfc6
Fix unexpected error on step attachments [SCI-7032]
2022-08-16 11:22:19 +02:00
Anton
174d33bba8
Add column dropdown to label template editor [SCI-7054]
2022-08-16 10:16:40 +02:00
ajugo
39fbb2a9a0
Fix office modal and protocol status [SCI-7064] ( #4352 )
2022-08-12 14:57:56 +02:00
ajugo
8dec17f606
Add print label button in view repository role [SCI-7097] ( #4351 )
2022-08-12 14:55:14 +02:00
artoscinote
e4a7aa3dad
Add name prompt for tables with empty names [SCI-7082] ( #4348 )
...
* Add name prompt for tables with empty names [SCI-7082]
* Move to separate component [SCI-7082]
2022-08-12 10:17:45 +02:00
ajugo
12fc3b0b3b
Fix protocol repository issues [SCI-7003] ( #4343 )
...
* Fix protocol repository issues [SCI-7003]
* Remove unnecessary inRepository [SCI-7003]
2022-08-10 15:39:45 +02:00
artoscinote
a37c236518
Inline edit and checklist improvements [SCI-7031] ( #4340 )
...
* Inline edit and checklist improvements [SCI-7031]
* Fix smart annotations in inline edit [SCI-7031]
2022-08-10 14:43:23 +02:00
ajugo
b6f273410b
Fix protocol repository CSS [SCI-7064] ( #4335 )
...
* Fix protocol repository CSS [SCI-7064]
* Fix protocol repository CSS [SCI-7064]
* Fix hound [SCI-7064]
2022-08-10 10:27:15 +02:00
artoscinote
c106c2d997
Add active reminders filter [SCI-7004] ( #4280 )
2022-08-09 10:23:40 +02:00
artoscinote
19d2fea4fe
Fix checkboxes [SCI-7057] ( #4317 )
2022-08-09 09:25:18 +02:00
Anton
edbcbffae4
Fix protocol creation from dashboard [SCI-7075]
2022-08-08 11:26:12 +02:00
Anton
51cb951e06
Update labels index page [SCI-7048]
2022-08-08 11:15:46 +02:00
artoscinote
eb619184a5
Implement typed label templates [SCI-7046] ( #4316 )
...
* Implement typed label templates [SCI-7046]
* Add structure.sql, fix migration [SCI-7046]
* Fix method name [SCI-7046]
* Add dependent option to team - label_template relation [SCI-7046]
* Migration code style, add input sanitization [SCI-7046]
* Fix new label creation [SCI-7046]
2022-08-08 10:06:00 +02:00
aignatov-bio
e5448f3d1f
Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen
...
Add general layout for template view screen [SCI-7030]
2022-08-04 14:13:25 +02:00
Anton
a38aa80fb5
Add main functionality to view/edit screen [SCI-7041]
2022-08-04 13:37:21 +02:00
ajugo
b58e3cd4d8
Add zebra settings screen [SCI-7016] ( #4310 )
...
* Add zebra settings screen [SCI-7016]
* Fix hound [SCI-7016]
2022-08-04 11:14:35 +02:00
artoscinote
9478779218
TinyMCE fixes [SCI-7033] ( #4308 )
2022-08-04 11:06:25 +02:00
artoscinote
ee9c877929
Implement BS tooltips on repository toolbar [SCI-6691] ( #4309 )
2022-08-04 11:05:55 +02:00
Anton
31202922af
Add general layout for template [SCI-7030]
2022-08-04 10:51:30 +02:00
Anton
8c080ea04c
Add promo page for label templates [SCI-7029]
2022-08-02 14:51:18 +02:00
ajugo
8222227712
Fix new step alignment and author list in protocols [SCI-6991] ( #4304 )
2022-08-02 12:22:29 +02:00
Anton
c7b0d1d6f8
Small CSS task fixes [SCI-7032]
2022-08-02 11:00:13 +02:00
artoscinote
89a3bc8072
Checklist fixes [SCI-7031] ( #4302 )
2022-08-02 10:18:25 +02:00
Alex Kriuchykhin
61395482a3
Merge pull request #4299 from okriuchykhin/ok_SCI_6978_v2
...
Fix long result names in PDF reports [SCI-6978]
2022-08-01 16:37:23 +02:00
Anton
784c10aec9
Fix image editor callback after save image [SCI-7019]
2022-08-01 13:32:55 +02:00
Oleksii Kriuchykhin
fcd0de80ca
Fix long result names in PDF reports [SCI-6978]
2022-08-01 13:14:53 +02:00
Anton
67df01711f
Add edit actions to label templates [SCI-7019]
2022-07-28 14:42:13 +02:00
aignatov-bio
0249f2a30e
CSS fixes for step attachments [SCI-7001] ( #4294 )
2022-07-28 09:56:09 +02:00
ajugo
ad4f52d912
Add Label template list screen - view mode [SCI-7018] ( #4292 )
...
* Initial label template datatable [SCI-7018]
* Add new columns to LabelTemplate and update datatable view [SCI-7018]
* Fix after rebase [SCI-7018]
* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
2022-07-27 10:10:32 +02:00
