Commits · 1910ad9ad0b6cb145b84536f39531d94c456e111 · OpenEdx / django-pipeline

12 Jan, 2013 3 commits
- Merge branch 'master' into jinja-ext · 1910ad9a
```
Conflicts:
	pipeline/jinja2/ext.py
	tests/tests/__init__.py
	tests/tests/test_jinja2.py
```
  Timothée Peignier committed Jan 12, 2013
  1910ad9a Browse Files
- Merge branch '1.2.X' · 1e1df0c0
```
Conflicts:
	docs/conf.py
	setup.py
```
  Timothée Peignier committed Jan 12, 2013
  1e1df0c0 Browse Files
- fix yuglify docs · 05d44760
  Timothée Peignier committed Jan 12, 2013
  
  05d44760 Browse Files
04 Jan, 2013 3 commits
- bump version · ed163be8
  Timothée Peignier committed Jan 04, 2013
  
  ed163be8 Browse Files
- fix default settings. close #169 · 8a6daaea
  Timothée Peignier committed Jan 04, 2013
  
  8a6daaea Browse Files
- fix default settings. close #169 · d84c82a9
  Timothée Peignier committed Jan 04, 2013
  
  d84c82a9 Browse Files
31 Dec, 2012 5 commits
- fix env declaration · c6adf747
  Timothée Peignier committed Dec 31, 2012
  
  c6adf747 Browse Files
- remove pypy from build temporarely · f09bd7ca
  Timothée Peignier committed Dec 31, 2012
  
  f09bd7ca Browse Files
- fix glob tests · afc34156
  Timothée Peignier committed Dec 31, 2012
  
  afc34156 Browse Files
- Merge branch 'pipeline-next' · f48646de
```
Conflicts:
	docs/conf.py
	setup.py
```
  Timothée Peignier committed Dec 31, 2012
  f48646de Browse Files
- use git repository for Django 1.5 · 8c26c5bb
  Timothée Peignier committed Dec 31, 2012
  
  8c26c5bb Browse Files
24 Dec, 2012 1 commit
- continue working on this · d4b24e31
  Timothée Peignier committed Dec 24, 2012
  
  d4b24e31 Browse Files
23 Dec, 2012 4 commits
- more work · bbc0a4e1
  Timothée Peignier committed Dec 23, 2012
  
  bbc0a4e1 Browse Files
- remove mention of jinja tests · ed80ec87
  Timothée Peignier committed Dec 23, 2012
  
  ed80ec87 Browse Files
- remove tests · ecc7f242
  Timothée Peignier committed Dec 23, 2012
  
  ecc7f242 Browse Files
- make jinja2 ext · 14ea9b65
  Timothée Peignier committed Dec 23, 2012
  
  14ea9b65 Browse Files
22 Dec, 2012 5 commits
- update changelog · 53e071ad
  Timothée Peignier committed Dec 22, 2012
  
  53e071ad Browse Files
- bump version · 7aebef02
  Timothée Peignier committed Dec 22, 2012
  
  7aebef02 Browse Files
- prepare version · ce34bf15
  Timothée Peignier committed Dec 22, 2012
  
  ce34bf15 Browse Files
- Merge branch 'master' into pipeline-next · 0e70c5da
```
Conflicts:
	pipeline/conf/settings.py
```
  Timothée Peignier committed Dec 22, 2012
  0e70c5da Browse Files
- separate yui compressor from yuglify compressor · 02c03f37
  Timothée Peignier committed Dec 22, 2012
  
  02c03f37 Browse Files
21 Dec, 2012 1 commit

Merge branch 'master' into pipeline-next · 277d1fe0

Conflicts:
	.travis.yml
	pipeline/compilers/__init__.py
	pipeline/compressors/__init__.py
	pipeline/jinja2/ext.py
	pipeline/storage.py
	pipeline/templatetags/compressed.py

committed Dec 21, 2012

277d1fe0 Browse Files

16 Dec, 2012 1 commit
- improve middleware · 416cca85
  Timothée Peignier committed Dec 16, 2012
  
  416cca85 Browse Files
15 Dec, 2012 5 commits
- silence pip install · 3e4fd4f1
  Timothée Peignier committed Dec 15, 2012
  
  3e4fd4f1 Browse Files
- bump version · 68fd6b7a
  Timothée Peignier committed Dec 15, 2012
  
  68fd6b7a Browse Files
- fix formatting · 4260faf1
  Timothée Peignier committed Dec 15, 2012
  
  4260faf1 Browse Files
- fix syntax · a15b2c10
  Timothée Peignier committed Dec 15, 2012
  
  a15b2c10 Browse Files
- Merge branch 'master' into pipeline-next · 6218e725
```
Conflicts:
	pipeline/compressors/__init__.py
```
  Timothée Peignier committed Dec 15, 2012
  6218e725 Browse Files
14 Dec, 2012 2 commits
- Merge pull request #166 from estebistec/better-cmd-error · c07721a2
```
better cmd error
```
  Timothée Peignier committed Dec 14, 2012
  c07721a2 Browse Files
- On compressor broken pipe, keep original exception when re-raising with new type · 06844897
  Steven Cummings committed Dec 14, 2012
  
  06844897 Browse Files
06 Dec, 2012 4 commits
- Merge pull request #165 from estebistec/fix-install-doc-yui-yuglify · 8d8bfc53
```
fix install doc yui yuglify
```
  Timothée Peignier committed Dec 06, 2012
  8d8bfc53 Browse Files
- Provide attempted command on IOError from pipe · cd0568fb
  Steven Cummings committed Dec 05, 2012
  
  cd0568fb Browse Files
- Correcting the YUI note on the installation page · cf37f15b
  Steven Cummings committed Dec 05, 2012
  
  cf37f15b Browse Files
- Merge remote-tracking branch 'upstream/master' · 935094ee
  Steven Cummings committed Dec 05, 2012
  
  935094ee Browse Files
05 Dec, 2012 1 commit
- fix license in setup.py. close #164 · e1229053
  Timothée Peignier committed Dec 05, 2012
  
  e1229053 Browse Files
29 Nov, 2012 3 commits
- pep8 fixes · a3f94e59
  Timothée Peignier committed Nov 29, 2012
  
  a3f94e59 Browse Files
- finish compat with python2.x and python3.x · 76c3060c
  Timothée Peignier committed Nov 29, 2012
  
  76c3060c Browse Files
- test against django 1.5b1 · 49d651b2
  Timothée Peignier committed Nov 29, 2012
  
  49d651b2 Browse Files
24 Nov, 2012 1 commit
- add documentation on non-packing storage. close #160 · 3a4c502e
  Timothée Peignier committed Nov 24, 2012
  
  3a4c502e Browse Files
15 Nov, 2012 1 commit
- bump version · 4d52a70f
  Timothée Peignier committed Nov 15, 2012
  
  4d52a70f Browse Files