Code

I787 production#789

Code

Closed

rdhyee wants to merge 20 commits intoekansa:mainekansa/open-context-py:mainfrom rdhyee:I787_productionrdhyee/open-context-py:I787_productionCopy head branch name to clipboard

+219-218

Commits

Commits on Nov 12, 2019

• Merge pull request ekansa#763 from ekansa/master

  Show description for 7997e69
  rdhyee

  authored
  7997e69

  Copy full SHA for 7997e69

Commits on Nov 13, 2019

• Merge pull request ekansa#764 from ekansa/master

  Show description for 48cf4f8
  rdhyee

  authored
  48cf4f8

  Copy full SHA for 48cf4f8

Commits on Dec 15, 2019

• Merritt image proxying

  ekansa

  committed
  df4ecf3

  Copy full SHA for df4ecf3

• Do client side (javascript) check for Merritt hosted images

  ekansa

  committed
  657eae5

  Copy full SHA for 657eae5

• Do second and third attempts to get Merritt images

  ekansa

  committed
  9be1d21

  Copy full SHA for 9be1d21

• Lookup images on scroll position changes

  ekansa

  committed
  9f2eadf

  Copy full SHA for 9f2eadf

• More tweeking of merritt proxies

  ekansa

  committed
  4f21c2d

  Copy full SHA for 4f21c2d

• Easier to JS for merritt proxy

  ekansa

  committed
  2cd0661

  Copy full SHA for 2cd0661

Commits on Dec 17, 2019

• Update image-proxy.js

  ekansa

  committed
  7c08b29

  Copy full SHA for 7c08b29

• Update bot herding

  ekansa

  committed
  6695c7f

  Copy full SHA for 6695c7f

Commits on Jan 11, 2020

• updated ssl cert for *.opencontext.org and .opencontext.org via certbot

  rdhyee

  committed
  b35fb99

  Copy full SHA for b35fb99

Commits on Jan 21, 2020

• Merge pull request ekansa#774 from rdhyee/ssl_cert_201912_prod

  Show description for 7352a06
  rdhyee

  authored
  7352a06

  Copy full SHA for 7352a06

Commits on Jan 24, 2020

• Pipfile / Pipfile.lock update to accompany upgrade to Django 2.2.9

  rdhyee

  committed
  a292a60

  Copy full SHA for a292a60

• Merge pull request ekansa#776 from rdhyee/production

  Show description for b34c866
  ekansa

  authored
  b34c866

  Copy full SHA for b34c866

Commits on Feb 15, 2020

• Issue ekansa#780: update te SSL certs for 2020.02

  rdhyee

  committed
  ad4e368

  Copy full SHA for ad4e368

• Merge pull request ekansa#782 from rdhyee/I780_production

  Show description for 5a4d936
  rdhyee

  authored
  5a4d936

  Copy full SHA for 5a4d936

Commits on Mar 27, 2020

• Merge branch 'master' into production

  ekansa

  committed
  c66cd25

  Copy full SHA for c66cd25

Commits on Mar 28, 2020

• Merge pull request ekansa#784 from ekansa/master

  Show description for ec42363
  ekansa

  authored
  ec42363

  Copy full SHA for ec42363

Commits on Mar 29, 2020

• Merge pull request ekansa#785 from ekansa/master

  Show description for fb90a26
  ekansa

  authored
  fb90a26

  Copy full SHA for fb90a26

• Issue ekansa#787: set maximum Django version to 2.x for now

  rdhyee

  committed
  4b34047

  Copy full SHA for 4b34047