1. 30 Jul, 2019 1 commit
  2. 27 Jul, 2019 2 commits
  3. 26 Jul, 2019 5 commits
  4. 25 Jul, 2019 1 commit
  5. 24 Jul, 2019 1 commit
  6. 23 Jul, 2019 2 commits
  7. 22 Jul, 2019 2 commits
  8. 21 Jul, 2019 7 commits
  9. 20 Jul, 2019 1 commit
  10. 17 Jul, 2019 2 commits
    • Ozzieisaacs's avatar
      Merge branch 'Develop' · 26a7d9ef
      Ozzieisaacs authored
      # Conflicts:
      #	cps/__init__.py
      #	cps/about.py
      #	cps/admin.py
      #	cps/cli.py
      #	cps/config_sql.py
      #	cps/constants.py
      #	cps/converter.py
      #	cps/db.py
      #	cps/editbooks.py
      #	cps/gdriveutils.py
      #	cps/helper.py
      #	cps/logger.py
      #	cps/oauth.py
      #	cps/server.py
      #	cps/services/simpleldap.py
      #	cps/ub.py
      #	cps/web.py
      #	cps/worker.py
      #	optional-requirements.txt
      #	setup.cfg
      #	setup.py
      26a7d9ef
    • Daniel Pavel's avatar
      fixed custom columns handling on dispose · 847dbfc0
      Daniel Pavel authored
      847dbfc0
  11. 16 Jul, 2019 4 commits
  12. 15 Jul, 2019 3 commits
  13. 14 Jul, 2019 7 commits
  14. 13 Jul, 2019 2 commits
    • Ozzieisaacs's avatar
      Merge branch 'Develop' · 4708347c
      Ozzieisaacs authored
      # 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
      4708347c
    • Ozzieisaacs's avatar
      Updated dependencies · 37736e11
      Ozzieisaacs authored
      37736e11