Rocky Duan
|
6c8214051f
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-07-30 17:17:32 -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
|
1b7e2b356e
|
edit layout of search box
|
2012-07-30 15:22:40 -04:00 |
|
Rocky Duan
|
ab339239f8
|
use single js dependencies for discussion in forum / courseware
|
2012-07-30 13:44:00 -04: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 |
|
Brittany Cheng
|
65730c2268
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-30 10:45:04 -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 |
|
Rocky Duan
|
0790a3add4
|
image uploading & render markdown
|
2012-07-27 17:50:38 -04:00 |
|
Brittany Cheng
|
4535188099
|
style changes
|
2012-07-27 17:20:37 -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 |
|
Bridger Maxwell
|
0a60881ca5
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-07-27 08:50:07 -04:00 |
|
Bridger Maxwell
|
351ded6c05
|
Merge branch 'MITx/hotfix/1.0.2'
|
2012-07-27 08:49:33 -04:00 |
|
Calen Pennington
|
6abd1ec64a
|
Merge pull request #309 from MITx/feature/tutorials_fix
Add optional hide_from_toc attribute to XML elements
|
2012-07-27 05:38:29 -07:00 |
|
Bridger Maxwell
|
dc021312dd
|
Added faq about UC Berkeley's 'X University' Consortium.
|
2012-07-27 08:38:01 -04:00 |
|
David Ormsbee
|
72341569f9
|
Remove sections from ever getting appended in the first place if hide_from_toc is true
|
2012-07-27 01:22:07 -04:00 |
|
Brittany Cheng
|
3b7b92993c
|
Merge branch 'master' of github.com:MITx/mitx into discussion
|
2012-07-26 18:00:17 -04:00 |
|
Rocky Duan
|
03898f4ab7
|
fixed unmatched div tag
|
2012-07-26 17:57:37 -04:00 |
|
Rocky Duan
|
104e4c9fc8
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-07-26 17:35:40 -04:00 |
|
Rocky Duan
|
fc4e21d4c4
|
use wmd editor for comments
|
2012-07-26 17:35:09 -04:00 |
|
Rocky Duan
|
f0ce33c951
|
make mathjax working with the editor
|
2012-07-26 15:34:22 -04:00 |
|
David Ormsbee
|
2671801f93
|
Add optional hide_from_toc attribute to XML elements to support Tutorials (which don't show up in the navigation).
|
2012-07-26 14:55:42 -04:00 |
|
Matthew Mongeau
|
8e2ced916f
|
Add field-error class to field with issues.
|
2012-07-26 14:06:29 -04:00 |
|
Rocky Duan
|
1a57ac50f4
|
custom mathjax setup
|
2012-07-26 11:09:33 -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
|
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 |
|
David Ormsbee
|
e4073663e2
|
Have Bloomberg link point to Bloomberg article :-P
|
2012-07-25 18:47:26 -04:00 |
|
Rocky Duan
|
3757e9757c
|
fixed discussion & news styling
|
2012-07-25 18:36:36 -04: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 |
|
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
|
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 |
|
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 |
|