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

517 Commits

Author SHA1 Message Date
Carlos Andrés Rocha
4050da6b4c Enable meta-universities (organizations that contain other) 2013-03-28 13:23:50 -04:00
Chris Dodge
b609a96902 ummm. forgot to commit stuff 2013-03-27 22:51:52 -04:00
Jay Zoldak
23364d8b0f Merge branch 'master' into feature/zoldak/refactor-factories 2013-03-20 13:36:01 -04:00
Jay Zoldak
daadaffb61 Add mongo contentstore to acceptance.py for lettuce tests for lms 2013-03-20 09:38:52 -04:00
Will Daly
20ccf5937b Implemented CodeResponse lettuce tests 2013-03-19 15:55:05 -04:00
Will Daly
8423816076 LMS contentstore lettuce tests now dynamically create courses in mongo 
using terrain.factories.py and capa.tests.response_xml_factory
 2013-03-15 14:04:22 -04:00
Calen Pennington
3b0aed5d42 Merge pull request #1572 from MITx/feature/alex/poll-merged 
Feature/alex/poll merged
 2013-03-15 09:04:42 -07:00
David Ormsbee
67a0cccba9 Addressing some pep8/pylint concerns 2013-03-15 11:08:09 -04:00
Calen Pennington
fb8352e2cc Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-15 10:33:54 -04:00
Chris Dodge
d2f216615f move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled 2013-03-14 13:57:48 -04:00
David Ormsbee
8d4e0f8386 Add ANALYTICS_API_KEY to config files and dashboard analytics call 2013-03-13 16:55:40 -04:00
Chris Dodge
413aeed1b3 use django caching to hold computed metadata inheritence. Also invalidate the cache entries on writes (insert, updates) 2013-03-13 15:33:15 -04:00
David Ormsbee
33c2507abc Guard against connection errors to the Analytics service. 2013-03-13 15:27:33 -04:00
David Ormsbee
a0dd6d9832 add entry for ANALYTICS_SERVER_URL to aws.py 2013-03-11 10:05:36 -04:00
David Ormsbee
3bb3cf3ca3 Consolidate some of the analytic fetching logic in the instructor dashboard. 2013-03-09 18:52:20 -05:00
David Ormsbee
d0bff1ed3c Merge branch 'master' into jmpm-analytics 
Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html
 2013-03-06 17:09:09 -05:00
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-04 16:33:40 -05:00
David Ormsbee
b0afbba58d Merge pull request #1516 from MITx/hack/dave/submission_history 
Record and report submission history for a problem
 2013-03-04 11:39:54 -08:00
Alexander Kryklia
4713c5f095 re-enable discussion service 2013-02-22 10:40:09 +02:00
Ned Batchelder
c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. 2013-02-21 11:38:45 -05:00
Vik Paruchuri
dbe93502f1 Fix tests 2013-02-20 12:44:12 -05:00
Diana Huang
03a4deb847 Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule 
Feature/vik/settings to xmodule
 2013-02-20 08:06:20 -08:00
Jay Zoldak
040f840c9d Remove portal (fake) app, move tests to courseware. 
Comment out tests that don't run correctly without prerequisites.
 2013-02-19 16:46:32 -05:00
Vik Paruchuri
4d57f1b9ee Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule 2013-02-19 10:43:55 -05:00
Alexander Kryklia
059b9f66e3 poll and conditional finished 2013-02-15 18:48:39 +02:00
David Ormsbee
8f17e6ae9e First pass at implementing problem history. 2013-02-15 01:30:14 -05:00
Victor Shnayder
4f8757600a merge 2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596 Foldit integration. 
- ops view for the desktop app to talk to
  - xmodule that talks to the foldit model and displays the student's state
  - grading tweak to make grade updates from an external service work:
    - Add an always_recalculate_grades property to XModuleDescriptor.
 2013-02-14 12:45:06 -05:00
Calen Pennington
793bbfd351 Set up dev environment for testing xml vs mongo vs split_mongo modulestores 2013-02-13 14:04:21 -05:00
Ned Batchelder
857edaf6f3 Remove dogfood and quickedit. 2013-02-13 12:23:08 -05:00
Vik Paruchuri
ba650202b4 Add in logic to pass settings to peer grading xmodule 2013-02-11 18:09:57 -05:00
Vik Paruchuri
aca5e2300b Fix dev settings 2013-02-11 17:33:16 -05:00
Vik Paruchuri
9bca4ebf21 Start to refactor grading settings 2013-02-11 17:32:11 -05:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
David Ormsbee
b947b88453 Merge pull request #1460 from MITx/fix/cdodge/remove-csrf-cookie-domain 
remove CSRF cookie domain setting in aws.py
 2013-02-07 08:17:34 -08:00
Chris Dodge
0394e33652 remove CSRF cookie domain setting in aws.py 2013-02-07 11:15:23 -05:00
David Ormsbee
976776643b Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue. 2013-02-06 22:46:22 -05:00
David Ormsbee
a470a62d12 Hack to disable YouTube <iframe> API when they break it. 2013-02-06 22:37:41 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
David Ormsbee
b68aff72f2 Merge pull request #1436 from MITx/debug/dave/sass 
undo pipeline changes
 2013-02-05 13:26:22 -08:00
David Ormsbee
1ef9d6388f re-add compression flag to sass 2013-02-05 16:25:59 -05:00
David Ormsbee
706a1072b9 undo pipeline changes 2013-02-05 16:24:53 -05:00
Diana Huang
120aa3cd3b Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule 
Feature/vik/peer grading xmodule
 2013-02-05 12:55:48 -08:00
Calen Pennington
2551243dfa Install the static_replace app for the management command 2013-02-05 11:06:46 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" 
This reverts commit c4f56620df.
 2013-02-05 11:06:45 -05:00
David Ormsbee
ecce3e5761 Merge pull request #1426 from MITx/debug/dave/sass 
Comment out YUI compressor (cause *something* is still causing CSS compression)
 2013-02-05 05:59:59 -08:00
David Ormsbee
818cd3aa48 Comment out YUI compressor (cause *something* is still causing CSS compression) 2013-02-05 08:58:59 -05:00
David Ormsbee
fae51815d8 Merge pull request #1420 from MITx/debug/dave/sass 
Force it to do expanded mode, because it's still generating compressed CSS output
 2013-02-04 15:04:03 -08:00
David Ormsbee
aeaad6f58d Force it to do expanded mode, because it's still generating compressed CSS output 2013-02-04 18:03:05 -05:00
Vik Paruchuri
bf97a6a9a9 Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule 
Conflicts:
	lms/djangoapps/open_ended_grading/peer_grading_service.py
 2013-02-04 17:55:55 -05:00