Commits · 1a57ac50f43f5531f47035aad07c314d77af9b25 · edx / edx-platform · GitLab

26 Jul, 2012 6 commits
- custom mathjax setup · 1a57ac50
  Rocky Duan committed Jul 26, 2012
  
  1a57ac50 Browse Files
- Merge branch 'master' of github.com:MITx/mitx · 9d2bccbe
  Rocky Duan committed Jul 26, 2012
  
  9d2bccbe Browse Files
- Merge remote-tracking branch 'origin/hotfix/1.0.1' · 73d6565f
```
Conflicts:
	common/djangoapps/student/views.py
```
  Calen Pennington committed Jul 26, 2012
  73d6565f Browse Files
- moved vendor js files to common · 7103bd00
  Rocky Duan committed Jul 25, 2012
  
  7103bd00 Browse Files
- files for wmd editor · 63633ae1
  Rocky Duan committed Jul 25, 2012
  
  63633ae1 Browse Files
- removed nonexisted scss links · 9f1353b0
  Rocky Duan committed Jul 25, 2012
  
  9f1353b0 Browse Files
25 Jul, 2012 34 commits
- Have Bloomberg link point to Bloomberg article :-P · e4073663
  David Ormsbee committed Jul 25, 2012
  
  e4073663 Browse Files
- Merge branch 'lol' · 52c71364
```
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
```
  Rocky Duan committed Jul 25, 2012
  52c71364 Browse Files
- fixed discussion & news styling · 3757e975
  Rocky Duan committed Jul 25, 2012
  
  3757e975 Browse Files
- Merge pull request #305 from MITx/feature/dormsbee/press_copy_updates · dd7b1374
```
Hotfix changes
```
  David Ormsbee committed Jul 25, 2012
  dd7b1374 Browse Files
- add a few items to the press links at the bottom of the front page · 5ad17914
  David Ormsbee committed Jul 25, 2012
  
  5ad17914 Browse Files
- move comment client in place · 02a73a94
  Rocky Duan committed Jul 25, 2012
  
  02a73a94 Browse Files
- moved datehelper in place · d1277ff3
  Rocky Duan committed Jul 25, 2012
  
  d1277ff3 Browse Files
- fixed eager · 9e3271e3
  Rocky Duan committed Jul 25, 2012
  
  9e3271e3 Browse Files
- minor typo fixes · 9671df3e
  David Ormsbee committed Jul 25, 2012
  
  9671df3e Browse Files
- Added styles for course images to always the right dimentions · 8c079c8a
  Kyle Fiedler committed Jul 25, 2012
  
  8c079c8a Browse Files
- show news & options when submit comment · 048deaa8
  Rocky Duan committed Jul 25, 2012
  
  048deaa8 Browse Files
- make course id available in xmodule · aab9f8dc
  Rocky Duan committed Jul 25, 2012
  
  aab9f8dc Browse Files
- watch/unwatch, vote status enabled in all views · 6a816e45
  Rocky Duan committed Jul 25, 2012
  
  6a816e45 Browse Files
- get user_id in discussion module · e6d437b6
  Rocky Duan committed Jul 25, 2012
  
  e6d437b6 Browse Files
- provide user_id for xmodules · b2da6eef
  Rocky Duan committed Jul 25, 2012
  
  b2da6eef Browse Files
- watch/unwatch threads; display current vote · 4b8c3b9b
  Rocky Duan committed Jul 25, 2012
  
  4b8c3b9b Browse Files
- removed unnecessary args · 0ee1b0c5
  Rocky Duan committed Jul 25, 2012
  
  0ee1b0c5 Browse Files
- refactored out thread rendering; vote · 5e5dda2d
  Rocky Duan committed Jul 25, 2012
  
  5e5dda2d Browse Files
- moved django_comment_client into edx · 28113d8b
  Rocky Duan committed Jul 25, 2012
  
  28113d8b Browse Files
- integrated search; refactored some frontend code · d49338c9
  Rocky Duan committed Jul 25, 2012
  
  d49338c9 Browse Files
- fixed twitter link to Berkeley Press Release · a8610c38
  David Ormsbee committed Jul 25, 2012
  
  a8610c38 Browse Files
- forum view for discussions · 3267aa17
  Rocky Duan committed Jul 25, 2012
  
  3267aa17 Browse Files
- fixed twitter link for course about pages · 619d4cd9
  David Ormsbee committed Jul 25, 2012
  
  619d4cd9 Browse Files
- create new post · 846a488e
  Rocky Duan committed Jul 25, 2012
  
  846a488e Browse Files
- some basic functionalities of discussion · d393481b
  Rocky Duan committed Jul 25, 2012
  
  d393481b Browse Files
- add discussion app & url conf · fb408a99
  Rocky Duan committed Jul 25, 2012
  
  fb408a99 Browse Files
- display simple threaded comment · 9abc8883
  Rocky Duan committed Jul 25, 2012
  
  9abc8883 Browse Files
- initial setup for the discussion module · 0373096c
  Rocky Duan committed Jul 25, 2012
  
  0373096c Browse Files
- New press articles · a86938ee
  David Ormsbee committed Jul 25, 2012
  
  a86938ee Browse Files
- Update About Page text with new intro paragraph · 3a933aea
  David Ormsbee committed Jul 25, 2012
  
  3a933aea Browse Files
- Merge pull request #304 from MITx/feature/halogenandtoast/press-page · 26a14fd2
```
Feature/halogenandtoast/press page
```
  David Ormsbee committed Jul 25, 2012
  26a14fd2 Browse Files
- Move press articles to json. · bd9da89f
  Matthew Mongeau committed Jul 25, 2012
  
  bd9da89f Browse Files
- Merge pull request #297 from MITx/arjun/minor_css_fixes · c7648bc4
```
change activation complete green and add styles for faq
```
  kylefiedler committed Jul 25, 2012
  c7648bc4 Browse Files
- Merge pull request #302 from MITx/feature/fix-courseware · 34a32ce1
```
fix courseware css file so it imports the right files in the right order
```
  Calen Pennington committed Jul 25, 2012
  34a32ce1 Browse Files