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.

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

Release 3.1.0 #304

Merged
merged 128 commits into from
Sep 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
d13284a
Update pytest-django from 3.8.0 to 3.9.0
pyup-bot Mar 31, 2020
9837d89
Update psycopg2-binary from 2.8.4 to 2.8.5
pyup-bot Apr 6, 2020
0efb4a5
Update pytest-sugar from 0.9.2 to 0.9.3
pyup-bot Apr 26, 2020
595d991
Update pytest from 5.3.5 to 5.4.3
pyup-bot Jun 2, 2020
89f861a
Update mypy from 0.770 to 0.780
pyup-bot Jun 3, 2020
e8e9fb7
Update google-auth from 1.12.0 to 1.17.2
pyup-bot Jun 12, 2020
9154ead
Update sphinx from 3.0.4 to 3.1.1
pyup-bot Jun 14, 2020
3f3e9ec
Merge branch 'pyup/update-sphinx-3.0.4-to-3.1.1' into develop
courtneycb Jun 15, 2020
22e2753
Merge develop.
courtneycb Jun 15, 2020
b3b64db
Merge branch 'pyup/update-pytest-django-3.8.0-to-3.9.0' into develop
courtneycb Jun 15, 2020
ea6c2e4
Merge branch 'develop' into pyup/update-pytest-sugar-0.9.2-to-0.9.3
courtneycb Jun 15, 2020
2dd27d0
Merge branch 'pyup/update-pytest-sugar-0.9.2-to-0.9.3' into develop
courtneycb Jun 15, 2020
9485f00
Merge branch 'develop' into pyup/update-google-auth-1.12.0-to-1.17.2
courtneycb Jun 15, 2020
582e2b4
Merge branch 'pyup/update-google-auth-1.12.0-to-1.17.2' into develop
courtneycb Jun 15, 2020
e363741
Merge branch 'develop' into pyup/update-mypy-0.770-to-0.780
courtneycb Jun 15, 2020
78d7ef8
Merge branch 'pyup/update-mypy-0.770-to-0.780' into develop
courtneycb Jun 15, 2020
580e7b0
merge develop.
courtneycb Jun 15, 2020
c577537
Merge branch 'pyup/update-psycopg2-binary-2.8.4-to-2.8.5' into develop
courtneycb Jun 15, 2020
d42ccb8
merge develop.
courtneycb Jun 15, 2020
6b9831f
Merge branch 'pyup/update-pytest-5.3.5-to-5.4.3' into develop
courtneycb Jun 15, 2020
c6cb9a6
Add blank line.
courtneycb Jun 15, 2020
af1e26a
Hide toast initially.
courtneycb Jun 18, 2020
c3aa6df
Merge pull request #259 from uccser/issue/256
courtneycb Jun 18, 2020
f8af433
Update google-auth from 1.17.2 to 1.18.0
pyup-bot Jun 19, 2020
5db0880
Update mypy from 0.780 to 0.781
pyup-bot Jun 20, 2020
cf58b3d
Merge branch 'pyup/update-google-auth-1.17.2-to-1.18.0' into develop
courtneycb Jun 22, 2020
7dfb0b3
Merge branch 'develop' into pyup/update-mypy-0.780-to-0.781
courtneycb Jun 22, 2020
cbfb3ec
Merge branch 'pyup/update-mypy-0.780-to-0.781' into develop
courtneycb Jun 22, 2020
ac9b222
Update mypy from 0.781 to 0.782
pyup-bot Jun 23, 2020
6b37761
Update sphinx from 3.1.1 to 3.1.2
pyup-bot Jul 6, 2020
96d3dde
Update pytest-sugar from 0.9.3 to 0.9.4
pyup-bot Jul 6, 2020
b808d07
update README
eAlasdair Jul 8, 2020
84c8b9d
begin third-party licensing
eAlasdair Jul 8, 2020
ba64acf
.
eAlasdair Jul 8, 2020
4855c3d
minor fixes
eAlasdair Jul 14, 2020
eaa8e9d
Update django-extensions from 2.2.9 to 3.0.3
pyup-bot Jul 14, 2020
db36c63
add licences up to/including base/django
eAlasdair Jul 22, 2020
5b75e9c
add licences for rest of base dependencies
eAlasdair Jul 22, 2020
ed49f28
add licences for prod dependencies
eAlasdair Jul 22, 2020
d4ab005
add licences for local dependencies
eAlasdair Jul 23, 2020
6fcaaa9
add licences for package.json dependencies
eAlasdair Jul 23, 2020
c503490
remove dependency that no longer exists
eAlasdair Jul 23, 2020
aa9c06a
Update coverage from 5.1 to 5.2.1
pyup-bot Jul 25, 2020
7441a94
Merge pull request #275 from uccser/release/3.0.0
eAlasdair Jul 27, 2020
31c3501
Update google-auth from 1.18.0 to 1.20.0
pyup-bot Jul 28, 2020
95e67d7
Update pillow to version 7.2.0.
courtneycb Jul 29, 2020
57bd4cc
add discovered licence files
eAlasdair Jul 29, 2020
45a329c
Merge pull request #278 from uccser/update-pillow
courtneycb Jul 29, 2020
92ae009
Merge branch 'develop' into issue/258
courtneycb Jul 29, 2020
1606a46
Update pytest from 5.4.3 to 6.0.0
pyup-bot Jul 29, 2020
e6c003e
Merge branch 'develop' into issue/258
courtneycb Jul 29, 2020
45b210d
Merge branch 'develop' into pyup/update-sphinx-3.1.1-to-3.1.2
courtneycb Jul 29, 2020
81ac6e9
Merge branch 'develop' into pyup/update-pytest-sugar-0.9.3-to-0.9.4
courtneycb Jul 29, 2020
bac9a19
Merge branch 'develop' into pyup/update-django-extensions-2.2.9-to-3.0.3
courtneycb Jul 29, 2020
4935856
Merge branch 'develop' into pyup/update-coverage-5.1-to-5.2.1
courtneycb Jul 29, 2020
73f6587
Merge branch 'develop' into pyup/update-google-auth-1.18.0-to-1.20.0
courtneycb Jul 29, 2020
9207273
Merge branch 'develop' into pyup/update-mypy-0.781-to-0.782
courtneycb Jul 29, 2020
938a643
Merge branch 'pyup/update-mypy-0.781-to-0.782' into develop
courtneycb Jul 29, 2020
42e62fa
Merge branch 'pyup/update-sphinx-3.1.1-to-3.1.2' into develop
courtneycb Jul 29, 2020
39a3ed1
Merge branch 'pyup/update-pytest-sugar-0.9.3-to-0.9.4' into develop
courtneycb Jul 29, 2020
00aaeeb
Merge branch 'pyup/update-django-extensions-2.2.9-to-3.0.3' into develop
courtneycb Jul 29, 2020
76c0b98
Merge branch 'pyup/update-coverage-5.1-to-5.2.1' into develop
courtneycb Jul 29, 2020
6aadcda
Merge branch 'pyup/update-google-auth-1.18.0-to-1.20.0' into develop
courtneycb Jul 29, 2020
600da56
Merge develop
courtneycb Jul 29, 2020
93b14a8
Merge branch 'pyup/update-pytest-5.4.3-to-6.0.0' into develop
courtneycb Jul 29, 2020
adb67ed
Merge branch 'develop' into issue/258
courtneycb Jul 29, 2020
62e80a3
Merge pull request #271 from uccser/issue/258
eAlasdair Jul 30, 2020
43173d5
Fix typo in readme
eAlasdair Jul 30, 2020
cf8fc87
Update pytest from 6.0.0 to 6.0.1
pyup-bot Jul 31, 2020
8a9cbec
Merge pull request #280 from uccser/readme-typo
eAlasdair Aug 6, 2020
5d625b4
Update google-auth from 1.20.0 to 1.20.1
pyup-bot Aug 7, 2020
0fb4918
Update google-cloud-logging from 1.15.0 to 1.15.1
pyup-bot Aug 7, 2020
4e7b213
Update django-extensions from 3.0.3 to 3.0.5
pyup-bot Aug 10, 2020
4c1b5c1
Update sphinx from 3.1.2 to 3.2.1
pyup-bot Aug 15, 2020
1a18bf3
WIP. Add introJS.
courtneycb Aug 18, 2020
711bc9e
Finish program tut. Add function tut.
courtneycb Aug 19, 2020
4b7f103
Add debugging tut.
courtneycb Aug 19, 2020
7d62199
Add parsons tut.
courtneycb Aug 19, 2020
24de88b
Add introjs licence.
courtneycb Aug 19, 2020
591ff3c
Hide tut on mobile.
courtneycb Aug 19, 2020
a09eac6
Add newline at EOF.
courtneycb Aug 19, 2020
41127d9
Update pydocstyle from 5.0.2 to 5.1.0
pyup-bot Aug 22, 2020
ef859bc
Move licence file.
courtneycb Aug 25, 2020
3c35da5
Add copyright notice to top of introjs css files.
courtneycb Aug 25, 2020
69b8444
Some review changes.
courtneycb Aug 26, 2020
de57abd
Review changes.
courtneycb Aug 26, 2020
5c38264
Merge branch 'develop' into pyup/update-pytest-6.0.0-to-6.0.1
courtneycb Aug 27, 2020
ab9dee7
Merge branch 'pyup/update-pytest-6.0.0-to-6.0.1' into develop
courtneycb Aug 27, 2020
f9d6f5b
Merge branch 'develop' into pyup/update-google-auth-1.20.0-to-1.20.1
courtneycb Aug 27, 2020
6b68928
Merge branch 'pyup/update-google-auth-1.20.0-to-1.20.1' into develop
courtneycb Aug 27, 2020
03405c6
merge develop
courtneycb Aug 27, 2020
7721c41
Merge branch 'pyup/update-google-cloud-logging-1.15.0-to-1.15.1' into…
courtneycb Aug 27, 2020
64a0ce3
Merge branch 'develop' into pyup/update-django-extensions-3.0.3-to-3.0.5
courtneycb Aug 27, 2020
4371c6e
Merge branch 'pyup/update-django-extensions-3.0.3-to-3.0.5' into develop
courtneycb Aug 27, 2020
e16712f
Merge branch 'develop' into pyup/update-sphinx-3.1.2-to-3.2.1
courtneycb Aug 27, 2020
5034de8
Merge branch 'pyup/update-sphinx-3.1.2-to-3.2.1' into develop
courtneycb Aug 27, 2020
4444d2e
Merge branch 'develop' into pyup/update-pydocstyle-5.0.2-to-5.1.0
courtneycb Aug 27, 2020
86d3d2a
Merge branch 'pyup/update-pydocstyle-5.0.2-to-5.1.0' into develop
courtneycb Aug 27, 2020
a709ed0
Update pydocstyle from 5.1.0 to 5.1.1
pyup-bot Aug 29, 2020
18e198b
Apply suggestions from code review
courtneycb Aug 31, 2020
bb1a6f1
Wording changes and trying to fix scroll.
courtneycb Aug 31, 2020
01ef7da
Resolve merge conflicts.
courtneycb Aug 31, 2020
0f729ab
Review changes.
courtneycb Aug 31, 2020
0017708
Update django-storages from 1.9.1 to 1.10
pyup-bot Aug 31, 2020
6bf8630
Update django-extensions from 3.0.5 to 3.0.7
pyup-bot Sep 2, 2020
9721137
Fix scrolling problem
eAlasdair Sep 3, 2020
d697f7b
fix strange sentence structure
eAlasdair Sep 3, 2020
234d756
Update google-auth from 1.20.1 to 1.21.1
pyup-bot Sep 3, 2020
3fb360d
Merge branch 'pyup/update-pydocstyle-5.1.0-to-5.1.1' into develop
courtneycb Sep 3, 2020
2384af0
Merge branch 'develop' into pyup/update-google-auth-1.20.1-to-1.21.1
courtneycb Sep 3, 2020
c5cb09e
Merge branch 'pyup/update-google-auth-1.20.1-to-1.21.1' into develop
courtneycb Sep 3, 2020
9a56878
Merge branch 'develop' into pyup/update-django-extensions-3.0.5-to-3.0.7
courtneycb Sep 3, 2020
388e643
Merge branch 'pyup/update-django-extensions-3.0.5-to-3.0.7' into develop
courtneycb Sep 3, 2020
d2e60b5
Resolve conflicts.
courtneycb Sep 3, 2020
1f1a25d
Merge branch 'pyup/update-django-storages-1.9.1-to-1.10' into develop
courtneycb Sep 3, 2020
758ec6e
Merge pull request #290 from uccser/issue/51
courtneycb Sep 4, 2020
51badec
Update django-extensions from 3.0.7 to 3.0.8
pyup-bot Sep 4, 2020
fb84bb7
Add super call to CSS block
courtneycb Sep 6, 2020
a4f10d5
Update psycopg2-binary from 2.8.5 to 2.8.6
pyup-bot Sep 6, 2020
b996e01
fix bug in tutorial where elements weren't scrolled to properly
eAlasdair Sep 7, 2020
4353521
Merge pull request #302 from uccser/issue/300
courtneycb Sep 7, 2020
7b0baf3
Merge pull request #303 from uccser/issue/51
eAlasdair Sep 7, 2020
3c8ef98
Merge branch 'develop' into pyup/update-django-extensions-3.0.7-to-3.0.8
courtneycb Sep 7, 2020
1cfc5f3
Merge branch 'pyup/update-django-extensions-3.0.7-to-3.0.8' into develop
courtneycb Sep 7, 2020
0ff6db3
Merge branch 'develop' into pyup/update-psycopg2-binary-2.8.5-to-2.8.6
courtneycb Sep 7, 2020
ba607e0
Merge branch 'pyup/update-psycopg2-binary-2.8.5-to-2.8.6' into develop
courtneycb Sep 7, 2020
0637863
Update changelog and version number.
courtneycb Sep 7, 2020
278c3e9
Update changelog.
courtneycb Sep 7, 2020
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
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Changelog

