Commits · f2977704fe868788462e0a38f4c2924d707a75f4 · edx / edx-platform · GitLab

31 Jul, 2013 1 commit
- Remove unused tests · f2977704
```
which a previous refactoring had replaced. Coverage of locator.py is
100%
```
  Don Mitchell committed Jul 31, 2013
  f2977704 Browse Files
30 Jul, 2013 27 commits
- Rename CourseLocator.revision to branch · 119652a6
```
and all related vars and methods.
```
  Don Mitchell committed Jul 30, 2013
  119652a6 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
- 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 12 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
- Merge pull request #519 from edx/christina/course_creators · f2a9d6fb
```
Change in signature for add_user_with_status_unrequested.
```
  Christina Roberts committed Jul 29, 2013
  f2a9d6fb Browse Files
- Merge pull request #518 from edx/feature/jsa/us_username · 1edf6161
```
user_api: get username into user object
```
  Jim Abramson committed Jul 29, 2013
  1edf6161 Browse Files
- Change in signature for add_user_with_status_unrequested. · f347bd44
  cahrens committed Jul 29, 2013
  
  f347bd44 Browse Files
- Merge pull request #514 from edx/peter-fogg/test-metadata-save · ee90ab68
```
Add (currently failing) test case around saving metadata.
```
  Peter Fogg committed Jul 29, 2013
  ee90ab68 Browse Files
- set and get settings and fix discussion.css post-variable-apocalypse · 4afa5481
  Your Name committed Jul 29, 2013
  
  4afa5481 Browse Files
- Add (currently failing) test case around saving metadata. · 0c973202
  Peter Fogg committed Jul 29, 2013
  
  0c973202 Browse Files
- user_api: get username into user object · 6463bcae
```
so it can be used to generate unsubscribe tokens
```
  jsa committed Jul 29, 2013
  6463bcae Browse Files
- add EDX_API_KEY to aws.py · 8ccaf623
  Jim Abramson committed Jul 29, 2013
  
  8ccaf623 Browse Files