Commits · 772196a56f58d606348fe980f60df6d01bf96005 · edx / edx-submissions

19 Nov, 2015 1 commit
- Merge remote-tracking branch 'origin/master' into django-upgrade/1.8 · 772196a5
```
Conflicts:
	setup.py
	submissions/models.py
```
  muhammad-ammar committed Nov 19, 2015
  772196a5 Browse Files
11 Nov, 2015 10 commits
- Version 0.1.2 · d6fc3578
  Ned Batchelder committed Nov 10, 2015
  
  d6fc3578 Browse Files
- Remove migration from post-0.1.0 · 517958bf
```
We had made the migrations from master, but that isn't what edx-platform
was using yet.  This migration is re-made from 0.1.0, which removes
things that happened after 0.1.0.
```
  Ned Batchelder committed Nov 10, 2015
  517958bf Browse Files
- bump library version · 51e5b8c2
  muhammad-ammar committed Nov 10, 2015
  
  51e5b8c2 Browse Files
- update django-extensions · 66e305d8
  muhammad-ammar committed Nov 10, 2015
  
  66e305d8 Browse Files
- set django version to 1.8.5 · 1ad8dd1c
  muhammad-ammar committed Nov 10, 2015
  
  1ad8dd1c Browse Files
- bump library version · 2bc33554
  muhammad-ammar committed Nov 10, 2015
  
  2bc33554 Browse Files
- update migrations · 4eed737e
```
remove deprecation warnings
```
  muhammad-ammar committed Nov 10, 2015
  4eed737e Browse Files
- bump django-nose version · 0a5cdc13
  muhammad-ammar committed Nov 10, 2015
  
  0a5cdc13 Browse Files
- Remove RemovedInDjango19Warning warnings · 50e621d2
  muhammad-ammar committed Nov 10, 2015
  
  50e621d2 Browse Files
- Upgrade django to 1.8. · 589d2cf3
  muzaffaryousaf committed Nov 10, 2015
  
  589d2cf3 Browse Files
10 Nov, 2015 2 commits
- Merge pull request #28 from edx/diana/update-submissions-version · 3d3ba2a4
```
Update the submission version.
```
  Diana Huang committed Nov 10, 2015
  3d3ba2a4 Browse Files
- Update the submission version. · 2d723863
  Diana Huang committed Nov 10, 2015
  
  2d723863 Browse Files
30 Oct, 2015 2 commits
- Merge pull request #25 from edx/diana/score-annotations · 87aaf568
```
Add the ability to annotate scores.
```
  Diana Huang committed Oct 30, 2015
  87aaf568 Browse Files
- Add the ability to annotate scores. · c16512e4
  Diana Huang committed Oct 30, 2015
  
  c16512e4 Browse Files
16 Sep, 2015 1 commit
- Merge pull request #20 from edx/will/upgrade-django-rest-framework · 14aeaa9e
```
Upgrade djangorestframework to v3.1
```
  Will Daly committed Sep 16, 2015
  14aeaa9e Browse Files
09 Sep, 2015 1 commit
- Fix submission admin · caded932
  Will Daly committed Sep 09, 2015
  
  caded932 Browse Files
04 Sep, 2015 1 commit
- Merge pull request #21 from edx/ammar/update-django-nose · 05f737c2
```
update django-nose
```
  Muhammad Ammar committed Sep 04, 2015
  05f737c2 Browse Files
03 Sep, 2015 1 commit
- update django-nose · 92a7aa70
  muhammad-ammar committed Sep 03, 2015
  
  92a7aa70 Browse Files
31 Aug, 2015 1 commit

Upgrade djangorestframework to v3.1 · 34d6987c

* Upgrade DRF to v3.1
* Use JSONField on the model instead of custom serializer field for the submission answer.

committed Aug 31, 2015

34d6987c Browse Files

25 Aug, 2015 2 commits
- Merge pull request #19 from edx/will/upgrade-django-model-utils · 7fce3f8e
```
Upgrade django-model-utils to 2.3.1
```
  Will Daly committed Aug 25, 2015
  7fce3f8e Browse Files
