Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,365 Commits 1 Branch 0 Tags
2c83dc3f09b49d740407daaffe05ab8fd549ed8a
Commit Graph

360 Commits

Author SHA1 Message Date
Diana Huang
ad7e0f94fb Update opaque-keys hash 2014-07-11 15:40:09 -04:00
Mat Peterson
aee47b44df Testing for bugs off master for opaque-keys deprecation 2014-07-11 15:40:08 -04:00
Will Daly
e582337522 ORA2 release-2014-07-07T19.28 2014-07-08 13:50:28 -04:00
Will Daly
28cb25a1e4 Revert "ORA2 release-2014-06-30T13.39; update EASE to bump the NLTK version to 2.0.4" 
This reverts commit f40834fa2f.
 2014-07-02 14:21:29 -04:00
Clinton Blackburn
d118fb8cb2 Get active student count from new analytics data API 
Disabled by default.
 2014-07-01 07:18:04 -04:00
Will Daly
f40834fa2f ORA2 release-2014-06-30T13.39; update EASE to bump the NLTK version to 2.0.4 2014-06-30 09:41:55 -04:00
cahrens
a4b172d9d8 Display names, help text, and "deprecated" for Advanced Settings. 
STUD-302, STUD-303
 2014-06-26 16:54:22 -04:00
Christine Lytwynec
3bd404c92f updating diff-cover to 0.5.0 2014-06-26 09:55:46 -04:00
David Baumgold
0c0859f17b Merge pull request #4026 from edx/db/requests-2 
Upgrade `requests` module
 2014-06-25 19:34:05 -04:00
Will Daly
ff996f2c0c Update EASE to include an optimization 2014-06-25 11:02:46 -04:00
Dave St.Germain
d9bb5365dd Merge pull request #3982 from edx/dcs/move-i18ntools 
Moved i18n tools to i18n-tools repo
 2014-06-23 16:35:50 -04:00
Ned Batchelder
a3cd274dec Update to the i18n-tools with the underscore processing 2014-06-23 16:30:13 -04:00
Dave St.Germain
e6ec664ac0 remove tests, and bump version 2014-06-23 10:05:33 -04:00
Dave St.Germain
a6ffe8c12d Moving these tools to i18n-tools repo 2014-06-23 10:05:33 -04:00
Will Daly
c16bdf332b ORA2 release-2014-06-23T13.19 2014-06-23 09:23:33 -04:00
Gabe Mulley
2ca79f34cf Merge branch 'release' 2014-06-17 17:07:13 -04:00
Piotr Mitros
d989454a9b Add MVP animation XBlock. Incorporate styling changes of Done XBlock. 2014-06-17 08:30:26 -04:00
David Ormsbee
3a5ba4ba83 Bump opaque_key dependency to 0.1.1 2014-06-13 15:48:14 -04:00
David Ormsbee
060b8680f4 update opaque keys dependency to fix install 2014-06-13 15:48:09 -04:00
Will Daly
cc457b4458 ORA2 release-2014-06-13T11.52 2014-06-13 08:06:47 -04:00
Will Daly
b00398f5ee ORA2 release-2014-06-11T10.43 
Install edx-submissions from PyPi instead of from edx-ora2
 2014-06-11 08:15:10 -04:00
David Baumgold
d719286971 Upgrade oauthlib to 0.6.3 2014-06-10 10:21:18 -04:00
David Baumgold
97af6a003d Upgrade requests-oauthlib to 0.4.1 2014-06-09 14:19:14 -04:00
David Baumgold
4b3ba4d693 Upgrade requests module to 2.3.0 2014-06-09 14:18:12 -04:00
John Jarvis
c54b8db6a7 locking version of requests-oauthlib to 0.4.0 
requests version 1.2.3 does not appear to be compatible with the
new version of requests-oauthlib.

requests-oathlib tries to import to_native_string in util.py:

