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

11151 commits

Author SHA1 Message Date
aignatov-bio 7a32703c1a
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability 2023-09-05 14:41:23 +02:00
aignatov-bio 647fb76910
Merge branch 'features/september-release' into ai-sci-9108-add-infinite-scroll 2023-09-05 14:40:03 +02:00
aignatov-bio c33243b962
Merge pull request #6126 from aignatov-bio/ai-sci-9141-add-title-to-tinymce-fields 
Add title to text component [SCI-9141]
 2023-09-05 14:32:42 +02:00
aignatov-bio c3a5bf2e37
Merge pull request #6136 from aignatov-bio/ai-sci-9195-fix-tinymce-sticky-header 
Fix tinymce header [SCI-9195]
 2023-09-05 14:31:20 +02:00
Anton b4659e88a9 Fix tinymce header [SCI-9195] 2023-09-05 12:06:48 +02:00
artoscinote 8d352b758a
Merge pull request #6133 from ivanscinote/SCI-9182-rearranging-content-within-a-result-modal-translation 
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
 2023-09-05 11:09:08 +02:00
Ivan Kljun 56744e2dcd Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182] 2023-09-05 11:02:39 +02:00
artoscinote c59ee1c358
Merge pull request #6132 from G-Chubinidze/gc_SCI_9179 
Archiving results doesn't work [SCI-9179]
 2023-09-05 10:53:43 +02:00
Giga Chubinidze b7da98c1dd Archiving results doesn't work [SCI-9179] 2023-09-05 11:55:15 +04:00
Ivan Kljun 54a8552901 Fix my_module_results_path and add id to experiments/tablejs tag [SCI-911] 2023-09-04 14:23:55 +02:00
Anton 86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
Giga Chubinidze 3b8669ed84 Add timestamps to results [SCI-9181] 2023-09-04 11:40:32 +04:00
Martin Artnik cb023cd9c8 Add back status_flow.scss, deleted by accident 2023-09-01 13:59:58 +02:00
artoscinote dc535bce52
Merge pull request #6121 from G-Chubinidze/gc_SCI_9186 
Button translation in the "Move to different result" Modal [sci-9186]
 2023-09-01 11:40:57 +02:00
artoscinote 7b73e03a5f
Merge pull request #6120 from G-Chubinidze/gc_SCI_9185 
Placeholder text in the "Move to different result" modal dropdown [SCI-9185]
 2023-09-01 11:40:34 +02:00
Giga Chubinidze b71323d720 changed object mutation/changed placeholder check 2023-09-01 13:37:48 +04:00
artoscinote 51227b5c65
Merge pull request #6119 from G-Chubinidze/gc_SCI_9081 
Placeholder text (titles, description field) [SCI-9081]
 2023-09-01 11:02:06 +02:00
Martin Artnik 3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
Giga Chubinidze 6db9134065 Button translation in the "Move to different result" Modal 2023-09-01 11:59:56 +04:00
Giga Chubinidze 100fdde5ca Placeholder text in the "Move to different result" modal dropdown 2023-09-01 11:49:43 +04:00
artoscinote 19026b936d
Merge pull request #6117 from artoscinote/ma_SCI_9180 
Fix result assets when duplicating [SCI-9180]
 2023-08-31 16:00:50 +02:00
Anton d2ffaa209c Fix results CSS [SCI-9177] 2023-08-31 15:53:38 +02:00
Martin Artnik 65e55acc06 Fix result assets when duplicating [SCI-9180] 2023-08-31 15:38:56 +02:00
artoscinote 142504743d
Merge pull request #6109 from artoscinote/ma_SCI_9107 
Fix up result element duplicate endpoints [SCI-9107]
 2023-08-30 15:59:39 +02:00
