Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update jquery and django #906

Merged
merged 5 commits into from
Aug 27, 2019
Merged

Update jquery and django #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3fc4c6
Updated vendored javascript dependencies
Jkrzy Jun 26, 2019
9e586a2
Update python dependencies
Jkrzy Jul 2, 2019
a729ba9
Merge branch 'master' into js-updates
Jkrzy Aug 8, 2019
ca02e06
Update python and js dev dependencies
Jkrzy Aug 8, 2019
dcebc5b
Update and Move vendored dependencies
Jkrzy Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 100 additions & 97 deletions Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion docs/dependency-management.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@ pipenv lock --requirements > requirements.txt

## JavaScript

Tock uses [npm] to manage JavaScript dependencies.
### Production

Tock uses Django's staticfiles functionality to serve frontend dependencies in production.

Updates for dependencies must be committed directly to this repository in `tock/tock/static`

### Development/Testing
Tock uses [npm] to manage development/testing JavaScript dependencies.

Update dependencies locally with the following:

Expand Down
Loading