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

66 Commits

Author SHA1 Message Date
Calen Pennington
729daf5cbf Move xmodule asset gathering out of server startup 
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
 2013-04-18 15:19:19 -04:00
Victor Shnayder
84f05f9f61 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
 2013-03-08 00:40:18 -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
Arthur Barrett
2f68cba24d merged from master 2013-02-20 11:07:46 -05:00
Alexander Kryklia
841cfd28cc fix typo 2013-02-19 13:06:14 +02:00
Alexander Kryklia
059b9f66e3 poll and conditional finished 2013-02-15 18:48:39 +02: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
Valera Rozuvan
156da20c35 Renamed videox to videoalpha, as per Piotr naming scheme request. 2013-02-13 10:27:55 +02:00
Arthur Barrett
45a27f303f Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-12 12:09:21 -05:00
Brian Wilson
290368ef0d merge out from master 2013-02-07 17:40:54 -05:00
Brian Wilson
cc11dc2aa3 switch to using timelimit module for Pearson test 2013-02-07 15:57:43 -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
Brian Wilson
33a5a5fd9f add implementation for fixed_time_module 2013-02-07 05:17:56 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -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
Victor Shnayder
82afc477fa Merge pull request #1396 from MITx/feature/victor/randomization 
Feature/victor/randomization
 2013-02-04 15:37:07 -08: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
ichuang
95b8134731 initial implementation of conditional_module; doesn't load dynamically yet 2013-02-03 18:53:51 -05:00
Arthur Barrett
48bb447fbd Adding basic annotatable module and related files. 2013-01-31 18:42:11 -05:00
Vik Paruchuri
59ba308354 Add in peer grading entry point 2013-01-31 18:28:15 -05:00
Victor Shnayder
e431378f46 Add first pass at a randomize module 2013-01-31 12:14:01 -05:00
Chris Dodge
48cbf38a41 resolve merge conflicts 2013-01-17 09:36:09 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
Alexander Kryklia
07cb76a7d9 first working version of gst module 2013-01-15 12:51:54 +02:00
Александр
c5107d42de bug 2013-01-15 12:51:53 +02:00
Vik Paruchuri
8e03c8f655 Fix missing comma issue 2013-01-10 18:59:57 -05:00
Vik Paruchuri
e975174d66 Convert self-assessment away from xmodule 2013-01-10 18:59:57 -05:00
Vik Paruchuri
0be51cfa2d Xmodule combined now working 2013-01-10 18:59:57 -05:00
Calen Pennington
8874d9d7f8 Add a draft implementation of the Poll module for Justice 2013-01-03 12:21:13 -05:00
Calen Pennington
cbfc7b201a WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms 2012-12-28 14:44:31 -05:00
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
 2012-11-13 10:22:42 -05:00
Chris Dodge
9cc1af5052 first pass at static tab editing. Doesn't yet support drag/drop as well as new tab creation, which needs to modify the policy on the course 2012-11-07 15:27:44 -05:00
Chris Dodge
55c69a1e13 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 
Conflicts:
	lms/djangoapps/courseware/module_render.py
 2012-11-06 14:20:59 -05:00
Vik Paruchuri
5586139594 bugfix to self assessment 2012-10-30 20:36:45 -04:00
Vik Paruchuri
188e1c68d7 add self assessment module 2012-10-30 20:13:35 -04:00
Chris Dodge
f4822c23de lots of tweeks to better support importing of existing courseware 2012-10-30 11:52:31 -04:00
Chris Dodge
ba15735214 implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff 2012-10-25 14:27:26 -04:00
Victor Shnayder
38bd83858b Make problemset render as a sequential, not a vertical. 
- Piotr requested this.  Hopefully it doesn't break anything, but we should run it by the content fellows before merging.
 2012-10-15 12:52:21 -04:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07:00
Calen Pennington
3b36fbf914 Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore 2012-08-16 12:49:42 -04:00
Rocky Duan
5d3b187540 Merge branch 'master' of github.com:MITx/mitx 2012-08-01 16:45:21 -04:00
Victor Shnayder
c0cdff7071 Rename MalformedDescriptor to ErrorDescriptor 
* change references and tests
* add staff/non-staff display
* added is_staff to ModuleSystem
 2012-08-01 11:42:39 -04:00
Victor Shnayder
53608922ba Make the malformed descriptor import properly 
* Also get rid of lazy loading of metadata and definition
 2012-08-01 11:40:11 -04:00
Rocky Duan
f7c51870f3 initial setup for the discussion module 2012-07-18 12:00:42 -04:00
Calen Pennington
cdd55373c6 Make it clear that the module for backwards compatability is just that 2012-07-11 22:19:34 -04:00
Calen Pennington
fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt
 2012-07-10 13:39:19 -04:00
Calen Pennington
a1f98e76cd WIP: Merging multicourse and xmodule descriptor changes 
The basic form has been fleshed out. Things still to do:
1) Extend get_course interface to the rest of modulestore
2) Make courses actually load
3) Make org/course/maybe others metadata attributes for course_module (see xml_module), so
that they are loaded/saved on import/export to xml
 2012-07-05 21:56:52 -04:00
Calen Pennington
e9ee1566d6 Modularize capa and mitxmako so that xmodule can properly depend on them 2012-07-05 12:48:18 -04:00