artoscinote
41e629d96c
Merge pull request #4728 from artoscinote/ma_SCI_7641
...
Fix duplicate entries for recent work [SCI-7641]
2022-12-20 15:12:58 +01:00
Martin Artnik
45aad7f429
Fix duplicate entries for recent work [SCI-7641]
2022-12-20 14:32:22 +01:00
Alex Kriuchykhin
5aaeee4b16
Merge pull request #4727 from okriuchykhin/ok_SCI_7422_v2
...
Fix viewer permissions for inventories [SCI-7422]
2022-12-20 13:43:36 +01:00
Oleksii Kriuchykhin
72f1cf2704
Fix viewer permissions for inventories [SCI-7422]
2022-12-20 13:26:38 +01:00
Anton
250a4b4602
CSS fixes for project/experiments cards [SCI-7628]
2022-12-20 12:51:44 +01:00
G-Chubinidze
f463664885
Merge pull request #4724 from G-Chubinidze/gc_SCI_7449
...
FE | BE Add new task modal field for Tags [SCI-7449]
2022-12-20 15:50:15 +04:00
Giga Chubinidze
377872dda3
hound code cleanup
2022-12-20 10:37:40 +04:00
Giga Chubinidze
1a84c60c74
FE | BE Add new task modal field for Tags [SCI-7449]
2022-12-19 14:55:38 +04:00
Anton
2fd2d7300e
Revert modified date on experiment card
2022-12-19 11:32:32 +01:00
Alex Kriuchykhin
f44cb2a1bb
Merge pull request #4716 from okriuchykhin/ok_SCI_7577_v2
...
Improve handling of unaccessible inventories in snapshot versions sidebar [SCI-7422]
2022-12-19 10:33:52 +01:00
Giga Chubinidze
ae8efa8e1a
changed if else logic, added back placeholders
2022-12-16 17:22:06 +04:00
ajugo
41892e35c6
Fix docx report generator for links in activity [SCI-7598] ( #4720 )
2022-12-15 10:54:24 +01:00
artoscinote
fcc3a9b5d9
Merge pull request #4719 from artoscinote/ma_SCI_7569
...
Fix table scroll wrapping [SCI-7569]
2022-12-14 14:41:56 +01:00
Martin Artnik
3ea059529d
Fix table scroll wrapping [SCI-7569]
2022-12-14 14:32:23 +01:00
Alex Kriuchykhin
766255e493
Merge pull request #4713 from okriuchykhin/ok_SCI_7577
...
Improve user team invitation logic [SCI-7324]
2022-12-13 16:14:48 +01:00
Oleksii Kriuchykhin
9900b62e03
Improve hadling of unaccessible inventories in snapshot versions sidebar [SCI-7577]
2022-12-13 16:12:08 +01:00
aignatov-bio
96aea292fb
Merge pull request #4714 from aignatov-bio/ai-sci-7579-experiment-card-fixes
...
Fix experiment cards views [SCI-7579]
2022-12-13 15:09:07 +01:00
Anton
8e1e95b219
Add new step text notification [SCI-7559]
2022-12-13 14:47:53 +01:00
Anton
66d21e9c4f
Fix experiment cards views [SCI-7579]
2022-12-13 13:14:51 +01:00
Oleksii Kriuchykhin
89258ce2ae
Improve user team invitation logic [SCI-7577]
2022-12-13 11:34:56 +01:00
Anton
d85e1e9d6c
Fix divider on project/experiment view [SCI-7586]
2022-12-13 10:01:38 +01:00
Giga Chubinidze
556431a0da
changed code for develop branch
2022-12-12 19:17:57 +04:00
Anton
abee54699d
Fix label template error handling [SCI-7572]
2022-12-12 15:21:15 +01:00
G-Chubinidze
0b27f0d973
Merge branch 'features/new_experiment_views' into gc_SCI_7496
2022-12-12 17:53:22 +04: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
Giga Chubinidze
477066f85e
code logic cleanup
2022-12-12 17:51:05 +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
Alex Kriuchykhin
67e4a7f658
Merge pull request #4706 from okriuchykhin/ok_SCI_7393
...
Remove underscore escaping for ZPL templates previews [SCI-7393]
2022-12-12 11:00:37 +01:00
Alex Kriuchykhin
67b6cd6ae9
Merge pull request #4700 from okriuchykhin/ok_SCI_7564
...
Fix search by ID for project cards [SCI-7564]
2022-12-12 10:34:39 +01:00
Oleksii Kriuchykhin
925d7e5c45
Remove underscore escaping for ZPL templates previews [SCI-7393]
2022-12-12 10:28:35 +01:00
aignatov-bio
d3fee7eee0
Merge pull request #4691 from okriuchykhin/ok_SCI_7551
...
Add img2zpl gem for ZPL image code generation [SCI-7551]
2022-12-09 14:28:15 +01:00
aignatov-bio
c2e8abb4a4
Merge pull request #4705 from aignatov-bio/ai-sci-7583-fix-protocol-id-on-task-page
...
Fix protocol id on task page [SCI-7583]
2022-12-09 14:07:20 +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
Anton
0736a02741
Fix protocol id on task page [SCI-7583]
2022-12-09 12:56:24 +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
Oleksii Kriuchykhin
c35df9a762
Fix search by ID for project cards [SCI-7564]
2022-12-08 21:24:21 +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
Oleksii Kriuchykhin
95baaefd7a
Add img2zpl gem for ZPL image code generation [SCI-7551]
2022-12-07 11:59:27 +01:00
Giga Chubinidze
864e92e03b
hound styling fix
2022-12-07 14:36:32 +04:00
Giga Chubinidze
96987977d1
fixed default visible column logic
2022-12-07 14:35:25 +04:00
Giga Chubinidze
c9a6af8de4
logic update | removed automatic redirection
2022-12-06 22:06:34 +04:00
G-Chubinidze
c2ae4e3a02
single quoted
2022-12-06 20:21:47 +04:00
G-Chubinidze
d696128ae1
Merge branch 'features/new_experiment_views' into gc_SCI_7442
2022-12-06 20:15:14 +04:00
Giga Chubinidze
0bad40c00d
styling changes
2022-12-06 19:58:59 +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
Giga Chubinidze
082745a3dc
The View flyout in the Archived tasks view
2022-12-06 03:23:22 +04:00
Alex Kriuchykhin
813c15838e
Merge pull request #4678 from okriuchykhin/ok_SCI_7543
...
Improve sorting of task results [SCI-7543]
2022-12-05 16:10:12 +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
ajugo
369fffc467
Fix building of circular protocols for protocols.io [SCI-7388] ( #4665 )
2022-12-05 10:21:12 +01:00
Giga Chubinidze
769fe7ebd8
fixed id sorting on reports removed model duplicate code
2022-12-05 13:17:15 +04: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
artoscinote
6f60a7cd4f
Merge pull request #4673 from artoscinote/ma_SCI_7238
...
Make overflowing tables in TinyMCE scrollable [SCI-7238]
2022-12-02 16:24:45 +01:00
artoscinote
28304668e7
Merge pull request #4679 from artoscinote/ma_SCI_7192
...
Properly format Excell dates in import preview [SCI-7192]
2022-12-02 16:02:38 +01:00
Oleksii Kriuchykhin
78660fb1aa
Improve sorting of task results [SCI-7543]
2022-12-02 14:58:36 +01:00
Martin Artnik
b600ca9771
Properly format Excell dates in import preview [SCI-7192]
2022-12-02 14:17:50 +01: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
Oleksii Kriuchykhin
0d6c6ccd9e
Introduce searchability by ID in global search field [SCI-7208]
2022-12-02 11:16:18 +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
a0682f962a
Merge pull request #4674 from G-Chubinidze/gc_SCI_7542
...
Add the time to the existing timestamp in the comments side panel [SCI-7542]
2022-12-02 10:18:08 +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
Martin Artnik
882178a2ca
Add missing job [SCI-7382]
2022-12-02 09:45:02 +01:00
Giga Chubinidze
22248d4fed
Add the time to the existing timestamp in the comments side panel [SCI-7542]
2022-12-02 10:49:06 +04:00
Martin Artnik
13cf136ca4
Make overflowing tables in TinyMCE scrollable [SCI-7238]
2022-12-01 15:20:23 +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
Anton
98572d9a2c
Add missed notifications to steps and fix notification for protocol repository [SCI-7531]
2022-12-01 14:55:23 +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
Giga Chubinidze
b2bbea5b62
explicit if statement
2022-11-30 20:25:22 +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
Alex Kriuchykhin
25e6a51be8
Merge pull request #4667 from rekonder/fix_session_end
...
Fix session end for remember me [SCI-7502
2022-11-30 12:12:45 +01:00
Andrej
a2dbf79716
Fix session end for remember me
2022-11-30 12:03:27 +01:00
Giga Chubinidze
b695903ea4
added frozen string literal
2022-11-30 11:39:28 +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
5a23cd442d
Add suffix for checklist and table duplication [SCI-7424]
2022-11-29 12:29:13 +01:00
Giga Chubinidze
8d97641110
Add IDs to pdf and docx reports [SCI-7200]
2022-11-29 11:38:08 +04:00
Oleksii Kriuchykhin
4430483bf4
Add creation of assigned tags and designated users to task creation action [SCI-7444]
2022-11-28 14:48:59 +01:00
G-Chubinidze
fdc8d8ef24
Merge pull request #4654 from G-Chubinidze/gc_SCI_7175
...
Update sorting on Projects and Experiments pages [SCI-7175]
2022-11-28 15:57:46 +04: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
ajugo
d255e40ba2
Fix printers instructions toggle [SCI-7535] ( #4656 )
2022-11-28 10:35:01 +01:00
Anton
8ef5a742f6
Fix tooltip for clear reminders [SCI-7472]
2022-11-28 10:11:06 +01:00
Giga Chubinidze
ba0ebfbe29
Update sorting on Projects and Experiments pages [SCI-7175]
2022-11-26 01:18:54 +04: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
Oleksii Kriuchykhin
3b474fc9f0
Improve activity records creation in controllers [SCI-7505]
2022-11-24 15:19:17 +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
aignatov-bio
0facc2bda0
Merge pull request #4647 from aignatov-bio/ai-sci-7452-add-archived-view-for-experiment-table
...
Add archived view for experiment table [SCI-7452]
2022-11-24 13:24:50 +01:00
Alex Kriuchykhin
3685176ce7
Merge pull request #4645 from okriuchykhin/ok_SCI_7439
...
Update the existing endpoint for listing the users with access to the task [SCI-7439]
2022-11-24 13:15:34 +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
Oleksii Kriuchykhin
daecd6a766
Update the existing endpoint for listing the users with access to the task [SCI-7439]
2022-11-23 17:20:14 +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
dd54a30e13
Merge pull request #4601 from rekonder/aj_SCI_7376
...
Enable checkboxes for experiment table/card view for all roles [SCI-7376]
2022-11-22 10:57:34 +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
Alex Kriuchykhin
b487894c9d
Merge pull request #4596 from aignatov-bio/ai-sci-7389-fix-protocol-import-error
...
fix protocol import error [SCI-7389]
2022-11-22 10:56:10 +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
Alex Kriuchykhin
d9897d6e7c
Merge pull request #4624 from okriuchykhin/ok_SCI_7457
...
Fix protocol owner re-assignment when removing a user from a team [SCI-7457]
2022-11-21 11:03:50 +01:00
Oleksii Kriuchykhin
49fbc2c561
Add basic modal for direct task creation [SCI-7197]
2022-11-18 17:00:11 +01:00
Oleksii Kriuchykhin
69812786ba
Fix protocol owner re-assignment when removing a user from a team [SCI-7457]
2022-11-18 12:52:30 +01:00
Oleksii Kriuchykhin
66f9f13508
Implement current team switch when navigating to tasks and experiments from another team [SCI-7447]
2022-11-18 11:48:49 +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
Giga Chubinidze
e9d9f613fb
updated old code version in empty_index
2022-11-11 14:22:26 +04: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
a72795ec98
Merge pull request #4586 from aignatov-bio/ai-sci-7387-fix-options-dropdown-position-on-step
...
Fix options dropdown position on step [SCI-7387]
2022-11-10 11:12:28 +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
G-Chubinidze
8e63bfb7c2
Update my_module.rb
2022-11-09 14:46:36 +04:00
G-Chubinidze
996cb68fdd
Update my_module.rb
2022-11-09 14:45:18 +04:00
G-Chubinidze
62b48ee59a
updated my_module rb, added searchable id attribute
2022-11-09 13:36:55 +04:00
Anton
a17cd78c20
Add view dropdown to experiment screen
2022-11-08 16:39:52 +01:00
Miha Mencin
c8bd5513cf
Merge pull request #4604 from okriuchykhin/ok_SCI_7434
...
Fix team export/import [SCI-7434]
2022-11-08 16:02:11 +01:00
Oleksii Kriuchykhin
be7ef8fdc0
Fix team export/import [SCI-7434]
2022-11-08 14:50:16 +01:00
Giga Chubinidze
18fe2cd207
update display of the current tasks with IDs [SCI-7205]
2022-11-08 16:06:48 +04:00
Anton
7ceb94ab1f
Add toolbar to experiment table [SCI-7379]
2022-11-08 12:52:49 +01:00
Oleksii Kriuchykhin
82d4b03cf6
Fix global activities user selection dropdown [SCI-7402]
2022-11-07 21:58:06 +01:00
Andrej
aa99c2d7c8
Enable checboxes for experiment table/card view for all roles [SCI-7376]
2022-11-07 15:51:39 +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
22c682c58b
fix protocol import error [SCI-7389]
2022-11-04 11:49:05 +01:00
Anton
b3bd165d01
Fix time picket CSS [SCI-7359]
2022-11-04 11:36:21 +01:00
Anton
5b08ee1cc8
Hide active reminders, if stock management disabled [SCI-7428]
2022-11-03 15:48:32 +01:00
Anton
bacd3524e8
Add tags manager to experiment table view [SCI-7368]
2022-11-02 15:17:10 +01:00
Giga Chubinidze
a8b1dbfe76
archived experiments cards updates [SCI-7202]
2022-11-02 11:18:18 +04: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
eddd5b7476
Fix options dropdown position on step [SCI-7387]
2022-10-27 12:42:54 +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
449283b4f5
Show only active result in experiment table view [SCI-7369] ( #4578 )
2022-10-27 09:52:20 +02:00
Oleksii Kriuchykhin
c16d0cb7a6
Fix update of shared inventories user assignments [SCI-7360]
2022-10-25 23:26:20 +02:00
Alex Kriuchykhin
d0f604f21e
Merge pull request #4576 from okriuchykhin/ok_SCI_7375
...
Fix displaying of user access for E/T [SCI-7375]
2022-10-25 16:14:51 +02:00
Oleksii Kriuchykhin
232f58dd30
Fix displaying of user access for E/T [SCI-7375]
2022-10-25 16:07:55 +02:00
artoscinote
938f2ce63b
Merge pull request #4573 from artoscinote/ma_SCI_7377
...
Add ENV setting for max step text length [SCI-7377]
2022-10-25 16:04:36 +02:00
artoscinote
78b3975759
Merge pull request #4575 from artoscinote/ma_SCI_7396
...
Fix label preview double refresh and unit issues [SCI-7396]
2022-10-25 15:55:57 +02:00
Martin Artnik
31b075ea8c
Fix label preview double refresh and unit issues [SCI-7396]
2022-10-25 15:54:05 +02:00
Martin Artnik
ebe0ffa286
Add ENV setting for max step text length [SCI-7377]
2022-10-25 13:08:33 +02:00
ajugo
ea75eefd88
Change switching permission for label templates and zebra print to stock management [SCI-7305] ( #4574 )
2022-10-25 13:07:45 +02:00
artoscinote
eec5fd9ab3
Merge pull request #4570 from artoscinote/ma_SCI_7357
...
Only render last label in ZPL [SCI-7357]
2022-10-25 11:53:52 +02:00
ajugo
58bca40632
Change zebra label instructions [SCI-7390] ( #4572 )
2022-10-25 11:44:50 +02:00
Martin Artnik
7f384f1964
Only render last label in ZPL [SCI-7357]
2022-10-24 15:50:10 +02:00
Anton
8feaedc0d1
Add core columns to experiment table [SCI-7212]
2022-10-24 15:27:57 +02:00
Andrej
09a1adb194
Fix hound [SCI-7181]
2022-10-24 13:12:28 +02:00
Andrej
745be5a0f7
Remove old step code [SCI-7181]
2022-10-24 13:07:10 +02:00
Alex Kriuchykhin
60dc26a42b
Merge pull request #4567 from okriuchykhin/ok_SCI_7375
...
Fix display of user access for experiments and tasks [SCI-7375]
2022-10-24 13:05:02 +02:00
Oleksii Kriuchykhin
09440d4f83
Fix display of user access for experiments and tasks [SCI-7375]
2022-10-24 12:57:08 +02:00
Oleksii Kriuchykhin
d38556e3fa
Fix repository permissions helper [SCI-7360]
2022-10-21 14:51:16 +02:00
Alex Kriuchykhin
3bc3036b58
Merge pull request #4563 from okriuchykhin/ok_SCI_7360_v2
...
Fix typo in update team assignments service, improve shared inventories migration [SCI-7360]
2022-10-21 14:36:52 +02:00
Alex Kriuchykhin
23a8f8fc07
Merge pull request #4561 from okriuchykhin/ok_SCI_7363
...
Fix task access display modal [SCI-7363]
2022-10-21 14:29:28 +02:00
Oleksii Kriuchykhin
a9e7e81e51
Fix typo in update team assignments service, improve shared inventories migration [SCI-7360]
2022-10-21 14:04:33 +02:00
Alex Kriuchykhin
2ddb6d8685
Merge pull request #4558 from rekonder/aj_SCI_7373
...
Fix permission on experiment open for org admins [SCI-7373]
2022-10-21 13:48:28 +02:00
Alex Kriuchykhin
207b8311af
Merge pull request #4559 from aignatov-bio/ai-sci-7374-fix-protocol-creation-from-dashboard
...
Fix protocol creation from dashboard [SCI-7374]
2022-10-21 13:47:33 +02:00
Oleksii Kriuchykhin
8dfedfe165
Fix task access display modal [SCI-7363]
2022-10-21 13:33:22 +02:00
Anton
bc86f11404
Add experiment table view [SCI-7174]
2022-10-21 12:22:38 +02:00
Anton
05902d485b
Fix protocol creation from dashboard [SCI-7374]
2022-10-21 11:40:50 +02:00
Andrej
140dc8c768
Fix permission on experiment open for org admins [SCI-7373]
2022-10-21 11:25:54 +02:00
Oleksii Kriuchykhin
7d3f48199a
Fix shared repositories migration, update sharing logic and permissions [SCI-7360]
2022-10-21 11:00:52 +02:00
Alex Kriuchykhin
1799361944
Merge pull request #4555 from okriuchykhin/ok_SCI_7366
...
Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366]
2022-10-21 10:35:10 +02:00
Oleksii Kriuchykhin
94978ea2ea
Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366]
2022-10-20 16:19:02 +02:00
Anton
ac0fe4389d
Fix label preview in print modal [SCI-7367]
2022-10-20 10:57:40 +02:00
Alex Kriuchykhin
a55390898a
Merge pull request #4553 from okriuchykhin/ok_SCI_7348_v2
...
Fix protocol permission propagation [SCI-7348]
2022-10-20 09:24:44 +02:00
ajugo
3a0eec7043
Fix button shrink for inventory toolbar [SCI-7252] ( #4551 )
2022-10-19 18:09:59 +02:00
Oleksii Kriuchykhin
5ba6fe08d6
Fix protocol permission propagation [SCI-7348]
2022-10-19 17:26:13 +02:00
ajugo
0a56d772b7
Move print button for shared repository in view mode [SCI-7277] ( #4550 )
2022-10-19 14:10:04 +02:00
ajugo
9639e30c72
Generate correct format for create at at print time [SCI-7351] ( #4547 )
2022-10-19 13:18:52 +02:00
ajugo
98c32fda78
Fix label preview for custom repository columns [SCI-7358] ( #4549 )
2022-10-19 13:18:33 +02:00
Anton
2ae8943d80
Update general canvas layout [SCI-7196]
2022-10-19 11:46:16 +02:00
aignatov-bio
822a4f87c7
Merge pull request #4548 from aignatov-bio/ai-sci-7350-replace-label-template-promo-logo
...
Replace label template promo logo [SCI-7350]
2022-10-19 11:44:06 +02:00
Anton
1062fbc2fd
Replace label template promo logo [SCI-7350]
2022-10-19 11:25:49 +02:00
Anton
c6e5fba21c
Fix file name in attachment delete modal [SCI-7356]
2022-10-19 11:12:27 +02:00
Alex Kriuchykhin
482044a448
Merge pull request #4542 from rekonder/aj_SCI_7346
...
Update default density for label templates [SCI-7346]
2022-10-19 10:04:53 +02:00
Anton
689c34e54d
Fix css issues for login and signup forms [SCI-7233]
2022-10-18 11:54:10 +02:00
aignatov-bio
83c3699493
Merge pull request #4539 from aignatov-bio/ai-sci-7340-save-label-dimenssions-on-preview-button
...
Save dimensions on refresh label template preview [SCI-7340]
2022-10-18 11:26:36 +02:00
ajugo
fab625d819
Set correct permission for repository on team role change [SCI-7341] ( #4540 )
2022-10-18 10:43:51 +02:00
ajugo
64975effc6
Close print label modal at print click [SCI-7327] ( #4526 )
2022-10-18 10:42:50 +02:00
Andrej
538f141aaf
Change default density for label templates [SCI-7346]
2022-10-18 09:41:25 +02:00
Anton
bb354f2dbc
Save dimensions on refresh label template preview [SCI-7340]
2022-10-17 12:25:08 +02:00
Anton
91c46e2005
Fix copy experiment only to active projects [SCI-7345]
2022-10-17 11:08:59 +02:00
Alex Kriuchykhin
6abfc8d293
Merge pull request #4527 from rekonder/aj_SCI_7326
...
Move loading label print modal for task [SCI-7326]
2022-10-17 10:21:51 +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