Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

7051 Commits

Author SHA1 Message Date
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
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
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
Arjun Singh
73261719ce Added TODO near temporary code. 2012-07-26 13:14:00 -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
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
Arjun Singh
3002260de5 Compiling coffee files in course data directories on startup. 2012-07-25 21:45:01 -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
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
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