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
Andrej
100eab9cb0
Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates
2023-05-18 10:56:10 +02:00
Alex Kriuchykhin
5a06f649d6
Merge pull request #5417 from scinote-eln/features/sa-item-assigning
...
Features/sa item assigning
2023-05-17 11:45:13 +02:00
artoscinote
aeb84e18d0
Implement bottom action toolbar for repository items [SCI-8300]
...
Implement bottom action toolbar for repository items [SCI-8300]
2023-05-17 11:27:55 +02:00
Andrej
32d8fc3e0c
Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning
2023-05-16 14:26:12 +02:00
Martin Artnik
c8521cd9c4
Make search icon right-alinged [SCI-8301]
2023-05-16 12:30:32 +02:00
Soufiane
c28f86d46d
Refactor inline events [SCI-8434] ( #5403 )
...
Refactor inline events in task results [SCI-8434]
2023-05-16 09:34:36 +02:00
ajugo
e0b742b336
Fix assigning of inventory items from inventory card [SCI-8416] ( #5397 )
2023-05-11 13:18:19 +02:00
Andrej
29a9c3781e
Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning
2023-05-04 13:34:45 +02:00
Soufiane
1b34de37ef
CSP and inline js refactor [SCI-8118][SCI-8119] ( #5206 )
...
CSP and inline js refactor [SCI-8118][SCI-8119]
2023-05-03 11:31:17 +02:00
Soufiane
314c7cbfd9
Add object IDs to smart annotation search and global search [SCI-8085] ( #5151 )
...
Add object codes to global search [SCI-8085]
2023-05-03 11:07:18 +02:00
ajugo
9b49745194
Fix repository_row call when no repository row is selected [SCI-8281] ( #5301 )
2023-04-25 15:18:12 +02:00
ajugo
d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] ( #5295 )
2023-04-25 15:12:19 +02:00
aignatov-bio
af9219b7ae
Assign item through repository item modal [SCI-8141] ( #5237 )
2023-04-25 14:30:14 +02:00
G-Chubinidze
e9cacc3db1
Open Inventory - Double action fix [SCI-7506] ( #5200 )
...
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-04-25 14:21:41 +02:00
Andrej
a33707bd5e
Reverse table header/row numbering for plate templates [SCI-8082]
2023-04-19 12:22:22 +02:00
G-Chubinidze
5eacd41ca5
Adding well plate table options to "insert step content" select menu [SCI-7931] ( #5302 )
...
* well plate implementation without nested dropdown
* Implement dropdown submenu [SCI-7931]
* minor code cleanup
---------
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
Co-authored-by: Martin Artnik <martin@scinote.net>
2023-04-18 15:42:53 +02:00
sboursen-scinote
dcd6f6267d
Merge develop in to sb_SCI-7815 [SCI-7815]
2023-04-12 15:46:52 +02:00
aignatov-bio
82333bdc18
Merge pull request #5222 from sboursen-scinote/sb_SCI-8134
...
Role dropdown on protocols.io import to SciNote [SCI-8134]
2023-04-11 11:22:50 +02:00
artoscinote
bd02b71efe
Merge pull request #5157 from sboursen-scinote/sb_SCI-7670
...
Pressing Enter button cancels adding of a image on task result [SCI-7670]
2023-04-05 15:27:22 +02:00
sboursen-scinote
2dfcb56748
Fix dropdown direction in modals [SCI-8134]
2023-03-28 17:19:37 +02:00
artoscinote
44098ece5d
Revert "Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]"
2023-03-21 15:26:06 +01:00
artoscinote
e2dc2e31ee
Revert "Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]"
2023-03-21 15:24:40 +01:00
artoscinote
a43c941b50
Merge pull request #5170 from G-Chubinidze/gc_SCI_8147
...
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
2023-03-21 15:18:37 +01:00
artoscinote
634b4145fd
Merge pull request #5169 from G-Chubinidze/gc_SCI_8098
...
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
2023-03-21 15:17:55 +01:00
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
