Commits · a22f120a185977fbbd69cb8c3f1d1a942ce64cf0 · edx / edx-platform · GitLab

04 Dec, 2014 18 commits
- Merge pull request #6133 from edx/renzo/track-email-opt-in · a22f120a
```
Add BI events for tracking email opt-ins
```
  Renzo Lucioni committed Dec 04, 2014
  a22f120a Browse Files
- Merge branch 'release' · 212598e6
```
Conflicts:
	lms/djangoapps/mobile_api/course_info/tests.py
```
  christopher lee committed Dec 04, 2014
  212598e6 Browse Files
- Merge branch 'release' · 526fdf01
  christopher lee committed Dec 04, 2014
  
  526fdf01 Browse Files
- Merge pull request #6134 from edx/hotfix/2014-12-03 · e8ffbb15
```
Make static URLs absolute in handouts, updates, and about for mobile API
```
  Christopher Lee committed Dec 04, 2014
  e8ffbb15 Browse Files
- Add BI events for tracking email opt-ins · 5e80389b
  Renzo Lucioni committed Dec 04, 2014
  
  5e80389b Browse Files
- Merge pull request #6138 from edx/sanchez/fix_register_email_opt_in · db9bb20c
```
Allowing email optin to work on register.
```
  Stephen Sanchez committed Dec 04, 2014
  db9bb20c Browse Files
- Merge pull request #5774 from edx/cdodge/shopping-cart-touchups · f7f9bec6
```
Cdodge/shopping cart touchups
```
  chrisndodge committed Dec 04, 2014
  f7f9bec6 Browse Files
- Merge pull request #5998 from edx/sylvia/docs/1162 · f2e20f33
```
Sylvia/docs/1162
```
  srpearce committed Dec 04, 2014
  f2e20f33 Browse Files
- Merge pull request #6077 from edx/will/enable-logistration · 3c5da9d3
```
Login/Registration A/B test cleanup
```
  Will Daly committed Dec 04, 2014
  3c5da9d3 Browse Files
- Merge pull request #6145 from edx/will/fix-mktg-iframe-redirect · 27e5c17e
```
Fix issue with iframe redirect
```
  Will Daly committed Dec 04, 2014
  27e5c17e Browse Files
- Code review comments · 7c78a099
  stephensanchez committed Dec 04, 2014
  
  7c78a099 Browse Files
- Fix minor typo in Trigonometric Functions row · 3e779a52
  Sylvia Pearce committed Dec 04, 2014
  
  3e779a52 Browse Files
- Merge pull request #6132 from edx/sanchez/fix_age_verification · dd77ec0f
```
Only allow users who turned 13 before this year began to opt in.
```
  Stephen Sanchez committed Dec 04, 2014
  dd77ec0f Browse Files
- Add support for external auth on the combined login/registration page · 98875339
```
Add support for redirect URLs in third party auth for combined login/registration page

Remove old login/registration acceptance tests

Add deprecation warnings to old login and register views

Move third party auth util to student_account

Add exception for microsites
```
  Will Daly committed Dec 04, 2014
  98875339 Browse Files
- Fix issue with iframe redirect · 2ef7829f
  Will Daly committed Dec 04, 2014
  
  2ef7829f Browse Files
- Merge pull request #6050 from edx/waheed/tnl558-fix-membership-page-tooltip-issue · 150fddd3
```
Fixed instructor dashboard tooltip far away issue.
```
  Waheed Ahmed committed Dec 04, 2014
  150fddd3 Browse Files
- Fixed instructor dashboard tooltip far away issue. · c2c40eba
```
TNL-558
```
  Waheed Ahmed committed Dec 04, 2014
  c2c40eba Browse Files
- Improvements and bug fixes for shopping cart: WL-117, WL-114, WL-116, WL-115, WK-122 · cd30164b
  Muhammad Shoaib committed Dec 04, 2014
  
  cd30164b Browse Files
03 Dec, 2014 22 commits
- Allowing email optin to work on register. · 79ca56c3
  stephensanchez committed Dec 03, 2014
  
  79ca56c3 Browse Files
