Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PBL-32835 Upgrade to Django 1.9 and use django-pipline #279

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open

PBL-32835 Upgrade to Django 1.9 and use django-pipline #279

wants to merge 42 commits into from

Commits on Jan 28, 2016

  1. Upgrade to Django 1.9.1

    Joseph Atkins-Turkish committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    55db94d View commit details
    Browse the repository at this point in the history

  2. Updated bootstrap/procfile/post_compile configuration

    Joseph Atkins-Turkish committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    009d320 View commit details
    Browse the repository at this point in the history

  3. Renamed 'auth' app to 'site_auth' to fix app name conflict.

    Joseph Atkins-Turkish committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    b1a0e8c View commit details
    Browse the repository at this point in the history

  4. Use 'celery worker -A cloudpebble' in Procfile

    Joseph Atkins-Turkish committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    f24a2ef View commit details
    Browse the repository at this point in the history

  5. Fixied some errors and updated some requirements.

    Joseph Atkins-Turkish committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    ee4480f View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2016

  1. Added django-pipeline support

    Joseph Atkins-Turkish committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    c38c98f View commit details
    Browse the repository at this point in the history

  2. Added staticfiles to .gitignore

    Joseph Atkins-Turkish committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    4613a5d View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2016

  1. Merge branch 'master' into feature/django-1.9

    Joseph Atkins-Turkish committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    b9c6c8f View commit details
    Browse the repository at this point in the history

  2. Upgrade to Django 1.9.2 & migrate --fake-initial in post_compile

    Joseph Atkins-Turkish committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    3ac0aaf View commit details
    Browse the repository at this point in the history

  3. Update initial migration with latest changes

    Joseph Atkins-Turkish committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    257f121 View commit details
    Browse the repository at this point in the history

  4. Support CSS compression with sourcemaps

    Joseph Atkins-Turkish committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    056afe4 View commit details
    Browse the repository at this point in the history

  5. Updated DEBUG=False logging to use console.

    Joseph Atkins-Turkish committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    93dc170 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2016

  1. Neatened stuff.

    Joseph Atkins-Turkish committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    a85a7df View commit details
    Browse the repository at this point in the history

  2. Use absolute BASE_DIR and STATIC_ROOT, and uglify-js

    Joseph Atkins-Turkish committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    9c02541 View commit details
    Browse the repository at this point in the history

  3. Try replacing dj_static with whitenoise

    Joseph Atkins-Turkish committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    16574fd View commit details
    Browse the repository at this point in the history

  4. Try enabling gzip compression

    Joseph Atkins-Turkish committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    1724057 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2016

  1. Set up S3 on first access instead of at module import time.

    Joseph Atkins-Turkish committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    ed9bcfe View commit details
    Browse the repository at this point in the history

  2. Corrected BucketHolder logic.

    Joseph Atkins-Turkish committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    c304cf5 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2016

  1. Set BucketHolder self.configured *after* actually configuring

    Joseph Atkins-Turkish committed Mar 25, 2016
    Configuration menu
    Copy the full SHA
    e22b6d4 View commit details
    Browse the repository at this point in the history

  2. s3.py Formatting fixes

    Joseph Atkins-Turkish committed Mar 25, 2016
    Configuration menu
    Copy the full SHA
    8fa0765 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2016

  1. Removed staticfiles_storage toggle

    Joseph Atkins-Turkish committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    ece69cf View commit details
    Browse the repository at this point in the history

  2. Fixed issues with django-pipeline speed in Development mode.

    Joseph Atkins-Turkish committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    8d43772 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/django-1.9 

    Conflicts:
	ide/tasks/keen_task.py
	requirements.txt
    Joseph Atkins-Turkish committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    a15d5e9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'task/update-python' into feature/django-1.9 

    Conflicts:
	requirements.txt
	utils/s3.py
    Joseph Atkins-Turkish committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    e7db207 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2016

  1. Bumped packages and updated project for compataility

    Joseph Atkins-Turkish committed Apr 15, 2016
    Configuration menu
    Copy the full SHA
    fb4b975 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2016

  1. Finders/storages changes

    Joseph Atkins-Turkish committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    3be02da View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2016

  1. Merge branch 'task/update-python' into feature/django-1.9

    Joseph Atkins-Turkish committed Apr 28, 2016
    Configuration menu
    Copy the full SHA
    db1d1c5 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2016

  1. Merge branch 'task/update-python' into feature/django-1.9 

    Conflicts:
	requirements.txt
    Joseph Atkins-Turkish committed May 3, 2016
    Configuration menu
    Copy the full SHA
    09786f5 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2016

  1. Merge branch 'feature/s3_bucketholder' into feature/django-1.9

    Joseph Atkins-Turkish committed May 10, 2016
    Configuration menu
    Copy the full SHA
    1e33def View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/travis' into feature/django-1.9 

    Conflicts:
	cloudpebble/settings.py
	requirements.txt
    Joseph Atkins-Turkish committed May 10, 2016
    Configuration menu
    Copy the full SHA
    6b05f12 View commit details
    Browse the repository at this point in the history

  3. Removed duplicate requirement

    Joseph Atkins-Turkish committed May 10, 2016
    Configuration menu
    Copy the full SHA
    e9191cc View commit details
    Browse the repository at this point in the history

