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

14837 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
wandji
bed7f574f0
Hide align toolbar option in OVE editor [SCI-9113] (#6113) 
* Hide align toolbar option in OVE editor [SCI-9113]

* Hide alligment toolbar in OVE editor [SCI-9113]
 2023-09-01 10:18:36 +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
Giga Chubinidze
793ab0eb99 Placeholder text (titles, description field) [SCI-9081] 2023-09-01 10:58:00 +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
aignatov-bio
def8da1aac
Merge pull request #6118 from aignatov-bio/ai-sci-9177-add-css-to-results-page 
Fix results CSS [SCI-9177][SCI-9176]
 2023-08-31 15:59:54 +02:00
Anton
d2ffaa209c Fix results CSS [SCI-9177] 2023-08-31 15:53:38 +02:00
Oleksii Kriuchykhin
b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
Martin Artnik
65e55acc06 Fix result assets when duplicating [SCI-9180] 2023-08-31 15:38:56 +02:00
Oleksii Kriuchykhin
7781ee8695 Bump version to 1.28.1.2 2023-08-31 13:47:39 +02:00
wandji
167abe5239
Add .json extension to OVE import tooltip [SCI-9116] (#6112) 
* Add .json extension to OVE import tooltip [SCI-9116]

* Override import and downlod tooltip values [SCI-9116]
 2023-08-31 12:51:49 +02:00
Alex Kriuchykhin
d63ec9f927
Fix shareable links association on user model [SCI-9200] (#6114) 2023-08-31 11:48:35 +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
Oleksii Kriuchykhin
0afe1d2946 Bump version to 1.28.1.1 2023-08-30 13:31:30 +02:00
aignatov-bio
03851503c2
Merge pull request #6107 from aignatov-bio/ai-sci-9124-fix-colors-in-tailwind 
Add custom colors to tailwind config [SCI-9124]
 2023-08-30 13:31:07 +02:00
Alex Kriuchykhin
fd58a23e55
Handle situations when file preview was not yet generated for shared tasks [SCI-9183] (#6106) 2023-08-30 13:30:12 +02:00
artoscinote
fb177765da
Merge pull request #6108 from artoscinote/ma_SCI_9184 
Fix TinyMCE sticky header calculation [SCI-9184]
 2023-08-30 13:30:00 +02:00
Martin Artnik
c6e8bc1d2a Fix TinyMCE sticky header calculation [SCI-9184] 2023-08-30 13:28:36 +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
Oleksii Kriuchykhin
4ee4d9acf0 Bump version to 1.28.1 2023-08-30 10:30:48 +02:00
wandji
645b6dbe16
Add sort options to dashboard current task dropdown [SCI-9121] (#6103) 2023-08-30 09:51:41 +02:00
Martin Artnik
d6ffb326d1 Display show more for experiment description if there are more than 2 lines [SCI-9096] 2023-08-29 17:03:34 +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
artoscinote
809461273e
Bump version to 1.28.0.2 2023-08-29 16:29:13 +02:00
Oleksii Kriuchykhin
75890a0053 Add CSP tag to sign_in_halt layout [SCI-9170] 2023-08-29 16:26:33 +02:00
artoscinote
2b15d811a3
Merge pull request #6098 from ivanscinote/SCI-9159-task-status-text-is-black-on-experiment-list-view 
Fix task status color on exp. list view [SCI-9159]
 2023-08-29 16:18:48 +02:00
Ivan Kljun
d5066c1a5d Fix task status color on exp. list view [SCI-9159] 2023-08-29 16:12:00 +02:00
aignatov-bio
44e6b54085
Merge pull request #6096 from sboursen-scinote/sb_SCI-9167 
Fix: Protocols.io modal not loading any protocols [SCI-9167]
 2023-08-29 15:06:52 +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
wandji
c80e99bdbc
Add protocol activity group for protocol step sequence assets [SCI-9087] (#6078) 2023-08-29 09:42:51 +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