- Upgrade django-model-utils to 2.3.1 · 9538ee8a
  Will Daly committed Aug 25, 2015
  
  9538ee8a Browse Files
24 Aug, 2015 1 commit
- Merge pull request #18 from edx/update-pytz · 9407f2b6
```
Update pytz to reflect upstream version change
```
  Kelketek committed Aug 24, 2015
  9407f2b6 Browse Files
21 Aug, 2015 3 commits
- Update pytz to reflect upstream version change · 8b633d8d
```
In certain circumstances the version of Pytz in this file will conflict with versions of pytz required by edx-platform in `requirements/edx/base.txt`. This PR makes the version in this repository match.
```
  Kelketek committed Aug 21, 2015
  8b633d8d Browse Files
- Merge pull request #17 from edx/will/upgrade-django-extensions · 6155277d
```
Upgrade django-extensions to 1.5.5
```
  Will Daly committed Aug 21, 2015
  6155277d Browse Files
- Upgrade django-extensions to 1.5.5 · 906c7b7a
  Will Daly committed Aug 21, 2015
  
  906c7b7a Browse Files
05 Jun, 2015 2 commits
- Merge pull request #14 from open-craft/data-export · 7c766502
```
Add get_all_submissions method to the API
```
  Sven Marnach committed Jun 05, 2015
  7c766502 Browse Files
- Sort by submitted_at and id instead of created_at in get_all_submissions(). · e4091fb7
```
This is consistent with the default ordering of the model and avoids ties in
case to items have the same timestamp.
```
  Sven Marnach committed Jun 05, 2015
  e4091fb7 Browse Files
03 Jun, 2015 1 commit
- Refactor get_all_submissions implementation and add a test. · b32d34f7
  Sven Marnach committed Jun 03, 2015
  
  b32d34f7 Browse Files
16 May, 2015 1 commit
- Add get_all_submissions method to the API · 29a96a4b
  Braden MacDonald committed May 16, 2015
  
  29a96a4b Browse Files
27 Apr, 2015 1 commit
- Merge pull request #15 from mcgachey/mcgachey-signals · e2361932
```
Adding signals for scoring events.
```
  David Ormsbee committed Apr 27, 2015
  e2361932 Browse Files
25 Apr, 2015 1 commit
- Adding signals for scoring events. · 835b7904
  Phil McGachey committed Apr 25, 2015
  
  835b7904 Browse Files
18 Feb, 2015 2 commits
- Merge pull request #13 from edx/muzaffar/fix-top-submissions-tnl1455 · 8fb070d2
```
The Top submissions should not be including the cancelled ones.
```
  Muzaffar yousaf committed Feb 18, 2015
  8fb070d2 Browse Files
- Return top submissions without the cancelled ones. · 85bab344
```
TNL-1455
```
  Muzaffar committed Feb 18, 2015
  85bab344 Browse Files
15 Jan, 2015 1 commit
- Merge pull request #12 from edx/muzaffar/removed-sub-with-0-score-tnl1125 · ff6a76e4
```
Ignore the submissions that have 0 score.
```
  Muzaffar yousaf committed Jan 15, 2015
  ff6a76e4 Browse Files
14 Jan, 2015 1 commit
- Ignore submissions that have 0 score (top_submissions). · 7d19adcc
```
TNL-1125
```
  Muzaffar committed Jan 14, 2015
  7d19adcc Browse Files
16 Sep, 2014 3 commits
- Version 0.0.8 · d6a14f5d
  Dave St.Germain committed Sep 16, 2014
  
  d6a14f5d Browse Files
- Merge pull request #11 from edx/dcs/restframework-version · c214f155
```
Don't pin the specific version of restframework
```
  Dave St.Germain committed Sep 16, 2014
  c214f155 Browse Files
- Don't pin the specific version of restframework · 245996e0
  Dave St.Germain committed Sep 16, 2014
  
  245996e0 Browse Files
11 Aug, 2014 1 commit
- Version 0.0.7 · bc4e85e8
  Will Daly committed Aug 11, 2014
  
  bc4e85e8 Browse Files