Commits on May 11, 2016

  1. Merge branch 'feature/travis' into feature/django-1.9

    Joseph Atkins-Turkish committed May 11, 2016
    Configuration menu
    Copy the full SHA
    978d66f View commit details
    Browse the repository at this point in the history

Commits on May 19, 2016

  1. Merge branch 'feature/improved-logging' into feature/django-1.9 

    Conflicts:
	cloudpebble/settings.py
	ide/tasks/archive.py
	ide/tasks/git.py
    Joseph Atkins-Turkish committed May 19, 2016
    Configuration menu
    Copy the full SHA
    d5185df View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2016

  1. Merge branch 'master' into feature/django-1.9 

    # Conflicts:
#	cloudpebble/settings.py
#	ide/tasks/archive.py
#	ide/tasks/gist.py
#	ide/templates/ide/project.html
#	requirements.txt
#	root/templates/common/base.html
#	utils/s3.py
    Joseph Atkins-Turkish committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    e93a4be View commit details
    Browse the repository at this point in the history

  2. Rebuilt initial migration

    Joseph Atkins-Turkish committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    2c06d97 View commit details
    Browse the repository at this point in the history

  3. Backported improvements from test-bench

    Joseph Atkins-Turkish committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    17810ba View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2016

  1. Merge branch 'master' into feature/django-1.9

    Joseph Atkins-Turkish committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    2d6bc84 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2016

  1. Merge branch 'master' into feature/django-1.9 

    # Conflicts:
#	ide/models/build.py
#	ide/templates/ide/project.html
    Joseph Atkins-Turkish committed Aug 3, 2016
    Configuration menu
    Copy the full SHA
    d69ac58 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2016

  1. Update migrations.

    Joseph Atkins-Turkish committed Aug 5, 2016
    Configuration menu
    Copy the full SHA
    df1339e View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2016

  1. Merge branch 'master' into feature/django-1.9 

    # Conflicts:
#	Dockerfile
#	cloudpebble/settings.py
#	ide/tasks/archive.py
#	ide/tasks/build.py
#	package.json
    Joseph Atkins-Turkish committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    732e0ef View commit details
    Browse the repository at this point in the history

  2. Update initial migrations.

    Joseph Atkins-Turkish committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    b5371a7 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2016

  1. Merge with origin/master

    Chase Sillevis committed Dec 16, 2016
    Configuration menu
    Copy the full SHA
    9630157 View commit details
    Browse the repository at this point in the history