Your Name
9f58f6890d
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-25 09:31:28 -05:00
Vik Paruchuri
d5865e70b8
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
2013-02-22 10:21:34 -05:00
Brian Wilson
6d174ef029
remove dead code
2013-02-21 15:41:28 -05:00
Brian Wilson
d503fe3d79
Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js
2013-02-21 15:38:28 -05:00
Your Name
ff68853990
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-21 13:30:24 -05:00
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
Vik Paruchuri
ad9400a0ef
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-02-20 16:43:04 -05:00
Vik Paruchuri
111ef30f05
Render to string fix, display ETA message when student submits
2013-02-20 16:30:44 -05:00
Vik Paruchuri
59b2f2ccd7
Move controller query service to xmodule side to prepare for ETA message displays
2013-02-20 16:19:17 -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
3db3d7b740
Fix eta message slightly
2013-02-20 13:31:06 -05:00
Vik Paruchuri
59e3647692
Add in support for getting and displaying ETA
2013-02-20 13:28:37 -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
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
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
