Commits · 2e45b8c3c6d94fbc8ca24ad06befd4cdb00a2f75 · edx / edx-platform · GitLab

08 Aug, 2012 4 commits
- Merge branch 'ccp0101/moderation' into lol · 2e45b8c3
  Rocky Duan committed Aug 08, 2012
  
  2e45b8c3 Browse Files
- Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation · b1e1cd57
  Rocky Duan committed Aug 08, 2012
  
  b1e1cd57 Browse Files
- Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation · 18fcdc4b
  Rocky Duan committed Aug 08, 2012
  
  18fcdc4b Browse Files
- limit permissions of a role to courses and fix bugs · b2a048e6
  Mike Chen committed Aug 08, 2012
  
  b2a048e6 Browse Files
07 Aug, 2012 36 commits
- Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into lol · f1dabe15
  Rocky Duan committed Aug 07, 2012
  
  f1dabe15 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx into brittany · f3d44225
  Rocky Duan committed Aug 07, 2012
  
  f3d44225 Browse Files
- fixed merge bugs · 690d97f2
  Rocky Duan committed Aug 07, 2012
  
  690d97f2 Browse Files
- revert permanent link for comments · e9c970e3
  Mike Chen committed Aug 07, 2012
  
  e9c970e3 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · 2fb02f1a
```
Conflicts:
	lms/urls.py
```
  Rocky Duan committed Aug 07, 2012
  2fb02f1a Browse Files
- left nav styles · 1f1ea8ad
  Brittany Cheng committed Aug 07, 2012
  
  1f1ea8ad Browse Files
- left nav styles · 0fba4d98
  Brittany Cheng committed Aug 07, 2012
  
  0fba4d98 Browse Files
- left nav styles · 67777ef5
  Brittany Cheng committed Aug 07, 2012
  
  67777ef5 Browse Files
- Merge branch 'master' into merge · 272c7b8b
  Rocky Duan committed Aug 07, 2012
  
  272c7b8b Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into brittany · 8df3ec3d
  Brittany Cheng committed Aug 07, 2012
  
  8df3ec3d Browse Files
- trending tags · 2685a3b6
  Rocky Duan committed Aug 07, 2012
  
  2685a3b6 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into brittany · a2f0e31d
  Brittany Cheng committed Aug 07, 2012
  
  a2f0e31d Browse Files
- recent activity · 9ae21a87
  Brittany Cheng committed Aug 07, 2012
  
  9ae21a87 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx · fddee7de
```
Conflicts:
	lms/templates/discussion/_recent_active_posts.html
```
  Rocky Duan committed Aug 07, 2012
  fddee7de Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into brittany · d934142a
  Brittany Cheng committed Aug 07, 2012
  
  d934142a Browse Files
- show recently active posts user's following · 7ba3bdfd
  Rocky Duan committed Aug 07, 2012
  
  7ba3bdfd Browse Files
- scaffold for trending tags · 6023aca5
  Rocky Duan committed Aug 07, 2012
  
  6023aca5 Browse Files
- recent activity · 338a6788
  Brittany Cheng committed Aug 07, 2012
  
  338a6788 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into brittany · e1a56410
  Brittany Cheng committed Aug 07, 2012
  
  e1a56410 Browse Files
- scaffold for recent active posts · 5309592f
  Rocky Duan committed Aug 07, 2012
  
  5309592f Browse Files
- Merge pull request #362 from MITx/ichuang/minor-disable-django-debug-dev-ike · 165ffe0a
```
disable diajgo debug toolbar on mit server (dev_ike.py)
```
  ichuang committed Aug 07, 2012
  165ffe0a Browse Files
- disable diajgo debug toolbar on mit server (dev_ike.py) · 8bbf4334
  ichuang committed Aug 07, 2012
  
  8bbf4334 Browse Files
- Merge pull request #361 from MITx/feature/disable_staff_course_check_in_dev · d558e3a4
```
Feature/disable staff course check in dev
```
  Calen Pennington committed Aug 07, 2012
  d558e3a4 Browse Files
- re-enable ENABLE_LMS_MIGRATION in dev, fix the course check filter to use… · f4138cae
```
re-enable ENABLE_LMS_MIGRATION in dev, fix the course check filter to use ACCESS_REQUIRE_STAFF_FOR_COURSE
```
  David Ormsbee committed Aug 07, 2012
  f4138cae Browse Files
- disable ENABLE_LMS_MIGRATION in dev mode, so courses are always displayed · fbd813ae
  David Ormsbee committed Aug 07, 2012
  
  fbd813ae Browse Files
- cleanup css · 39dc6a63
  Brittany Cheng committed Aug 07, 2012
  
  39dc6a63 Browse Files
- Merge pull request #359 from MITx/ichuang/minor-fix-edit-link · a237322b
```
change edit link showhide to use <a> instead of <input> type submit
```
  Calen Pennington committed Aug 07, 2012
  a237322b Browse Files
- change edit link showhide to use <a> instead of <input> type submit · 9d2b821c
```
(fixes issues with edit links in multipart problems and video)
```
  ichuang committed Aug 07, 2012
  9d2b821c Browse Files
- error styles · ed8595ad
  Brittany Cheng committed Aug 07, 2012
  
  ed8595ad Browse Files
- info styles · 79628130
  Brittany Cheng committed Aug 07, 2012
  
  79628130 Browse Files
- error handling · 49840933
  Brittany Cheng committed Aug 07, 2012
  
  49840933 Browse Files
- Run all tests all the way through before quitting on errors · 9cba2232
  Calen Pennington committed Aug 07, 2012
  
  9cba2232 Browse Files
- Merge pull request #349 from MITx/feature/kfiedler/courseware-style · 258b9eb5
```
A bunch of various fixes and de-styling
```
  thomasxiii committed Aug 07, 2012
  258b9eb5 Browse Files
- fixed error field for new post · dbb46736
  Rocky Duan committed Aug 07, 2012
  
  dbb46736 Browse Files
- Merge branch 'discussion3' of github.com:dementrock/mitx · aeb2d73c
  Rocky Duan committed Aug 07, 2012
  
  aeb2d73c Browse Files
- Merge branch 'discussion3' of github.com:dementrock/mitx · a9b171c8
```
Conflicts:
	lms/static/coffee/src/discussion/templates.coffee
```
  Rocky Duan committed Aug 07, 2012
  a9b171c8 Browse Files