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
|
2019-07-13 20:54:21 +02:00 |
|
lorek123
|
d508b909d1
|
update js and css libs, especially to fix xss in Jquery and Bootstrap
|
2019-02-10 18:17:33 +01:00 |
|
Ozzieisaacs
|
9128615f48
|
Fix #424
Fix #425
|
2019-01-26 09:43:17 +01:00 |
|
Ozzieisaacs
|
ec81a3cd92
|
Fix Authors page pagination
Update infinite scroll plugin
|
2019-01-25 21:58:19 +01:00 |
|
OzzieIsaacs
|
cb5f196f4b
|
Merge remote-tracking branch 'adv/modal-details'
# Conflicts:
# cps/static/js/main.js
# cps/templates/detail.html
|
2017-07-23 14:03:02 +02:00 |
|
janeczku
|
13919a1d23
|
Move vendored css/js to libs folders to fix language stats
|
2017-02-07 19:21:14 +01:00 |
|