scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
13987 commits 70 branches 179 tags 165 MiB
Commit graph

4187 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Giga Chubinidze 73e35994d5 new icon changes 2023-08-09 04:19:57 +04: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
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
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
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
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
Oleksii Kriuchykhin b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
ivanscinote 242df0632d
Merge branch 'features/august-release' into SCI-8807-notifications 2023-08-02 13:40:06 +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
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 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