Homec4science

resolve conflict

Authored by borel on Mon, Dec 23, 15:26.

Description

resolve conflict

Details

Committed
borelMon, Dec 23, 15:26
Pushed
borelMon, Dec 23, 15:26
Parents
rOACCT2e74391c0d8e: OACT closure announcement
rOACCT0615c7ce0b3f: fix broken Docker build after Debian version change
Branches
Unknown
Tags
Unknown
References
staging

Merged Changes

CommitAuthorDetailsCommitted
2e74391c0d8eborel
OACT closure announcement 
Dec 23 2024
9a2bd6dc282cborel
OACT closure announcement 
Dec 23 2024
c2f7495829e9borel
OACT closure announcement 
Dec 23 2024
f4453b11c1ecborel
OACT closure announcement 
Dec 23 2024
b7129946b228borel
typo fix 
Dec 22 2023
cb07d9dfd6c4borel
No joy. Back to Debian Bullseye 
Dec 22 2023
f251632675c4borel
testing fix for apt error with Debian Bookworm 
Dec 22 2023
36b9b565e991borel
testing Python and Debian upgrade 
Dec 22 2023
9c84f6f438d8borel
upgrade to https://deb.nodesource.com/setup_20.x 
Aug 9 2023
b89fb4146fcaborel
revert to standard Debian node/npm packages 
Aug 9 2023
956a891f5089borel
change Debian package for npm 
Aug 9 2023
a84bbbdf7faaborel
testing Debian version work-around for build failure 
Aug 9 2023
bb69e8fb05bdborel
use ROR instead of funder id in the frontend 
Apr 12 2023
8f0159354c35borel
Use ROR instead of institution id in the frontend 
Apr 12 2023
b2e714284a5dborel
conditionset API filter by ROR working, ISSN not quite yet 
Apr 12 2023
dd18357f1600borel
API search for journals by classIssn.issn 
Apr 12 2023
c19147ea74e9borel
performance improvement for condition_set_light API 
Apr 5 2023
c40695eab043borel
tests with the journals API serializers 
Apr 4 2023
86e971dd29bdborel
script to save API log before a data reload 
Apr 3 2023
de7da1a61917borel
add missing parts in TermLightSerializer 
Mar 31 2023