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

66833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kimth
27e142dd2f Extra empty line 2012-07-31 12:58:32 -04:00
Brittany Cheng
607bc6b50b Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-31 12:51:17 -04:00
Calen Pennington
b659846e1f Add askbot to lms staticfiles_dirs in test 2012-07-31 12:46:47 -04:00
Rocky Duan
701f8716f7 only show edit button when user can edit 2012-07-31 12:31:59 -04:00
Brittany Cheng
cf92f356c0 edit styles for tags, discussion votes, etc 2012-07-31 12:03:45 -04:00
Rocky Duan
e301be4a80 modify anonymity handling; display comments count 2012-07-31 11:54:02 -04:00
Brittany Cheng
32cf7c6f66 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-07-31 11:26:17 -04:00
David Ormsbee
7bfd21732a Merge pull request #321 from MITx/feature/kfiedler/courseware-style 
Fixed jquery ui image problem and added a base style sheet for lms to ov...
 2012-07-31 08:22:46 -07:00
Kyle Fiedler
2bbb19790d Fixed jquery ui image problem and added a base style sheet for lms to override fonts 2012-07-31 11:06:39 -04:00
Brittany Cheng
9bd1aa94d8 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-31 10:48:18 -04:00
Rocky Duan
a08d4b808b fix raw tag data bug 2012-07-31 10:47:42 -04:00
kimth
3968e117e1 Simplify dict load in xqueue_callback 2012-07-31 10:42:32 -04:00
Brittany Cheng
278483371b fix merge conflicts 2012-07-31 10:30:26 -04:00
Brittany Cheng
6285f2a2be discussion styles 2012-07-31 10:27:14 -04:00
Rocky Duan
ada66adff6 Merge branch 'master' of github.com:MITx/mitx 2012-07-31 10:12:06 -04:00
Rocky Duan
6f44001813 basic editing functionality 2012-07-31 10:11:51 -04:00
kimth
22af531b0b Hardcoded URL moved to LMS for now 2012-07-31 10:09:47 -04:00
Calen Pennington
2f95a8e1d0 Re-add __init__.py for contentstore that was accidentally deleted in 05add5818b 2012-07-31 09:29:14 -04:00
kimth
e2f4995bc9 LMS provides fully qualified callback URL 2012-07-31 08:57:28 -04:00
ichuang
94e73936fc Merge pull request #319 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-30 18:51:16 -07:00
kimth
6d600ecf2c Merge branch 'master' into kimth/lms-coderesponse 2012-07-30 20:42:10 -04:00
kimth
b9e5e9f0ee Read XML for queuename 2012-07-30 20:18:25 -04:00
kimth
6244412c28 Simplify default linenumbers behavior 2012-07-30 18:59:11 -04:00
Brittany Cheng
6da690f692 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-30 18:37:11 -04:00
Brittany Cheng
bba8e29733 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-07-30 18:36:23 -04:00
Brittany Cheng
cc47de5135 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-30 18:36:15 -04:00
Brittany Cheng
a98c505ba8 fix merge conflicts 2012-07-30 18:36:06 -04:00
Rocky Duan
cef347226b Merge branch 'master' of github.com:MITx/mitx 2012-07-30 18:35:11 -04:00
Rocky Duan
24610899cf fix accordion 2012-07-30 18:34:47 -04:00
Brittany Cheng
92cfded595 added color to error msg and borders to threads 2012-07-30 18:34:07 -04:00
David Ormsbee
e5fd92630d Merge pull request #316 from MITx/feature/halogenandtoast/form-field-errors 
Added styles for errors
 2012-07-30 15:24:12 -07:00
David Ormsbee
1baa306cfa Merge pull request #320 from MITx/feature/kfiedler/courseware-style 
Start to whip out a bunch of the styles and get courseware working
 2012-07-30 15:23:52 -07:00
Rocky Duan
d6b7707725 refactored reply rendering by using mustache 2012-07-30 18:19:04 -04:00
Rocky Duan
e705bbb764 Merge branch 'discussion2' of github.com:dementrock/mitx 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
 2012-07-30 17:45:29 -04:00
Rocky Duan
8228bebc2a Merge branch 'master' of github.com:MITx/mitx 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
 2012-07-30 17:41:19 -04:00
Kyle Fiedler
c611bd9228 added treeview 2012-07-30 17:39:44 -04:00
Kyle Fiedler
257ce0430f Moved vendor sass files to css folder and included them in 2012-07-30 17:39:19 -04:00
Kyle Fiedler
7ab5bbfaef Moved files and removed files 2012-07-30 17:37:53 -04:00
Kyle Fiedler
6cad5459b3 Start to refactor courseware scss 2012-07-30 17:37:11 -04:00
Brittany Cheng
95291ef745 fix line 511 2012-07-30 17:29:07 -04:00
Brittany Cheng
2ad854abb7 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-30 17:28:05 -04:00
Rocky Duan
e6776682df ..and fix again bug caused by changing id 2012-07-30 17:25:14 -04:00
Brittany Cheng
554fc827f4 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-30 17:22:12 -04:00
Rocky Duan
5fcc12136e fixed bug caused by rearranging stuff 2012-07-30 17:20:30 -04:00
Rocky Duan
6c8214051f Merge branch 'discussion2' of github.com:dementrock/mitx 2012-07-30 17:17:32 -04:00
Rocky Duan
8bf2eb17e8 middleware file forgot to include 2012-07-30 17:17:09 -04:00
Rocky Duan
941ae0f068 basic error handling 2012-07-30 17:16:44 -04:00
Rocky Duan
2869de16dd refactored thread.html 2012-07-30 17:15:53 -04:00
Brittany Cheng
91cb814ee0 merging with origin master 2012-07-30 16:28:49 -04:00
Kyle Fiedler
3bb82c41d2 Remove couse css file 2012-07-30 16:21:03 -04:00