alanorth/cgspace-notes
1
0
Fork 0
mirror of https://github.com/alanorth/cgspace-notes.git synced 2024-11-26 08:28:18 +01:00
Code Issues Projects Releases Wiki Activity

Update notes for 2016-10

Browse Source
This commit is contained in:
Alan Orth 2018-04-04 16:25:57 +03:00
parent 56626d1245
commit dcea6057db
Signed by: alanorth
GPG Key ID: 0FB860CC9C45B1B9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/posts/2016-10.md
View File

@ -105,8 +105,10 @@ $ ./fix-metadata-values.py -i ccafs-authors-oct-16.csv -f dc.contributor.author
- Start working on DSpace 5.5 porting work again: - Start working on DSpace 5.5 porting work again:
$ git checkout -b 5_x-55 5_x-prod ```
$ git rebase -i dspace-5.5 $ git checkout -b 5_x-55 5_x-prod
$ git rebase -i dspace-5.5
```
- Have to fix about ten merge conflicts, mostly in the SCSS for the CGIAR theme - Have to fix about ten merge conflicts, mostly in the SCSS for the CGIAR theme
- Skip 1e34751b8cf17021f45d4cf2b9a5800c93fb4cb2 in lieu of upstream's 55e623d1c2b8b7b1fa45db6728e172e06bfa8598 (fixes X-Forwarded-For header) because I had made the same fix myself and it's better to use the upstream one - Skip 1e34751b8cf17021f45d4cf2b9a5800c93fb4cb2 in lieu of upstream's 55e623d1c2b8b7b1fa45db6728e172e06bfa8598 (fixes X-Forwarded-For header) because I had made the same fix myself and it's better to use the upstream one