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

22621 Commits

Author SHA1 Message Date
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
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
Brittany Cheng
1b7e2b356e edit layout of search box 2012-07-30 15:22:40 -04:00
David Ormsbee
f500fac0ae Merge pull request #318 from MITx/pmitros/minidash 
Miniature staff dashboard. Not really tested, but should be safe to merge
 2012-07-30 11:43:01 -07:00
Calen Pennington
1fce1dbe34 Make sure that django-pipelined css and js don't collide between the cms and lms 2012-07-30 14:04:39 -04:00
Rocky Duan
ab339239f8 use single js dependencies for discussion in forum / courseware 2012-07-30 13:44:00 -04:00
Rocky Duan
96c2a34c95 dumb bug 2012-07-30 13:43:28 -04:00
Calen Pennington
818cb0d1e7 Separate cms and lms auth and env files, and have the LMS that runs with the CMS use the CMS modulestore 2012-07-30 12:59:28 -04:00
Calen Pennington
012036a478 Clean up minor whitespace stuff in settings 2012-07-30 12:59:28 -04:00
Calen Pennington
c9e637d719 Make cms and lms tests run independently (they had been colliding on collectstatic) 2012-07-30 12:58:45 -04:00
Calen Pennington
5e60983e48 Merge pull request #314 from MITx/kf-cms-style 
Style for CMS
 2012-07-30 09:58:08 -07:00
Bridger Maxwell
a2271d4e48 The message div will only show up when there is a message to display. 2012-07-30 12:11:54 -04:00
Kyle Fiedler
b402cde650 Added some style for the dashboard message 2012-07-30 12:11:46 -04:00
Kyle Fiedler
c51f78bdfa Added styles for course images to always the right dimentions 2012-07-30 12:09:30 -04:00
Kyle Fiedler
a040f4346e Added styles for errors 2012-07-30 11:57:31 -04:00
Rocky Duan
4fcc76c24b Merge branch 'discussion_ui' of github.com:dementrock/mitx 2012-07-30 11:08:29 -04:00
Rocky Duan
d15d2c55e3 raise exception when received error from service 2012-07-30 11:05:15 -04:00
Brittany Cheng
65730c2268 Merge branch 'master' of github.com:dementrock/mitx into discussion 2012-07-30 10:45:04 -04:00
Kyle Fiedler
84272f3f8c Added Gemfile.lock to ignore 2012-07-30 09:51:50 -04:00
Kyle Fiedler
d94fd1542d Added Gemfile.lock to ignore 2012-07-30 09:50:24 -04:00
Rocky Duan
3ad309c2fd forgot to include files & tiny styling fix 2012-07-29 17:40:11 -04:00
Rocky Duan
8e3251c915 basic tag autocomplete 2012-07-29 17:32:00 -04:00
Rocky Duan
b92a180d25 add tags to threads & view threads by tags 2012-07-29 15:24:15 -04:00
Brittany Cheng
f6a3842fd8 merging inline html 2012-07-28 18:18:47 -04:00
Rocky Duan
1ad838ace8 fix random js stuff; tag fields; override mathjax config for now 2012-07-28 18:15:37 -04:00