Permalink
Commits on Mar 1, 2017
  1. Merge pull request #96 from ccnmtl/nikolas-patch-1

    Fix documentation sidebar
    sdreher committed on GitHub Mar 1, 2017
  2. Fix documentation sidebar

    nikolas committed on GitHub Mar 1, 2017
Commits on Nov 28, 2016
  1. Default to SimpleImageBlock instead of ImageBlock

    To avoid depending on sorl.
    nikolas committed with thraxil Nov 25, 2016
Commits on Nov 21, 2016
  1. Merge pull request #94 from ccnmtl/docker-compose

    docker + docker-compose setup
    nikolas committed on GitHub Nov 21, 2016
  2. Merge pull request #93 from ccnmtl/make-mk

    include make.mk
    nikolas committed on GitHub Nov 21, 2016
  3. docker + docker-compose setup

    thraxil committed Nov 21, 2016
  4. include make.mk

    so makefiles can automatically be updated
    thraxil committed Nov 21, 2016
Commits on Nov 18, 2016
  1. misc. documentation updates

    nikolas committed with thraxil Nov 18, 2016
  2. ⬆️ virtualenv 15.1.0

    This update required wheel to be present in virtualenv_support
    nikolas committed with thraxil Nov 18, 2016
  3. Remove bootstrap.py

    nikolas committed with thraxil Nov 18, 2016
  4. ⬆️ django 1.10.3

    nikolas committed with thraxil Nov 18, 2016
  5. Add wagtail

    nikolas committed with thraxil Nov 18, 2016
  6. Use standard makefiles

    nikolas committed with thraxil Nov 18, 2016
  7. update node dependencies

    nikolas committed with thraxil Nov 18, 2016
Commits on Dec 21, 2015
  1. Merge pull request #84 from ccnmtl/ccnmtlsettings

    convert to ccnmtlsettings
    nikolas committed Dec 21, 2015
Commits on Dec 15, 2015
  1. convert to ccnmtlsettings

    thraxil committed Dec 15, 2015
  2. Merge pull request #83 from ccnmtl/library-updates

    ⬆️ library version bumps
    nikolas committed Dec 15, 2015
  3. ⬆️ library version bumps

    thraxil committed Dec 15, 2015
Commits on Oct 12, 2015
  1. Merge pull request #82 from ccnmtl/update-wsgi-syntax

    Use new wsgi syntax in apache dir
    thraxil committed Oct 12, 2015
Commits on Oct 10, 2015
  1. Merge pull request #81 from ccnmtl/nikolas-patch-11

    fix docs link
    sdreher committed Oct 10, 2015
Commits on Oct 8, 2015
  1. Use new wsgi syntax in apache dir

    nikolas committed Oct 8, 2015
  2. fix docs link

    nikolas committed Oct 8, 2015
Commits on Oct 7, 2015
  1. Merge pull request #80 from ccnmtl/nikolas-patch-11

    ⬆️ wheel 0.26.0
    sdreher committed Oct 7, 2015
  2. ⬆️ wheel 0.26.0

    nikolas committed Oct 7, 2015
Commits on Aug 17, 2015
  1. Merge pull request #78 from ccnmtl/nikolas-patch-10

    add docs icon to readme
    thraxil committed Aug 17, 2015
Commits on Aug 16, 2015
  1. add docs icon to readme

    nikolas committed Aug 16, 2015
Commits on Aug 15, 2015
  1. Merge pull request #77 from ccnmtl/docs

    Add basic docs for js unit testing
    sdreher committed Aug 15, 2015
Commits on Aug 14, 2015
  1. Add basic docs for js unit testing

    This just adds a sphinx document to give some explanation to
    the mocha testing stuff I added.
    
    I plan on getting more in-depth here, and adding some examples
    for testing ajax interactions, Backbone views and models, etc.,
    but at the moment I've gotten stuck because the test runner
    fails any time I try and load jQuery via a requirejs module
    like utils.js. Here's a post about the problem:
    http://www.columbia.edu/~njn2118/journal/2015/8/14.html
    
    Once I resolve this I can move forward and add some more useful
    examples here.
    nikolas committed with nikolas Aug 12, 2015
Commits on Aug 6, 2015
  1. Merge pull request #76 from ccnmtl/remove-jed

    remove jed from superuser whitelist
    sdreher committed Aug 6, 2015
  2. remove jed from superuser whitelist

    thraxil committed Aug 6, 2015
Commits on Jul 31, 2015
  1. Merge pull request #75 from ccnmtl/new-travis-infrastructure

    upgrade to new travis container infrastructure
    nikolas committed Jul 31, 2015
Commits on Jul 30, 2015
  1. upgrade to new travis container infrastructure

    thraxil committed Jul 30, 2015
Commits on Jul 15, 2015
  1. Merge pull request #74 from ccnmtl/ssl-sni-fix

    support SSL SNI
    nikolas committed Jul 15, 2015
  2. support SSL SNI

    At some point recently, we deployed SSL certificates to neptune for
    non-CCNMTL domains. This uses [SNI](https://en.wikipedia.org/wiki/Server_Name_Indication) to get the
    correct certificate to the browser.
    
    At this point, SNI is generally well supported enough that most things
    just work. Unfortunately, python's built in http/ssl libraries don't support
    SNI out of the box. According to this:
    
    http://docs.python-requests.org/en/latest/community/faq/#what-are-hostname-doesn-t-match-errors
    
    and this:
    
    https://stackoverflow.com/questions/18578439/using-requests-with-tls-doesnt-give-sni-support/18579484#18579484
    
    there need to be a couple extra libraries installed for SNI.
    
    Where this hits us is with Sentry. `sentry.ccnmtl.columbia.edu` resolves
    to neptune, which is now using SNI. So all of our apps need to be
    patched to handle SNI so they can submit errors to Sentry.
    thraxil committed Jul 15, 2015