Anton
da3c54b7f0
Merge branch 'develop' into features/bugfixes-and-css
2023-10-25 13:26:06 +02:00
Ivan Kljun
2031286261
Implement file-checkout localhost call [SCI-9466]
2023-10-25 09:30:42 +02:00
Alex Kriuchykhin
8a18bc6ad3
Fix item card on results page, fix smart annotation links in RTE fields [SCI-9572] ( #6506 )
2023-10-19 16:35:23 +02:00
Martin Artnik
73ec9848ea
Merge pull request #6470 from artoscinote/ma_SCI_9411
...
Fix MarvinJS loading race condition [SCI-9411]
2023-10-18 15:23:21 +02:00
Martin Artnik
947d5e6744
Fix MarvinJS loading race condition [SCI-9411]
2023-10-17 15:15:11 +02:00
Martin Artnik
3021297f73
Revert "Refocus on tinymce editor after marvinjs img update [SCI-9515]"
2023-10-13 14:40:52 +02:00
Martin Artnik
118a25e0ab
Merge pull request #6430 from ivanscinote/SCI-9515-click-away-not-working-after-editing-chemical-drawing-in-rtf
...
Refocus on tinymce editor after marvinjs img update [SCI-9515]
2023-10-12 16:45:36 +02:00
Ivan Kljun
d80d0af5b8
Refocus on tinymce editor after marvinjs img update [SCI-9515]
2023-10-12 16:35:36 +02:00
ajugo
04a898760a
Add assign button to item cards [SCI-9158] ( #6326 )
2023-10-12 15:46:13 +02:00
ajugo
357eebee40
Fix stock export on task [SCI-9477] ( #6400 )
2023-10-12 14:43:17 +02:00
Andrej
79118effa7
Merge branch 'develop' into features/october-release
2023-10-10 11:09:04 +02:00
Martin Artnik
5bd9834e91
Fix issues with project filters [SCI-9492]
2023-10-10 10:12:26 +02:00
Martin Artnik
56f53a7ed8
Merge pull request #6366 from lasniscinote/gl_SCI_9463
...
Fixed project filter not saved, red dot missing [SCI-9463]
2023-10-06 15:33:51 +02:00
Gregor Lasnibat
7c7c0b0d88
Working on project filter not saved, red dot missing [SCI-9463]
...
Fixed project filters not saved/red dot not showing when applied [SCI-9463]
PR fix 01 [SCI-9463]
2023-10-06 15:31:00 +02:00
Martin Artnik
5c7ee78cd6
Fix attachment issues [SCI-9410]
2023-10-05 15:44:41 +02:00
Martin Artnik
b15cedd198
Merge pull request #6345 from G-Chubinidze/gc_SCI_9438
...
CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438]
2023-10-04 12:51:20 +02:00
Giga Chubinidze
5544b0e50e
uniquefied gallery param from js
2023-10-04 14:49:32 +04:00
Alex Kriuchykhin
40b6078ab2
Merge pull request #6312 from rekonder/aj_SCI_9386
...
Refactor export stock consumption modal [SCI-9386]
2023-10-03 10:33:00 +02:00
Gregor Lasnibat
80de7483eb
Prepare a modal displaying relationships for a specific item [SCI-9357]
2023-10-03 09:33:39 +02:00
Andrej
835cfb5e07
Refactor export stock consumption modal [SCI-9386]
2023-10-03 09:27:10 +02:00
Martin Artnik
6e405d40a6
Refactor datepicker limits [SCI-9338]
2023-09-28 13:33:17 +02:00
Gregor Lasnibat
f352c7f186
Working on new behaviour for switching between item clicks [SCI-9354]
...
Working on scrolling and highlighting [SCI-9354]
Item card preload and section title animation [SCI-9354]
Added box-shadow [SCI-9354]
Refactored logic and styles [SCI-9354]
PR fix, added back the missing HighlightComponent [SCI-9354]
PR fixes, refactoring [SCI-9354]
PR fix [SCI-9354]
Fixed scrolling to 'Assigned', highlighting [SCI-9354]
PR fix, modular logic, rename [SCI-9354]
2023-09-28 13:21:20 +02:00
Martin Artnik
a499a0f0ea
Merge pull request #6307 from artoscinote/ma_SCI_9338
...
Fix datepicker min/max limits [SCI-9338]
2023-09-27 14:53:55 +02:00
Martin Artnik
99dd94e21f
Fix datepicker min/max limits [SCI-9338]
2023-09-27 14:46:48 +02:00
Martin Artnik
d86da2d145
Merge pull request #6207 from ivanscinote/SCI-9217-eye-icons-out-of-placeholder-placeholder-height
...
Fix eye icon placement in password fields [SCI-9217]
2023-09-27 14:19:41 +02:00
Oleksii Kriuchykhin
d69b7cc6e8
Merge branch 'develop' into features/october-release
2023-09-26 11:11:30 +02:00
Martin Artnik
3a22d7715d
Merge branch 'develop' into features/september-release
2023-09-25 10:37:40 +02:00
wandji20
3dd7d0fdb3
Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914]
2023-09-22 09:36:07 +01:00
Oleksii Kriuchykhin
3b170a0c0d
Connect backend to the new item card [SCI-9313]
2023-09-18 16:42:01 +02:00
wandji20
996e3b1d9a
Fix issue loading iframe modal in session_layouts [SCI-9310]
2023-09-18 10:28:19 +01:00
Ivan Kljun
af18a42129
Add constants for status state polling [SCI-9304]
2023-09-14 16:21:17 +02:00
Anton
af0fbfeec0
Merge branch 'develop' into features/september-release
2023-09-14 13:45:40 +02:00
Ivan Kljun
01a909c9e7
Fix eye icon placement in password fields [SCI-9217]
2023-09-13 14:16:52 +02:00
Martin Artnik
631d987b92
Merge pull request #5909 from G-Chubinidze/gc_SCI_8796
...
Date range in filters allows start date to be after end date [SCI-8796]
2023-09-13 13:37:03 +02:00
wandji
1631de67ea
Fix issue opening dropdown when typing [SCI-9172] ( #6171 )
2023-09-11 15:29:27 +02:00
wandji
a59f94c5a9
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] ( #6092 )
...
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]
* Add consumption export modal and improve report generation [SCI-9023]
* Add repository_row association to repository_ledger_records [SCI-9023]
2023-09-07 13:12:27 +02:00
wandji
dfce1e1382
Fix issue previewing large image after edit [SCI-8914] ( #6143 )
2023-09-06 11:43:51 +02:00
Alex Kriuchykhin
f0fe040932
Fix OVE asset preview reloading after update [SCI-9112] ( #6122 )
2023-09-05 11:36:37 +02:00
Martin Artnik
3724a4a067
Merge branch 'develop' into features/september-release
2023-09-01 10:30:48 +02:00
Oleksii Kriuchykhin
b4eb4d38e6
Merge branch 'develop' into features/ove-integration
2023-08-31 15:52:38 +02:00
Alex Kriuchykhin
165b7febcf
Fix JS errors on text results creation/editing [SCI-9140] ( #6086 )
2023-08-28 14:53:09 +02:00
Soufiane
a19ab3b519
Fix OVE CSS issues [SCI-9114] ( #6081 )
...
- Fix broken CSS import.
- Hide body scroll when editor is open.
- Fix editor header design.
2023-08-25 14:22:37 +02:00
Andrej
29cddf5ef7
Merge branch 'develop' into features/ove-integration
2023-08-22 11:00:34 +02:00
Anton
0780ed17b0
Fix conflicts
2023-08-21 11:34:34 +02:00
Anton
2d64d2fcbf
Merge branch 'develop' into features/september-release
2023-08-21 11:25:27 +02:00
Soufiane
4f1ea84489
Add the promotion screen for Sequence editor (OVE) [SCI-8968] ( #6007 )
2023-08-17 15:39:32 +02:00
Anton
16eedcdade
Revamp modals across app [SCI-8978]
2023-08-17 14:01:26 +02:00
sboursen-scinote
d631098d9a
Fix multiple issues with edit sequence on task protocol [SCI-8966]
...
- Fix edit button label and icon
- Fix preview modal for gene-sequence
2023-08-16 17:01:43 +02:00
Alex Kriuchykhin
975a197716
Merge pull request #5987 from ivanscinote/SCI-9034-shared-task-issues
...
Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]
2023-08-16 15:34:57 +02:00
Alex Kriuchykhin
5eea990881
Merge pull request #5980 from wandji20/wb-SCI-9058
...
Move new and edit result asset inline Javascript to result_asset.js [SCI-9058]
2023-08-16 15:34:21 +02:00
Ivan Kljun
1ea77b4ac8
Apply hound linter suggestions
2023-08-16 15:28:28 +02:00
Ivan Kljun
843cbb06da
Fix trigger load and error event in active_storage_previews
2023-08-16 15:27:09 +02:00
Ivan Kljun
1880723c8c
Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]
2023-08-16 10:49:34 +02:00
Martin Artnik
8d31c5eb3b
Merge branch 'develop' into features/ove-integration
2023-08-16 10:41:26 +02:00
sboursen-scinote
dcaf55eeb2
Fix icon position for form password fields [SCI-9020]
2023-08-15 09:54:00 +02:00
wandji20
3fc5ac36b0
Set nonce for new and edit result asset inline javascript and fix image preview after editing [SCI-9058]
2023-08-14 16:48:00 +01:00
Anton
6e5fa5ccd7
Add create actions [SCI-8953]
2023-08-11 15:04:49 +02:00
wandji20
52fc7eb0e8
Fix Css issues [SCI-9003]
2023-08-11 10:45:51 +01:00
Martin Artnik
a952319afd
Merge branch 'develop' into features/september-release
2023-08-09 16:43:15 +02:00
wandji
6c18a5a622
Fix issue previewing image after edit [SCI-8914] ( #5908 )
...
* Fix issue previewing image after edit [SCI-8914]
2023-08-09 10:38:01 +02:00
wandji
a1e6392a45
Fix bugs with jquery3 upgrade [SCI-8973] ( #5933 )
...
* Fix bugs with jquery3 upgrade [SCI-8973]
* Remove deprecated jquery method (.error, .completed, .success) [SCI-8973]
* Fix linter error [SCI-8973]
2023-08-09 10:33:58 +02:00
Giga Chubinidze
a98137bb57
Date range in filters allows start date to be after end date [SCI-8796]
2023-08-03 11:58:34 +04:00
ivanscinote
5a531c98ae
Add callback to clear form errors at create wopi files [SCI-8927] ( #5877 )
...
* Add callback to clear form errors at create wopi files [SCI-8927]
2023-08-02 15:34:36 +02:00
Martin Artnik
76a0f433cd
Basic OVE editor implementation [SCI-8929]
2023-08-02 14:13:04 +02:00
Ivan Kljun
9278e887d6
Fix checkbox project select [SCI-8584]
2023-07-26 15:48:24 +02:00
Martin Artnik
3978d9efef
Merge branch 'develop' into features/august-release
2023-07-26 11:22:49 +02:00
Alex Kriuchykhin
31880521ef
Fix displaying of file previews, refactor file analyzer [SCI-8892] ( #5818 )
2023-07-20 12:59:45 +02:00
Martin Artnik
5cc087835a
Merge branch 'develop' into features/august-release
2023-07-19 11:21:24 +02:00
ivanscinote
f21a4ec17b
Remove searchfield glitch at reports and label templates index page ( #5769 )
2023-07-14 12:30:58 +02:00
Oleksii Kriuchykhin
fca9aea4a8
Merge branch 'features/rails-upgrade' into develop
2023-07-13 13:10:59 +02:00
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] ( #5760 )
2023-07-13 09:45:53 +02:00
Anton
8e1836aa82
CSS fixes [SCI-8762]
2023-07-10 21:09:29 +02:00
Soufiane
eb4d0f2065
Revert changing .js.erb file [SCI-8810] ( #5741 )
2023-07-10 09:43:00 +02:00
Soufiane
b44678d09a
Switch to keyword parameters in i18n.t [SCI-8810] ( #5739 )
2023-07-07 14:55:51 +02:00
wandji
322346c8e4
Fix dropdown issue for filters [SCI_8781] ( #5731 )
2023-07-07 10:58:43 +02:00
Anton
586d9eaf4b
CSS fixes [SCI-8758][SCI-8759]
2023-06-27 20:31:25 +02:00
Andrej
35ebbadae9
Fix adding tags to the task at creation [SCI-8745]
2023-06-27 10:52:03 +02:00
Soufiane
c71d8df470
Add support to characters in smartAnnotation [SCI-8656] ( #5617 )
...
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-22 15:40:39 +02:00
ajugo
e82338be70
Fix zoom on pdf preview [SCI-8697] ( #5647 )
2023-06-22 10:41:35 +02:00
Anton
f675034b7f
Fix UI css fixes [SCI-8660]
2023-06-20 15:53:33 +02:00
Anton
4e972de096
UI CSS fixes
2023-06-19 15:58:17 +02:00
Anton
289c92cb00
UX fixes [SCI-8658][SCI-8667][SCI-8668][SCI-8669][SCI-8672][SCI-8660][SCI-8662]
2023-06-16 12:38:09 +02:00
aignatov-bio
20a411c777
Merge pull request #5600 from scinote-eln/features/ui-revamp
...
Features/UI revamp
2023-06-15 11:51:44 +02:00
ajugo
2afe589657
Remove double load of current task on dashboard page [SCI-8642] ( #5597 )
2023-06-15 09:41:46 +02:00
Anton
d795f996f2
Merge branch 'develop' into features/ui-revamp
2023-06-14 15:18:50 +02:00
Martin Artnik
dcc30822f5
New icon tweaks & fixes [SCI-8366]
2023-06-08 17:33:50 +02:00
Giga Chubinidze
a777fd5584
New icons implementation [SCI-8366]
2023-06-08 10:33:37 +04:00
sboursen-scinote
456670dd15
Fix Activities type dropdowns [SCI-8498]
...
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-02 10:39:56 +02:00
artoscinote
c58a852e2a
Merge pull request #5532 from G-Chubinidze/gc_SCI_8098_8147
...
Cursor position improvements, focused fields - part 1 & 2 [SCI-8098] [SCI-8147]
2023-06-01 12:36:54 +02:00
Giga Chubinidze
9b7abe8de7
changed logic to accomodate globally
2023-05-31 15:36:09 +04:00
Giga Chubinidze
4c4bec1b50
Empty state of inventories - Clickable empty row [SCI-8575]
2023-05-31 11:52:15 +04:00
Giga Chubinidze
80b8a8803d
amended focus fields
2023-05-31 11:08:16 +04:00
artoscinote
1b1ecbfbaf
Merge pull request #5488 from G-Chubinidze/gc_SCI_8147
...
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
2023-05-29 11:08:41 +02:00
artoscinote
5612303f79
Merge pull request #5487 from G-Chubinidze/gc_SCI_8098
...
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
2023-05-29 11:07:53 +02:00
Giga Chubinidze
81db122a08
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
2023-05-26 03:14:27 +04:00
Giga Chubinidze
d72653aff2
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
2023-05-26 02:59:19 +04:00
Soufiane
fc1ce332de
Issue with scrollbar in smart annotation pop-up [SCI-8420] ( #5479 )
...
* Fix issues in smart annotation pop-up
- Initialize perfectScrollBar on the current atWho container.
- Close AtWho pop-up when tinyMCE editor is closed.
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
* Fix hound [SCI-8420]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
* Close smart annotation pop-up after tinyMCE save [SCI-8420]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
---------
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-25 16:01:36 +02:00
Soufiane
c7fcd0a52f
Activate assign items button in Results page [SCI-8419] ( #5469 )
...
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-24 10:35:58 +02:00
Soufiane
136fff1f09
Using more than one way of adding file results file title is lost [SCI-8346] ( #5354 )
...
Persist uploaded items names when adding new ones [SCI-8346]
2023-05-23 17:30:37 +02:00
ajugo
7e771d457e
Fix assigning items from smart annotation with one team inventory [SCI-8484] ( #5434 )
2023-05-18 16:23:00 +02:00
