Tom Atkins
2f0cedb270
Fix merge conflict in README.rst
2015-11-18 11:19:46 +00:00
Tom Atkins
c653801d5a
Add mailhog binary to gitignore
2015-11-18 11:16:44 +00:00
Tom Atkins
3316a3b023
Fix merge conflict in README.rst
2015-11-18 11:16:25 +00:00
Audrey Roy Greenfeld
7eb0fc0e81
Add pyc fix to changelog
2015-11-17 21:07:14 -08:00
Audrey Roy Greenfeld
840f4a7d4c
*.pyc is already covered by *.py[cod]
...
No need to include it separately.
2015-11-17 21:05:28 -08:00
Taylor Edmiston
f45b81b7a0
Fix typo in readme
2015-11-17 22:54:29 -05:00
Daniel Roy Greenfeld
aad3284f58
Merge
2015-11-17 16:58:40 -08:00
Daniel Roy Greenfeld
d69a6f020b
Update changelog for @burhan
2015-11-17 16:58:00 -08:00
Daniel Roy Greenfeld
d7dab03e1e
Merge pull request #411 from burhan/opbeat-integration
...
initial configuration to support opbeat
2015-11-17 16:49:16 -08:00
Burhan Khalid
e2c700da5c
updating env.example
2015-11-17 10:27:58 +03:00
Tom Atkins
e4f922763f
Add mailhog binary to gitignore
2015-11-16 19:17:03 +00:00
Burhan Khalid
8b2ec73a8c
Merge branch 'opbeat-integration' of github.com:burhan/cookiecutter-django into opbeat-integration
...
* 'opbeat-integration' of github.com:burhan/cookiecutter-django:
E303 too many blank lines fix
fixing the middleware order
initial configuration to support opbeat
2015-11-16 21:42:56 +03:00
Burhan Khalid
03edea3021
E303 too many blank lines fix
2015-11-16 21:41:06 +03:00
Burhan Khalid
f4a75e0d10
fixing the middleware order
2015-11-16 21:41:06 +03:00
Burhan Khalid
4c07b5dea6
initial configuration to support opbeat
2015-11-16 21:41:06 +03:00
Fábio C. Barrionuevo da Luz
70b2f74f34
Merge pull request #412 from burhan/settings-fixes
...
fixing error in settings docs
2015-11-16 15:38:39 -03:00
Burhan Khalid
b78b2ddf73
fixing error in settings
2015-11-16 21:24:21 +03:00
Burhan Khalid
07ec413f98
E303 too many blank lines fix
2015-11-16 19:20:15 +03:00
Burhan Khalid
a68f256e5b
fixing the middleware order
2015-11-16 19:04:07 +03:00
Burhan Khalid
727281e99a
initial configuration to support opbeat
2015-11-16 18:55:37 +03:00
Tom Atkins
005dd8c296
Replace Maildump with MailHog
2015-11-16 11:45:29 +00:00
Fábio C. Barrionuevo da Luz
9c28c8e0df
Update CHANGELOG.md
2015-11-16 08:36:51 -03:00
Fábio C. Barrionuevo da Luz
61fed1a0b8
Merge pull request #408 from burhan/docs-cleanup
...
cleanup of main readme
2015-11-16 08:27:40 -03:00
Burhan Khalid
9920c6d5b9
upstream merge
2015-11-16 14:20:19 +03:00
Audrey Roy Greenfeld
5079db3a4a
Merge pull request #381 from ad-m/patch-2
...
Add factories for model users.User
2015-11-14 20:05:10 -08:00
Adam Dobrawy
c86d5c928c
Fix typo & import in UserFactory
2015-11-14 14:15:00 +01:00
Fábio C. Barrionuevo da Luz
c1469c9549
Merge pull request #406 from pydanny/luzfcb-patch-1
...
add Cristian Vargas in CONTRIBUTORS list and update CHANGELOG
2015-11-12 17:44:07 -03:00
Fábio C. Barrionuevo da Luz
da956975e7
Update CHANGELOG.md
2015-11-12 17:42:34 -03:00
Fábio C. Barrionuevo da Luz
782f93c68e
add Cristian Vargas in CONTRIBUTORS list
2015-11-12 17:39:30 -03:00
Fábio C. Barrionuevo da Luz
ff0177f614
Merge pull request #375 from swappsco/readme-update
...
added a warning: repo_name must be a valid Python module
2015-11-12 17:38:03 -03:00
Fábio C. Barrionuevo da Luz
5214d6ca65
Update CHANGELOG.md
2015-11-12 17:33:42 -03:00
Fábio C. Barrionuevo da Luz
cb9480437b
Merge pull request #405 from yunti/load-url-tags
...
remove {% load url from future %} in templates - deprecated in django 1.9
2015-11-12 17:32:28 -03:00
Barclay StudyPC
1ae2d85dd6
Load url tags removed - deprecated in django 1.9
2015-11-12 15:07:22 +00:00
Fábio C. Barrionuevo da Luz
40f74a8e89
Update CHANGELOG.md
2015-11-12 09:50:33 -03:00
Fábio C. Barrionuevo da Luz
d8675eda89
Merge pull request #404 from yunti/patch-1
...
Update django-aullauth to latest release
2015-11-12 09:47:48 -03:00
yunti
219afa9153
Update base.txt
2015-11-12 12:43:56 +00:00
Audrey Roy Greenfeld
d1de33fb3e
Use django_coverage_plugin to check template test coverage.
2015-11-11 21:07:16 -08:00
Adam Dobrawy
794c9f1ce7
Fix flake erros in UserFactory
2015-11-12 05:54:38 +01:00
Adam Dobrawy
88c6a1775b
Added default password to UserFactory
2015-11-12 05:51:15 +01:00
Daniel Roy Greenfeld
a1ec736a9f
Merge pull request #382 from crdoconnor/master
...
Hitch : Updates to the default end to end test framework template
2015-11-09 07:23:07 -08:00
Daniel Roy Greenfeld
28fe831700
Update CONTRIBUTORS.rst
2015-11-09 07:21:40 -08:00
Daniel Roy Greenfeld
9c2b33c5ab
Update CHANGELOG.md
2015-11-09 07:20:37 -08:00
Daniel Roy Greenfeld
c49c942ba7
Merge pull request #394 from show0k/patch-1
...
Fix python version issue in .travis.yml
2015-11-09 07:19:28 -08:00
Daniel Roy Greenfeld
45bbcf0687
Update CHANGELOG.md
2015-11-09 07:17:55 -08:00
Daniel Roy Greenfeld
cb8376ce2a
Merge pull request #402 from hackebrot/use-tox-and-pytest-cookies
...
Use tox and pytest cookies
2015-11-09 07:15:32 -08:00
Raphael Pierzina
7664194ab8
Ensure that tox passes on certain environment variables
2015-11-09 00:54:48 +01:00
Raphael Pierzina
54267d0dce
Remove requirements.txt from tox.ini in favor of explicit testenv deps
2015-11-09 00:41:35 +01:00
Raphael Pierzina
adf10a03ba
Update travis config to use tox instead of pytest
2015-11-09 00:38:52 +01:00
Raphael Pierzina
b68e89279f
Add tox v2.1.1 to requirements.txt
2015-11-09 00:35:21 +01:00
Raphael Pierzina
cca450878c
Write docs on running the test suite with tox, resolve #399
2015-11-09 00:33:42 +01:00
