resolve conflict
Description
Description
Details
Details
- Committed
borel Mon, Dec 23, 15:26 - Pushed
borel Mon, Dec 23, 15:26 - Parents
- rOACCT2e74391c0d8e: OACT closure announcement
rOACCT0615c7ce0b3f: fix broken Docker build after Debian version change - Branches
- Unknown
- Tags
- References
- staging
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
2e74391c0d8e | borel | OACT closure announcement | Dec 23 2024 | |||
9a2bd6dc282c | borel | OACT closure announcement | Dec 23 2024 | |||
c2f7495829e9 | borel | OACT closure announcement | Dec 23 2024 | |||
f4453b11c1ec | borel | OACT closure announcement | Dec 23 2024 | |||
b7129946b228 | borel | typo fix | Dec 22 2023 | |||
cb07d9dfd6c4 | borel | No joy. Back to Debian Bullseye | Dec 22 2023 | |||
f251632675c4 | borel | testing fix for apt error with Debian Bookworm | Dec 22 2023 | |||
36b9b565e991 | borel | testing Python and Debian upgrade | Dec 22 2023 | |||
9c84f6f438d8 | borel | upgrade to https://deb.nodesource.com/setup_20.x | Aug 9 2023 | |||
b89fb4146fca | borel | revert to standard Debian node/npm packages | Aug 9 2023 | |||
956a891f5089 | borel | change Debian package for npm | Aug 9 2023 | |||
a84bbbdf7faa | borel | testing Debian version work-around for build failure | Aug 9 2023 | |||
bb69e8fb05bd | borel | use ROR instead of funder id in the frontend | Apr 12 2023 | |||
8f0159354c35 | borel | Use ROR instead of institution id in the frontend | Apr 12 2023 | |||
b2e714284a5d | borel | conditionset API filter by ROR working, ISSN not quite yet | Apr 12 2023 | |||
dd18357f1600 | borel | API search for journals by classIssn.issn | Apr 12 2023 | |||
c19147ea74e9 | borel | performance improvement for condition_set_light API | Apr 5 2023 | |||
c40695eab043 | borel | tests with the journals API serializers | Apr 4 2023 | |||
86e971dd29bd | borel | script to save API log before a data reload | Apr 3 2023 | |||
de7da1a61917 | borel | add missing parts in TermLightSerializer | Mar 31 2023 |