scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-19 15:41:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
14676 commits 31 branches 181 tags 166 MiB
Commit graph

4401 commits

Author SHA1 Message Date
Anton
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
artoscinote
de61c37a4e
Merge pull request #5706 from wandji20/wb-SCI-8559 
Fix CSS Issues[SCI-8559]
 2023-08-21 11:05:38 +02:00
Andrej
ef4d360be8 Fix scrolling of the shareable links layout [SCI-9077] 2023-08-21 10:38:54 +02:00
artoscinote
25f5afdcef
Merge pull request #6023 from G-Chubinidze/gc_SCI_8864 
UI changes of "Create new inventory" modal [SCI-8864]
 2023-08-21 10:25:29 +02:00
artoscinote
7b3d1b92c5
Merge pull request #5907 from ivanscinote/SCI-8893-navigator-freezes 
Create vue method for toggling navigator state [SCI-8893]
 2023-08-21 09:20:29 +02:00
Ivan Kljun
b357e3117c Merge remote-tracking branch 'upstream/features/september-release' into SCI-8893-navigator-freezes 2023-08-21 09:16:32 +02:00
Giga Chubinidze
620c76a975 UI changes of "Create new inventory" modal 2023-08-21 06:56:14 +04:00
artoscinote
3f754710ac
Merge pull request #6021 from ivanscinote/SCI-9007-update-colors 
Add .btn-not-started to task status flow modal [SCI-9007]
 2023-08-18 17:37:48 +02:00
Ivan Kljun
f71c54dd74 Add .btn-not-started to task status flow modal [SCI-9007] 2023-08-18 17:21:26 +02:00
Alex Kriuchykhin
e3c23bd474
Merge pull request #6016 from sboursen-scinote/sb_SCI-9059 
Fix PDF report generation error [SCI-9059]
 2023-08-18 11:37:30 +02:00
sboursen-scinote
4d7fa93c06 Fix PDF report generation error [SCI-9059] 2023-08-18 11:23:49 +02:00
Alex Kriuchykhin
e9e15f015b
Merge pull request #6015 from okriuchykhin/ok_SCI_9079 
Fix move experiment modal form submission [SCI-9079]
 2023-08-18 11:13:10 +02:00
Ivan Kljun
ca35e13893 Merge remote-tracking branch 'upstream/features/september-release' into SCI-8925-show-paragraphs-checklist 2023-08-18 11:12:49 +02:00
Oleksii Kriuchykhin
c76fca0ab3 Fix move experiment modal form submission [SCI-9079] 2023-08-18 10:55:21 +02:00
Ivan Kljun
6918b3c568 Merge with develop and fix conflict [SCI-8928] 2023-08-18 10:54:07 +02:00
artoscinote
20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications 
Remove system notifications [SCI-8807]
 2023-08-18 10:28:05 +02:00
artoscinote
45791a764f
Merge pull request #6014 from wandji20/wb-SCI-9057 
Fix bug in new result table event delegation [SCI-9057]
 2023-08-18 10:13:36 +02:00
artoscinote
664819a7fc
Merge pull request #6008 from ivanscinote/SCI-9007-update-colors 
Update status and shared buttons design to Amanda [SCI-9007]
 2023-08-18 10:12:26 +02:00
artoscinote
c28b54c43b
Merge pull request #5937 from G-Chubinidze/gc_SCI_5605 
Some icons have the checkboard pattern applied to the background [SCI-5605]
 2023-08-18 10:04:06 +02:00
wandji20
cf3cb707fd Fix bug in new result table event delegation [SCI-9057] 2023-08-18 07:16:01 +01:00
artoscinote
f21c1ba7c5
Merge pull request #6009 from artoscinote/ma_SCI_8959 
Add some basic result component layout [SCI-8959]
 2023-08-17 16:42:26 +02:00
Martin Artnik
23a8872e11 Add some basic result component layout [SCI-8959] 2023-08-17 16:32:42 +02:00
artoscinote
2cc49ec6b5
Merge pull request #6005 from wandji20/wb-SCI-9003 
Fix CSS style issues [SCI-9003]
 2023-08-17 15:48:07 +02:00
