Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,611 Commits 1 Branch 0 Tags
bc1ee3dbfa1ba0f7b3de62dec3696f76569e1b4e
Commit Graph

1412 Commits

Author SHA1 Message Date
Vik Paruchuri
d5ba5457dc Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-02-20 16:49:59 -05:00
Diana Huang
a789d6c363 Merge branch 'master' into diana/fix-self-assessment-test 2013-02-20 13:37:42 -05:00
Diana Huang
6e453c2b8b Clean up and fix some peer grading tests. 2013-02-20 13:36:09 -05:00
Vik Paruchuri
2302c3244b Merge branch 'feature/vik/disable-spell-check' into feature/vik/check-if-submission-allowed 2013-02-20 12:01:42 -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
db6fa9a3aa Pep8fix lettuce test code 2013-02-19 16:46:32 -05: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
Jay Zoldak
9096914782 Move terrain module from lms to common. 2013-02-19 16:46:32 -05:00
Vik Paruchuri
2b01ecc1af Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule 2013-02-19 15:21:47 -05:00
Vik Paruchuri
72d069825d Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed 
Conflicts:
	lms/templates/instructor/staff_grading.html
 2013-02-19 15:21:09 -05:00
David Ormsbee
821e2d06e9 Merge pull request #1466 from MITx/feature/ichuang/fix-idashboard-error-message 
Fix error message provided by Instructor dashboard datadump - make it more useful
 2013-02-19 11:08:21 -08:00
Vik Paruchuri
4d57f1b9ee Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule 2013-02-19 10:43:55 -05:00
Diana Huang
f4addddf42 Merge pull request #1484 from MITx/feature/vik/improve-oe-ui 
Feature/vik/improve oe ui
 2013-02-19 07:27:29 -08: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
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
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
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
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
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
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
David Ormsbee
1c07fae501 Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump 
add instructor dashboard feature to download profile & problem state
 2013-02-07 08:19:52 -08:00
Chris Dodge
faf7c64ea5 add try/catch and fallback to returning a path to the root of the course 2013-02-07 10:32:13 -05:00
ichuang
bf17341fdb add select_related("profile") 2013-02-06 23:16:44 -05:00
Victor Shnayder
2af06ef1d4 Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 66889b8724, reversing
changes made to 0dd9c24e74.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
 2013-02-06 20:29:17 -05:00
Victor Shnayder
884a7a61b9 Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 965e3b4c49, reversing
changes made to 1a7d2a06a8.

I accidentally merged this before it was ready.  This was silly, so now I'm undoing it.  We'll need to revert the revert later.
 2013-02-06 20:27:01 -05:00
Kevin Chugh
1dd0ef274d addressed somme comments in pull request and instructor fixes and blank group fix 2013-02-06 18:26:41 -05:00