## 3.1.0

- Add step by step introduction/tutorial to question pages.
- Add third party licence files.
- Update README.
- Dependency updates:
- Update coverage from 5.1 to 5.2.1.
- Update django-extensions from 2.2.9 to 3.0.8.
- Update django-storages[google] from 1.9.1 to 1.10.
- Update google-auth from 1.12.0 to 1.21.1.
- Update google-cloud-logging from 1.15.0 to 1.15.1.
- Update mypy from 0.770 to 0.782.
- Update Pillow from 7.0.0 to 7.2.0.
- Update psycopg2-binary from 3.0.4 to 3.2.1.
- Update pydocstyle from 5.0.2 to 5.1.1.
- Update pytest from 5.3.5 to 6.0.1.
- Update pytest-django from 3.8.0 to 3.9.0.
- Update pytest-sugar from 0.9.2 to 0.9.4.
- Update Sphinx from 2.8.4 to 2.8.6.

## 3.0.0

Add style checker for beginners.
Expand Down
File renamed without changes.
763 changes: 763 additions & 0 deletions LICENCE-THIRD-PARTY

Large diffs are not rendered by default.

41 changes: 38 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,42 @@
# CodeWOF

A website for maintaining your basic programming skills.
[![Build Status](https://travis-ci.org/uccser/codewof.svg?branch=master)](https://travis-ci.org/uccser/codewof)

## License
CodeWOF is a website for maintaining your basic programming skills, developed at the University of Canterbury in New Zealand.
The latest release of CodeWOF can be viewed at [https://www.codewof.co.nz/](https://www.codewof.co.nz/).

This repository is licensed under the [MIT license](https://opensource.org/licenses/MIT) (`LICENSE` file).
## Features

There are two major features of the CodeWOF project:

- Programming 'fitness' helper:
With a free account you can maintain your basic programming skills with short daily programming exercises.
Earn points and achievements while maintaining your coding Warrant of Fitness.
- Style checkers:
We've rewritten professional code style standards to make them easier to understand for beginners.
Our [style checkers](https://www.codewof.co.nz/style/) review your code with professional standards but provide simplified descriptions and examples to easily help you improve your coding style (no account needed).

Currently both features are available for Python 3; we would like to introduce more languages in future updates.

## Documentation

This is it! All of it.
We intend to create proper documentation in a full `docs` directory in the near future.
Don't be afraid to ask for help!

## Contributing

We would love your help to make CodeWOF as useful as it can be!
A contribution guide will be made available in the future.

## Licence

Third-party libraries used in this project have their licences listed within the `LICENCE-THIRD-PARTY` file, with a full copy of the licence available within the `third-party-licences` directory.
If a source file of a third-party library or system is stored within this repository, then a copyright notice should be present at the top of the file.

This rest of the project is licensed under the [MIT licence](https://opensource.org/licenses/MIT) (`LICENCE` file).
This licence applies to the content and all other underlying code used to manage and display the content.

## Contact

You can contact us at [csse-education-research@canterbury.ac.nz](mailto:csse-education-research@canterbury.ac.nz).
2 changes: 1 addition & 1 deletion codewof/config/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Configuration for Django system."""

__version__ = "3.0.0"
__version__ = "3.1.0"
__version_info__ = tuple(
[
int(num) if num.isdigit() else num
Expand Down
2 changes: 1 addition & 1 deletion codewof/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"clipboard": "2.0.6",
"details-element-polyfill": "2.3.1",
"fuse.js": "3.4.4",
"intro.js": "2.9.3",
"jquery": "3.4.1",
"popper.js": "1.15.0",
"skulpt": "0.11.1",
Expand All @@ -19,7 +20,6 @@
"@babel/core": "7.4.4",
"@babel/preset-env": "7.4.4",
"browserify": "16.2.3",
"child_process": "1.0.2",
"del": "4.1.1",
"gulp": "4.0.2",
"gulplog": "1.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ For example if we call `triangle(5)` we would expect the output to be:
*****
```

If `x` is less than 1 (inclusive), your function should **print** `That isn't a triangle!`
If `x` is 1 or less, your function should **print** `That isn't a triangle!`
62 changes: 62 additions & 0 deletions codewof/static/css/third-party/introjs-modern.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/**
* Intro.js v2.9.3
* https://github.com/usablica/intro.js
*
* Copyright (C) 2017 Afshin Mehrabani (@afshinmeh)
*/

.introjs-tooltip {
background-color: rgba(000, 0, 0, 0.5);
color: #fff;
}

.introjs-button,
.introjs-button:hover, .introjs-button:focus, .introjs-button:active,
.introjs-disabled, .introjs-disabled:focus, .introjs-disabled:hover {
outline: none;
background-image: none;
background-color: transparent;
color: #fff;
border: 1px solid transparent;
border-radius: 50px;
box-shadow: none;
border-shadow: none;
text-shadow: none;
}

.introjs-button:hover, .introjs-button:focus, .introjs-button:active {
border: 1px solid #fff
}
.introjs-disabled, .introjs-disabled:focus, .introjs-disabled:hover {
color: #ccc;
border: 1px solid transparent;
}

.introjs-arrow {
border: 10px solid #fff;
}
.introjs-arrow.top, .introjs-arrow.top-middle, .introjs-arrow.top-right {
border-color: transparent transparent rgba(000, 0, 0, 0.5);
top: -20px;
left: 20px;
}
.introjs-arrow.bottom, .introjs-arrow.bottom-middle, .introjs-arrow.bottom-right {
border-color: rgba(000, 0, 0, 0.5) transparent transparent;
bottom: -20px;
left: 20px;
}
.introjs-arrow.left, .introjs-arrow.right {
top: 20px;
}
.introjs-arrow.left-bottom, .introjs-arrow.right-bottom {
bottom: 20px;
}

.introjs-arrow.left, .introjs-arrow.left-bottom {
left: -20px;
border-color: transparent rgba(000, 0, 0, 0.5) transparent transparent;
}
.introjs-arrow.right, .introjs-arrow.right-bottom {
right: -20px;
border-color: transparent transparent transparent rgba(000, 0, 0, 0.5);
}
Loading