Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

65817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
731e04e013 Add an explanation of replication 2012-08-10 02:02:44 -04:00
David Ormsbee
b597b17db1 Add support for replicating course enrollment/unenrollment to course databases 2012-08-10 02:02:44 -04:00
David Ormsbee
165d5dcfd3 add config files for running different server groups in dev 2012-08-10 02:02:44 -04:00
David Ormsbee
0d824c6c02 Move modx_dispatch URL calls into the course 2012-08-10 02:02:44 -04:00
Victor Shnayder
1c3038ff3a Make accordion remember state 
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
 2012-08-09 19:47:08 -04:00
Mike Chen
2a9bf1a115 Merge branch 'master' of github.com:MITx/mitx into ccp0101/playground 2012-08-09 14:46:01 -04:00
Tom Giannattasio
ced521c17d cleaned up textbook nav styles 2012-08-09 14:44:50 -04:00
Calen Pennington
ecbb0ee39a Merge pull request #373 from MITx/MITx/feature/bridger/fast_course_grading 
Make templates render on non-xml modulestores
 2012-08-09 10:41:19 -07:00
Victor Shnayder
298954fc01 Clean up customtag handling 
* load the template at descriptor init
* make it  export inline, not as a pointer
* update import/export test to do export to initial directory
 2012-08-09 13:32:57 -04:00
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
David Ormsbee
2c676bc4ff Merge pull request #376 from MITx/dormsbee/new_jobs 
Dormsbee/new jobs
 2012-08-09 10:01:48 -07:00
David Ormsbee
b78c038bf2 Merge pull request #375 from MITx/dormsbee/new_jobs 
Dormsbee/new jobs
 2012-08-09 10:00:14 -07: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
Tom Giannattasio
3c23aca898 styled bulleted lists on jobs page 2012-08-09 12:26:32 -04:00
Tom Giannattasio
3d3ee02e52 started textbook nav styles 2012-08-09 12:16:13 -04:00
Mike Chen
46a7c51df5 remove voting arrows if one cannot vote 2012-08-09 12:12:43 -04:00
David Ormsbee
775ddf6fcc Add updated jobs descriptions for content related positions 2012-08-09 12:11:37 -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
Tom Giannattasio
e82582e329 added course name to global nav bar 2012-08-09 11:17:26 -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
Tom Giannattasio
5c14a1ce65 added admin controls to main post and comments 2012-08-08 16:42:19 -04: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