Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,908 Commits 1 Branch 0 Tags
b2c0e0584dfdc75dff4e9cc658eac8cd57879cb7
Commit Graph

140 Commits

Author SHA1 Message Date
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
Christine Lytwynec
da6d70a92b updating diff-cover, adding --compare-branch feature to paver task 2014-06-06 15:35:33 -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
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
Will Daly
a74502bd33 ORA2 release-2014-05-23T16.59 2014-05-23 15:59:53 -04:00
Calen Pennington
8f72394e81 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/templates/widgets/header.html
 2014-05-19 09:20:08 -04:00
Will Daly
8b3992bf4b ORA2 release 2014-05-19 2014-05-19 08:05:13 -04:00
Calen Pennington
240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
 2014-05-13 15:30:56 -04:00
Stephen Sanchez
3e13962930 Release for May 12, 2014 2014-05-12 11:39:55 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
 2014-05-09 15:29:32 -04:00
Calen Pennington
2248968c57 Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit adds updated requirements.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-06 09:24:00 -04:00
Will Daly
a2225bd719 ORA2 release-2014-05-05T12.00 2014-05-05 09:08:31 -04:00
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS 
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
 2014-05-01 14:04:35 -04:00
Stephen Sanchez
c9f707f49d Release for Apr 27, 2014 2014-04-27 16:21:33 -04:00
Stephen Sanchez
575c92c8c3 Release for Apr 22, 2014 2014-04-22 13:02:04 -04:00
Stephen Sanchez
cd412448bb Release for Apr 22, 2014 2014-04-22 11:17:54 -04:00
Dave St.Germain
5bd944a3a6 Update codejail to enable logging 2014-04-22 09:46:48 -04:00
Jay Zoldak
a78b3225bb Merge pull request #3387 from edx/zoldak/update_page_objects 
Update bok-choy page definitions
 2014-04-18 16:07:04 -04:00
Jay Zoldak
5e1964dd87 Update bok-choy page definitions 2014-04-18 09:35:10 -04:00
Will Daly
0b40354c12 Reset submission API scores in beta and legacy instructor dash 2014-04-16 09:25:53 -04:00
Stephen Sanchez
d0635b852d Release Apr 14, 2014 2014-04-14 13:17:55 -04:00
Stephen Sanchez
3f184082f5 Updating ORA2 requirements for patch fix 2014-04-08 09:29:09 -04:00
Stephen Sanchez
af17ae9f6a Updating the release with a tagged hash 2014-04-07 11:38:21 -04:00
Stephen Sanchez
6c43f279d4 Updating the ORA2 hash for release week 2014-04-07 2014-04-07 09:57:55 -04:00
Stephen Sanchez
e6e818a5a2 Updating the hash of the ORA2 release candidate in the requirements 2014-04-02 16:05:54 -04:00
Stephen Sanchez
1c55ce0a62 Updating ora2 requirements 2014-04-01 11:44:54 -04:00
Gabe Mulley
d6052675da Support emitting analytical events from xblocks running in the LMS 
XBlocks can and should use the "publish" method provided by the runtime to emit analytical events. In theory we could now start replacing calls to track_function with calls to publish, however, that migration is not handled by this change.

Fixes: AN-789
 2014-03-27 18:50:46 -04:00
Piotr Mitros
20805974cd Merge 2014-03-25 12:28:02 -04:00
Piotr Mitros
bd4eb72e31 Concept XBlock prototype 2014-03-25 10:58:35 -04:00
Will Daly
440d9ddb89 Install edx-ora2 
Support for displaying submissions API scores in Progress page.
 2014-03-25 09:42:55 -04:00
Jay Zoldak
806a6b9f99 Update edx-platform page objects and tests to be compatible with new bok-choy version 
Change expectedFailure decorators to skip, because that still takes
a screenshot as if it were an error and at least one of those
take a super long time when running locally on devstack.
 2014-03-21 17:10:15 -04:00
Will Daly
1287268cb7 Update XBlock to latest version 2014-03-19 07:45:45 -04:00
Andy Armstrong
2c9585ea5d Merge pull request #2811 from edx/andya/container-unit-tests 
Add more tests for the container page
 2014-03-07 11:31:41 -05:00
Andy Armstrong
bc12869a00 Add more tests for the container page 2014-03-05 17:41:10 -05:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing 
Also fixes STUD-1351
 2014-03-05 13:46:03 -05:00
Dave St.Germain
7126a2283d Update django-wiki revision 2014-02-28 13:18:19 -05:00
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release' 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-02-27 17:33:40 -05:00
Sarina Canelake
e71bbeb1e2 Tests for embargo middleware feature 2014-02-27 09:33:17 -05:00
Julia Hansbrough
a7ae152d9b Embargo Middleware feature 
Adds configurable middleware in common/djangoapps/embargo that
allows specific courses to comply with US Export regulations by
embargoing students from specific countries, whilst simultaneously
allowing other courses to be freely open to all.
 2014-02-27 08:37:58 -05:00
Xavier Antoviaque
73ef78f8ae splash-url-exclusion: Exclude '/heartbeat' from redirect 
Update the dependency to load this commit:
6e8bd68521

Which allows to prevent `/heartbeat` from being redirected, which is
necessary on production servers
 2014-02-25 18:06:54 -05:00
Calen Pennington
c72d410083 Remove doc-ready tests, which were flaky 2014-02-25 14:01:37 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00