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

4382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Chen
efad5632d8 set invisible instead of remove to preserve space of voting arrows when voting is disabled 2012-08-09 13:03:28 -04:00
Mike Chen
1bea419237 fix discussion_module after merging from MITx/mitx 2012-08-09 13:02:43 -04:00
Mike Chen
3ae1de5ed9 Merge branch 'master' of github.com:MITx/mitx into ccp0101/playground 2012-08-09 12:52:15 -04:00
Mike Chen
67ab56af6c Merge branch 'brittany' of github.com:dementrock/mitx into ccp0101/playground 
Conflicts:
	lms/templates/discussion/_thread.html
 2012-08-09 12:44:43 -04:00
Mike Chen
f7924aef08 Merge branch 'master' of github.com:dementrock/mitx into ccp0101/playground 
Conflicts:
	lms/urls.py
 2012-08-09 12:40:55 -04:00
Mike Chen
46a7c51df5 remove voting arrows if one cannot vote 2012-08-09 12:12:43 -04:00
Calen Pennington
4e5af13d52 Merge pull request #374 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-08-09 09:11:21 -07:00
kimth
062eff12c4 Remove test url of xqueue 2012-08-09 12:06:36 -04:00
kimth
6b1bf0d4ca Fix tests with new score_msg format 2012-08-09 12:05:34 -04:00
Mike Chen
2fae27d582 temporarily disable trending and active if no such data is passed to template. 2012-08-09 12:05:19 -04:00
Mike Chen
b449334462 generate permanent link for thread/comment on client side 2012-08-09 12:04:38 -04:00
kimth
e47ff641f3 Testing new instances of xqueue 2012-08-09 11:57:59 -04:00
Calen Pennington
f2c8d5b427 Merge pull request #364 from MITx/MITx/feature/bridger/fast_course_grading 
Even Faster Course Grading
 2012-08-09 07:49:19 -07:00
Victor Shnayder
9867dceca5 Load templates at descriptor load 
* instead of being lazy
 2012-08-09 10:47:08 -04:00
Victor Shnayder
9d87710f59 Revert "Lazily loading capa problems (for faster grading)." 
We don't want lazyness, and will save the proper fix (moving work into descriptor load for later)
 2012-08-09 10:31:48 -04:00
Calen Pennington
6a21580c21 Merge pull request #372 from MITx/kimth/lms-coderesponse 
New external grader format: JSON-serialized dict
 2012-08-09 07:23:34 -07:00
Calen Pennington
42fe35aa63 Merge pull request #368 from MITx/feature/victor/cms-drag-and-drop 
Feature/victor/cms drag and drop
 2012-08-09 07:15:18 -07:00
kimth
e3ed383888 Move old externalresponse XML parser into subfunction, fix correctness bug (should be correct/incorrect not True/False) 2012-08-09 09:41:27 -04:00
kimth
58a1248d32 New external grader format: JSON-serialized dict 2012-08-09 08:29:12 -04:00
thomasxiii
f318cbea27 Merge pull request #371 from MITx/feature/kfiedler/courseware-style 
A bunch of minor changes and bug fixes for the courseware
 2012-08-08 14:25:13 -07:00
Kyle Fiedler
971ec9891e Added new selections styles 2012-08-08 16:27:48 -04:00
Kyle Fiedler
c3cd858e4b Remove black bars for video 2012-08-08 16:27:48 -04:00
Kyle Fiedler
ccc1f1dfd5 Removed padding and added line-height for the tutorials 2012-08-08 16:27:48 -04:00
Kyle Fiedler
23e52f02c3 Fix odd movement on hover for the next button on hover 2012-08-08 16:27:48 -04:00
Kyle Fiedler
643617599a Made sequnce nav black and white 2012-08-08 16:27:47 -04:00
Kyle Fiedler
17d072711b Make the sidebar links more standard, and remove some of their styling 2012-08-08 16:27:47 -04:00
Bridger Maxwell
e4329c312d Fixed log of error. Xmodules don't have ids, so I log the location instead. 2012-08-08 16:03:28 -04:00
Bridger Maxwell
3930dabdc9 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 2012-08-08 16:00:22 -04:00
Calen Pennington
6abc2d733f Merge pull request #370 from MITx/feature/bridger/django1.4 
Feature/bridger/django1.4
 2012-08-08 12:52:33 -07:00
Bridger Maxwell
9df10c5808 Updated sumbodule to compatible version of askbot. 2012-08-08 15:37:54 -04:00
Mike Chen
f4edc050d0 confirm before deleting comment/thread 2012-08-08 14:57:13 -04:00
Mike Chen
b06e31d2ed fix Close Thread showing for students and empty bracket in search bar 2012-08-08 14:51:49 -04:00
David Ormsbee
d5dd59bcbb Merge pull request #369 from MITx/feature/halogenandtoast/table_of_contents 
Feature/halogenandtoast/table of contents
 2012-08-08 11:45:52 -07:00
Rocky Duan
65f849637f Merge branch 'ccp0101/moderation' into lol 
Conflicts:
	lms/urls.py
 2012-08-08 14:39:10 -04:00
Rocky Duan
c453885489 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-08 14:36:31 -04:00
Matthew Mongeau
bcdcd7341f include courseware js 2012-08-08 14:13:34 -04:00
Matthew Mongeau
0b03834f51 XML based table of contents for books. 2012-08-08 14:13:20 -04:00
Bridger Maxwell
7ae0005afd Fixed CMS setting for 1.4 transition. 2012-08-08 13:30:43 -04:00
Victor Shnayder
523cb334a0 Hook up reordering children in the browser. 
* NOTE: the new order is NOT saved to the server!
 2012-08-08 13:15:05 -04:00
Victor Shnayder
77175872cc Fix some of the CMS jasmine tests. 
* still a few that I haven't tracked down...
 2012-08-08 13:14:54 -04:00
Brittany Cheng
3ec658df56 merge tom's styles, warning: LOTS OF STUFF BROKE 2012-08-08 12:45:40 -04:00
Mike Chen
eaf8279451 Merge branch 'lol' of github.com:dementrock/mitx into ccp0101/moderation 
Conflicts:
	lms/urls.py
 2012-08-08 12:04:41 -04:00
Mike Chen
2b803b024e fix MITx master bug in courseware. 2012-08-08 12:02:50 -04:00
Bridger Maxwell
14a35b9605 Upgrading to django 1.4. 2012-08-08 11:57:15 -04:00
Mike Chen
5e6261ebb1 courseware still not working.. 2012-08-08 11:30:11 -04:00
Mike Chen
8627a5f33e Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-08 11:20:13 -04:00
Tom Giannattasio
dc5b8b51c4 placeholder and button color updates 2012-08-08 11:08:58 -04:00
Calen Pennington
80b8529f2f Merge branch 'hotfix/1.0.4' 
Conflicts:
	common/djangoapps/util/middleware.py
 2012-08-08 11:05:26 -04:00
Tom Giannattasio
10ff6af3bb discussion sidebar additions; inline text editor example 2012-08-08 10:56:59 -04:00
Rocky Duan
2e45b8c3c6 Merge branch 'ccp0101/moderation' into lol 2012-08-08 10:46:11 -04:00