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

7051 Commits

Author SHA1 Message Date
Kyle Fiedler
d30ae5389e Added fix for videos start to zero out colors and mit styles 2012-07-31 14:18:42 -04:00
Brittany Cheng
b3474fbf10 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-31 14:09:12 -04:00
Brittany Cheng
ff4d0637f5 merging styles 2012-07-31 14:09:06 -04:00
Rocky Duan
32c76d1351 bug fix search bar lol.. 2012-07-31 14:08:31 -04:00
kimth
2e3c5de1a5 Remove hardcoding of LMS callback URL and default queuename 2012-07-31 14:08:02 -04:00
Brittany Cheng
643316a10b tag styles 2012-07-31 14:05:11 -04:00
Rocky Duan
20f958e6be bug fix: resize input for defaulttext (tagsinput) 2012-07-31 14:03:55 -04:00
Rocky Duan
c43d5d236a Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 
Conflicts:
	lms/static/coffee/src/discussion.coffee
 2012-07-31 13:43:53 -04:00
Brittany Cheng
836242706f buttons 2012-07-31 13:41:21 -04:00
Rocky Duan
401f57b81a show new post form after clicking button 2012-07-31 13:40:26 -04:00
Brittany Cheng
ddce6d8cb6 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-31 13:39:13 -04:00
Rocky Duan
799f66b776 make search bar configurable 2012-07-31 13:26:36 -04:00
Brittany Cheng
48674d6fa5 search button style 2012-07-31 13:23:35 -04:00
Rocky Duan
c39b2db678 retrieve inline discussion by ajax 2012-07-31 13:22:25 -04:00
kimth
0879f3e0a8 Use build_absolute_uri rather than hardcoded sandbox URL 2012-07-31 13:21:45 -04:00
kimth
a773df588a Merge branch 'master' into kimth/lms-coderesponse 2012-07-31 13:02:48 -04:00
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
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
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
kimth
e2f4995bc9 LMS provides fully qualified callback URL 2012-07-31 08:57:28 -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
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