Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

12296 Commits

Author SHA1 Message Date
Victor Shnayder
e4312d67f0 work in progress on supporting science puzzles 2013-02-19 09:43:19 -05:00
Christina Roberts
a62a575a33 Merge pull request #1506 from MITx/feature/btalbot/studio-softlanding 
Soft Landing UI, Studio Nav Revamp, Sign In/Up Revisions
 2013-02-19 06:34:32 -08:00
Diana Huang
3e23b9e1f2 Merge pull request #1480 from MITx/diana/staff-grading-flagging 
Flag submissions from staff grading view
 2013-02-15 13:08:16 -08:00
Jay Zoldak
34a4b35e66 Fix lettuce acceptance tests to reflect the new soft landing page changes. 2013-02-15 14:07:46 -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
Brian Wilson
0d3b566dd8 finish piping URL through to pdf.js 2013-02-14 15:47:53 -05:00
Victor Shnayder
cc7a97082a Merge pull request #1468 from MITx/feature/ichuang/fix-module-staff-access-v2 
fix module staff accesss - by has_access, not by user.is_staff
 2013-02-14 12:08:56 -08:00
Victor Shnayder
723012b2bb Better logging, and make view csrf exempt... 2013-02-14 14:50:18 -05:00
Victor Shnayder
d7f9bdda66 Move foldit app into the lms. No need for it in the cms, and it was breaking tests there.. 2013-02-14 13:23:58 -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
Victor Shnayder
21dab27ed6 fix logger name in module_render 2013-02-14 12:45:01 -05:00
Vik Paruchuri
6a10ffc7da Fix up error messages to staff and students 2013-02-13 19:12:16 -05:00
Vik Paruchuri
8b12f26626 Fix error messages to staff 2013-02-13 18:24:33 -05:00
Brian Wilson
f0258b8dd0 first pass at pdfbook 2013-02-13 18:01:44 -05:00
Calen Pennington
927da34477 Fix data_dirs for /static link replacement 2013-02-13 16:15:22 -05:00
Vik Paruchuri
7a3a56d4bc Fixing tests 2013-02-13 15:20:59 -05:00
Vik Paruchuri
5f29e0e1a6 Fix OE tests 2013-02-13 15:11:37 -05:00
Calen Pennington
f0f7e0dc1c Fix more tests 2013-02-13 14:22:08 -05:00
Calen Pennington
bd822b9d2f Fix tests post-merge 2013-02-13 14:13:22 -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
Vik Paruchuri
e397575732 Remove import statements 2013-02-13 11:46:53 -05:00
Vik Paruchuri
8f7c145957 Remove old import statements 2013-02-13 09:45:29 -05:00
Brian Wilson
b5378b04b3 change timer to calculate relative duration in javascript 2013-02-12 12:25:11 -05:00
Vik Paruchuri
b9bf96520e Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports 2013-02-11 18:43:47 -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
01e8fe8d08 Pass S3 interface in module_render 2013-02-11 17:54:37 -05:00
Vik Paruchuri
0f71f5b92e Finish settings refactor 2013-02-11 17:36:33 -05:00
Vik Paruchuri
9bca4ebf21 Start to refactor grading settings 2013-02-11 17:32:11 -05:00
Ned Batchelder
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00
David Ormsbee
75ff2bd6cb Merge pull request #1456 from MITx/fix/cdodge/dangling-discussion-modules 
Fix/cdodge/dangling discussion modules
 2013-02-11 11:40:00 -08:00
David Ormsbee
5d894fdf03 Typo fix 2013-02-11 10:24:07 -05:00
David Ormsbee
04deb30fb6 Factor out the access group generation so we can check staff/instructor status without DB lookup. 2013-02-11 10:17:57 -05:00
David Ormsbee
00b3717829 Use prefetch on user to load groups and prevent extra DB lookups. 2013-02-11 10:16:57 -05:00
Diana Huang
f3bb429915 Get and pass the new submission flagged information through 
the controller to the backend.
 2013-02-11 09:23:55 -05:00
Vik Paruchuri
46da4cf241 Add in a better notification icon 2013-02-09 10:15:11 -05:00
Victor Shnayder
0e06f5f587 Merge remote-tracking branch 'origin/feature/kevin/groups_ui_changes' into feature/victor/revert-revert-of-forums-ui 2013-02-08 15:01:30 -05:00
Victor Shnayder
6d9a9ec46f Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge" 
This reverts commit e4819a1b55, reversing
changes made to b6ec41cae0.

Now that we're ready to test again, need to revert the revert to put the filtering UI back in.
 2013-02-08 15:00:25 -05:00
Your Name
21c06c741b inline mustache working 2013-02-08 14:28:48 -05:00
Brian Wilson
f51876da6a cosmetic changes 2013-02-08 13:42:54 -05:00
ichuang
04cc257bdd fix module staff accesss - by has_access, not by user.is_staff 2013-02-08 10:46:17 -05:00
ichuang
ad0d304e67 fix instructor dashboard datadump error message to be useful 2013-02-08 09:21:36 -05:00
Kevin Chugh
c6bece8620 more updates 2013-02-08 09:11:41 -05:00
Your Name
7dd252178c cohort filter almost done 2013-02-07 18:14:46 -05:00
Your Name
3965f9129d cohort filter almost done 2013-02-07 18:13:53 -05:00
Brian Wilson
290368ef0d merge out from master 2013-02-07 17:40:54 -05:00
Brian Wilson
80e4944314 minor cleanup 2013-02-07 16:12:02 -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