Ozzieisaacs
|
9fc0c3b3de
|
Merge remote-tracking branch 'English_texts/master'
# Conflicts:
# cps/templates/config_edit.html
# cps/templates/config_view_edit.html
# cps/templates/layout.html
# cps/templates/search_form.html
# cps/templates/user_edit.html
|
5 years ago |
|
Ozzieisaacs
|
7c89f0b5b9
|
Merge with branch develop
Release version
|
5 years ago |
|
Josh O'Brien
|
8f518993a4
|
Merge branch 'master' into master
|
5 years ago |
|
Ozzieisaacs
|
6698773d81
|
Improved testability
|
5 years ago |
|
Josh O'Brien
|
9b49125776
|
English Language Updates
Changes to provide consistency for English language.
|
5 years ago |
|
Kyos
|
c93dd32179
|
Fixed typo and column size for LG screens
|
5 years ago |
|
Kyos
|
7165826011
|
Adds Authors, Series and Book Cover to the shelf order view
|
5 years ago |
|
Kyos
|
ada727a570
|
Adds Authors, Series and Book Cover to the shelf order view
|
5 years ago |
|
Ozzieisaacs
|
4708347c16
|
Merge branch 'Develop'
# Conflicts:
# MANIFEST.in
# README.md
# cps/helper.py
# cps/static/js/archive/archive.js
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/updater.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
|
6 years ago |
|
OzzieIsaacs
|
ba8e107402
|
Move vendored css/js to libs folders to fix language stats
|
8 years ago |
|
OzzieIsaacs
|
ea2e8205e3
|
Added code for rearranging shelfs #73
|
8 years ago |