Commits · c7ff657b4df63b903f6bfc434a121926da6a7531 · edx / edx-platform · GitLab

30 Jul, 2013 26 commits
- Merge pull request #531 from edx/hotfix/jsa/user_api_basic_auth · c7ff657b
```
make user api work with basic auth
```
  Jim Abramson committed Jul 30, 2013
  c7ff657b Browse Files
- make user_api compatible with HTTP basic auth · fc5d4aa7
  jsa committed Jul 30, 2013
  
  fc5d4aa7 Browse Files
- Merge pull request #530 from edx/e0d/fix_feature_flag · 45d7444e
```
E0d/fix feature flag
```
  e0d committed Jul 30, 2013
  45d7444e Browse Files
- changing the default in common.py · b9d762a0
  e0d committed Jul 30, 2013
  
  b9d762a0 Browse Files
- removing an unneeded line that does damage · f1962a7b
  e0d committed Jul 30, 2013
  
  f1962a7b Browse Files
- fix for underscore template issue for xmodules · 21f1e58c
  Your Name committed Jul 30, 2013
  
  21f1e58c Browse Files
- Merge pull request #524 from edx/cale/external_discussion_tab · 487c9a4f
```
Cale/external discussion tab
```
  Calen Pennington committed Jul 30, 2013
  487c9a4f Browse Files
- Make sure that all tab types used by the default for the course.tabs field work correctly · 5e4cf500
  Calen Pennington committed Jul 30, 2013
  
  5e4cf500 Browse Files
- Merge branch 'master' into rc/2013-07-30 · b65200c2
  David Ormsbee committed Jul 30, 2013
  
  b65200c2 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 14 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
- Reverting 89c48f4a to unbreak codejail for this release. · 3d8b32bb
  David Ormsbee committed Jul 29, 2013
  
  3d8b32bb Browse Files
- Merge branch 'master' into rc/2013-07-30 · 629b3d4d
  David Ormsbee committed Jul 29, 2013
  
  629b3d4d 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