Commit graph

774 commits

Author SHA1 Message Date
Giga Chubinidze
9dcd2f1500 Cursor position improvements, focused fields - part 2 [SCI-8147] 2023-03-21 13:17:44 +04:00
Giga Chubinidze
b7490ebcca Cursor position improvements, focused fields - part 1 [SCI-8098 2023-03-21 11:14:44 +04:00
Oleksii Kriuchykhin
7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
sboursen-scinote
0526bfaae1 Fix the result asset cancel behavior when clicking enter [SCI-7670] 2023-03-16 14:19:24 +01:00
aignatov-bio
fedd9e040e
Fix escaping for protocol keyword [SCI-8137] (#5147) 2023-03-15 16:04:33 +01:00
aignatov-bio
44823da268
Fix escaping for dropdown options and keywords escaping [SCI-8137] (#5145) 2023-03-15 12:55:28 +01:00
sboursen-scinote
c6bb9850ea Merge feature/protocol_versioning into sb_SCI-8007 [SCI-8007] 2023-03-15 09:24:45 +01:00
aignatov-bio
946ea47d55
Fix xss for titles in tags labels [SCI-8133] (#5130) 2023-03-13 14:39:12 +01:00
ajugo
1b9b10ccfb
Fix clickaway filtering for empty filter states [SCI-8103] (#5122) 2023-03-13 13:04:23 +01:00
Alex Kriuchykhin
87153b8899
Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106) 2023-03-09 11:38:47 +01:00
sboursen-scinote
b3f7c41548 Update the filter dropDown globaly [SCI-8007] 2023-03-08 16:25:10 +01:00
sboursen-scinote
9dd5c4d024 Add a small refactor [SCI-7815] 2023-02-16 23:18:35 +01:00
Anton
7f58440b0e Fix infinite scroll [SCI-7836] 2023-02-14 12:29:43 +01:00
Anton
ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
sboursen-scinote
b0505adc4d Fix hound issues [SCI-7625] 2023-02-09 12:37:35 +01:00
sboursen-scinote
dc333f77d5 Update the Selector when a user is selected/deselected [SCI-7625] 2023-02-09 12:30:51 +01:00
sboursen-scinote
42eae72d2a Update the layout of the move-experiment-modal when there are errors [SCI-7676] 2023-01-30 12:00:33 +01:00
ajugo
0973659f52
Fix duplicated tasks in the table after filtering or duplicating [SCI-7794] (#4865) 2023-01-19 17:59:12 +01:00
Anton
e41238a590 Update comments in canvas [SCI-7742] 2023-01-16 12:40:44 +01:00
Martin Artnik
19b282cba2 Merge branch 'develop' into features/tiny_mce_6 2023-01-10 11:13:23 +01:00
ajugo
194c519a9b
Fix experiment table due date initialization [SCI-7649] (#4730)
* Fix experiment table due date initialization [SCI-7649]

* Fix due date overflow [SCI-7649]
2023-01-05 11:14:34 +01:00
Martin Artnik
4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
ajugo
4f55b4a749
Fix advanced filters on PET tables [SCI-7650] (#4747) 2023-01-04 09:59:05 +01:00
ajugo
ae55935002
Add missing microinteractions on step editing [SCI-7575] (#4711) 2023-01-03 12:25:22 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Martin Artnik
3ea059529d Fix table scroll wrapping [SCI-7569] 2022-12-14 14:32:23 +01:00
Martin Artnik
c828d02b99 Merge branch 'develop' into features/tiny_mce_6 2022-12-07 14:07:43 +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
Martin Artnik
76de2d1380 Make deferred SmartAnnotation loading optional [SCI-7534] 2022-11-29 13:47:52 +01:00
Martin Artnik
f231c69a02 Move atwho initialization to when a field is focused [SCI-7534] 2022-11-28 11:44:25 +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
Anton
007aeaa2b6 Fix session modal overlap [SCI-7522] 2022-11-23 13:21:28 +01:00
ajugo
5b291acc27
Fix smart annotation [SCI-7498] (#4626) 2022-11-23 12:58:32 +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
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
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
ajugo
4e77174e52
Fix vue print modal component initialization [SCI-7469] (#4616) 2022-11-14 10:42:51 +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
artoscinote
0994c4a25b
Merge branch 'develop' into ma_SCI_6982 2022-11-10 11:04:57 +01:00
ajugo
bdf56ea2a1
Add comments to the experiment table view [SCI-7217] (#4583) 2022-10-27 14:41:35 +02:00
Andrej
745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +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
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
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
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
88d9ece237
Fix zebra printer library load [SCI-7310] (#4502) 2022-10-06 13:52:49 +02:00
Andrej
eebdee5129 Add label printer modal to task [SCI-7270] 2022-09-29 16:35:51 +02:00
Oleksii Kriuchykhin
ac11d41359 Fix label printing status modal [SCI-7271] 2022-09-28 17:01:07 +02:00
Anton
40022a7012 Add initial VUE container for print dialog [SCI-7193] 2022-09-23 14:07:52 +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
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
0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
Anton
73917ec4c0 Fix tinymce errors [SCI-7182] 2022-09-09 15:50:59 +02:00
Oleksii Kriuchykhin
557c4b205a Reimplement custom TinyMCE plugin: customImageUploader [SCI-7151] 2022-09-09 10:59:20 +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
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
artoscinote
44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385)
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]

* Cleanup and refactor [SCI-7081]

* Clean up legacy plugins [SCI-7150]

* Linter fix [SCI-7081]]
2022-09-05 11:29:19 +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
46b2b87654 Fix error on task text field [SCI-7033] 2022-08-16 12:21:59 +02:00
artoscinote
c106c2d997
Add active reminders filter [SCI-7004] (#4280) 2022-08-09 10:23:40 +02:00
Anton
784c10aec9 Fix image editor callback after save image [SCI-7019] 2022-08-01 13:32:55 +02:00
Martin Artnik
98b3627219 Implement multiline editing in repositories [SCI-6982] 2022-07-19 12:24:33 +02:00
Anton
8e8826d33c Fix step comments [SCI-6971] 2022-07-12 13:54:10 +02:00
artoscinote
a51ce1c322
Fix text field error states [SCI-6952] (#4216) 2022-07-11 10:44:27 +02:00
ajugo
10e95ad465
Remove datatable for repository item CARD [SCI-6913] (#4188) 2022-07-06 11:44:30 +02:00
Martin Artnik
9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
aignatov-bio
adc87b85f1
Merge pull request #4077 from aignatov-bio/ai-sci-6791-add-show-password-button
Add show icon for password [SCI-6791]
2022-05-26 12:46:00 +02:00
Anton
7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +02:00
artoscinote
c33b426c03
Add marvinJS integration [SCI-6831] (#4113) 2022-05-24 11:30:15 +02:00
Anton
a494051f61 Add placeholder for new files in step [SCI-6833] 2022-05-23 13:44:34 +02:00
ajugo
ee448a9997
Micro-interactions for reminder flyout correction [SCI-6804] (#4096) 2022-05-16 11:16:07 +02:00
Anton
04e16cf6b5 Add text component [SCI-6808] 2022-05-11 09:51:47 +02:00
Anton
3856fd9cf1 Add show icon for password [SCI-6791] 2022-05-06 16:14:21 +02:00
Anton
36ae58872f Show last page message only after second page [SCI-6761] 2022-04-28 14:11:11 +02:00
aignatov-bio
918a11a0b0
Fix decimal render function [SCI-6742] (#4037)
Co-authored-by: Anton <anton@scinote.net>
2022-04-20 11:07:37 +02:00
aignatov-bio
4a232ac391
Merge pull request #4020 from biosistemika/features/projects-experiments-pagination
Features/projects experiments pagination
2022-04-14 10:45:27 +02:00
aignatov-bio
36639727a1
Stock small ux fixes [SCI-6714] (#4015)
Co-authored-by: Anton <anton@scinote.net>
2022-04-13 12:15:30 +02:00
Anton
d091c56e9f Add pagination for experiments [SCI-6656] 2022-04-12 15:16:02 +02:00
ajugo
986e817fdc
Removed autofocus clear on open reminder flyout [SCI-6690] (#4003)
* Removed clear autofocus on open reminder flyout [SCI-6690]

* Fix hound [SCI-6690]
2022-04-08 18:08:55 +02:00
Anton
d96103d714 Add pagination to projects list [SCI-6655] 2022-04-07 12:22:52 +02:00
aignatov-bio
be9a576842
Fix reminder dropdown on task screen [SCI-6678] (#3987)
Co-authored-by: Anton <anton@scinote.net>
2022-04-04 12:10:14 +02:00
artoscinote
401a32edd9
Implement failed snapshot pop-up on task screen [SCI-6612] (#3950)
* Implement failed snapshot pop-up on task screen [SCI-6612]

* Copy change [SCI-6612]

* Proper handling of snapshot transition error [SCI-6612]

* Move modal auto open logic to JS file [SCI-6612]

* Remove unnecessary .html_safe [SCI-6612]
2022-04-04 11:04:03 +02:00
aignatov-bio
ca53c3058a
Stock modal bugs [SCI-6667] (#3970)
Co-authored-by: Anton <anton@scinote.net>
2022-03-30 14:03:07 +02:00
aignatov-bio
5e92429212
Add micro-interactions to reminders flyout [SCI-6627] (#3951)
Co-authored-by: Anton <anton@scinote.net>
2022-03-24 10:16:47 +01:00
aignatov-bio
c6c073c750
Add micro interactions for stock modal [SCI-6625] (#3947)
Co-authored-by: Anton <anton@scinote.net>
2022-03-22 14:35:27 +01:00
aignatov-bio
fecaafecf9
Refactor repository toolbar [SCI-6545] (#3943)
Co-authored-by: Anton <anton@scinote.net>
2022-03-18 14:10:34 +01:00
ajugo
d1610fba53
Low stock flyout reminders [SCI-6502] (#3932)
* Display low stock flyout reminder [SCI-6502]

* Display low stock flyout reminder [SCI-6502]

* Adapt showing stock reminders for every bell icon click [SCI-6502]

* Correct hound error [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix hound [SCI-6502]

* Remove not needed line [SCI-6502]

* Add reminder template [SCI-6502]

* Add clearing messages [SCI-6502]
2022-03-15 10:24:35 +01:00
Anton
8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
aignatov-bio
f2e4c579af
Multiple UX fixes for filters [SCI-6525] (#3858)
Co-authored-by: Anton <anton@scinote.net>
2022-02-15 15:03:25 +01:00
artoscinote
f1e04cc604
Fix appearance of members pagination, copy fix [SCI-6265] (#3792) 2022-02-02 10:41:29 +01:00
artoscinote
cdbf1f5fa0
Implement stock management activities [SCI-6452] (#3810)
* Implement stock management activities [SCI-6452]

* PR code fixes [SCI-6452]
2022-02-02 10:33:02 +01:00