Soufiane
4f1ea84489
Add the promotion screen for Sequence editor (OVE) [SCI-8968] (#6007) 2023-08-17 15:39:32 +02:00
Ivan Kljun
400c1cb303 Update status and shared buttons design to Amanda [SCI-9007] 2023-08-17 15:18:46 +02:00
Anton
622a8766bb Hide results title if results not selected [SCI-9062] 2023-08-17 14:51:40 +02:00
wandji20
4a3f8146e3 Fix CSS style issues [wb-SCI-9003] 2023-08-17 13:11:58 +01:00
Alex Kriuchykhin
c356018965
Merge pull request #5918 from sboursen-scinote/sb_SCI-8981 
Share button is disabled for locked and archived tasks [SCI-8981]
 2023-08-17 14:10:09 +02:00
Anton
16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
artoscinote
0082b858ec
Merge pull request #5983 from sboursen-scinote/sb_SCI-9042 
Add space after (A) in shareable links layout [SCI-9042]
 2023-08-17 09:00:01 +02:00
sboursen-scinote
ffa6e8bc51 Add space after (A) in shareable links layout [SCI-9042] 2023-08-16 21:10:10 +02:00
wandji20
25e6cbdbd8 Move inline JavaScript inclusion for new and edit result table to result_tables.js [SCI-9057] 2023-08-16 17:08:25 +01: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
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
wandji20
ebcb784149 Move result asset new and edit event handler to result asset and delete files [SCI-9058] 2023-08-16 13:50:40 +01:00
artoscinote
0062108996
Merge pull request #5984 from wandji20/wb-SCI-9043 
Fix inventory item CSS and set nonce shared file preview inline JavaScript [SCI-9043]
 2023-08-16 11:17:47 +02:00
Alex Kriuchykhin
145b834e8a
Merge pull request #5935 from ivanscinote/SCI-8800-projects-table-double-load 
Add turbolinks-cache-control to no-preview [SCI-8800]
 2023-08-16 11:06:16 +02:00
wandji20
ad65de20ce Add space in curly braces for edit result asset form html property [SCI-9058] 2023-08-16 10:06:06 +01:00
Martin Artnik
8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
ajugo
689f699d83
Merge pull request #5974 from sboursen-scinote/sb_SCI-8997 
Update Scinote logo in multiple pages [SCI-8997]
 2023-08-16 10:26:50 +02:00
sboursen-scinote
dc27620d00 Make share button independent of task status flow or archived state [SCI-8981] 2023-08-16 10:22:55 +02:00
artoscinote
61f9acb9fa
Merge pull request #5981 from wandji20/wb-SCI-9057 
Set nonce for new and edit result table inline Javascript  [SCI-9057]
 2023-08-16 09:51:40 +02:00
ajugo
f3fe21db5e
Merge pull request #5976 from sboursen-scinote/sb_SCI-9055 
Update font weights on shared tasks page [SCI-9055]
 2023-08-16 09:50:37 +02:00
wandji20
b9e391e781 Fix inventory item CSS abd set nonce shared file preview inline JavaScript [SCI-9043] 2023-08-15 14:28:53 +01:00
wandji20
6d8e4670f1 Set nonce for new and edit result table inline javascript [SCI-9057] 2023-08-14 17:09:08 +01: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
sboursen-scinote
68d65222a6 Update the font weights on shared tasks page [SCI-9055] 2023-08-11 15:00:17 +02:00
sboursen-scinote
4d6adace9f Update Scinote logo in multiple pages [SCI-8997] 
- In public error pages.
- In sign_in_halt.
 2023-08-11 14:19:24 +02:00
Alex Kriuchykhin
acb1a034a8
Fix assets inclusion in sign_in_halt layout [SCI-9044] (#5973) 2023-08-11 13:52:30 +02:00
Alex Kriuchykhin
a3bc894df8
Fix repository creation modal [SCI-9045] (#5971) 2023-08-11 13:44:26 +02:00
Anton
a46674b3a3 Fix small bootstrap issues [SCI-9051] 2023-08-11 11:34:11 +02:00
Anton
f6191dbb67 Add elements and attachments to new result [SCI-8953] 2023-08-11 11:03:26 +02:00
ivanscinote
e9ac5bed82
Fix rendering team table [SCI-9039] (#5967) 
* Fix rendering team table [SCI-9039]

* Remove unused def_delegator
 2023-08-11 10:52:47 +02:00
artoscinote
8a72c4ca02
Merge pull request #5966 from G-Chubinidze/gc_SCI_9001 
Smart annotation modal- inventories are out of modal [SCI-9001]
 2023-08-11 10:21:11 +02:00
Giga Chubinidze
26eba7da64 Smart annotation modal- inventories are out of modal [SCI-9001] 2023-08-10 22:41:39 +04:00
Giga Chubinidze
348d467d02 Non team owner user does not have access to archive inventory [SCI-8955] 2023-08-10 22:26:45 +04:00
Alex Kriuchykhin
a4ea995027
Revert to using intermediate jquery_bundle file [SCI-9031] (#5962) 2023-08-10 17:19:28 +02:00
Alex Kriuchykhin
c6a545d8b3
Fix Turbolinks redirects with ajax requests, add JQuery migration library [SCI-9031] (#5961) 2023-08-10 16:25:04 +02:00
Anton
ac37885885 Merge branch 'develop' into features/september-release 2023-08-10 15:01:58 +02:00
aignatov-bio
acab34679d
Merge pull request #5960 from aignatov-bio/ai-test-jquery-pr 
Restore bootstrap overrides
 2023-08-10 14:43:12 +02:00
Anton
3c0ccc730f Restore bootstrap overrides 2023-08-10 14:36:06 +02:00
artoscinote
c8d11306fc
Merge pull request #5958 from sboursen-scinote/sb_SCI-9042 
Update shared task title [SCI-9042]
 2023-08-10 13:31:24 +02:00
Martin Artnik
16dbd48ad3 Merge branch 'develop' into features/september-release 2023-08-10 13:21:27 +02:00
sboursen-scinote
17ecdeeaf6 Update shared task title [SCI-9042] 
- Add (A) prefix to archived tasks.
- Truncate long task names.
 2023-08-10 13:13:17 +02:00
Ivan Kljun
f9e5821361 Replace bootstrap_form_tag with form_with at _destroy_modal.html.erb [SCI-9039] 2023-08-10 11:16:43 +02:00
ajugo
2ddb43c2ea
Merge pull request #5850 from sboursen-scinote/sb_SCI-8842 
Update illustrations [SCI-8842]
 2023-08-10 10:53:41 +02:00
sboursen-scinote
d97035988a Move images to public folder [SCI-8842] 2023-08-10 10:33:35 +02:00
Soufiane
aedd3e0b6d
Fix multiple issues for Shared tasks feature [SCI-8985] (#5936) 
- Centre vertically all related modals
- Convert task header tabs to sentence case
 2023-08-10 09:43:31 +02:00
wandji20
b4657e534a Fix CSS Issues[SCI-8559] 2023-08-10 08:11:07 +01:00
Andrej
104a9d5c17 Implemented trial period for open vector editor [SCI-8962] 2023-08-10 08:58:49 +02:00
ajugo
0224f420b1
Merge pull request #5946 from sboursen-scinote/sb_SCI-9002 
Fix Shared task CSS [SCI-9002]
 2023-08-09 17:02:59 +02:00
Martin Artnik
a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
sboursen-scinote
d5240f4620 Fix Shared task CSS [SCI-9002] 
- Remove hover effect from step RTF elements
- Fix the styling of the assigned items datatable.
 2023-08-09 16:09:45 +02:00
ajugo
aed9c0d658
Merge pull request #5948 from sboursen-scinote/sb_SCI-9009 
Fix shareable links left panel scroll [SCI-9009]
 2023-08-09 15:59:57 +02:00
Martin Artnik
f1173661f5 Fix forms [SCI-9004] 2023-08-09 15:47:33 +02:00
sboursen-scinote
45f6e02524 Fix shareable links left panel scroll [SCI-9009] 2023-08-09 15:44:58 +02:00
Anton
2da83f460f Test moving jquery 2023-08-09 14:43:17 +02:00
Alex Kriuchykhin
e01c3682b4
Fix handling of result table metadata for project exports [SCI-9000] (#5943) 2023-08-09 13:54:31 +02:00
Anton
f688995635 Refactor task page UX [SCI-8951] 2023-08-09 11:03:30 +02:00
Giga Chubinidze
73e35994d5 new icon changes 2023-08-09 04:19:57 +04:00
Ivan Kljun
5d92987779 Add turbolinks-cache-control to no-preview and thus eliminating double js loading on turbolinks [SCI-8800] 2023-08-08 14:21:26 +02:00
Alex Kriuchykhin
ab758c747f
Merge pull request #5920 from sboursen-scinote/sb_SCI-8983 
Shared task - Details - multiple issues [SCI-8983]
 2023-08-08 11:42:14 +02:00
sboursen-scinote
7b2a752d60 Fix multiple issues with shared task [SCI-8983] 
- Circumvent authentication by using direct URL Users' avatars
- Change wrong completed-on icon
- Parse dates in browser's format
 2023-08-08 11:11:46 +02:00
Anton
eac87c1804 Merge branch 'develop' into features/september-release 2023-08-08 11:06:27 +02:00
Alex Kriuchykhin
8f1276440a
Merge pull request #5928 from rekonder/aj_SCI_8971 
Fix WOPI preview for shareable link assets [SCI-8971]
 2023-08-08 10:06:16 +02:00
ajugo
c63b7d7a64
Merge pull request #5927 from sboursen-scinote/sb_SCI-8982 
Fix task details CSS [SCI-8982]
 2023-08-07 16:41:46 +02:00
Martin Artnik
fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00
Alex Kriuchykhin
4299cce08b Migrate results to the new data model with ResultOrderableElements [SCI-8878] (#5869) 2023-08-07 16:07:20 +02:00
sboursen-scinote
04fdf0cfee Fix task details CSS [SCI-8982] 2023-08-07 15:53:09 +02:00
Andrej
baf9b7f30a Fix WOPI preview for shareable link assets [SCI-8971] 2023-08-07 15:32:36 +02:00
Anton
7961bee35f Merge branch 'develop' into features/september-release 2023-08-07 14:11:29 +02:00
Alex Kriuchykhin
dacc6b48aa
Merge pull request #5924 from scinote-eln/features/protocol-parsing 
Merge features/protocol-parsing to develop
 2023-08-07 13:00:56 +02:00
Oleksii Kriuchykhin
6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +02:00
aignatov-bio
be4bd7f038
Merge pull request #5922 from scinote-eln/features/remove-front-end-gems 
Features/remove front end gems
 2023-08-07 11:31:12 +02:00
Anton
89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +02:00
ajugo
6f76e86171
Implement results tab for shareable task link [SCI-8753] (#5910) 
* Implement results tab for shareable task link [SCI-8753]
 2023-08-07 10:45:52 +02:00
Anton
937bc60542 Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release 2023-08-07 10:37:20 +02:00
ajugo
9a55889264
Merge pull request #5919 from okriuchykhin/ok_SCI_8974 
Fix file URL generation on shared task page [SCI-8974]
 2023-08-07 08:56:05 +02:00
Oleksii Kriuchykhin
c61a075818 Fix file URL generation on shared task page [SCI-8974] 2023-08-04 15:09:59 +02:00
Alex Kriuchykhin
b365553a14
Merge pull request #5917 from scinote-eln/features/august-release 
Merge features/august release to develop
 2023-08-04 14:01:44 +02:00
ajugo
40b4a972f4
Merge pull request #5915 from rekonder/aj_SCI_8979 
Fix calculations in table for shareable task [SCI-8979]
 2023-08-04 13:49:48 +02:00
ajugo
380a426524
Merge pull request #5916 from sboursen-scinote/sb_SCI-8975 
Fix shareable links CSS [SCI-8975]
 2023-08-04 13:49:32 +02:00
sboursen-scinote
40f78f4a28 Fix shareable links CSS [SCI-8975] 
- Fix the style of the toggle button globally.
- Fix permissions on who can toggle team shareable links.
- Change wrong translations in shareable links modal.
- Remove placeholder text for start-date
 2023-08-04 12:34:04 +02:00
Andrej
caf34320f8 Fix calculations in table for shareable task [SCI-8979] 2023-08-04 12:32:19 +02:00
ajugo
7a6886b895
Fix rendering of RTE images for shareable links [SCI-8970] (#5913) 2023-08-04 11:24:27 +02:00
Soufiane
f3bef4ae25
Fix Broken CSP on the shareable links page [SCI-8969] (#5911) 2023-08-04 11:22:33 +02:00
Soufiane
f856ddf78c
Assigned items in task datatable will not load if stock management is enabled [SCI-8944] (#5904) 
* Fix assigned items datatable in shareable link with stock management [SCI-8944]

* Avoid skipping auth token verification for assets download [SCI-8944]
 2023-08-04 11:21:43 +02:00
sboursen-scinote
c27c7245bc Fix various CSS issues [SCI-8940] 
- Maintain the position of the top navigation controls when user is without team.
- Add "missing" avatar to avatar change modal
- Disable wrapping of (A) in archived P/E/T
- Fix padding/margin issues in Archived tasks and Protocol templates
 2023-08-04 09:11:53 +02:00
Ivan Kljun
2d26c70d40 Create vue method for toggling navigator state 2023-08-02 16:45:06 +02:00
Oleksii Kriuchykhin
b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
Martin Artnik
80c5268efd Add read-only mode to OVE [SCI-8962] 2023-08-02 15:46:07 +02:00
Martin Artnik
76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
ivanscinote
242df0632d
Merge branch 'features/august-release' into SCI-8807-notifications 2023-08-02 13:40:06 +02:00
Soufiane
382a4e57ac
Load external services asynchronously [SCI-8937] (#5900) 2023-08-02 11:17:34 +02:00
ajugo
fa187f3b31
Add shared assets download and fix loading of the shareable button on task [SCI-8754] (#5878) 
* Add shared assets download and fix loading of the shareable button on task [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Load asset for specific task [SCI-8754]
 2023-08-01 16:46:41 +02:00
Soufiane
3f3064ba19
Fix Auth issues task public view [SCI-8936] (#5890) 2023-08-01 14:23:48 +02:00
artoscinote
556c1de182
Merge pull request #5896 from G-Chubinidze/gc_SCI_8846 
Inventory column resizing issues [SCI-8846]
 2023-08-01 10:39:13 +02:00
Soufiane
8d6c417936
Extract date formatting from user browser in shareable links views [SCI-8778] (#5889) 2023-08-01 10:38:00 +02:00
artoscinote
a76bc912b1
Merge pull request #5887 from G-Chubinidze/gc_SCI_8849 
CSS - mixed issues [SCI-8849]
 2023-08-01 10:32:02 +02:00
ajugo
e71d5805ca
Refactored settings for Label templates feature and Zebra printing [SCI-8918] (#5895) 
* Refactored settings for Label templates feature and Zebra printing [SCI-8918]

* Add check for label template [SCI-8918]
 2023-08-01 10:30:57 +02:00
Giga Chubinidze
8827c6d447 Inventory column resizing issues [SCI-8846] 2023-08-01 11:56:30 +04:00
Ivan Kljun
9a37b75001 Applied hound linter suggestions 2023-07-31 15:45:39 +02:00
Ivan Kljun
a7aad50607 Disable simple_format option for pdf report 2023-07-31 15:12:23 +02:00
Ivan Kljun
d9df37745f Support paragraphs for checklist items in print protocol and pdf/docx report [SCI-8925] 2023-07-31 15:12:04 +02:00
Giga Chubinidze
4cd1f59d7b CSS - mixed issues [SCI-8849] 2023-07-31 08:47:43 +04:00
wandji20
c5d6239e88 Fix issue with repository header changing when fetching data [SCI-8793] 2023-07-27 20:55:11 +01:00
Ivan Kljun
8e7076ab2a Fix modal id name conflict [SCI-8928] 2023-07-27 08:22:22 +02:00
ajugo
44c919d3dc
Implement shareable link task view [SCI-8752] (#5843) 
* Implement shareable link task view [SCI-8752]
 2023-07-26 15:19:32 +02:00
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Ivan Kljun
18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +02:00
Alex Kriuchykhin
026e96652b
Fix team name escaping in inventories export modal [SCI-8922] (#5859) 2023-07-25 13:37:45 +02:00
Martin Artnik
3c58b8473d Fix icon in stock consume modal [SCI-8915] 2023-07-25 09:56:55 +02:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
Soufiane
effdc9563a
Improve Breadcrumbs responsiveness [SCI-8494] (#5778) 
- Refactor Breadcrumbs using VUE.
- Implement responsiveness breakpoints
 2023-07-25 09:24:49 +02:00
sboursen-scinote
e0fa6c0a0f Update illustrations [SCI-8842] 2023-07-25 09:19:02 +02:00
Martin Artnik
91153b156a Fix incorrect icons [SCI-8915] 2023-07-24 14:18:24 +02:00
Anton
5394fee3db Fix escape issues [SCI-8912] 2023-07-21 11:48:19 +02:00
sboursen-scinote
be0648bfe9 Merge branch 'develop' into sb_SCI-8827 2023-07-20 14:18:00 +02:00
sboursen-scinote
97744e2ed5 Fix rendering of json handson tables metadata in results during project export [SCI-8827] 2023-07-20 14:06:03 +02:00
Alex Kriuchykhin
31880521ef
Fix displaying of file previews, refactor file analyzer [SCI-8892] (#5818) 2023-07-20 12:59:45 +02:00
Andrej
37d8ac6cd6 Fix shareable links after develop merge 2023-07-20 09:39:17 +02:00
Andrej
3ed91daf4f Fix opening tabs on tasks for archived tasks [SCI-8887] 2023-07-19 13:47:03 +02:00
Andrej
f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Martin Artnik
db8583c39c Remove legacy task move/restore buttons 2023-07-19 11:32:39 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
Giga Chubinidze
4025a4a497 changed tw class 2023-07-19 11:10:08 +02:00
ajugo
0d37011bba Change behavior of repository table loading on state change [SCI-8637] (#5712) 2023-07-19 11:08:40 +02:00
ajugo
c1db4529e9
Fix consume modal display on full table view on task [SCI-8868] (#5798) 2023-07-19 10:32:36 +02:00
ajugo
f84de45cfe
Fix opening of activites for archived my_module [SCI-8887] (#5804) 2023-07-19 09:42:23 +02:00
Soufiane
12dd66b6a6
Fix smart annotation popover in tasks [SCI-8867] (#5805) 2023-07-18 15:59:47 +02:00
sboursen-scinote
bb7eee9b64 Fix smart annotation popover in tasks [SCI-8866][SCI-8867] 2023-07-18 14:55:19 +02:00
Anton
85f14a6bb0 Merge branch 'features/remove-front-end-gems' of github.com:scinote-eln/scinote-web into features/remove-front-end-gems 2023-07-18 14:38:25 +02:00
Anton
1087f67228 Merge branch 'develop' into features/remove-front-end-gems 2023-07-18 14:36:40 +02:00
wandji
59077e5ab6
Fix css issues for reports wizard steps [SCI-8786] (#5724) 
* Fix css issues got reports wizard steps [SCI-8786]

* Fix linter errors [SCI-8786]

* Improve caret alignment for report wizard [SCI-8786]
 2023-07-18 13:39:20 +02:00
wandji
aafeb456fa
Fix CSS issues in experiments tasks page and modal [SCI-8766] (#5738) 
* Fix CSS issues in experiments tasks page and modal [SCI-8766]

* Fix linter errors [SCI-8766]

* Increase spacing for icons in ask display modal and remove html.erb extention from render partial

* Optimize changes [SCI-8766]
 2023-07-18 13:38:50 +02:00
Giga Chubinidze
3cf1c5365f conflict fix 2023-07-18 14:18:41 +04:00
artoscinote
e79c73f8c4
Merge pull request #5777 from wandji20/wb-SCI-8851 
Fix issue archiving task result tables and when downloading archived result table
 2023-07-18 08:18:11 +02:00
artoscinote
a8a631bf72
Merge pull request #5784 from sboursen-scinote/sb_SCI-8866-8867 
Fix smart annotation popover URL [SCI-8866][SCI-8867]
 2023-07-18 08:16:35 +02:00
ivanscinote
6300c1bef8
Fix smart annotations multiline display [SCI-8816] (#5790) 2023-07-17 16:20:49 +02:00
ajugo
2f5015e2a2
Fix error at adding consumption to assigned item to task [SCI-8868] (#5789) 2023-07-17 15:42:40 +02:00
Soufiane
5736c444f6
Remove not used code for global activities [SCI-4851] (#5773) 
* Fix broken task/activity [SCI-4851]

* Remove unused code for global activities [SCI-4851]
 2023-07-17 15:36:22 +02:00
sboursen-scinote
3167a3ca8f Fix smart annotation popover url [SCI-8866][SCI-8867] 2023-07-17 12:06:52 +02:00
wandji20
3ee5049654 Fix issue archiving task result tables and when downloading archived tables [SCI-8851] 2023-07-15 11:33:44 +01:00
ivanscinote
a483699d73
CSS: Protocol templates UI issues [SCI-8790] (#5736) 
* CSS: Protocol templates UI issues [SCI-8790]

* Reorder css properties

* Remove whitespace in scss

* Adding flexible class to protocols-show
 2023-07-14 12:31:54 +02:00
ivanscinote
527551068b
Fix smart annotations multiline display [SCI-8816] (#5747) 2023-07-14 12:31:33 +02:00
Soufiane
5266fad02d
Fix bootstrap input-group style [SCI-8723] (#5770) 2023-07-14 08:37:29 +02:00
Oleksii Kriuchykhin
a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin
092e451f2e Merge branch 'develop' into features/protocol-parsing 2023-07-13 13:59:10 +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
G-Chubinidze
ac399e5722
Activities - Issues after rails upgrade [SCI-8824] (#5755) 2023-07-12 11:11:10 +02:00
ajugo
32fc7698d2
Implement welcome modal for shareable links [SCI-8748] (#5729) 2023-07-11 16:01:42 +02:00
artoscinote
4a8582ebc8
Initial implementation of protocol processing modal [SCI-8661] (#5683) 
* Initial implementation of protocol processing modal [SCI-8661]

* Prepare placeholder jobs and integrate notifications [SCI-8661]
 2023-07-11 09:27:15 +02:00
Soufiane
a1e32e0c3d
Profile - 2FA error page [SCI-8779] (#5734) 
* Fix 2FA form submit [SCI-8779]
 2023-07-11 09:22:42 +02:00
Soufiane
d8658991d6
Fix task page issues after rails upgrade [SCI-8821] (#5745) 2023-07-11 09:21:22 +02:00
Soufiane
9034793d69
Implement the assigned items datatable for shareable links [SCI-8751] (#5721) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-07-11 08:16:29 +02:00
Anton
8e1836aa82 CSS fixes [SCI-8762] 2023-07-10 21:09:29 +02:00
Soufiane
e8c62d6cd8
Fix protocol template issues after rails upgrade [SCI-8822] (#5740) 2023-07-10 13:57:13 +02:00
Soufiane
b44678d09a
Switch to keyword parameters in i18n.t [SCI-8810] (#5739) 2023-07-07 14:55:51 +02:00
Anton
2daa9126d1 Small fixes for css bundling [SCI-8773] 2023-07-07 11:44:42 +02:00
Alex Kriuchykhin
97a16f2e76
Fix archived columns behaviour in repositories export [SCI-8777] (#5728) 2023-07-07 11:08:28 +02:00
ajugo
6c6fc404d2
Implement task shareable modal [SCI-8651] (#5723) 
* Implement task shareable modal [SCI-8651]

* Fix routes [SCI-8651]

* Clean code for vue share button initilization [SCI-8651]
 2023-07-06 16:05:03 +02:00
Soufiane
33bb79d17a
Implement details and notes sections of shareable links [SCI-8750] (#5710) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-07-06 15:10:26 +02:00
Anton
f071e482d8 Migrate to css bundling [SCI-8773] 2023-07-06 13:26:41 +02:00
Anton
93a6a0bdc5 Merge branch 'features/remove-front-end-gems' of github.com:scinote-eln/scinote-web into features/remove-front-end-gems 2023-07-06 11:15:48 +02:00
Anton
4b82ba9613 Merge branch 'features/rails-upgrade' into features/remove-front-end-gems 2023-07-06 11:14:48 +02:00
Soufiane
94ead579e6
Create the general layout for shareable links [SCI-8749] (#5699) 2023-07-06 09:19:29 +02:00
ajugo
836d1b6be1
Add permissions for shareable links and some fixes for controller [SCI-8747] (#5709) 
Add permissions for shareable links and som fixes for controller [SCI-8747]
 2023-07-05 16:21:26 +02:00
ivanscinote
71e5c81f8b
Unified paddings for collapsing content at printers pages [SCI-8787] (#5720) 
* Unified paddings for collapsing content at printers pages

* Reordered css values as per bot-hound suggestion
 2023-07-05 15:06:53 +02:00
ajugo
c8c0a147b5
Revert "Unified paddings for collapsing content at printers pages [SCI-8787] (#5718)" (#5719) 
This reverts commit dbb0e1a50a.
 2023-07-05 14:20:22 +02:00
ivanscinote
dbb0e1a50a
Unified paddings for collapsing content at printers pages [SCI-8787] (#5718) 
* Unified paddings for collapsing content at printers pages

* Reordered css values as per bot-hound suggestion
 2023-07-05 14:19:23 +02:00
Soufiane
ea6a714dac
Disallow scripts loading over https [SCI-8634] (#5713) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-07-05 13:19:16 +02:00
Alex Kriuchykhin
5f1c6bf2f0
Fix multiple issues after Rails upgrade [SCI-8780] (#5716) 2023-07-05 12:43:23 +02:00
Anton
9a5abfabf7 Move js gems to packages [SCI-8772] 2023-07-05 12:03:44 +02:00
artoscinote
85ad167998
Merge pull request #5660 from artoscinote/ma_SCI_8506 
Make label print modal work globally [SCI-8506]
 2023-07-05 09:53:56 +02:00
Alex Kriuchykhin
b7e04972e1
Implement model and controller for shareable links, update team model [SCI-8648] (#5693) 2023-07-03 15:54:11 +02:00
artoscinote
fc7a04d0f9
Merge pull request #5649 from G-Chubinidze/gc_SCI_7524 
Settings - My preferences - Date formats appear duplicated [SCO-7524]
 2023-07-03 14:49:40 +02:00
Anton
b956f9de25 Remove bootstrap form 2023-07-03 12:59:13 +02:00
Soufiane
9d70d35491
Implement share button on task [SCI-8650] (#5691) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-29 13:38:59 +02:00
Soufiane
1a9ef4a1d5
Update the Tasks screens for the Shareable-links feature [SCI-8649] (#5679) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-29 11:17:41 +02:00
Martin Artnik
02a9813fb8 Show checkboxes for tasks in archived experiments [SCI-8692] 2023-06-28 15:57:15 +02:00
Martin Artnik
1d6f3cedc7 Add action toolbar to archived tasks card view [SCI-8691] 2023-06-28 15:39:03 +02:00
ajugo
563605e6ef
Implement share task toggle on settings page [SCI-8647] (#5686) 2023-06-28 11:47:41 +02:00
Anton
586d9eaf4b CSS fixes [SCI-8758][SCI-8759] 2023-06-27 20:31:25 +02:00
Anton
e2190cedde Small css fixes [SCI-8742] 2023-06-27 11:58:02 +02:00
artoscinote
5fe463d293
Merge pull request #5674 from sboursen-scinote/sb_SCI-8164-8726 
[SCI-8164][SCI-8726]
 2023-06-26 15:43:29 +02:00
sboursen-scinote
706c2e492b Fix CSS and icon inconsistencies [SCI-8164][SCI-8726] 
- Use the correct arrow-left/arrow-right icons.
- Show the tasks of active experiments in archived branch in the Navigator.
- Fix minor style issues in P/E/T.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-26 15:22:36 +02:00
artoscinote
fa60cb6589
Merge pull request #5664 from G-Chubinidze/gc_SCI_8476 
Breadcrumbs on label/protocol template page [SCI-8476]
 2023-06-26 13:00:19 +02:00
artoscinote
ec3e8a20cc
Merge pull request #5671 from sboursen-scinote/sb_SCI-8729 
Archived view broken after folder [SCI-8729]
 2023-06-26 11:55:08 +02:00
sboursen-scinote
49ac9a20d8 Fix folders style in table archived view [SCI-8729] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-24 13:20:46 +02:00
Soufiane
fdc4f4ddd7
Create an export_limit_exceeded model for repositories export [SCI-8730] (#5667) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-23 12:10:58 +02:00
Giga Chubinidze
ef94a4f2bb logic refactor, url removal 2023-06-23 13:39:54 +04:00
artoscinote
496fbc9eca
Merge pull request #5653 from rekonder/aj_SCI_8719 
Remove breadcrumbs project table and fix project filtering [SCI-8719]
 2023-06-23 09:54:00 +02:00
artoscinote
f1876b4f59
Merge pull request #5661 from okriuchykhin/ok_SCI_8710 
Fix breadcrumbs for archived view mode [SCI-8710]
 2023-06-23 09:50:03 +02:00
Giga Chubinidze
828e566698 changed logic to accomodate templates unique design 2023-06-23 11:26:53 +04:00
Oleksii Kriuchykhin
e86f0e76de Fix breadcrumbs for archived view mode [SCI-8710] 2023-06-22 15:41:37 +02:00
Martin Artnik
9364d139e0 Make label print modal work globally [SCI-8506] 2023-06-22 14:52:47 +02:00
Soufiane
9c2c767f9f
Fix Drag me Canvas button [SCI-8720] (#5652) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-22 13:45:44 +02:00
Andrej
3d2f9eae1e Remove breadcrumbs project table and fix filtering [SCI-8719] 2023-06-22 13:44:27 +02:00
Anton
8fac4c1b7c UI CSS fixes 2023-06-22 11:55:23 +02:00
G-Chubinidze
dfdab6e051
CSS: Issues with the projects page [SCI-8507] (#5648) 
* CSS: Issues with the projects page [SCI-8504]

* css fix

* added empty cells for folder row
 2023-06-22 10:38:36 +02:00
Giga Chubinidze
e77e2813bd Settings - My preferences - Date formats appear duplicated [SCO-7524] 2023-06-22 11:09:27 +04:00
Oleksii Kriuchykhin
66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
artoscinote
de10f32b0f
Add tailwind styles to sign in halt layout [SCI-8689] (#5642) 2023-06-21 12:41:31 +02:00
Anton
2030b71082 UI CSS Fixes 2023-06-21 12:02:18 +02:00
Soufiane
8b8fd1db42
Fix wicked_pdf asset pipeline [SCI-8684] (#5629) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-21 10:42:27 +02:00
G-Chubinidze
d686d746cb
updated breadcrumb logic for templates (#5609) 2023-06-21 10:27:21 +02:00
G-Chubinidze
a88adf7630
changed tooltips (#5639) 2023-06-21 10:00:46 +02:00
Soufiane
f3dcef44ac
Show checkmark on selected user role only [SCI-8699] (#5636) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-21 08:12:31 +02:00
aignatov-bio
55e75ffa91
Merge pull request #5635 from aignatov-bio/ai-sci-8662-ui-css-fixes 
UI css fixes [SCI-8662]
 2023-06-21 08:06:52 +02:00
aignatov-bio
0543a9a0c4
Merge pull request #5637 from aignatov-bio/ai-sci-8660-ui-css-fixes 
Fix UI css fixes [SCI-8660]
 2023-06-20 16:36:45 +02:00
Anton
f675034b7f Fix UI css fixes [SCI-8660] 2023-06-20 15:53:33 +02:00
Anton
73880619d6 UI css fixes [SCI-8662] 2023-06-20 13:41:42 +02:00
artoscinote
ad26237d02
Implement column resizing [SCI-7961] (#5596) 
* Patch datatables to support ColReorder + ColResize [SCI-7961]

* Implement repository column resizing [SCI-7961]

* Fix colResize and colReorder interactions [SCI-7961]

* Add styling improvements for column interactions [SCI-7961]

* Update grip icons [SCI-7961]

* Tweaks and fixes [SCI-7961]
 2023-06-20 12:52:02 +02:00
aignatov-bio
be42f6b0da
Revert "Fix logo size [SCI-8329]" 2023-06-20 10:22:39 +02:00
Anton
4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
aignatov-bio
245a58b5c1
Merge pull request #5626 from aignatov-bio/ai-sci-8659-fix-filters-save-button 
Revert save filter and clear reminders button [SCI-8659]
 2023-06-19 12:51:24 +02:00
Anton
1c1c42c88a Revert save filter and clear reminders button 2023-06-19 12:48:40 +02:00
artoscinote
62daa073ae
Merge pull request #5611 from G-Chubinidze/gc_SCI_8526 
Double scroller on assign item to task from inventory table [SCI-8526]
 2023-06-19 12:36:54 +02:00
ajugo
76b6d92d6e
Fix task duplication on experiment table page [SCI-8676] (#5618) 2023-06-19 11:20:56 +02:00
aignatov-bio
411e62b2bd
Merge pull request #5623 from aignatov-bio/ai-sci-8329-fix-logo-size 
Fix logo size [SCI-8329]
 2023-06-19 10:50:09 +02:00
artoscinote
36ae7e6ebd
Merge pull request #5621 from G-Chubinidze/gc_SCI_8673 
Search field on assign/assigned item to task [SCI-8673]
 2023-06-19 10:44:52 +02:00
Anton
58c17b1b00 Fix logo size [SCI-8329] 2023-06-19 10:44:13 +02:00
artoscinote
84cefeef40
Merge pull request #5620 from G-Chubinidze/gc_SCI_8645 
Buttons title (tooltip on hover) - top action toolbar [SCI-8645]
 2023-06-19 10:43:59 +02:00
artoscinote
8ba08c3797
Merge pull request #5619 from G-Chubinidze/gc_SCI_8406 
(A) label (instead of icons) in front of titles of archived elements [SCI-8406]
 2023-06-19 10:43:00 +02:00
Giga Chubinidze
44a5a1f3b2 Search field on assign/assigned item to task [SCI-8673] 2023-06-19 10:21:04 +04:00
G-Chubinidze
7c55585e1f
Merge branch 'develop' into gc_SCI_8645 2023-06-19 10:18:27 +04:00
Giga Chubinidze
aa6cc57160 (A) label (instead of icons) in front of titles of archived elements 2023-06-19 10:14:13 +04:00
Giga Chubinidze
96ff988c77 Buttons title (tooltip on hover) - top action toolbar [SCI-8645] 2023-06-19 10:04:58 +04:00