Commit Graph

4759 Commits

Author SHA1 Message Date
Burhan Khalid
a54081a761 tweaking the comments to match master README 2015-07-16 07:44:49 +03:00
Burhan Khalid
f966888ff1 making maildump optional 2015-07-16 07:21:06 +03:00
Burhan Khalid
07354a3d37 Fixing links for maildump and updating master README 2015-07-16 07:03:16 +03:00
Burhan Khalid
a103eaa93e Adding support for maildump for local development (replaces the nice, but not friendly console email handler) 2015-07-16 06:58:08 +03:00
Daniel Greenfeld
895dc09a45 Much cleaner user urls and added get_absolute_url to User 2015-07-15 20:37:38 -07:00
Daniel Greenfeld
70c871dfbd Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-07-15 13:40:43 -07:00
Daniel Greenfeld
8852fef5f7 Add name to user detail page 2015-07-15 13:40:38 -07:00
Fábio C. Barrionuevo da Luz
7538839297 Merge pull request #276 from pydanny/luzfcb-patch-1
fix issue #275
2015-07-15 16:58:14 -03:00
Fábio C. Barrionuevo da Luz
d181fca7d4 fix issue #275 2015-07-15 16:53:44 -03:00
Daniel Greenfeld
d412946f93 Fix User initial migration 2015-07-15 12:40:04 -07:00
Daniel Greenfeld
88188812a1 Fix user_list.html 2015-07-15 12:00:20 -07:00
Daniel Greenfeld
1d194d0e12 Remove unnecessary divs from the User form 2015-07-15 11:08:49 -07:00
Daniel Greenfeld
6dbe252c83 Use a more global 'name' field in User model 2015-07-15 11:06:03 -07:00
Daniel Greenfeld
696d1c5606 Making bootstrap containers fluid 2015-07-14 13:23:26 -07:00
Burhan Khalid
5589003ff3 fixing requirements 2015-07-14 12:05:25 +03:00
Daniel Greenfeld
265d14b645 Added ipdb for improved REPL 2015-07-13 20:33:49 -07:00
Daniel Greenfeld
536fb07f02 Merge pull request #271 from audreyr/update-navbar
Update navbar
2015-07-13 19:32:12 -07:00
Audrey Roy
03dba391ca Don't make Home active in base template. 2015-07-13 19:28:42 -07:00
Audrey Roy
35112546c4 Close navbar-collapse div. 2015-07-13 19:26:40 -07:00
Audrey Roy
7a147e72e2 Update navbar HTML to latest Bootstrap as per http://getbootstrap.com/components/#navbar 2015-07-13 19:20:13 -07:00
Daniel Greenfeld
e25942652d Added instructions on how to install compass. 2015-07-13 15:50:00 -07:00
Daniel Greenfeld
acfef44b64 Remove specification for installing just grunt.
Otherwise it ignores the other modules.
2015-07-13 15:39:51 -07:00
Daniel Greenfeld
3710e9b953 Changed 'taskman' to 'taskapp 2015-07-13 13:32:47 -07:00
Daniel Greenfeld
f038f8fd88 Merge pull request #266 from jayfk/master
added optional celery support
2015-07-13 13:19:55 -07:00
Jay
9bfca28f6f refactored to load celery from an AppConfig 2015-07-10 11:30:42 +02:00
Fábio C. Barrionuevo da Luz
7837c4e099 update Django version to 1.8.3
https://www.djangoproject.com/weblog/2015/jul/08/security-releases/
2015-07-09 11:47:10 -03:00
Burhan Khalid
32dd1be245 merging from upstream 2015-07-08 12:58:19 +03:00
Fábio C. Barrionuevo da Luz
b498bb4245 Merge pull request #263 from burhan/patch/move-aws-settings
set correct variables for heroku/doku
2015-07-07 16:39:26 -03:00
Burhan Khalid
076c7c21c6 set correct variables for heroku/doku 2015-07-07 22:29:41 +03:00
Fábio C. Barrionuevo da Luz
a3c46bb8a0 Merge pull request #262 from burhan/patch/move-aws-settings
unifying environment variables
2015-07-07 16:23:46 -03:00
Burhan Khalid
740483f0e7 unifying environment variables 2015-07-07 22:06:46 +03:00
Fábio C. Barrionuevo da Luz
baeba18d7c Merge pull request #261 from luzfcb/master
update dependencies versions
2015-07-07 09:26:50 -03:00
Fabio C. Barrioneuvo da Luz
e5dc8b97c1 update dependencies versions
update pylibmc version to 1.5.0
django-allauth to 0.21.0
Pillow to 2.9.0
whitenoise to 2.0.2
2015-07-07 09:15:26 -03:00
Fábio C. Barrionuevo da Luz
ec58914ea7 add Burhan Khalid to CONTRIBUTORS list 2015-07-07 08:17:03 -03:00
Saurabh Kumar
21a1062fae Merge pull request #259 from burhan/feature/mailgun-support
add support for mailgun, while dropping sendgrid support.
2015-07-07 10:46:26 +05:30
Burhan Khalid
768b8cf2c8 adding support for mailgun 2015-07-06 21:25:08 +03:00
Burhan Khalid
3c285e0569 adding redis support 2015-07-06 14:09:13 +03:00
Daniel Greenfeld
504e170f9e Merge pull request #257 from audreyr/document-user-setup
Document user setup
2015-06-28 14:58:07 -07:00
Audrey Roy
f370702c4d Instructions for creating user accounts. Fix #39. 2015-06-28 14:56:13 -07:00
Audrey Roy
e9e560eb17 Break up 'Getting up and running' into more readable sections 2015-06-28 14:56:13 -07:00
Daniel Greenfeld
6c163c1d56 Merge pull request #256 from audreyr/add-migrate
Add instruction to migrate after doing createdb.
2015-06-28 14:54:41 -07:00
Daniel Greenfeld
7181d8a614 Moved @audreyr to direct code contributors list
Also documented her commit rights.
2015-06-28 14:29:19 -07:00
Audrey Roy
79ac986be8 Add instruction to migrate after doing createdb. 2015-06-28 14:28:58 -07:00
Fábio C. Barrionuevo da Luz
b9a2b90773 Merge pull request #255 from audreyr/add-createdb
Add PostgreSQL createdb instructions to generated README.
2015-06-28 18:21:03 -03:00
Audrey Roy
5e48e162f7 Add PostgreSQL createdb instructions to generated README. 2015-06-28 14:14:34 -07:00
Daniel Greenfeld
cd8c694b15 Added .env to protect repos
For those instances when people use a project directory to store the location of their virtual environment.
2015-06-28 11:28:41 -07:00
Saurabh Kumar
de08741305 Merge pull request #233 from schinkelg/master
Update common.py postgres connection string
2015-06-24 13:10:25 +05:30
Fábio C. Barrionuevo da Luz
c61c58dbd2 update pytest version to 2.7.2 2015-06-23 21:40:55 -03:00
Fábio C. Barrionuevo da Luz
80a80bd660 Merge pull request #249 from luzfcb/master
update requirements
2015-06-22 09:34:17 -03:00
Fabio C. Barrioneuvo da Luz
009f6b79a4 update ipython version to 3.2.0
whitenoise version to 2.0
coverage version to 4.0a6
2015-06-22 09:21:16 -03:00