Anton
66d21e9c4f
Fix experiment cards views [SCI-7579]
2022-12-13 13:14:51 +01:00
G-Chubinidze
10f31c8796
Merge pull request #4687 from G-Chubinidze/gc_SCI_7442
...
BE: Column display switch (Task data display) [SCI-7442]
2022-12-12 17:51:58 +04:00
Anton
6b6105dfe6
CSS fixes for exposed ID [SCI-7586]
2022-12-12 11:45:59 +01:00
aignatov-bio
d596746893
Merge pull request #4702 from aignatov-bio/ai-sci-7581-fix-long-protocol-name-in-task-flyout
...
Fix long protocol name in task protocol flyout [SCI-7581]
2022-12-12 11:09:52 +01:00
aignatov-bio
66b0968b66
Merge pull request #4696 from aignatov-bio/ai-sci-7552-add-company-logo-to-label-templates
...
Add logo to label templates [SCI-7552]
2022-12-09 13:36:27 +01:00
Anton
c5d91b061b
Add logo to label templates
2022-12-09 13:33:10 +01:00
Martin Artnik
de9f06a1fc
Upgrade TinyMCE to 6.3, fix issues [SCI-7574]
2022-12-09 12:52:18 +01:00
Anton
de35386f29
Fix long protocol name in task protocol flyout [SCI-7581]
2022-12-09 12:48:37 +01:00
Anton
a3045a79a9
Fix expose ids css fixes [SCI-7578]
2022-12-09 09:59:51 +01:00
artoscinote
a3e8000360
Merge branch 'develop' into features/exposed_ids
2022-12-08 15:58:11 +01:00
ajugo
e3cc9c9105
Update experiment name field [SCI-7539] ( #4689 )
2022-12-08 10:16:37 +01:00
ajugo
add6554732
Connect experiment options to the table view [SCI-7554] ( #4692 )
2022-12-07 14:51:48 +01:00
Martin Artnik
c828d02b99
Merge branch 'develop' into features/tiny_mce_6
2022-12-07 14:07:43 +01:00
G-Chubinidze
d696128ae1
Merge branch 'features/new_experiment_views' into gc_SCI_7442
2022-12-06 20:15:14 +04:00
Giga Chubinidze
420ec69f20
BE: Column display switch (Task data display) [SCI-7442]
2022-12-06 17:51:11 +04:00
Martin Artnik
df4654189b
Revert "Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]""
...
This reverts commit 50e7531ffa
.
2022-12-06 12:43:30 +01:00
ajugo
4b83f77c5b
Add new task modal field for Assign users for experiment views [SCI-7450] ( #4670 )
...
* Add new task modal field for Assign users for experiment views [SCI-7450]
* Fix loading users assigned to the experiment [SCI-7450]
* Fix task creation on experiment if none exists [SCI-7450]
2022-12-05 12:55:57 +01:00
ajugo
02f039ffed
Implement sorting for experiment table view [SCI-7451] [SCI-7497] ( #4659 )
...
* Implement experiment table sort flyout [SCI-7451]
* Implement archive sort options for experiment table [SCI-7497]
* Fix hound [SCI-7451]
* Clean code for experiment table view sorting [SCI-7497]
* Fix hound [SCI-7451]
2022-12-05 10:30:20 +01:00
G-Chubinidze
756e81c091
Merge pull request #4588 from G-Chubinidze/gc_SCI_7176
...
expose experiment ids in active / archived card views [SCI-7176] [SCI-7202]
2022-12-02 20:16:40 +04:00
G-Chubinidze
df4ac4d5b3
Merge pull request #4429 from G-Chubinidze/gc_SCI_7172
...
Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] [SCI-7201]
2022-12-02 20:16:05 +04:00
Giga Chubinidze
eff5d12253
removed last-page class by default
2022-12-02 20:10:03 +04:00
aignatov-bio
7f87f850b3
Merge branch 'features/new_experiment_views' into ai-sci-7453-add-restore-task-to-experiment-table-view
2022-12-02 13:37:39 +01:00
aignatov-bio
cd0af24a24
Merge pull request #4676 from aignatov-bio/ai-sci-7525-experiment-table-connect-actions-to-context-menu
...
Experiment table connect task action in dropdown [SCI-7525]
2022-12-02 13:36:01 +01:00
Giga Chubinidze
76884bafc1
code cleanup
2022-12-02 15:53:22 +04:00
Giga Chubinidze
36b99fa2cb
code cleanup
2022-12-02 14:51:22 +04:00
ajugo
847280489a
Add report id to the report datatable [SCI-7199] ( #4453 )
...
* Add report id to the report datatable [SCI-7199]
* Remove report id migration [SCI-7199]
2022-12-02 11:41:32 +01:00
ajugo
7525ffeede
Add IDs to task cards in the canvas edit mode [SCI-7523] ( #4666 )
2022-12-02 11:40:57 +01:00
ajugo
8ff822c7e5
Implement due date column in experiment table view [SCI-7406] ( #4646 )
...
* Implement due date column in experiment table view [SCI-7406]
* Fix due date [SCI-7406]
* Move text to translation [SCI-7406]
* Fix table due date partial [SCI-7406]
* Fix table due date partial [SCI-7406]
2022-12-02 11:01:40 +01:00
artoscinote
eaf9017def
Merge pull request #4643 from artoscinote/ma_SCI_7206
...
Add exposed IDs to recent work [SCI-7206]
2022-12-02 10:16:51 +01:00
Anton
12f141b82e
Experiment table connect task action in dropdown [SCI-7525]
2022-12-02 10:03:01 +01:00
artoscinote
4664ef1d9b
Implement task cloning in experiments table [SCI-7382] ( #4653 )
...
* Implement task cloning in experiments table [SCI-7382]
* Fix provisioning status polling [SCI-7382]
* Remove unused method [SCI-7382]
* Fix linter issues [SCI-7382]
* Fix fetching last clone number [SCI-7382]
* Fixing experiment duplication [SCI-7382]
* Add truncation to cloned name [SCI-7382]
* Add readable scope to batch clone action [SCI-7382]
* Move 'Clone' to translations, simplify JS [SCI-7382]
2022-12-01 15:08:59 +01:00
Oleksii Kriuchykhin
b032cfbd35
Add task moving action to experiment table view [SCI-7381]
2022-12-01 13:33:07 +01:00
aignatov-bio
bd0ac95307
Merge pull request #4669 from aignatov-bio/ai-sci-7510-finish-user-assignment-modal
...
Finish user assignment for experiment table [SCI-7510]
2022-12-01 12:59:30 +01:00
G-Chubinidze
2d04357ba8
Merge pull request #4668 from G-Chubinidze/gc_SCI_7494
...
Archived table view filters update [SCI-7494]
2022-12-01 12:32:41 +04:00
Anton
234c4dfaeb
Finish user assignment for experiment table [SCI-7510]
2022-11-30 15:04:02 +01:00
Giga Chubinidze
8e78938b02
Archived table view filters update [SCI-7494]
2022-11-30 16:47:49 +04:00
Anton
393bc03d47
CSS update for protocol import screen [SCI-7394]
2022-11-29 15:41:57 +01:00
aignatov-bio
7ea57d9ffe
Merge pull request #4630 from aignatov-bio/ai-sci-7440-add-dropdown-for-assigned-user-experiment-table
...
Add user assignments dropdown for experiment table [SCI-7440]
2022-11-29 15:32:00 +01:00
ajugo
ea7f447190
Fix ovelaping checkbox on experiment card view [SCI-7546] ( #4663 )
2022-11-29 15:08:47 +01:00
aignatov-bio
887b1b062a
Merge pull request #4652 from aignatov-bio/ai-sci-7493-update-archived-my-modules-card-screen
...
Update archive module cards header [SCI-7493]
2022-11-29 14:04:30 +01:00
artoscinote
c4ba723998
Merge pull request #4662 from artoscinote/ma_SCI_7534
...
Make deferred SmartAnnotation loading optional [SCI-7534]
2022-11-29 13:51:28 +01:00
Martin Artnik
76de2d1380
Make deferred SmartAnnotation loading optional [SCI-7534]
2022-11-29 13:47:52 +01:00
Anton
bd77433fce
Add user assignments dropdown for experiment table [SCI-7440]
2022-11-29 13:42:39 +01:00
Anton
2901c7b627
Add restore action to experiment table [SCI-7453]
2022-11-28 12:45:18 +01:00
artoscinote
7cc09faa94
Merge pull request #4657 from artoscinote/ma_SCI_7534
...
Move atwho initialization to when a field is focused [SCI-7534]
2022-11-28 12:39:45 +01:00
Martin Artnik
f231c69a02
Move atwho initialization to when a field is focused [SCI-7534]
2022-11-28 11:44:25 +01:00
ajugo
9c88a34d99
Implement empty and loader for canvas view navigator [SCI-7445] ( #4651 )
2022-11-28 10:35:42 +01:00
Anton
8ef5a742f6
Fix tooltip for clear reminders [SCI-7472]
2022-11-28 10:11:06 +01:00
Anton
e2cd0dfd91
Update archive module cards header [SCI-7493]
2022-11-25 15:29:15 +01:00
artoscinote
1a700b8359
Merge pull request #4650 from artoscinote/ma_SCI_7460
...
Fix disabling item edit button [SCI-7460]
2022-11-25 10:36:20 +01:00
Martin Artnik
6fe86f2015
Fix disabling item edit button [SCI-7460]
2022-11-25 10:24:24 +01:00
ajugo
80f66736b6
Add new task modal for experiment table view [SCI-7448] ( #4638 )
...
* Add new task modal for experiment table view [SCI-7448]
* Fix placeholder and size of the icon [SCI-7448]
* Reload experiment table [SCI-7448]
2022-11-24 14:49:42 +01:00
Anton
2e2086a03b
Add archived view for experiment table [SCI-7452]
2022-11-24 12:07:52 +01:00
aignatov-bio
c2be99abda
Merge pull request #4595 from aignatov-bio/ai-sci-7359-fix-select-time-layout
...
Fix time picket CSS [SCI-7359]
2022-11-24 09:44:12 +01:00
ajugo
c44aa2cb9c
Implement session end for multiple tabs [SCI-7502] ( #4632 )
2022-11-23 20:08:26 +01:00
artoscinote
5605c3dfed
Merge pull request #4644 from aignatov-bio/ai-sci-7446-experiment-table-task-flyout-menu
...
Add menu to experiment table row [SCI-7446]
2022-11-23 16:48:20 +01:00
Anton
440800537c
Add menu to experiment table row [SCI-7446]
2022-11-23 15:05:13 +01:00
Martin Artnik
2959cf6276
Add exposed IDs to recent work [SCI-7206]
2022-11-23 15:03:35 +01:00
aignatov-bio
d1c664e0ab
Merge pull request #4640 from aignatov-bio/ai-sci-7522-fix-session-modal-overlap
...
Fix session modal overlap [SCI-7522]
2022-11-23 14:37:53 +01:00
artoscinote
7d53027530
Merge pull request #4641 from G-Chubinidze/gc_SCI_7492
...
Missing navigate away pop up at inventory page [SCI-7492]
2022-11-23 14:14:35 +01:00
Giga Chubinidze
f78cf58552
pointer events value change
2022-11-23 17:12:25 +04:00
Anton
007aeaa2b6
Fix session modal overlap [SCI-7522]
2022-11-23 13:21:28 +01:00
Giga Chubinidze
dac093823e
few double quotes changed to single quotes
2022-11-23 16:08:43 +04:00
Giga Chubinidze
3b8a58b7db
fixed code according to hound styling comments
2022-11-23 16:05:56 +04:00
ajugo
5b291acc27
Fix smart annotation [SCI-7498] ( #4626 )
2022-11-23 12:58:32 +01:00
Giga Chubinidze
47d593f0db
Missing navigate away pop up at inventory page [SCI-7492]
2022-11-23 15:38:01 +04:00
aignatov-bio
d6b5034db9
Merge pull request #4634 from aignatov-bio/ai-sci-7472-fix-tooltip-on-new-button-in-inventory
...
Fix tooltip on new button in inventory [SCI-7472]
2022-11-23 12:05:24 +01:00
Martin Artnik
c21152b2e2
Add protocol ID to linked protocol dropdown [SCI-7204]
2022-11-23 11:49:53 +01:00
aignatov-bio
176f3c48e1
Merge pull request #4637 from aignatov-bio/ai-sci-7233-fix-show-password-for-edit-settings
...
Fix show password for edit settings [SCI-7233]
2022-11-22 16:23:36 +01:00
Anton
7079072eb8
Fix show password for edit settings [SCI-7233]
2022-11-22 16:06:47 +01:00
Anton
e940bf8c0e
Small canvas edit mode changes [SCI-7387]
2022-11-22 13:08:56 +01:00
G-Chubinidze
415443a108
Merge pull request #4633 from G-Chubinidze/gc_SCI_7179
...
add IDs to the protocol templates tables [SCI-7179]
2022-11-22 14:50:57 +04:00
Anton
98e87a2f4b
Fix markup [SCI-7359]
2022-11-22 11:29:57 +01:00
Alex Kriuchykhin
b7664ad70f
Merge pull request #4621 from scinote-eln/release/1.26.2.1
...
Release/1.26.2.1
2022-11-22 11:07:20 +01:00
Anton
961b39159e
Fix tooltip on new button in inventory [SCI-7472]
2022-11-22 11:05:57 +01:00
Alex Kriuchykhin
d6728ef9d3
Merge pull request #4597 from rekonder/aj_SCI_7361
...
Fixed external protocol icon out of body [SCI-7361]
2022-11-22 10:56:55 +01:00
Giga Chubinidze
43f8370a08
add IDs to the protocol templates tables [SCI-7179]
2022-11-22 13:55:41 +04:00
Alex Kriuchykhin
dc9831d3bc
Merge pull request #4568 from rekonder/aj_SCI_7181
...
Remove old step code [SCI-7181]
2022-11-22 10:52:06 +01:00
ajugo
f2a680d826
Fix zebra printer print status [SCI-7474] ( #4625 )
2022-11-21 16:55:03 +01:00
artoscinote
92d446b43d
Merge pull request #4628 from artoscinote/ma_SCI_7473
...
Fix inventory multiline file uploads [SCI-7473]
2022-11-21 12:59:40 +01:00
Martin Artnik
5d41ea5fa7
Disable instead of hide edit button when selected items not on page [SCI-7460]
2022-11-21 11:58:15 +01:00
Martin Artnik
95348b82e8
Fix inventory multiline file uploads [SCI-7473]
2022-11-21 11:47:46 +01:00
Oleksii Kriuchykhin
49fbc2c561
Add basic modal for direct task creation [SCI-7197]
2022-11-18 17:00:11 +01:00
Giga Chubinidze
44d74b5797
refactoring projects scss
2022-11-17 22:29:15 +04:00
Giga Chubinidze
7f09fb8997
Archived projects cards and table updates [SCI-7201]
2022-11-17 22:25:54 +04:00
Anton
85c00c61e0
Add table columns display modal to experiment table [SCI-7441]
2022-11-16 09:54:12 +01:00
Anton
7523535e24
Add archive action to experiment table [SCI-7384]
2022-11-14 11:31:53 +01:00
ajugo
42af732073
Fix zebra printer switch and optimize zebra library loading [SCI-7430] ( #4612 )
...
* Fix zebra printer switch and optimize zebra library loading [SCI-7430]
* Fix zebra enabled [SCI-7430]
2022-11-14 10:43:09 +01:00
ajugo
4e77174e52
Fix vue print modal component initialization [SCI-7469] ( #4616 )
2022-11-14 10:42:51 +01:00
Anton
51446b130f
Add experiment table manage access [SCI-7385]
2022-11-13 22:33:41 +01:00
Anton
0a87513458
Add edit modal to experiment table [SCI-7383]
2022-11-11 11:24:23 +01:00
G-Chubinidze
e3b9314646
Update my_modules.scss
2022-11-11 12:48:22 +04:00
Giga Chubinidze
5a429549da
archived tasks updates [SCI-7203]
2022-11-11 12:45:07 +04:00
aignatov-bio
c5466771ff
Merge pull request #4609 from aignatov-bio/ai-sci-7471-fix-merge-issue
...
Fix merge issue [SCI-7471]
2022-11-10 11:47:54 +01:00
Anton
c0141137eb
Fix merge issue [SCI-7471]
2022-11-10 11:46:14 +01:00
aignatov-bio
4b6ab3bd25
Merge pull request #4544 from aignatov-bio/ai-sci-7233-fix-login-signup-forms
...
Fix css issues for login and signup forms [SCI-7233]
2022-11-10 11:15:03 +01:00
aignatov-bio
2c17c05c7d
Merge pull request #4260 from artoscinote/ma_SCI_6982
...
Implement multiline editing in repositories [SCI-6982][SCI-6983]
2022-11-10 11:07:30 +01:00
artoscinote
0994c4a25b
Merge branch 'develop' into ma_SCI_6982
2022-11-10 11:04:57 +01:00
aignatov-bio
0ee586a394
Merge pull request #4439 from rekonder/aj_SCI_7027
...
Session end implementation [SCI-7027]
2022-11-10 11:03:02 +01:00
Anton
63ce422367
Add basic filters for experiment table [SCI-7215]
2022-11-09 15:27:39 +01:00
Anton
a17cd78c20
Add view dropdown to experiment screen
2022-11-08 16:39:52 +01:00
Anton
7ceb94ab1f
Add toolbar to experiment table [SCI-7379]
2022-11-08 12:52:49 +01:00
ajugo
dd22d53bda
Implemented pagination for experiment table [SCI-7214] ( #4591 )
...
* Implement pagination for experiment table [SCI-7214]
* Fix table experiment pagination [SCI-7214]
* Move pagination to service [SCI-7214]
2022-11-07 11:46:54 +01:00
Andrej
a88d41ca6a
Fixed external protocol icon out of body [SCI-7361]
2022-11-07 11:03:34 +01:00
Anton
b3bd165d01
Fix time picket CSS [SCI-7359]
2022-11-04 11:36:21 +01:00
Anton
bacd3524e8
Add tags manager to experiment table view [SCI-7368]
2022-11-02 15:17:10 +01:00
Giga Chubinidze
d1aa127b7a
Merge branch 'features/exposed_ids' of github.com:scinote-eln/scinote-web into gc_SCI_7176
2022-10-28 15:30:28 +04:00
Giga Chubinidze
a9287df1a0
exposed experiment ids on card view page / other styling updates [SCI-7176]
2022-10-28 15:16:49 +04:00
G-Chubinidze
81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172
2022-10-28 15:05:38 +04:00
Giga Chubinidze
fe488ed00f
fixed unstable project name and code styling in cards
2022-10-28 11:38:38 +04:00
Giga Chubinidze
b1296adeb3
pitstop
2022-10-28 10:49:13 +04:00
ajugo
29ce28a1af
Implement canvas view navigator [SCI-7198] ( #4577 )
2022-10-27 14:43:31 +02:00
ajugo
bdf56ea2a1
Add comments to the experiment table view [SCI-7217] ( #4583 )
2022-10-27 14:41:35 +02:00
Anton
c2338d677d
Fix label preview height in print modal [SCI-7410]
2022-10-27 12:13:25 +02:00
ajugo
fedaf703d4
Add view button to experiment title bar [SCI-7216] ( #4579 )
2022-10-27 09:53:01 +02:00
ajugo
58bca40632
Change zebra label instructions [SCI-7390] ( #4572 )
2022-10-25 11:44:50 +02:00
Anton
8feaedc0d1
Add core columns to experiment table [SCI-7212]
2022-10-24 15:27:57 +02:00
Andrej
745be5a0f7
Remove old step code [SCI-7181]
2022-10-24 13:07:10 +02:00
Anton
bc86f11404
Add experiment table view [SCI-7174]
2022-10-21 12:22:38 +02:00
Anton
ac0fe4389d
Fix label preview in print modal [SCI-7367]
2022-10-20 10:57:40 +02:00
ajugo
3a0eec7043
Fix button shrink for inventory toolbar [SCI-7252] ( #4551 )
2022-10-19 18:09:59 +02:00
Anton
2ae8943d80
Update general canvas layout [SCI-7196]
2022-10-19 11:46:16 +02:00
Anton
1062fbc2fd
Replace label template promo logo [SCI-7350]
2022-10-19 11:25:49 +02:00
Anton
689c34e54d
Fix css issues for login and signup forms [SCI-7233]
2022-10-18 11:54:10 +02:00
ajugo
64975effc6
Close print label modal at print click [SCI-7327] ( #4526 )
2022-10-18 10:42:50 +02:00
Alex Kriuchykhin
4cee224180
Merge pull request #4534 from okriuchykhin/ok_SCI_7338
...
Fix user role selection when inviting new users [SCI-7338]
2022-10-17 10:21:37 +02:00
Oleksii Kriuchykhin
a5336608f8
Fix user role selection when inviting new users [SCI-7338]
2022-10-14 11:35:35 +02:00
Giga Chubinidze
62febd44dd
centered project code for tables
2022-10-13 20:31:37 +04:00
Andrej
f3fdcc1204
Remove old label printer modal code [SCI-7305]
2022-10-13 16:49:06 +02:00
ajugo
58acb94977
Remove status from print label modal [SCI-7328] ( #4524 )
2022-10-12 16:56:58 +02:00
Alex Kriuchykhin
827567c167
Merge pull request #4515 from rekonder/aj_SCI_7314
...
Fixed the existing templates [SCI-7314]
2022-10-12 11:49:09 +02:00
Andrej
230aea15fc
Update experiment templates [SCI-7314]
2022-10-11 15:55:56 +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
Giga Chubinidze
f7472d25b9
more styling fixes
2022-10-07 17:14:43 +04:00
Oleksii Kriuchykhin
0e95b7ea66
Connect update fluics template button with controller action [SCI-7261]
2022-10-07 14:52:23 +02:00
Giga Chubinidze
3f3c2a3504
project name card size change
2022-10-07 15:27:33 +04: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
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
ajugo
88d9ece237
Fix zebra printer library load [SCI-7310] ( #4502 )
2022-10-06 13:52:49 +02:00
ajugo
7fbac92f9c
Add status for Zebra printers in label print modal [SCI-7269] ( #4492 )
2022-10-04 09:57:47 +02:00
Oleksii Kriuchykhin
b20c2b13a3
Fix label printers dropdown on print modal [SCI-7258]
2022-10-03 10:37:04 +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
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
Anton
2d925a3bfe
Add help and quick toolbar plugin to tinymce [SCI-7190]
2022-09-21 12:01:08 +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
Giga Chubinidze
102eed8241
Expose project IDs in tables & cards view [SCI-7172] [SCI-7173]
2022-09-15 22:27:23 +04:00
Giga Chubinidze
b31f60026a
Expose project IDs in tables & cards view [SCI-7172] [SCI-7173]
2022-09-15 22:20:04 +04: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
2c393a1bef
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 13:31:04 +04:00
Giga Chubinidze
fbbe394029
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 13:24:06 +04:00
Anton
7d02b9f26d
Fix repository selection in reports [SCI-7167]
2022-09-13 09:59:11 +02:00
Giga Chubinidze
271867710f
added scrollbar to task paper dropdown [SCI-7115]
2022-09-09 23:28:37 +04:00
Anton
73917ec4c0
Fix tinymce errors [SCI-7182]
2022-09-09 15:50:59 +02: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
Oleksii Kriuchykhin
557c4b205a
Reimplement custom TinyMCE plugin: customImageUploader [SCI-7151]
2022-09-09 10:59:20 +02:00
aignatov-bio
7d9fbb45d5
Merge branch 'features/tiny_mce_6' into ai-sci-7152-update-tinymce-image-toolbar-plugin
2022-09-08 12:13:58 +02:00
Anton
2f01a5a358
Update tinymce placeholder plugin [SCI-7153]
2022-09-07 15:16:03 +02:00
Anton
c8af3e1fa8
Update tinymce image toolbar plugin [SCI-7152]
2022-09-07 11:24:54 +02:00
artoscinote
95105b86af
Fix ininite scroll [SCI-7160] ( #4414 )
2022-09-07 10:01:00 +02:00
Anton
1ebd4046cd
Update tinyMCE marvinjs plugin [SCI-7154]
2022-09-06 13:05:56 +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