Calen Pennington
|
1d554c76a0
|
Comment out really loud debug messages from xml.py
|
2012-07-26 12:05:23 -04:00 |
|
Brittany Cheng
|
9a5aa25229
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-26 11:14:48 -04:00 |
|
Rocky Duan
|
b04a645685
|
make indentation the same
|
2012-07-26 11:11:45 -04:00 |
|
Rocky Duan
|
eb0a9bc9e8
|
only run customwmd when where's markdown
|
2012-07-26 11:11:30 -04:00 |
|
Rocky Duan
|
1a57ac50f4
|
custom mathjax setup
|
2012-07-26 11:09:33 -04:00 |
|
kimth
|
6631848b53
|
CodeMirror fix in the new scss org
|
2012-07-26 10:49:10 -04:00 |
|
Calen Pennington
|
c6d160ad1e
|
Ignore some spurious errors from pylint
|
2012-07-26 10:48:55 -04:00 |
|
Rocky Duan
|
9d2bccbee7
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-07-26 10:43:42 -04:00 |
|
kimth
|
848e4e5801
|
Pull clean codemirror.css from master
|
2012-07-26 10:27:59 -04:00 |
|
Brittany Cheng
|
08fd19c3b4
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-26 10:24:11 -04:00 |
|
kimth
|
8e8ac35d46
|
restored responsetypes.py from master
|
2012-07-26 10:11:49 -04:00 |
|
kimth
|
07de2d9903
|
Merging master
|
2012-07-26 10:08:55 -04:00 |
|
kimth
|
1255ed130f
|
Adjust comments
|
2012-07-26 09:15:07 -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 |
|
Arjun Singh
|
9b032f08b8
|
Removing stray print statement
|
2012-07-25 21:46:01 -04:00 |
|
Arjun Singh
|
3002260de5
|
Compiling coffee files in course data directories on startup.
|
2012-07-25 21:45:01 -04:00 |
|
Arjun Singh
|
1d851713a0
|
Compiling coffee files in course data directories on startup.
|
2012-07-25 21:36:52 -04:00 |
|
Rocky Duan
|
7103bd0071
|
moved vendor js files to common
|
2012-07-25 20:57:38 -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 |
|
David Ormsbee
|
e4073663e2
|
Have Bloomberg link point to Bloomberg article :-P
|
2012-07-25 18:47:26 -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 |
|
Rocky Duan
|
3757e9757c
|
fixed discussion & news styling
|
2012-07-25 18:36:36 -04:00 |
|
David Ormsbee
|
dd7b1374eb
|
Merge pull request #305 from MITx/feature/dormsbee/press_copy_updates
Hotfix changes
|
2012-07-25 15:35:30 -07:00 |
|
David Ormsbee
|
5ad1791433
|
add a few items to the press links at the bottom of the front page
|
2012-07-25 18:31:57 -04:00 |
|
Rocky Duan
|
02a73a945f
|
move comment client in place
|
2012-07-25 18:26:41 -04:00 |
|
Rocky Duan
|
d1277ff32b
|
moved datehelper in place
|
2012-07-25 18:25:40 -04:00 |
|
Rocky Duan
|
9e3271e3cb
|
fixed eager
|
2012-07-25 18:25:28 -04:00 |
|
David Ormsbee
|
9671df3e25
|
minor typo fixes
|
2012-07-25 18:22:46 -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
|
6a816e453f
|
watch/unwatch, vote status enabled in all views
|
2012-07-25 18:15:52 -04:00 |
|
Rocky Duan
|
e6d437b66e
|
get user_id in discussion module
|
2012-07-25 18:15:52 -04:00 |
|
Rocky Duan
|
b2da6eef9f
|
provide user_id for xmodules
|
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
|
0ee1b0c5d0
|
removed unnecessary args
|
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
|
28113d8b43
|
moved django_comment_client into edx
|
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 |
|
David Ormsbee
|
a8610c3889
|
fixed twitter link to Berkeley Press Release
|
2012-07-25 18:15:37 -04:00 |
|
Rocky Duan
|
3267aa1737
|
forum view for discussions
|
2012-07-25 18:14:58 -04:00 |
|
David Ormsbee
|
619d4cd989
|
fixed twitter link for course about pages
|
2012-07-25 18:14:05 -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
|
fb408a99b5
|
add discussion app & url conf
|
2012-07-25 18:09:34 -04:00 |
|
Rocky Duan
|
9abc888340
|
display simple threaded comment
|
2012-07-25 18:09:34 -04:00 |
|
Rocky Duan
|
0373096c8d
|
initial setup for the discussion module
|
2012-07-25 18:09:34 -04:00 |
|
David Ormsbee
|
a86938ee93
|
New press articles
|
2012-07-25 18:09:26 -04:00 |
|
David Ormsbee
|
3a933aeab8
|
Update About Page text with new intro paragraph
|
2012-07-25 17:40:58 -04:00 |
|