```
File
"/root/.virtualenvs/edx-platform/local/lib/python2.7/site-packages/requests_oauthlib/oauth1_auth.py",
line 10, in <module>
    from requests.utils import to_native_string
ImportError: cannot import name to_native_string
```
 2014-06-07 13:28:30 -04:00
clytwynec
6c6f67dc1f Merge pull request #3945 from edx/clytwynec/rake2paver-tests 
Deprecated unit tests from rake to paver
 2014-06-06 16:14:42 -04:00
Christine Lytwynec
da6d70a92b updating diff-cover, adding --compare-branch feature to paver task 2014-06-06 15:35:33 -04:00
David Baumgold
30815dba01 Merge pull request #3960 from edx/db/update-ddt 
Update ddt to 0.8.0
 2014-06-06 13:16:58 -04:00
David Baumgold
8dd4731d42 Merge pull request #3965 from edx/db/django-babel-underscore 
Extract i18n strings from *.underscore files using django-babel-underscore
 2014-06-06 10:36:12 -04:00
Piotr Mitros
5bf5766da4 Code review changes from Ned+Cale 2014-06-03 11:18:02 -04:00
Ned Batchelder
a1abd16a20 Move LS requirements to edx private. 
Author/owner of change is Ned. Committer/typer is Piotr.
 2014-06-03 11:18:02 -04:00
Piotr Mitros
16078ba8a7 Added completion and audio XBlocks 2014-06-03 11:17:24 -04:00
David Baumgold
563d71c14f Extract i18n strings from *.underscore files using django-babel-underscore 2014-06-03 10:51:09 -04:00
David Baumgold
10909442e5 Update ddt to 0.8.0 2014-06-02 16:46:04 -04:00
Will Daly
9d13f23d1a Update EASE version (includes base reqs) 2014-06-02 16:35:29 -04:00
Will Daly
1a90aa9fcd ORA2 release-2014-06-02T15.45 2014-06-02 11:47:53 -04:00
Carlos Andrés Rocha
8d84bfab0b Merge pull request #3926 from rocha/update-event-tracking-version 
Updated version of event-tracking library to 0.1.0
 2014-05-30 11:28:27 -04:00
Will Daly
684c6fad98 Update EASE in edx-platform requirements 2014-05-30 09:26:25 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library 
[LMS-2757]
 2014-05-29 17:03:35 -04:00
Carlos Andrés Rocha
a3360aa643 Updated version of event-tracking library to 0.1.0 2014-05-29 14:41:14 -04:00
Will Daly
e11cb4a34d Add EASE to edx-platform requirements 2014-05-29 11:04:20 -04:00
Calen Pennington
ed7a631c80 Extract opaque_keys into a separate library 
[LMS-2571]
 2014-05-28 11:40:19 -04:00
muhammad-ammar
8809c5f0e0 Merge pull request #3487 from edx/ammar/fix-paver-python-prereq-paths 
Fix paver python prereq paths
 2014-05-28 20:17:19 +05:00
Will Daly
a74502bd33 ORA2 release-2014-05-23T16.59 2014-05-23 15:59:53 -04:00
Calen Pennington
29f7fe14fb Merge remote-tracking branch 'edx/master' into ok-merge-from-master 2014-05-23 10:05:56 -04:00
Xavier Antoviaque
9df7e1d1cf mentoring-opaque-keys: Adds support for opaque keys 
Updates commit hash to add support for opaque keys in mentoring. See
https://github.com/gsehub/xblock-mentoring/pull/2 for the relevant
commits.
 2014-05-22 15:31:59 -04:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
 2014-05-22 10:52:00 -04:00
Muhammad Ammar
33d01232de Flaky is a plugin for nose that automatically reruns flaky tests. 2014-05-22 14:51:57 +00:00
Julia Hansbrough
5752312bbb Merge pull request #2776 from aboudreault/embargo-restrict-additions 
Extended Embargo feature to support site access restriction and ip network
 2014-05-21 15:24:07 -04:00
David Baumgold
6e0e13003f Merge pull request #3744 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool [Fix]
 2014-05-20 15:34:34 -04:00