Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2939 Commits

Author SHA1 Message Date
Kyle Fiedler
a040f4346e Added styles for errors 2012-07-30 11:57:31 -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
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
b92a180d25 add tags to threads & view threads by tags 2012-07-29 15:24:15 -04:00
Brittany Cheng
148d499bfe Merge branch 'master' of github.com:dementrock/mitx into discussion 2012-07-27 14:43:43 -04:00
Brittany Cheng
aff57bf855 mostly font edits 2012-07-27 14:43:33 -04:00
Brittany Cheng
c5aa22ed65 Merge branch 'master' of github.com:MITx/mitx into discussion 2012-07-27 14:42:39 -04:00
Rocky Duan
7a53bc52ae Merge branch 'master' of github.com:MITx/mitx 2012-07-27 12:30:54 -04:00
Rocky Duan
fc4e21d4c4 use wmd editor for comments 2012-07-26 17:35:09 -04:00
Rocky Duan
b04a645685 make indentation the same 2012-07-26 11:11:45 -04:00
kimth
6631848b53 CodeMirror fix in the new scss org 2012-07-26 10:49:10 -04:00
Rocky Duan
9d2bccbee7 Merge branch 'master' of github.com:MITx/mitx 2012-07-26 10:43:42 -04:00
Calen Pennington
73d6565fac Merge remote-tracking branch 'origin/hotfix/1.0.1' 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-26 09:05:57 -04:00
Rocky Duan
63633ae1d3 files for wmd editor 2012-07-25 20:47:11 -04:00
Rocky Duan
9f1353b027 removed nonexisted scss links 2012-07-25 20:42:27 -04:00
Rocky Duan
52c7136493 Merge branch 'lol' 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/lib/comment_client.py
	lms/lib/datehelper
	lms/static/sass/application.scss
	lms/templates/discussion/index.html
	lms/templates/news.html
 2012-07-25 18:41:24 -04:00
Kyle Fiedler
8c079c8a72 Added styles for course images to always the right dimentions 2012-07-25 18:18:52 -04:00
Rocky Duan
048deaa87f show news & options when submit comment 2012-07-25 18:16:57 -04:00
Rocky Duan
aab9f8dc1c make course id available in xmodule 2012-07-25 18:15:52 -04:00
Rocky Duan
4b8c3b9b12 watch/unwatch threads; display current vote 2012-07-25 18:15:52 -04:00
Rocky Duan
5e5dda2dfb refactored out thread rendering; vote 2012-07-25 18:15:51 -04:00
Rocky Duan
d49338c948 integrated search; refactored some frontend code 2012-07-25 18:15:51 -04:00
Rocky Duan
3267aa1737 forum view for discussions 2012-07-25 18:14:58 -04:00
Rocky Duan
846a488ef2 create new post 2012-07-25 18:11:00 -04:00
Rocky Duan
d393481b21 some basic functionalities of discussion 2012-07-25 18:11:00 -04:00
Rocky Duan
9abc888340 display simple threaded comment 2012-07-25 18:09:34 -04:00
Arjun Singh
cdea9488ef Fixing up bracket indentation 2012-07-25 15:58:14 -04:00
Kyle Fiedler
bb3dfc5c08 fix courseware css file so it imports the right files in the right order 2012-07-25 15:54:18 -04:00
Rocky Duan
54ea3dba22 show news & options when submit comment 2012-07-25 15:30:05 -04:00
Kyle Fiedler
00596d2f20 Added courseware css back into the main template 2012-07-25 14:57:44 -04:00
Brittany Cheng
388ddc5365 change activation complete green and add styles for faq 2012-07-25 14:57:00 -04:00
Rocky Duan
bedeac3a55 make course id available in xmodule 2012-07-24 18:51:56 -04:00
Calen Pennington
bdf964a305 Modularize video css 2012-07-24 16:14:05 -04:00
Calen Pennington
6029c28695 Modularize sequence css 2012-07-24 16:14:04 -04:00
Calen Pennington
8a0270ea2b Allow for modular css from XModules, and split capa module css out as a test 2012-07-24 16:14:04 -04:00
Calen Pennington
7e4d3c8b35 Modularize sequence coffeescript in prepration for CMS preview 2012-07-24 16:14:02 -04:00
Rocky Duan
a06cc229a0 watch/unwatch threads; display current vote 2012-07-24 15:34:17 -04:00
Calen Pennington
d8f8d8c656 Merge branch 'release/1.0' 
Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py
 2012-07-24 08:52:50 -04:00
Kyle Fiedler
3008c17730 Added bottom margin for articles in help 2012-07-23 19:19:50 -04:00
Kyle Fiedler
18ec7ca8e8 Added social links to the footer of the press release 2012-07-23 19:17:22 -04:00
Rocky Duan
d6be47d942 refactored out thread rendering; vote 2012-07-23 19:03:36 -04:00
Kyle Fiedler
6aac776a33 Added styles for help page 2012-07-23 18:40:58 -04:00
Kyle Fiedler
2cb9e2997e Move the shiv back to the header 2012-07-23 18:22:21 -04:00
Kyle Fiedler
63faa76e2a More small ie fixes 2012-07-23 17:49:48 -04:00
Kyle Fiedler
0f4976e069 Added some small IE fixes 2012-07-23 16:53:39 -04:00
David Ormsbee
64ecd3a211 Merge pull request #275 from MITx/uc_berkeley_press 
Added contact info on Berkeley press release.
 2012-07-23 12:52:16 -07:00
Rocky Duan
616eaf2500 integrated search; refactored some frontend code 2012-07-23 15:41:09 -04:00
Bridger Maxwell
e1ad3539b6 Updated contact information on press release. 2012-07-23 15:40:10 -04:00
Kyle Fiedler
b4d08f820e Chage placement of the read more link 2012-07-23 15:28:24 -04:00