Commit Graph

10 Commits (37a80b935d452a30699dfebc2ee240c7ce7dd939)

Author SHA1 Message Date
Ozzieisaacs 52489a484a Merge remote-tracking branch 'Knepherbird/master' into master
# Conflicts:
#	cps/jinjia.py
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/web.py
4 years ago
Ozzieisaacs 6e6f144b7a Paginated search and advanced search
Wraparound on books list deactivated
4 years ago
OzzieIsaacs ad144922fb Merge with master 4 years ago
Ozzie Isaacs 94ad93ebd7 Added series like custom columns #1501 4 years ago
Michael Knepher 7e0d9fbace series_index filter to show x.0 as x 5 years ago
Ozzieisaacs 827b0c6e50 Changed pubdate to timestamp 5 years ago
Ozzieisaacs 5f0660a4e5 Refactored helper.py and db.py 5 years ago
Ozzieisaacs 24c743d23d Code cosmetics 5 years ago
Ozzieisaacs 2ea45b1fdc Removed shebang on non executable scripts 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