Fábio C. Barrionuevo da Luz
b5054f4cc8
Merge pull request #168 from Phyxsius/patch-1
...
Fixed typo [skip ci]
2014-12-31 17:54:05 -03:00
Fábio C. Barrionuevo da Luz
3f782d1bf9
Merge pull request #169 from Phyxsius/patch-2
...
Fixed typo and case change
2014-12-31 17:05:02 -03:00
Andy
23fb0572c3
Update CONTRIBUTORS.txt
2014-12-31 12:24:00 -06:00
Andy
f712016bf7
Fixed typo and case change
2014-12-31 11:27:37 -06:00
Andy
69fb567787
Fixed typo
2014-12-24 00:13:23 -06:00
Fábio C. Barrionuevo da Luz
e68479a502
Merge pull request #166 from luzfcb/force-travis-not-send-email
...
force travis-ci not send email with "build status" to github repo owner
2014-12-19 06:23:50 -03:00
Saurabh Kumar
a4568173f6
fix boto==2.34.1 not available, update dep to latest
2014-12-19 14:41:23 +05:30
Saurabh Kumar
a162aa4c98
Merge pull request #156 from martinblech/django-extensions
...
Added django-extensions to local configuration
2014-12-19 14:32:30 +05:30
Martin Blech
a362c4041a
Added django-extensions to local configuration
...
It's one of the recommended apps in Two Scoops of Django. `runserver_plus` and
`shell_plus` are real time-savers!
2014-12-18 18:29:02 -03:00
Daniel Greenfeld
ec3a480595
Merge pull request #158 from martinblech/atomic-requests
...
Added ATOMIC_REQUESTS=True to default DB setup
2014-12-18 09:12:34 -08:00
Saurabh Kumar
7b09ef5090
Merge pull request #157 from martinblech/replace-yourapp
...
Replaced `yourapp` with `repo_name` template var.
2014-12-18 22:35:44 +05:30
Daniel Greenfeld
10beba8a61
Tiny whitespace fix to force travis to fire
2014-12-18 08:39:27 -08:00
Fabio C. Barrioneuvo da Luz
ce76e5a871
force travis-ci not send email with "build status" to github repo owner
2014-12-18 12:32:41 -03:00
Fábio C. Barrionuevo da Luz
5838d71083
Merge pull request #165 from luzfcb/update-requirements
...
update requirements
2014-12-18 12:23:11 -03:00
Fabio C. Barrioneuvo da Luz
c35b810aa4
update requirements
2014-12-18 12:19:56 -03:00
Fábio C. Barrionuevo da Luz
214f9cfdf7
Merge pull request #163 from chrisfranklin/patch-3
...
Fix quote marks in common config to be consistent.
2014-12-15 01:22:25 -03:00
Fábio C. Barrionuevo da Luz
0a73f6990b
fix travis badget on README.rst
2014-12-03 12:35:34 -03:00
Chris Franklin
e0cf4337d2
Fix quote marks in common config to be consistent.
2014-12-03 15:07:22 +00:00
Fábio C. Barrionuevo da Luz
38b29c23c8
Merge pull request #159 from chrisfranklin/patch-3
...
Few minor cleanups
2014-12-03 12:06:23 -03:00
Chris Franklin
9ee47dab78
Fix quote marks
2014-12-03 15:04:52 +00:00
Chris Franklin
7e048c8942
Fix spelling mistakes in production config
2014-12-03 15:02:52 +00:00
Martin Blech
96d053c866
Added ATOMIC_REQUESTS=True to default DB setup
...
Quoting Two Scoops of Django:
> Use `ATOMIC_REQUESTS` as long as the performance overhead is bearable. That
> means "forever" on most sites.
2014-12-02 17:30:46 -03:00
Daniel Greenfeld
3fb367b477
Add @martinblech to contributors
2014-12-01 17:05:15 -08:00
Daniel Greenfeld
9d268f4e10
Merge pull request #155 from martinblech/vagrant-gateway
...
Added default Vagrant gateway to INTERNAL_IPS
2014-12-01 17:04:28 -08:00
Martin Blech
f1c53656bc
Replaced yourapp with repo_name template var.
...
No need to ask the user to replace it by hand, cookiecutter can do it for them.
2014-12-01 21:09:28 -03:00
Martin Blech
48a1ddd48c
Added default Vagrant gateway to INTERNAL_IPS
...
Makes Django Debug Toolbar show up too when running inside the Vagrant VM.
2014-12-01 20:54:48 -03:00
Matt Warren
d87d332ef2
add myself to contributors.rst
2014-11-26 00:22:00 +05:30
Matt Warren
e29879d813
addresses issue mentioned here: https://code.djangoproject.com/ticket/19353
...
adding users in admin resulted in reference to auth.User
2014-11-26 00:21:25 +05:30
Fábio C. Barrionuevo da Luz
c243085d8c
Merge pull request #153 from arruda/fix-setup-django-version
...
Fixing setup.py django version
2014-11-17 20:39:17 -02:00
Felipe Arruda Pontes
3624aae692
adding myself to contributors
2014-11-13 00:35:54 -02:00
Felipe Arruda Pontes
811c1a3336
bumping version of Django in setup.py to correspond to requirements/base.txt
2014-11-13 00:31:17 -02:00
Daniel Greenfeld
57eeef37d0
Merge pull request #149 from benjaminabel/check-pep8
...
Check for pep8 errors using travis
2014-10-30 16:20:33 -07:00
Benjamin ABEL
8a3c2ff2a9
Set max line lenght to 120 for pep8
2014-10-30 22:26:17 +01:00
Daniel Greenfeld
0aefa073c7
Merge pull request #150 from benjaminabel/patch-1
...
Explain database configuration in README.rst
2014-10-30 13:39:42 -07:00
Benjamin ABEL
16988aa187
Explain database configuration in README.rst
2014-10-30 21:12:59 +01:00
Benjamin ABEL
59dd3c6ef5
Added Travis build image in README.rst
2014-10-30 14:17:58 +01:00
Benjamin ABEL
a78ec1d134
Fix pep8 errors in docs/conf.py
2014-10-30 14:06:39 +01:00
Benjamin ABEL
a58602b3ee
Added travis.yml to check code with pep8
2014-10-30 14:06:19 +01:00
Daniel Greenfeld
08d6cbad6f
Merge pull request #148 from benjaminabel/patch-1
...
Update django to 1.7.1 in requirements
2014-10-29 14:14:53 -07:00
Benjamin ABEL
e59cd33ec8
Update django to 1.7.1
2014-10-29 22:11:27 +01:00
Daniel Greenfeld
166df8fae1
Merge pull request #147 from slafs/lintfix
...
minor pep8 fixes
2014-10-27 17:01:46 -07:00
Sławek Ehlert
cdac4b6f06
minor pep8 fixes
...
fixes those small linting issues that should not be in this template.
``users/models.py`` F401 warnings are intentionally left for
convenience in future coding.
2014-10-27 23:51:27 +01:00
Daniel Greenfeld
259f0afae6
Added triple quotes to admin name fix #145
...
This fixes the problem with author names with apostrophes breaking the settings files.
2014-10-21 21:33:56 -07:00
Daniel Greenfeld
7f6ba8eb6a
Fix license goof
2014-10-16 12:15:22 -07:00
Daniel Greenfeld
eee57ca95d
Merge pull request #144 from chrisfranklin/patch-2
...
Add dokku deployment instructions
2014-10-13 13:17:58 -07:00
Chris Franklin
3e1f2a2610
Update CONTRIBUTORS.txt
2014-10-13 13:27:10 +01:00
Chris Franklin
593ed5a07d
Add sendgrid instructions and note about backup.
2014-10-12 16:13:48 +01:00
Chris Franklin
f4e4dce6f2
Fix RST syntax.
2014-10-12 16:07:02 +01:00
Chris Franklin
e97f91f475
Add dokku deployment instructions
...
Not ready to be merged, WIP.
2014-10-12 15:59:17 +01:00
Jay
073666e09c
now passes flake8
2014-10-12 10:32:17 +02:00
