Commits · 0967cb0d9d20435590f3d1520e9a4a18669f46c0 · edx / edx-platform · GitLab

30 Jul, 2013 18 commits
- Fix word cloud modules not exporting correctly. · 0967cb0d
  Peter Fogg committed Jul 30, 2013
  
  0967cb0d 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 22 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
- Merge pull request #495 from dangtrinh/vi_branch · f9387506
```
Change git clone protocal to https
```
  David Baumgold committed Jul 29, 2013
  f9387506 Browse Files
- Merge pull request #454 from edx/cale/default-branch-info-for-release-email-script · f0d0da37
```
Default branch info for release email script
```
  Calen Pennington committed Jul 29, 2013
  f0d0da37 Browse Files
- Merge pull request #478 from edx/cale/xmodule-descriptor-studio-view · 8ed33b3d
```
Cale/xmodule descriptor studio view
```
  Calen Pennington committed Jul 29, 2013
  8ed33b3d Browse Files
- Only redirect when redirect url is an internal page. · d1b503d5
  Diana Huang committed Jul 29, 2013
  
  d1b503d5 Browse Files
- merge with Marcos new design · 75079219
  Your Name committed Jul 29, 2013
  
  75079219 Browse Files
- fix merge conflict with _variables.scss · 13ca61ba
  Your Name committed Jul 29, 2013
  
  13ca61ba Browse Files
- Merge pull request #503 from edx/fix/back-button · 50ef0d1c
```
fixes back nav button
```
  Adam committed Jul 29, 2013
  50ef0d1c Browse Files
- update checkbox with get settings · 62769971
  Your Name committed Jul 29, 2013
  
  62769971 Browse Files
- Merge pull request #488 from edx/christina/emails · 4c35a0f1
```
Send e-mails when course creator status changes.
```
  Christina Roberts committed Jul 29, 2013
  4c35a0f1 Browse Files
- Studio course creator e-mails. · 087d35c9
  cahrens committed Jul 29, 2013
  
  087d35c9 Browse Files