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

4136 Commits

Author SHA1 Message Date
Vik Paruchuri
b22bad7fa1 Add in some removed imports (fix tests) 2013-01-31 17:11:44 -05:00
Vik Paruchuri
01cdc6e7f8 Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes 
Conflicts:
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
 2013-01-31 16:50:10 -05:00
Brian Wilson
9b3d7efb3f add first pass at testcenter exam 2013-01-30 18:14:53 -05:00
Calen Pennington
c4f56620df Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" 
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
 2013-01-30 16:49:49 -05:00
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
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
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
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
Vik Paruchuri
01f218b7f8 Fix some tab issues from the rebase 2013-01-29 21:36:55 -05:00
Vik Paruchuri
fde370bd92 Fix notification issue, sanitize input html 2013-01-29 21:24:04 -05:00
Vik Paruchuri
bd0b933ff2 Highlight the correct tab 2013-01-29 21:24:04 -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
6412eb4080 Fix naming for overall need to check 2013-01-29 19:39:24 -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
0f212cc8f2 Fix course id passing, template rendering 2013-01-29 19:31:02 -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
Vik Paruchuri
68db8b0d77 Refactor tab logic, start adding in combined notifications view 2013-01-29 19:30:04 -05:00
Vik Paruchuri
693337593e Properly parse url for grading controller 2013-01-29 19:30:03 -05:00
Vik Paruchuri
b0599ea133 Fix queries and some controller query stuff 2013-01-29 19:30:03 -05:00
Vik Paruchuri
2191f3e228 Add in open ended problems view 2013-01-29 19:30:03 -05:00
Vik Paruchuri
fe77bb00c4 Fix naming for overall need to check 2013-01-29 19:25:56 -05:00
Vik Paruchuri
5e63a4690b Work on getting combined notifications 2013-01-29 19:25:56 -05:00
Vik Paruchuri
d28228639e Add in controller query stuff 2013-01-29 19:25:56 -05:00
cahrens
26cb1c5a25 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). 2013-01-29 16:30:41 -05:00
Deena Wang
4f58e9c177 Merge branch 'master' into feature/deena/testing to get factory files 2013-01-29 14:33:54 -05:00
Deena Wang
d9fdccb567 testing testing tests 2013-01-29 14:23:55 -05:00
Deena Wang
7918c35414 fixing up tests 2013-01-28 15:29:55 -05:00
Victor Shnayder
6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts 
Conflicts:
	common/djangoapps/student/models.py
 2013-01-26 12:37:26 -05:00
Ned Batchelder
08acf43575 Don't store first_time_user any more, instead interested observers 
can examine whether .position is None or not.
 2013-01-25 15:49:29 -05:00
Deena Wang
583505b95b test_courses.py 2013-01-25 12:19:16 -05:00
Chris Dodge
1787157e00 put back the 'position' argument to get_module() which got accidentially - or so I think - dropped in a previous commit 2013-01-24 21:38:02 -05:00
Deena Wang
f9b0ec37cd more tests in test_views, needs templates to continue 2013-01-24 16:08:19 -05:00
Victor Shnayder
9e84ae14d4 Started integration work with Kevin's cohort changes 
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.

Next: testing :)
 2013-01-24 15:14:33 -05:00
Deena Wang
9663973038 more tests for courseware/views 2013-01-24 14:59:46 -05:00
Calen Pennington
592d044864 Fix more tests 2013-01-24 14:37:46 -05:00
Kevin Chugh
def2d8adf2 fix cohorts in create, and read, and update regular expressions to fix courses with periods not working in General commentable 2013-01-24 14:20:18 -05:00
Calen Pennington
9a3e122a48 Fix a few failing tests 2013-01-24 14:04:03 -05:00
Ned Batchelder
ac9d162d86 Fix a failing test. Pennington's Law strikes again. 2013-01-24 13:07:55 -05:00
Deena Wang
d81b031624 Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-01-24 10:05:04 -05:00
Deena Wang
61e12f57e7 experimenting with creating a course 2013-01-24 09:59:33 -05:00