Anton 2d76e628be Add infinite scroll to results [SCI-9108] 2023-08-30 15:51:23 +02:00
G-Chubinidze 7a1b1b5cf5
UI rework of thumbnail view asset controls [SCI-9015] (#6104) 
* UI rework of thumbnail view asset controls [SCI-9015]

* styling change css -> tailwind
 2023-08-30 15:42:55 +02:00
Martin Artnik 8245ad9738 Fix up result element duplicate endpoints [SCI-9107] 2023-08-30 14:54:38 +02:00
Anton e9cd01467d Add custom colors to tailwind config [SCI-9124] 2023-08-30 13:21:51 +02:00
Martin Artnik 9c1948998d Revert "Fix Protocols.io modal not loading any protocols [SCI-9167]" 
This reverts commit 983daa0e67.
 2023-08-30 13:09:20 +02:00
aignatov-bio f5235a9b9d
Merge pull request #6097 from aignatov-bio/ai-sci-8980-scrolling-on-task-page 
Add sticky scrolling to task page [SCI-8980]
 2023-08-30 11:54:28 +02:00
Anton c496d2c763 Fix transaction rollback [SCI-9088] 2023-08-30 11:48:16 +02:00
Anton 6a287fa54f Add sticky scrolling to task page [SCI-8980] 2023-08-30 11:09:27 +02:00
wandji 645b6dbe16
Add sort options to dashboard current task dropdown [SCI-9121] (#6103) 2023-08-30 09:51:41 +02:00
artoscinote ffb8c7c455
Merge pull request #6100 from scinote-eln/hotfix/1.28.0.2 
Hotfix/1.28.0.2
 2023-08-29 16:31:04 +02:00
artoscinote fabc9ddd1d
Merge pull request #6099 from okriuchykhin/ok_SCI_9170 
Add CSP tag to sign_in_halt layout [SCI-9170]
 2023-08-29 16:29:38 +02:00
Oleksii Kriuchykhin 75890a0053 Add CSP tag to sign_in_halt layout [SCI-9170] 2023-08-29 16:26:33 +02:00
Ivan Kljun d5066c1a5d Fix task status color on exp. list view [SCI-9159] 2023-08-29 16:12:00 +02:00
sboursen-scinote 983daa0e67 Fix Protocols.io modal not loading any protocols [SCI-9167] 
The JavaScript responsible for loading the list was attached to a
Partial that by itself was loaded using and AJAX request. Therefore,
The JavaScript was not being executed (no page reload). It was thus moved
to the parent partial (loaded on page reload) and called when the required
HTML is appended to the DOM.
 2023-08-29 14:26:07 +02:00
artoscinote 30cb9b0697
Fix RTE images in exports [SCI-9164] (#6095) 2023-08-29 13:50:43 +02:00
aignatov-bio e75d846930
Merge pull request #6085 from sboursen-scinote/sb_SCI-9138 
Fix description text area when creating a new team [SCI-9138]
 2023-08-29 10:33:06 +02:00
artoscinote c955c235d2
Fix user assignment endpoints [SCI-9150] (#6094) 
* Fix project assignments API endpoint [SCI-9150]

* Fix API endpoint for updating experiment assignments [SCI-9150]

* Fix API endpoint for updating task assignments [SCI-9150]
 2023-08-29 10:32:39 +02:00
artoscinote bb3a2f1c24
Fix applying resizable class [SCI-9137] (#6093) 2023-08-29 10:20:46 +02:00
aignatov-bio e8f839d719
Merge pull request #6088 from aignatov-bio/ai-sci-8977-ui-revamp-filters-modal 
Revamp filters flyouts [SCI-8977]
 2023-08-29 10:18:54 +02:00
sboursen-scinote 9f05f6d28b Fix description text area when creating a new team [SCI-9138] 2023-08-28 20:51:03 +02:00
aignatov-bio 1f382be2ca
Merge pull request #6091 from aignatov-bio/ai-sci-9144-fix-marvinjs-on-steps 
Fix marvinJS button initialisation [SCI-9144]
 2023-08-28 15:59:50 +02:00
Anton eb44724ece Fix marving JS button initialization [SCI-9144] 2023-08-28 15:53:58 +02:00
aignatov-bio 0cbcfadec9
Merge pull request #6090 from aignatov-bio/ai-sci-9149-fix-tinymce-in-safari 
Fix tinymce in safari [SCI-9149]
 2023-08-28 15:20:24 +02:00
Anton 8d7aa2aba5 Fix tinymce in safari [SCI-9149] 2023-08-28 15:17:15 +02:00
artoscinote 90f23cc61c
Fix API endpoints for user assignments [SCI-9150] (#6089) 
* Fix project assignments API endpoint [SCI-9150]

* Fix API endpoint for updating experiment assignments [SCI-9150]

* Fix API endpoint for updating task assignments [SCI-9150]
 2023-08-28 15:13:30 +02:00
Alex Kriuchykhin 165b7febcf
Fix JS errors on text results creation/editing [SCI-9140] (#6086) 2023-08-28 14:53:09 +02:00