Commit Graph

22621 Commits

Author SHA1 Message Date
Victor Shnayder
f2944334ab Merge pull request #1387 from MITx/feature/zoldak/courseware-unit-tests
Add unit tests for lms courseware access
2013-01-30 12:51:50 -08:00
Your Name
1fc26de945 merge master 2013-01-30 15:19:43 -05:00
Your Name
66e443ae63 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-01-30 15:18:45 -05:00
Calen Pennington
ab437b9463 Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic
Don't run collectstatic on course content
2013-01-30 12:07:47 -08:00
Jay Zoldak
91b8a95ed7 Add unit tests for lms courseware access 2013-01-30 15:03:43 -05:00
John Jarvis
e7e16b94d8 FAQ update for the embargo restriction 2013-01-30 13:51:14 -05:00
John Jarvis
d52a619d74 Updating FAQ text 2013-01-30 13:02:42 -05:00
Vik Paruchuri
4840205554 Make CSS nicer 2013-01-30 13:00:03 -05:00
chrisndodge
67775fbfa9 Merge pull request #1377 from MITx/feature/christina/misc
Bug fixes for problem progress not updating.
2013-01-30 08:24:38 -08:00
David Ormsbee
d0ea29358a Merge pull request #1381 from MITx/press/bostonX
fix copy+paste bug.
2013-01-30 07:48:22 -08:00
Vik Paruchuri
bae898edb0 Auto convert image to link, display inside student answer 2013-01-30 10:47:50 -05:00
Victor Shnayder
99dd9636ce fix copy+paste bug. 2013-01-30 10:43:36 -05:00
Your Name
043d962329 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-01-30 10:26:23 -05:00
Christina Roberts
fd4b3f9489 Merge pull request #1332 from MITx/fix/cdodge/unit-test-of-draft-store
add unit test to test DraftModuleStore.get_items() fix
2013-01-30 06:49:53 -08:00
Chris Dodge
dbf15fc2ac add comment on draft store test which explains test success is just for get_items() not to throw an exception when passed in a course_id 2013-01-30 09:46:38 -05:00
cahrens
3c1c61fb19 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). 2013-01-30 09:23:07 -05:00
Calen Pennington
2854d7d066 Point course_image.jpg at the correct place in the /static url space 2013-01-30 09:12:50 -05:00
Calen Pennington
07487a8d8f Use descriptor when setting up replace_urls, as it's been created at that point 2013-01-30 09:12:50 -05:00
Calen Pennington
e773b8e7b1 Fix import error 2013-01-30 09:12:50 -05:00
Calen Pennington
95f2c9e275 Standardize how static urls are replaced by modules in their own html 2013-01-30 09:12:50 -05:00
Calen Pennington
89f984c08b Prefix courseware urls with /static, since they are no longer served through collectstatic 2013-01-30 09:12:50 -05:00
Calen Pennington
d132f2e18a Only put data repos in STATICFILES_DIRS if we're serving them from django (which is only in dev) 2013-01-30 09:12:50 -05:00
Vik Paruchuri
fbdc190a58 Add in file upload ability 2013-01-29 22:16:48 -05:00
Vik Paruchuri
b730c25056 Fix rubric rendering 2013-01-29 21:51:48 -05:00
Vik Paruchuri
01f218b7f8 Fix some tab issues from the rebase 2013-01-29 21:36:55 -05:00
Vik Paruchuri
9c5fe05689 Update reqs for pillow, work on file uploads 2013-01-29 21:29:10 -05:00
Vik Paruchuri
fde370bd92 Fix notification issue, sanitize input html 2013-01-29 21:24:04 -05:00
Vik Paruchuri
6425a519fd Fix notifications to work with cache (sync timings) 2013-01-29 21:24:04 -05:00
Vik Paruchuri
bd0b933ff2 Highlight the correct tab 2013-01-29 21:24:04 -05:00
Diana Huang
ea6ce60d0b Use the variable and not the hex value. 2013-01-29 21:24:04 -05:00
Diana Huang
d4ed059975 Do some better error checking for items. 2013-01-29 21:24:04 -05:00
Diana Huang
a2db72e10f Update text. 2013-01-29 21:24:04 -05:00
Diana Huang
486753a263 Display alerts from notifications on the panel. 2013-01-29 21:24:03 -05:00
Diana Huang
9f19eafcf0 Update main notification dashboard with new styles. 2013-01-29 21:24:03 -05:00
Diana Huang
d07bf0157e UI updates to the Open Ended Problems page 2013-01-29 21:24:03 -05:00
Vik Paruchuri
665fb707b1 Cache notifications for 5 mins so that we don't hit the grading server on every web request 2013-01-29 21:24:03 -05:00
Vik Paruchuri
68f563a178 Fix naming issue 2013-01-29 21:24:03 -05:00
Vik Paruchuri
8b8c1dbe60 Fix query error 2013-01-29 21:24:03 -05:00
Vik Paruchuri
33003e65d4 Make things less noisy (remove debug statements) 2013-01-29 19:53:36 -05:00
Vik Paruchuri
0630f59c06 Pass proper parameters, fix templating 2013-01-29 19:52:50 -05:00
Vik Paruchuri
6412eb4080 Fix naming for overall need to check 2013-01-29 19:39:24 -05:00
Vik Paruchuri
bb55792b2b Make things less noisy (remove debug statements) 2013-01-29 19:31:03 -05:00
Vik Paruchuri
d3d4e557d6 Fix notification display 2013-01-29 19:31:03 -05:00
Vik Paruchuri
457afaaeda Making tab render properly for open ended notifications 2013-01-29 19:31:03 -05:00
Vik Paruchuri
f47c431faf Fix templating 2013-01-29 19:31:03 -05:00
Vik Paruchuri
8602e1595b Pass proper parameters, fix templating 2013-01-29 19:31:03 -05:00
Vik Paruchuri
0f212cc8f2 Fix course id passing, template rendering 2013-01-29 19:31:02 -05:00
Vik Paruchuri
6b7ba37999 Combined notification view 2013-01-29 19:30:04 -05:00
Vik Paruchuri
22a2bdaa3d Disable student problem list caching, build out notifications 2013-01-29 19:30:04 -05:00
Vik Paruchuri
4112f8ad8e Pass back dictionaries where needed from notifications functions 2013-01-29 19:30:04 -05:00