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
|
1b7e2b356e
|
edit layout of search box
|
2012-07-30 15:22:40 -04:00 |
|
Brittany Cheng
|
833f5fdbe0
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-30 13:45:55 -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 |
|
Brittany Cheng
|
f290204dbc
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-30 11:11:33 -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 |
|
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 |
|
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 |
|
Calen Pennington
|
aa855eec0f
|
Merge pull request #307 from MITx/kimth/lms-coderesponse
Kimth/lms coderesponse
|
2012-07-27 05:37:57 -07:00 |
|
Calen Pennington
|
81d5c17a60
|
Merge pull request #310 from MITx/arjun/javascript_loading
Adding the ability for javascript from problems to execute more intelligently
|
2012-07-27 05:37:04 -07: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 |
|
Arjun Singh
|
c4c8bc2fbe
|
Adding the ability for javascript from problems to execute more intelligently; for example, errors from javascript included in the returned html will show up in the console when using this mechanism.
|
2012-07-26 16:35:33 -04:00 |
|
Calen Pennington
|
6afe1709e7
|
Merge pull request #306 from MITx/arjun/compile_coffee
Compiling coffee files in course data directories on startup.
|
2012-07-26 13:31:46 -07:00 |
|
Rocky Duan
|
2e26f84e9b
|
improve for multiple editor on page
|
2012-07-26 16:20:26 -04:00 |
|
Rocky Duan
|
dbad9338e1
|
removed unnecessary/commented out lines
|
2012-07-26 16:01:57 -04:00 |
|
David Ormsbee
|
9cd3b013f3
|
Merge pull request #308 from MITx/feature/halogenandtoast/form-field-errors
Add field-error class to field with issues.
|
2012-07-26 12:54:04 -07:00 |
|
Brittany Cheng
|
a3bb3182c0
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-26 15:43:17 -04:00 |
|
Brittany Cheng
|
7a44ebb34d
|
Merge branch 'master' of github.com:MITx/mitx into discussion
|
2012-07-26 15:40:01 -04:00 |
|
Rocky Duan
|
b37df4d0a5
|
removed the dumb debug line
|
2012-07-26 15:35:06 -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 |
|
Victor Shnayder
|
08ce3944ab
|
Make logging work for xmodule and company.
* We do not want to disable existing loggers when setting up our own
|
2012-07-26 14:49:11 -04:00 |
|
Matthew Mongeau
|
8e2ced916f
|
Add field-error class to field with issues.
|
2012-07-26 14:06:29 -04:00 |
|
Brittany Cheng
|
72e76560c1
|
Merge branch 'master' of github.com:MITx/mitx into discussion
|
2012-07-26 13:18:13 -04:00 |
|
Arjun Singh
|
73261719ce
|
Added TODO near temporary code.
|
2012-07-26 13:14:00 -04:00 |
|
Calen Pennington
|
1d554c76a0
|
Comment out really loud debug messages from xml.py
|
2012-07-26 12:05:23 -04:00 |
|