- Merge pull request #6131 from edx/gprice/fix-paver-test-js · b99dca98
```
Fix paver test_js task to work without -p flag
```
  Greg Price committed Dec 03, 2014
  b99dca98 Browse Files
- Make static URLs absolute in handouts, updates, and about for mobile API · 66f41e1d
```
JIRA: MA-147
```
  Akiva Leffert committed Dec 03, 2014
  66f41e1d Browse Files
- Revert "Make static URLs absolute in handouts, updates, and about for mobile API" · b89113e1
```
This reverts commit fb6579abfdb6fc9fb8bc9233554ff5c6e9215659.
```
  christopher lee committed Dec 03, 2014
  b89113e1 Browse Files
- Make static URLs absolute in handouts, updates, and about for mobile API · 1088855d
```
JIRA: MA-147
```
  Akiva Leffert committed Dec 03, 2014
  1088855d Browse Files
- LMS: revising styling of calculator tooltip content · 8d947f02
  Brian Talbot committed Dec 03, 2014
  
  8d947f02 Browse Files
- LMS: revising semantic markup of calculator tooltip content · a9daaff1
  Brian Talbot committed Dec 03, 2014
  
  a9daaff1 Browse Files
- Merge pull request #6129 from cpennington/fewer-queries-in-field-data-cache · e01ffcc2
```
Don't query for the user every time in FieldDataCache, just use the user_id instead
```
  Calen Pennington committed Dec 03, 2014
  e01ffcc2 Browse Files
- Only allow users who turned 13 before this year began to opt in. · f993a484
  stephensanchez committed Dec 03, 2014
  
  f993a484 Browse Files
- Fix paver test_js task to work without -p flag · bc41b65c
  Greg Price committed Dec 03, 2014
  
  bc41b65c Browse Files
- Merge branch 'release' · 3c999122
  christopher lee committed Dec 03, 2014
  
  3c999122 Browse Files
- Merge pull request #6080 from edx/benp/find-deprecated-tracker · c09f0ea4
```
Enforce pylint violation when using old event tracker.
```
  Ben Patterson committed Dec 03, 2014
  c09f0ea4 Browse Files
- Merge pull request #6128 from edx/adam/fix-upgrade-text · fd2891ed
```
fix typo on course payment page (ECOM-714)
```
  Christopher Lee committed Dec 03, 2014
  fd2891ed Browse Files
- Don't query for the user every time in FieldDataCache, just use the user_id instead · 14e6f3cc
  Calen Pennington committed Dec 03, 2014
  
  14e6f3cc Browse Files
- fix typo on course payment page (ECOM-714) · c0b87d87
  Adam Palay committed Dec 03, 2014
  
  c0b87d87 Browse Files
- Merge pull request #6110 from edx/will/email-opt-in-analytics · f0e6cdd3
```
Add management command to create the email opt-in list.
```
  Will Daly committed Dec 03, 2014
  f0e6cdd3 Browse Files
- Merge pull request #5917 from edx/sarina/fix-i18n · c74b05e9
```
Fix Solutions i18n issues
```
  Sarina Canelake committed Dec 03, 2014
  c74b05e9 Browse Files
- If feature flag is enabled, replace the old login/registration pages with the… · f40447b3
```
If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page.
```
  Will Daly committed Dec 03, 2014
  f40447b3 Browse Files
- Add management command to create the email opt-in list. · 61ecae98
  Will Daly committed Dec 03, 2014
  
  61ecae98 Browse Files
- Add additional context for translators · dc972eb2
  Sarina Canelake committed Dec 02, 2014
  
  dc972eb2 Browse Files
- Keep closing lines of email together for translation purposes · 6539a6e0
  Sarina Canelake committed Dec 02, 2014
  
  6539a6e0 Browse Files
- Fix dashboard i18n · 98b9fb09
  Sarina Canelake committed Dec 02, 2014
  
  98b9fb09 Browse Files