Code

v1.4.0 prep - DO NOT MERGE#32

Code

Open

joncotton wants to merge 16 commits intoarmstrong:v1.4.0-preparmstrong/armstrong.core.arm_content:v1.4.0-prepfrom joncotton:v1.4.0-prepjoncotton/armstrong.core.arm_content:v1.4.0-prepCopy head branch name to clipboard

+136-391

Commits

Commits on Jan 14, 2014

• Cleanup - removing unnecessary imports.

  joncotton

  committed
  e415562

  Copy full SHA for e415562

• WIP cleanup - removing unnecessary import and found two incorrect tests.

  Show description for 531c3b9
  joncotton

  committed
  531c3b9

  Copy full SHA for 531c3b9

• Clarify the two tests previously discussed to better reflect what is happening.

  Show description for 7b82534
  joncotton

  committed
  7b82534

  Copy full SHA for 7b82534

• Import cleanup for test files. Don't rely on AppsContent for tests (that seems dangerously circular). Remove static test file, setting and url route for the removed "audio" component.

  joncotton

  committed
  78fd9c8

  Copy full SHA for 78fd9c8

• Drop Lettuce (as we've been doing with other components and because it breaks testing).

  joncotton

  committed
  881c215

  Copy full SHA for 881c215

• Update gitignore

  joncotton

  committed
  f292e8a

  Copy full SHA for f292e8a

Commits on Jan 21, 2014

• Readme and informational updates.

  joncotton

  committed
  ac6a076

  Copy full SHA for ac6a076

• Requirement updates for Sorl.

  Show description for f8a6318
  joncotton

  committed
  f8a6318

  Copy full SHA for f8a6318

• Requirements - Remove fixed Django requirement. Remove Reversion since it isn't used. Update model-utils to minimum version for Django 1.5 and max version for Django 1.3.

  joncotton

  committed
  4616f9f

  Copy full SHA for 4616f9f

Commits on Jan 22, 2014

• Django 1.4+ URL imports

  joncotton

  committed
  5111b31

  Copy full SHA for 5111b31

• TravisCI - test on Python 2.6, use South, update Django versions

  joncotton

  committed
  1eaef57

  Copy full SHA for 1eaef57

• More test cleanup and fix a circular import issue on Python 2.6 with Django 1.4. Use standard method to override settings.

  Show description for d6f8e02
  joncotton

  committed
  d6f8e02

  Copy full SHA for d6f8e02

• Fix tests in Django 1.4/proper cleanup. Should have been part of 78fd9c8.

  joncotton

  committed
  9a4c17e

  Copy full SHA for 9a4c17e

Commits on Jan 26, 2014

• Tests - tidy imports and remove an unused function.

  joncotton

  committed
  a57507b

  Copy full SHA for a57507b

• Tests - simplify and pep8 publication test.

  joncotton

  committed
  055df86

  Copy full SHA for 055df86

• Tests - simplify ContentBase testing. Using the support models means we don't need magic to trick Django into making concrete model instances.

  Show description for 895e67f
  joncotton

  committed
  895e67f

  Copy full SHA for 895e67f