Commits · e23b693d90fd0e200fd0d640d6ec0babe94f3fc5 · edx / edx-platform · GitLab

30 Jul, 2013 36 commits
- put a 4th field in the create new course form where the user must specify a… · e23b693d
```
put a 4th field in the create new course form where the user must specify a course_run. Also update unit tests to also provide this 4th parameter. Styling changes to better lay out the form fields are still TBD.
```
  Chris Dodge committed Jul 30, 2013
  e23b693d Browse Files
- Merge pull request #470 from edx/db/course-team-admin-grants · 7d7513b6
```
Grant admin rights to members of the course team
```
  David Baumgold committed Jul 30, 2013
  7d7513b6 Browse Files
- Change "user" to "admin" in course team BDD descriptions · 0022469e
  David Baumgold committed Jul 30, 2013
  
  0022469e Browse Files
- Add a lettuce test for course team admins removing admin status · eaac4f8b
  David Baumgold committed Jul 30, 2013
  
  eaac4f8b Browse Files
- Studio: adds badge UI firefox fix · 573445aa
  Brian Talbot committed Jul 30, 2013
  
  573445aa Browse Files
- Studio: adds logic to show add new user to team view · 7a41855f
  Brian Talbot committed Jul 30, 2013
  
  7a41855f Browse Files
- Add a lettuce test for course team admins granting admin status · fba50589
  David Baumgold committed Jul 30, 2013
  
  fba50589 Browse Files
- Studio: revises badge and create call to action design · c82ad6cd
  Brian Talbot committed Jul 30, 2013
  
  c82ad6cd Browse Files
- Studio: corrects legend element copy on new user form · 2161961f
  Brian Talbot committed Jul 30, 2013
  
  2161961f Browse Files
- Merge pull request #526 from edx/dhm/yacibug · 6a7fa41e
```
Yet another Course Info bug
```
  Don Mitchell committed Jul 30, 2013
  6a7fa41e Browse Files
- Merge pull request #480 from edx/rocha/show-dates-in-instructor-analytics · 5b30c06b
```
Show dates when the data was collected in the instructor dashboard panel
```
  Carlos Andrés Rocha committed Jul 30, 2013
  5b30c06b Browse Files
- Wrap malformed course_update rather than silently failing update · 1fb4354a
  Don Mitchell committed Jul 30, 2013
  
  1fb4354a Browse Files
- Test reproducing the error: malformed course_update silently failing update · 27d32f19
  Don Mitchell committed Jul 30, 2013
  
  27d32f19 Browse Files
- Merge pull request #523 from edx/feature/kevin/notifications_panel_xmodule_workaround · 4de1ab2d
```
fix for underscore template issue for xmodules
```
  Kevin Chugh committed Jul 30, 2013
  4de1ab2d Browse Files
- Merge pull request #515 from edx/db/template-improvements · 71bb5270
```
Studio: Improvements for loading JS templates on Advanced Settings and Course Updates pages
```
  David Baumgold committed Jul 30, 2013
  71bb5270 Browse Files
- Re-added missing render() call · 4f5c2cce
  David Baumgold committed Jul 30, 2013
  
  4f5c2cce Browse Files
- Show dates when the data was collected in the instructor dashboard panel · b8d1a138
  Carlos Andrés Rocha committed Jul 30, 2013
  
  b8d1a138 Browse Files
- fix for underscore template issue for xmodules · 56c8057e
  Your Name committed Jul 30, 2013
  
  56c8057e Browse Files
- Merge pull request #520 from edx/feature/kevin/email_notifications_panel · 77a796e2
```
Feature/kevin/email notifications panel
```
  Jim Abramson committed Jul 30, 2013
  77a796e2 Browse Files
- Merge pull request #499 from edx/diana/login-redirect · 0d10a872
```
Only redirect when redirect url is an internal page.
```
  Diana Huang committed Jul 30, 2013
  0d10a872 Browse Files
- Merge pull request #517 from edx/bug/jsa/edx_api_key · 98fe2d49
```
add EDX_API_KEY to aws.py
```
  Jim Abramson committed Jul 30, 2013
  98fe2d49 Browse Files
- Merge branch 'feature/kevin/email_notifications_panel' of… · 05f31f8b
```
Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel
```
  jsa committed Jul 30, 2013
  05f31f8b Browse Files
- notification_prefs/views: correct docstring · 7a7c0709
  jsa committed Jul 30, 2013
  
  7a7c0709 Browse Files
- address code review comments · e1e591f8
  Kevin Chugh committed Jul 30, 2013
  
  e1e591f8 Browse Files
- fix notifications URL · 4f7edbf6
  Kevin Chugh committed Jul 30, 2013
  
  4f7edbf6 Browse Files
- fix merge conflict · c3e609fe
  Kevin Chugh committed Jul 30, 2013
  
  c3e609fe Browse Files
- update coffeescript to use new status url · 5c91edd4
  Kevin Chugh committed Jul 30, 2013
  
  5c91edd4 Browse Files
- notification_prefs: add ajax endpoint to get preference status · 908fd46f
  jsa committed Jul 30, 2013
  
  908fd46f Browse Files
- Merge branch 'feature/kevin/email_notifications_panel' of… · 986a2cde
```
Merge branch 'feature/kevin/email_notifications_panel' of github.com:edx/edx-platform into feature/kevin/email_notifications_panel
```
  Kevin Chugh committed Jul 30, 2013
  986a2cde Browse Files
- add ajax endpoint for getting notifications status · 803b92fc
  Kevin Chugh committed Jul 30, 2013
  
  803b92fc Browse Files
- Merge branch 'feature/kevin/email_notifications_panel' of… · 79994b5d
```
Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel
```
  jsa committed Jul 30, 2013
  79994b5d Browse Files
- remove failing jasmine tests and print statements · 8f98a1c2
  Kevin Chugh committed Jul 30, 2013
  
  8f98a1c2 Browse Files
- copy changes · 8b6c2787
  Mark L. Chang committed Jul 30, 2013
  
  8b6c2787 Browse Files
- fix strange comment typo · 0207255e
  jsa committed Jul 30, 2013
  
  0207255e Browse Files
- first pass at jasmine tests · 99f235ec
  Kevin Chugh committed Jul 30, 2013
  
  99f235ec Browse Files
- home button working, default to home when no thread selected · 62f6e2d5
  Kevin Chugh committed Jul 29, 2013
  
  62f6e2d5 Browse Files
29 Jul, 2013 4 commits
- updates but getting status and setting status not working · 47dbf2e6
  Your Name committed Jul 29, 2013
  
  47dbf2e6 Browse Files
- Merge branch 'feature/kevin/email_notifications_panel' of… · 06eb5cdd
```
Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel
```
  jsa committed Jul 29, 2013
  06eb5cdd Browse Files
- add feature flag to enable/disable discussion home panel · 33d4ae69
  jsa committed Jul 29, 2013
  
  33d4ae69 Browse Files
- visual cleanup for email icon and discussion context label post branch merge · b7d6d774
  marco committed Jul 29, 2013
  
  b7d6d774 Browse Files