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

315 Commits

Author SHA1 Message Date
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
Alan Boudreault
ba6e61b907 Extended Embargo feature to support site access restriction and ip network 2014-05-19 15:12:02 -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
18c91d0f1d Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html
 2014-05-16 14:01:20 -04:00
lduarte1991
e911d57911 Revert "Revert pull request #3466" 
This reverts commit 59e3cae4c9.
 2014-05-15 15:23:28 -04:00
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -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
e0d
eced86d6ce reverting the upgrade 2014-05-13 10:36:07 -04:00
Stephen Sanchez
3e13962930 Release for May 12, 2014 2014-05-12 11:39:55 -04:00
Calen Pennington
19acdd31e8 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html
 2014-05-12 11:35:03 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool
 2014-05-09 16:14:42 -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
d466132a1f Merge remote-tracking branches 'edx/opaque-keys-base-keys', 'edx/opaque-keys-cms', 'edx/opaque-keys-common-djangoapps', 'edx/opaque-keys-common-lib-xmodule', 'edx/opaque-keys-common-misc', 'edx/opaque-keys-django-fields', 'edx/opaque-keys-embargo-tests', 'edx/opaque-keys-library', 'edx/opaque-keys-lms-courseware', 'edx/opaque-keys-lms-djangoapps', 'edx/opaque-keys-lms-templates', 'edx/opaque-keys-mongoengine-fields', 'edx/opaque-keys-requirements' and 'edx/opaque-keys-roles-table' into opaque-keys 2014-05-08 20:32:28 -04:00
David Baumgold
43b4a6b40e Merge pull request #3646 from edx/db/mysql-python-upgrade 
Upgrade mysql-python to 1.2.5
 2014-05-08 14:36:55 -04:00
Jason Bau
78950bb501 Merge pull request #3566 from edx/jbau/django-1.4.12 
Bump django 1.4 minor version to 1.4.12 to pick up patches
 2014-05-08 11:06:38 -07:00
David Baumgold
175180d022 Upgrade mysql-python to 1.2.5 2014-05-08 13:19:01 -04:00
Calen Pennington
014cb9e564 Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit is the base library for OpaqueKeys.

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-08 07:40:25 -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
Jason Bau
2e97d472d9 Bump django 1.4 minor version to 1.4.12 to pick up patches 2014-05-01 12:14:59 -07: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
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
David Baumgold
7c89055089 Merge pull request #3404 from edx/watchdog-in-paver-reqs 
Added watchdog to Paver requirements
 2014-04-22 14:39:27 -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
David Baumgold
fdcafa9427 Added watchdog to Paver requirements 2014-04-18 15:38:26 -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
Adam
69f11c7d53 Merge pull request #3322 from edx/release 
Release
 2014-04-11 14:40:44 -04:00
Chris Rossi
f04cd649e4 Upgrade JSDraw. 2014-04-10 12:01:02 -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
David Baumgold
6292e55997 Merge pull request #3204 from edx/db/upgrade-django-nose 
Upgrade django_nose to 1.2
 2014-04-04 10:43:37 -04:00
David Baumgold
63c58bb26d Merge pull request #3189 from edx/db/upgrade-pyparsing 
Upgrade pyparsing to 2.0.1
 2014-04-03 13:02:54 -04:00
David Baumgold
176392225f Upgrade django_nose to 1.2 2014-04-03 10:48:52 -04:00
David Baumgold
cb5e3c8111 Upgrade pyparsing to 2.0.1 2014-04-02 16:09:53 -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