Commit Graph

339 Commits

Author SHA1 Message Date
pyup.io bot
25feee54a5 Update pillow from 3.4.1 to 3.4.2 (#857) 2016-10-18 12:47:09 -07:00
pyup.io bot
f6bce5c5f7 Update django-allauth from 0.27.0 to 0.28.0 (#849) 2016-10-17 09:56:25 -07:00
pyup-bot
02ef6b76a4 Update django-crispy-forms from 1.6.0 to 1.6.1 2016-10-17 03:20:09 -07:00
Fábio C. Barrionuevo da Luz
3b3e53b57b fix issue #847 2016-10-12 10:43:48 -03:00
René Muhl
77ce5f04ee Upgrade django debug toolbar to 1.6 (#844)
* Replaced django-debug-toolbar github link with version 1.6

* Contributor update
2016-10-10 17:39:35 +02:00
Sam Collins
52e84608be Added --noinput to migate command (#842)
When deploying with a stale content type the migration command can ask for user input which fails the deployment.
2016-10-08 14:55:02 -07:00
Daniel Roy Greenfeld
04a58d5b21 Removed Heroku instant deploy button 2016-10-07 13:55:15 -07:00
Marlon
bb15e5a02e Create 403_csrf.html (#803)
This takes advantage of the ability to easily customize the 403 template for CSRF, introduced in Django 1.10.
2016-10-05 16:01:30 +02:00
pyup.io bot
50b883c7ea Update pytz from 2016.6.1 to 2016.7 (#835) 2016-10-05 15:58:46 +02:00
pyup.io bot
01f80c7857 Update pillow from 3.3.1 to 3.4.1 (#838) 2016-10-05 15:58:38 +02:00
pyup.io bot
ef2b68115d Update celery from 3.1.23 to 3.1.24 (#831) 2016-10-05 15:58:25 +02:00
pyup.io bot
ccedf35895 Update django from 1.10.1 to 1.10.2 (#834) 2016-10-05 15:58:16 +02:00
pyup-bot
024a9671c7 Update sphinx from 1.4.7 to 1.4.8 2016-10-01 09:20:26 -07:00
pyup.io bot
6446312eed Update sphinx from 1.4.6 to 1.4.7 (#832) 2016-10-01 08:09:52 -07:00
Fabio C. Barrioneuvo da Luz
c1b389b27d workaround to fix django-debug-toolbar issue #827 2016-09-29 13:12:11 -03:00
Fabio C. Barrioneuvo da Luz
bbcd408193 add django-debug-toolbar urlpatterns 2016-09-29 13:09:49 -03:00
Fábio C. Barrionuevo da Luz
2f8a7d0641 upgrade Sphinx to 1.4.6 2016-09-29 02:11:45 -03:00
pyup-bot
b28fe19f3a Update pytest-django from 2.9.1 to 3.0.0 2016-09-29 01:48:42 -03:00
pyup-bot
80c569e2c2 Update pytest-django from 2.9.1 to 3.0.0 2016-09-29 01:48:42 -03:00
pyup-bot
3872cd08c3 Update raven from 5.27.0 to 5.27.1 2016-09-29 01:48:42 -03:00
pyup-bot
ef020ecd31 Update django-model-utils from 2.5.2 to 2.6 2016-09-29 01:48:42 -03:00
Fabio C. Barrioneuvo da Luz
8f045fc08c update jquery to 3.1.1 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
e9fc2f0582 update django-redis and whitenoise version 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
97febbf8b4 removed django-autoslug until it's ready for 1.10 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
0e9eafbfc4 sync migrations with django1.10 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
b4e6e08100 change 'admin' url, to stay the same as generated by django 1.10
https://github.com/django/django/blob/1.10.1/django/conf/project_template/project_name/urls.py-tpl#L20
2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
2aed9268b6 update frontend dependencies 2016-09-29 01:43:48 -03:00
Steve Steiner
6cbc513e6d Make test_docker.sh tests pass by passing new password auth rules 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
6c0cb7ed72 update django to 1.10.1 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
4f9bb652f2 ignore F401 error on manage.py 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
178844d616 use manage.py from django 1.10 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
f040921d9a add default AUTH_PASSWORD_VALIDATORS 2016-09-29 01:43:48 -03:00
Fabio C. Barrioneuvo da Luz
f2aab6edc3 rename MIDDLEWARE_CLASSES to MIDDLEWARE 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
a091dcbae8 Fix elastic beanstalk checks 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
d31e86fc8a Now includes message for missing .env file. Fixed #819 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
cac685d909 Add Experimental AWS Elastic Beanstalk support (#817)
Includes:

* First pass at Elastic Beanstalk integration
* Gets code and elasticache working
* Very rudimentary documentation
* Includes post hook cleanup
2016-09-29 01:43:48 -03:00
Delio Castillo
3d25befb3f Updates to anymail 0.5 and adds new config setting for MAILGUN_SENDER_DOMAIN 2016-09-22 11:42:16 -07:00
Delio Castillo
a4884bb5d7 Update nginx.conf (#808)
* Update nginx.conf

* Update .editorconfig

* Update .editorconfig

* Update nginx.conf

* Update .editorconfig

* Update .editorconfig
2016-09-20 23:22:47 +02:00
pyup.io bot
bb913b7507 Update raven from 5.26.0 to 5.27.0 (#799) 2016-09-18 23:11:25 +02:00
Audrey Roy Greenfeld
a46f3dd56b Change template debugging back to False
Since we're no longer using django_coverage_plugin.
2016-09-16 11:49:13 -07:00
Audrey Roy Greenfeld
da42b3854d Turn on template debugging in test settings
This resolves the following error:

``` bash
coverage run ./manage.py test --settings=config.settings.test
Coverage.py warning: Disabling plugin 'django_coverage_plugin.DjangoTemplatePlugin' due to an exception:
Traceback (most recent call last):
  File "/Users/audreyr/.virtualenvs/everycheese/lib/python3.5/site-packages/coverage/control.py", line 517, in _should_trace_internal
    file_tracer = plugin.file_tracer(canonical)
  File "/Users/audreyr/.virtualenvs/everycheese/lib/python3.5/site-packages/django_coverage_plugin/plugin.py", line 154, in file_tracer
    check_debug()
  File "/Users/audreyr/.virtualenvs/everycheese/lib/python3.5/site-packages/django_coverage_plugin/plugin.py", line 69, in check_debug
    "Template debugging must be enabled in settings."
django_coverage_plugin.plugin.DjangoTemplatePluginException: Template debugging must be enabled in settings.
```
2016-09-16 11:05:57 -07:00
Ray Ch
fc8e318193 NPM Logs (#796) 2016-09-16 15:28:22 +02:00
Daniel Roy Greenfeld
df22044745 Ignore output generated by django-compressor 2016-09-15 16:01:22 -07:00
Audrey Roy Greenfeld
9013f072a8 Test users app URL patterns
For the sake of completeness, and since regular expressions can be error-prone.
2016-09-14 15:51:18 -07:00
Audrey Roy Greenfeld
bf6d6b741c Remove redundant comments
Thought these comments seemed unnecessary.
2016-09-14 15:32:58 -07:00
Audrey Roy Greenfeld
84ee2fc5ec Convey button role to screen readers
See http://v4-alpha.getbootstrap.com/components/buttons/#button-tags for more on `role="button"` attribute
2016-09-13 13:14:45 -07:00
Audrey Roy Greenfeld
833e59f89c Make navbar titlecasing consistent 2016-09-13 13:10:36 -07:00
Bartłomiej Kurzeja
d53afa6c96 Remove misleading comment (#787)
ImproperlyConfigured exception won't raise because default value is passed.
2016-09-12 15:52:49 +02:00
Jannis Gebauer
7d7b044432 Remove webpack and merge (#778) (#785)
* Remove webpack and merge

* Put postgresql_version line back in cookiecutter.json

* Put goldhand back in contributors file, added ssteinerX

* Add *.egginfo to .gitignore

* Fix dangling endif in README.rst
2016-09-12 00:22:21 +02:00
Jannis Gebauer
6a9ec57bf5 removed django-coverage-plugin until it's ready for 1.10 2016-09-12 00:01:19 +02:00
Audrey Roy Greenfeld
04bd07bbef Make user form template indentation consistent 2016-09-10 09:59:52 -07:00
Daniel Hepper
12aed4724e Use app registry instead of INSTALLED_APPS to discover celery tasks (#754)
* Use app registry instead of INSTALLED_APPS to discover celery tasks. Fixes #717

* Added Daniel Hepper to contributors list
2016-09-10 13:33:25 +02:00
Alexandre Provencio
b2207f5768 Pep8 imports (#767) 2016-09-10 13:32:14 +02:00
Daniel Roy Greenfeld
28542a91a4 Removed floppyforms (see #703)
While this is an awesome package...

* Nothing in Cookiecutter Django uses it 
* Doesn't work with Django 1.10 yet
* Developers can add it themselves
2016-09-09 20:13:33 -07:00
Audrey Roy Greenfeld
2b2caaf6ce Template indentation cleanup 2016-09-09 16:39:49 -07:00
Audrey Roy Greenfeld
8bbf83d3d7 Combine load tags, fix indentation 2016-09-09 16:29:18 -07:00
pyup.io bot
909b85291e Update django-extensions from 1.7.3 to 1.7.4 (#777) 2016-09-08 11:19:14 +02:00
Peter Bittner
29049719d1 Correct header markup, reduce paragraph spacing (#775)
* Correct header markup, reduce paragraph spacing

* Add @bittner to contributors
2016-09-05 01:13:16 +02:00
Stanislav Shabalin
6f6f37cba8 replace unicode-slugify with awesome-slugify (#761) 2016-09-04 10:52:52 -07:00
Jannis Gebauer
3ad0f57ef5 Merge pull request #765 from aleprovencio/fix-compressor
Fix compressor section on common.py
2016-09-02 09:49:32 +02:00
Jannis Gebauer
0f527271a3 Merge pull request #766 from aleprovencio/separator-line
Put separator line following the current pattern
2016-09-02 09:49:16 +02:00
Jannis Gebauer
bf69bfe40e Merge pull request #769 from aleprovencio/whitespace
Fix whitespace around operator
2016-09-02 09:48:41 +02:00
Jannis Gebauer
37ef48558a Merge pull request #770 from pydanny/pyup-update-raven-5.25.0-to-5.26.0
Update raven to 5.26.0
2016-09-02 09:48:18 +02:00
Jannis Gebauer
30820b95f3 Merge pull request #763 from pydanny/pyup-update-werkzeug-0.11.10-to-0.11.11
Update werkzeug to 0.11.11
2016-09-02 09:47:34 +02:00
pyup-bot
b3c27b9b30 Update raven from 5.25.0 to 5.26.0 2016-08-31 14:34:56 -07:00
Alexandre Provencio
31c63f0d3f Fix compressor section on common.py 2016-08-31 14:44:24 -03:00
Alexandre Provencio
86c1cd5f26 Fix whitespace around operator 2016-08-31 12:59:36 -03:00
Alexandre Provencio
b33b104251 Put separator line following the current pattern 2016-08-31 12:56:25 -03:00
Alexandre Provencio
3ad2d5c61e Fix docstrings 2016-08-31 12:48:25 -03:00
pyup-bot
cf092b6269 Update werkzeug from 0.11.10 to 0.11.11 2016-08-31 06:19:54 -07:00
Jannis Gebauer
043ff3d8dc Merge pull request #636 from mirskiy/master
Changed nginx confs for dockers new networking
2016-08-31 11:39:16 +02:00
pyup-bot
56f2048b32 Update django-extensions from 1.7.2 to 1.7.3 2016-08-26 12:58:51 -07:00
Philip Deuchler
887ba934e2 Fixes an issue with Jinja choking on a django template tag (#759)
* Fixes an issue with Jinja choking on a django template tag, similar to #278

* Same fix for field_errors_block.html
2016-08-26 12:35:48 -07:00
Daniel Roy Greenfeld
77c8abc4b0 merge 2016-08-26 11:27:36 -07:00
Daniel Roy Greenfeld
28293c0cad Fixing the README.rst 2016-08-26 11:26:20 -07:00
Audrey Roy Greenfeld
de2c7198b2 Merge pull request #756 from Parbhat/Patch-2
fix: Gulpfile Issue #738 and correct order of PostgreSQL version
2016-08-26 11:10:59 -07:00
Audrey Roy Greenfeld
a2386c796c Merge pull request #757 from pydanny/pyup-update-opbeat-3.3.4-to-3.4.0
Update opbeat to 3.4.0
2016-08-26 11:10:08 -07:00
Daniel Roy Greenfeld
c01d81b2fe Added bootstrap4 templates to fix Crispy Forms 2016-08-26 10:40:18 -07:00
Daniel Roy Greenfeld
50573b1910 Formatting hack to get around crispy-forms unfortunate hardcoding in helpers.FormHelper 2016-08-26 09:33:36 -07:00
pyup-bot
6ce53bf6d8 Update opbeat from 3.3.4 to 3.4.0 2016-08-25 06:43:43 -07:00
Parbhat Puri
f5be5731cb fix: Gulpfile Issue #738 2016-08-25 16:07:17 +05:30
Michael Luk
5f53ebe5f1 add missing 'raw' tag to fix jinja error (#755) 2016-08-25 13:27:25 +05:30
Daniel Roy Greenfeld
ba2673ab5f Made Bootstrap4 Alpha 2 compliant 2016-08-24 19:31:13 -07:00
Audrey Roy Greenfeld
e1b3070abe Add spaces around templated author name 2016-08-24 15:48:03 -07:00
pyup-bot
5ce00085d2 Update raven from 5.24.3 to 5.25.0 2016-08-23 15:49:30 -07:00
Jannis Gebauer
5dc41812d5 Update base.txt 2016-08-23 08:24:43 +02:00
Daniel Roy Greenfeld
d98bbcd70e Fix #737, so django-compressor works on Windows 2016-08-22 07:36:40 -07:00
Andreas Meistad
41059ff4df Change use_python2 [N] to use_python3 [Y]
Fixes #747
2016-08-21 22:11:01 +02:00
pyup-bot
3b3948feec Update django-allauth from 0.26.1 to 0.27.0 2016-08-19 07:10:12 -07:00
pyup-bot
ee31df81fa Update django-test-plus from 1.0.14 to 1.0.15 2016-08-18 14:50:01 -07:00
pyup-bot
95e31d6554 Update django-test-plus from 1.0.14 to 1.0.15 2016-08-18 14:50:01 -07:00
Audrey Roy Greenfeld
7279aa29eb Merge pull request #734 from pydanny/pyup-update-django-floppyforms-1.6.2-to-1.7.0
Update django-floppyforms to 1.7.0
2016-08-18 10:27:00 -07:00
Audrey Roy Greenfeld
3fc22c1f50 Merge pull request #735 from pydanny/pyup-update-django-extensions-1.7.1-to-1.7.2
Update django-extensions to 1.7.2
2016-08-18 10:26:39 -07:00
pyup-bot
24d03c477c Update pillow from 3.3.0 to 3.3.1 2016-08-18 06:04:58 -07:00
Daniel Roy Greenfeld
87bb085550 Force rssmin to be installed without C extensions 2016-08-16 15:31:59 -07:00
Daniel Roy Greenfeld
f1f499ddd3 Update version to Django 1.9.9 2016-08-16 14:15:04 -07:00
Parbhat Puri
e5fe8fa935 fix: offset class modified in Bootstrap 4 alpha 3 (#720) 2016-08-16 12:22:56 -07:00
yunti
6224a15884 Update crispy forms template pack (#718)
Updated to be inline with bootstrap 4 currently used in the project
2016-08-16 12:22:16 -07:00
Jannis Gebauer
34631ad819 adds the ability to wait for the postgres container (#736) 2016-08-16 12:20:41 -07:00
pyup-bot
45fe8fafb1 Update django-extensions from 1.7.1 to 1.7.2 2016-08-16 05:04:45 -07:00
pyup-bot
d0638780fa Update django-floppyforms from 1.6.2 to 1.7.0 2016-08-15 10:49:41 -07:00
Jannis Gebauer
eff9260acf Merge pull request #731 from pydanny/pyup-update-django-model-utils-2.5.1-to-2.5.2
Update django-model-utils to 2.5.2
2016-08-11 14:30:26 +02:00
Jannis Gebauer
b646fccc4c Merge pull request #732 from pydanny/pyup-update-django-compressor-2.0-to-2.1
Update django-compressor to 2.1
2016-08-11 14:30:19 +02:00
pyup-bot
676cee53b5 Update django-compressor from 2.0 to 2.1 2016-08-11 03:05:16 -07:00
pyup-bot
bb9bb72999 Update django-model-utils from 2.5.1 to 2.5.2 2016-08-11 03:05:08 -07:00
pyup-bot
7bde8e74ae Update whitenoise from 3.2 to 3.2.1 2016-08-11 03:05:06 -07:00
Jannis Gebauer
39dc3d93e9 Merge pull request #723 from pydanny/pyup-update-raven-5.24.2-to-5.24.3
Update raven to 5.24.3
2016-08-11 11:43:13 +02:00
Jannis Gebauer
9bf319ff45 Merge pull request #725 from pydanny/pyup-update-django-extensions-1.6.7-to-1.7.1
Update django-extensions to 1.7.1
2016-08-11 11:42:57 +02:00
Burhan Khalid
716c179a03 postgresql versions are now selectable 2016-08-10 18:31:48 +03:00
pyup-bot
5e4980cd29 Update django-extensions from 1.6.7 to 1.7.1 2016-08-09 05:19:01 -07:00
pyup-bot
43df65afca Update raven from 5.24.2 to 5.24.3 2016-08-08 12:48:56 -07:00
Jannis Gebauer
26561841f6 Merge pull request #719 from pydanny/pyup-update-raven-5.23.0-to-5.24.2
Update raven to 5.24.2
2016-08-08 13:12:48 +02:00
pyup-bot
312dd65acc Update flake8 from 3.0.3 to 3.0.4 2016-08-08 03:48:55 -07:00
pyup-bot
795ac65034 Update raven from 5.23.0 to 5.24.2 2016-08-05 16:48:38 -07:00
Audrey Roy Greenfeld
603e36acf9 Upgrade to Bootstrap 4 Alpha 3 2016-08-03 16:03:43 -07:00
pyup-bot
2b0e185687 Update django-model-utils from 2.5 to 2.5.1 2016-08-03 07:48:24 -07:00
Fábio C. Barrionuevo da Luz
91aabe10d9 Merge pull request #695 from pydanny/pyup-update-coverage-4.1-to-4.2
Update coverage to 4.2
2016-07-30 09:31:55 -03:00
pyup-bot
1f1c0e31ef Update flake8 from 3.0.1 to 3.0.3 2016-07-30 05:02:58 -07:00
pyup-bot
35ebc9bc00 Update coverage from 4.1 to 4.2 2016-07-26 14:10:15 -07:00
pyup-bot
8ba3d3ad86 Update coverage from 4.1 to 4.2 2016-07-26 14:10:14 -07:00
Jannis Gebauer
f6e27dd240 Merge pull request #693 from pydanny/pyup-update-django-allauth-0.25.2-to-0.26.1
Update django-allauth to 0.26.1
2016-07-26 10:15:26 +02:00
pyup-bot
564e3cea43 Update flake8 from 3.0.0 to 3.0.1 2016-07-25 17:55:06 -07:00
Dan Mirsky
b766b7c4bc Fixes to support renewal with docker's new networking
Added new replacement variable for nginx-secure: ___NAMESERVER___. This
is parsed out from the system resolv.conf and used to resolve the
ip's of the containers dynamically
Modified nginx-secure.conf to resolve certbot dynamically
NOTE: if using `docker-compose run certbot ...`, set `--name certbot` so it
can be resolved properly
Added CMD /start.sh back in, guessing it was removed by accident
2016-07-25 13:14:18 -07:00
pyup-bot
bc699f55fd Update django-allauth from 0.25.2 to 0.26.1 2016-07-25 12:40:05 -07:00
Jannis Gebauer
8ed195145a Merge pull request #682 from pydanny/pyup-update-gevent-1.1.1-to-1.1.2
Update gevent to 1.1.2
2016-07-25 17:45:16 +02:00
Jannis Gebauer
f11e3f8329 Merge pull request #689 from pydanny/pyup-update-django-webpack-loader-0.3.0-to-0.3.3
Update django-webpack-loader to 0.3.3
2016-07-25 17:45:05 +02:00
Jannis Gebauer
e1d73dcb8e Merge pull request #690 from pydanny/pyup-update-flake8-2.6.2-to-3.0.0
Update flake8 to 3.0.0
2016-07-25 17:44:57 +02:00
pyup-bot
4a0ad7bd2f Update django-redis from 4.4.3 to 4.4.4 2016-07-25 05:25:00 -07:00
pyup-bot
4d773729f5 Update flake8 from 2.6.2 to 3.0.0 2016-07-25 04:25:01 -07:00
pyup-bot
d63e2e22ad Update django-webpack-loader from 0.3.0 to 0.3.3 2016-07-24 12:54:58 -07:00
pyup-bot
df135c9a6f Update gevent from 1.1.1 to 1.1.2 2016-07-21 07:54:37 -07:00
Jannis Gebauer
fc20db3ed6 remove sqlparse from dependencies 2016-07-21 11:32:28 +02:00
pyup-bot
1292e5b57b Update django-debug-toolbar from 1.4 to 1.5 2016-07-21 02:24:35 -07:00
Jannis Gebauer
96722f53b3 Merge pull request #676 from pydanny/pyup-update-django-1.9.7-to-1.9.8
Update django to 1.9.8
2016-07-20 19:27:21 +02:00
Jannis Gebauer
7a0b9402b7 Merge pull request #678 from pydanny/pyup-update-boto-2.41.0-to-2.42.0
Update boto to 2.42.0
2016-07-20 19:27:15 +02:00
Jannis Gebauer
5ca39c4d86 adding debug_toolbar temporary workaround 2016-07-20 19:25:37 +02:00
pyup-bot
1afa107d68 Update boto from 2.41.0 to 2.42.0 2016-07-19 15:24:26 -07:00
pyup-bot
ffd26051c6 Update django from 1.9.7 to 1.9.8 2016-07-18 11:24:17 -07:00
Jannis Gebauer
d9abe0b6d0 Merge pull request #671 from pydanny/pyup-update-pytz-2016.4-to-2016.6.1
Update pytz to 2016.6.1
2016-07-16 11:56:22 +02:00
Jannis Gebauer
50125f1c44 Merge pull request #672 from pydanny/pyup-update-raven-5.22.0-to-5.23.0
Update raven to 5.23.0
2016-07-16 11:56:10 +02:00
Daniel Roy Greenfeld
b1e7f55b6b Update common.py 2016-07-14 12:06:29 -07:00
pyup-bot
cc2cad0236 Update raven from 5.22.0 to 5.23.0 2016-07-14 03:23:49 -07:00
pyup-bot
dfa8138297 Update pytz from 2016.4 to 2016.6.1 2016-07-14 01:23:51 -07:00
pyup-bot
f9fe8891ac Update sphinx from 1.4.4 to 1.4.5 2016-07-13 05:23:43 -07:00
pyup-bot
08d29de9a9 Update raven from 5.21.0 to 5.22.0 2016-07-07 07:38:06 -07:00
Fábio C. Barrionuevo da Luz
8182878dea Merge pull request #661 from pydanny/pyup-update-pillow-3.2.0-to-3.3.0
Update pillow to 3.3.0
2016-07-07 08:27:25 -03:00
pyup-bot
ff483f0a5c Update psycopg2 from 2.6.1 to 2.6.2 2016-07-06 19:38:04 -07:00
pyup-bot
5b6c3c75a5 Update psycopg2 from 2.6.1 to 2.6.2 2016-07-06 19:38:03 -07:00
pyup-bot
56493d2d50 Update psycopg2 from 2.6.1 to 2.6.2 2016-07-06 19:38:02 -07:00
pyup-bot
3bcaba103f Update pillow from 3.2.0 to 3.3.0 2016-07-01 21:07:26 +08:00