Commit Graph

110 Commits

Author SHA1 Message Date
Bruno Alla
19547ac937 Bootstrap4 workarounds cleanup (#1470)
* Cleanup workaround CSS for Bootstrap 4 + DDT fix

* Cleanup custom Bootstrap 4 + crispy forms workaround
2018-02-05 07:10:49 -08:00
Dayson Pais
8edcb1cbfe
Merge branch 'master' into update-django-1.11.8-to-2.0 2018-02-05 10:24:58 +00:00
Bruno Alla
af12f39996 Improve custom_bootstrap_compilation option (#1429)
* Add Bootstrap to package.json in case of custom_bootstrap_compilation

* Update JS task runners and base HTML to handle custom scss compilation

* Generate a vendors.js with custom bootstrap compilation + Gulp

* Update documentation accordingly

* Add missing if/endif in gulpfile

* Update to Bootstrap v4 final
2018-01-20 17:05:12 -08:00
Reggie Riser
f7bd7a5814 Fixing leftovers from migration to Django 1.11 and Python 3.6. 2018-01-03 08:44:54 -05:00
Dayson Pais
8bfe18b52a Update django from 1.11.8 to 2.0
- Refactor django.core.urlresolvers module import to django.urls. Resolves: The django.core.urlresolvers module is removed in favor of its new location, django.urls.

- Add an app namespace to urls in user app. Resolves: Support for setting a URL instance namespace without an application namespace is removed.
2017-12-30 12:16:19 +05:30
Reggie Riser
874caee360 Removed references and old CSS specific to Bootstrap alpha. (#1333)
* Removed references and old CSS specific to Bootstrap alpha.

* Fixed Bootstrap alpha reference in README.
2017-09-18 10:44:16 +03:00
Arcuri Davide
433eef62e4 Update bootstrap to 4.0.0-beta (#1319)
* Update bootstrap to 4.0.0-beta

Update cdn link for js and css.
Fixed class names for navbar -https://medium.com/@lukaszholeczek/how-to-upgrade-bootstrap-4-alpha-6-to-bootstrap-4-beta-d43b4210f2a3

* Updated CONTRIBUTORS.rst

Updated CONTRIBUTORS.rst
2017-09-05 15:21:25 +03:00
Reggie Riser
5f4e195007 Loading "static" tags instead of "staticfiles" for Django 1.10+ per https://docs.djangoproject.com/en/dev/releases/1.10/#django-contrib-staticfiles . (#1308) 2017-08-29 15:55:15 +03:00
Shupeyko Nikita
1f7be4eb57 Revert "Node.JS + docker-compose = ♥" (#1206)
* Revert "[Fix] #1173 Nginx SSL redirect loop (#1174)"

This reverts commit cabcc7b106.

* Revert "Fix Getting Up and Running Locally With Docker doc sphinx warnings (#1165)"

This reverts commit 83c8594203.

* Revert "Fix index.rst sphinx warnings (#1166)"

This reverts commit 51dd0b5e73.

* Revert "Pin mailhog Docker image to v1.0.0 (#1201)"

This reverts commit d9f870461b.

* Revert "Node.JS + docker-compose = ♥ (#1128)"

This reverts commit 4b06fe3958.
2017-06-21 23:12:22 +03:00
Shupeyko Nikita
4b06fe3958 Node.JS + docker-compose = ♥ (#1128)
* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Fix typo

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Revert "Fix typo"

This reverts commit 02033729b5.

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Fix typo

* Revert "Fix typo"

This reverts commit 02033729b5.

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Remove Gulp-Docker integraton not supported initialization message
2017-06-20 22:48:17 +03:00
Ben Warren
4aff5971d1 Automatic recompilation of Bootstrap with user-defined variables (#1181)
Allow for dynamic bootstrap compilation

Exclude sublime artifacts

Make custom bootstrap vars file

Add custom bootstrap compilation

Add cookiecutter option

Use the right name for the file

Add explanation to generated README

Add self to contributors

Remove sublime exclusion
2017-06-12 19:38:00 +03:00
Shupeyko Nikita
e78b6fb425 Fix W391 blank line at end of file (#1136) 2017-04-23 01:27:58 +03:00
Daniel Roy Greenfeld
6aced9ba73 Remove Python 2.7 support per #1129 (#1130)
* Remove Python 2.7 support per

* Remove Python 2.7 references

* Remove Python 2.7 references

* remove python 2 entirely
2017-04-21 12:31:45 -07:00
Daniel Roy Greenfeld
b0fe04fc52 First pass at Bootstrap 4 Alpha 6, just the basic layout 2017-04-20 15:18:30 -07:00
Daniel Roy Greenfeld
a383fa2378 Document source of unclear links 2017-04-14 11:54:38 -07:00
Shupeyko Nikita
1c1cc9ee9c Prevent PyCharm from formatting raven and opbeat imports (#1063)
* Prevent PyCharm from formatting raven and opbeat imports

Since raven and opbeat are required in production only, imports might (most surely will) be wiped out during PyCharm code clean up started in other environments.

* Prevent PyCharm from formatting raven and opbeat imports

Since raven and opbeat are required in production only, imports might (most surely will) be wiped out during PyCharm code clean up started in other environments.

* Fix line breaks and spaces

* Fix linebreaks
2017-04-13 10:50:11 -07:00
Wee Liat
0b14104ae0 added btn class to forget password (#1102) 2017-04-01 08:30:24 -07:00
William Martin Stewart
f298ef7722 Inconsistent title case in 404 (#974)
We should either title case it or just capitalise the first letter, imho.
2017-02-13 10:44:02 -08:00
shireenrao
85c7ff1288 remove html5.js as source no longer exists (#853)
* remove html5.js as source no longer exists

* Update the path for html5shiv

Added path https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js
2016-10-19 08:51:53 -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
Fabio C. Barrioneuvo da Luz
fc770f1506 update jquery to 3.1.1 2016-09-29 01:07:40 -03:00
Fabio C. Barrioneuvo da Luz
0ea6153b00 removed django-autoslug until it's ready for 1.10 2016-09-29 01:01:01 -03:00
Fabio C. Barrioneuvo da Luz
7740744885 sync migrations with django1.10 2016-09-29 01:01:01 -03:00
Fabio C. Barrioneuvo da Luz
791b2f5cc2 update frontend dependencies 2016-09-29 01:01:01 -03:00
Steve Steiner
d556f3cc5f Make test_docker.sh tests pass by passing new password auth rules 2016-09-29 01:01:01 -03: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
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
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
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
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
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
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
Parbhat Puri
e5fe8fa935 fix: offset class modified in Bootstrap 4 alpha 3 (#720) 2016-08-16 12:22:56 -07:00
Audrey Roy Greenfeld
603e36acf9 Upgrade to Bootstrap 4 Alpha 3 2016-08-03 16:03:43 -07:00
Jannis Gebauer
248a5647f6 Merge pull request #627 from kappataumu/fix-574
Fix for issue #574
2016-06-24 22:43:05 +02:00
Will Farley
8880e777d2 WIP: Add webpack as an option (#610)
* Add webpack as an option

Adds webpack as a js_taskrunner option to cookiecutter-json. Will clone @hzdg/cookiecutter-webpack --pydanny-django branch into the project using cookiecutter's api in post_hooks.

The static webpack project will be placed into the <project_slug>/static/<project_slug>/ directory.
The webpack configs are placed in the ./config/ directory.

The cookiecutter-webpack project includes react / redux / karma configurations that are brought into the project.

* Add webpack documentation
2016-06-19 12:24:43 -07:00
Daniel Roy Greenfeld
bf15e018c2 Switch to using apps.py with Users app 2016-06-18 13:18:40 -07:00
Andres Gonzalez
3d2385a3b6 Add django-compressor suport (#568)
* #342 Add compressor option to requirements

* #342 Add compressor to production settings

* #342 Add compressor to base template

* #342 Add settings to common.py and add tags to base template

* #342 Flake8 fix for tox tests

* #342 Remove redundant line

* #342 Add required options for S3 to production.py and added Env variable to enable/disable compression

* #342 Add required options for compressor on S3 to production.py
2016-06-17 19:07:45 -07:00
kappataumu
4c334c07b5 Fix automated conversion hiccup 2016-06-16 12:22:07 +00:00
kappataumu
a023333499 Change to Sign out for consistency 2016-06-16 12:16:20 +00:00
kappataumu
ee7b4dd108 Logout button class fix 2016-06-16 11:56:58 +00:00
kappataumu
6e7ac19f69 Change to Sign in for consistency 2016-06-16 11:54:03 +00:00
kappataumu
813032eff7 Fix buttons 2016-06-16 11:47:38 +00:00
kappataumu
9dda2a97da Update base.html 2016-06-16 11:28:54 +00:00
kappataumu
473ee0760e Sync with upstream 2016-06-16 11:28:23 +00:00
kappataumu
83db25211d Update Bootstrap CSS and JS to v4.0.0-alpha.2 minified. Fixes #589 2016-06-06 13:48:00 +00:00
Daniel Roy Greenfeld
783e7f644e Fix #390 #450 2016-06-05 12:32:05 -07:00
Daniel Roy Greenfeld
f40f304457 Use sentry for error reporting 2016-06-05 10:47:07 -07:00
Vivian Guillen
cda3cfc641 merge in @@viviangb #585 2016-06-03 17:35:46 -07:00
Daniel Roy Greenfeld
36ac82b1cf Removed angular2 2016-06-03 14:07:25 -07:00
Fabio C. Barrioneuvo da Luz
0601795f68 update requirements and changelog 2016-05-13 00:13:42 -03:00
Fabio C. Barrioneuvo da Luz
2b878fcf36 replace occurrences of readthedocs.org to readthedocs.io 2016-05-09 17:18:58 -03:00
Audrey Roy Greenfeld
15f350f05e Change repo_name to project_slug for clarity. 2016-04-20 10:00:35 -07:00