Commits · a6003991a5cabf48294c9c01806d789e3a791e17 · edx / edx-platform

09 Dec, 2014 1 commit

MA-157 Mobile analytics end-to-end. · a6003991

Move app-generated context back into properties.
Ignore BI events through segment's webhook.
Ignore events without Data in Properties.

committed Dec 09, 2014

a6003991 Browse Files

03 Dec, 2014 10 commits
- 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
- 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
- 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
02 Dec, 2014 20 commits
- Merge pull request #6121 from edx/clytwynec/revert-not-editable-mode · 97d357cd
```
Revert "Do not install requirements from github.txt in editable mode"
```
  Christine Lytwynec committed Dec 02, 2014
  97d357cd Browse Files
- Merge pull request #6070 from edx/will/verified-messaging-per-course · 84301e76
```
Student verification status
```
  Will Daly committed Dec 02, 2014
  84301e76 Browse Files
- Revert "Do not install requirements from github.txt in editable mode" · d852bc92
```
This reverts commit 61cf1d6e.

Conflicts:
	requirements/edx/github.txt
```
  Christine Lytwynec committed Dec 02, 2014
  d852bc92 Browse Files
- Merge pull request #6115 from edx/alasdair/email-opt-out · 500a33db
```
Added styles for email opt in/out checkbox label
```
  AlasdairSwan committed Dec 02, 2014
  500a33db Browse Files
- Added styles for email opt in/out checkbox label · 96afb82d
  AlasdairSwan committed Dec 02, 2014
  
  96afb82d Browse Files
- Merge pull request #6105 from edx/clintonb/oidc-administrator-claim · 46d55932
```
Added OAuth2 Permissions Scope Handler
```
  Clinton Blackburn committed Dec 02, 2014
  46d55932 Browse Files
- Added OAuth2 Permissions Scope Handler · 5a561f81
```
This scope offers a simple claim, administrator, that is true iff the user is a superuser.
```
  Clinton Blackburn committed Dec 02, 2014
  5a561f81 Browse Files
- Merge pull request #6112 from edx/zoldak/fix-pep8 · 1cf9a3a0
```
Fix pep8 violations in some tests
```
  Jesse Zoldak committed Dec 02, 2014
  1cf9a3a0 Browse Files
- Merge pull request #6113 from Shrhawk/shr/bug/TNL-590-encode-error-fixing-pep-8 · 94d3d236
```
Remove extra line
```
  Shrhawk committed Dec 02, 2014
  94d3d236 Browse Files
- ECOM-677 ECOM-678 styled the new messages · 962dc221
  AlasdairSwan committed Dec 02, 2014
  
  962dc221 Browse Files
- Show student verification status on the dashboard. · 464dfcfa
  Will Daly committed Dec 02, 2014
  
  464dfcfa Browse Files
- Fix pep8 violations in some tests · e26a0c43
  Jesse Zoldak committed Dec 02, 2014
  
  e26a0c43 Browse Files
- Remove extra line · 9aff1d57
  Syed Hassan Raza committed Dec 02, 2014
  
  9aff1d57 Browse Files
- Merge pull request #6078 from edx/zoldak/modulestore-test-refactor · 17379f40
```
Clean up all modulestore testcases
```
  Jesse Zoldak committed Dec 02, 2014
  17379f40 Browse Files
- Merge pull request #5888 from Shrhawk/shr/bug/TNL-590-encode-error · 0f3bce02
```
Handle Unicode for Incoming Keys
```
  Shrhawk committed Dec 02, 2014
  0f3bce02 Browse Files
- Small fixes to modulestore test refactoring · 121b3130
  Jesse Zoldak committed Dec 02, 2014
  
  121b3130 Browse Files
- Clean up all modulestore testcases · bf3b87bc
```
Move modulestore config for tests to an importable location
Disable pylnt warning for lms imports in common tests
Refactor all testcases that loaded all xml courses
TE-610
TE-489
```
  Jesse Zoldak committed Dec 02, 2014
  bf3b87bc Browse Files
- Merge pull request #6104 from edx/zoldak/heartbeat-mock-tests · 8c946f8b
```
Mock the modulestore for the heartbeat tests
```
  Jesse Zoldak committed Dec 02, 2014
  8c946f8b Browse Files
- Merge pull request #6085 from edx/ammar/update-advance-config · 927249bc
```
Update AWS Configuration for ORA1 Problem Creation
```
  Muhammad Ammar committed Dec 02, 2014
  927249bc Browse Files
- Mock the modulestore for the heartbeat tests · 6f1bccd5
  Jesse Zoldak committed Dec 01, 2014
  
  6f1bccd5 Browse Files
01 Dec, 2014 9 commits
- Merge pull request #6098 from edx/db/remove-unused-envs · 9b241fe5
```
removed dev_ike and dev_shared_preview
```
  David Baumgold committed Dec 01, 2014
  9b241fe5 Browse Files
- Merge pull request #6062 from edx/renzo/email-opt-in · 28186e23
```
Updating the marketing iframe, courseware views, and student views for email opt-in
```
  Renzo Lucioni committed Dec 01, 2014
  28186e23 Browse Files
- Update the student views to accept the email_opt_in parameter · 8961ec4f
```
Includes tests checking that the student views integrate with the profile API as expected.
```
  Renzo Lucioni committed Dec 01, 2014
  8961ec4f Browse Files
- Merge pull request #6102 from edx/gprice/js-test-port · 7d6dd565
```
Add paver option to specify js-test-tool port
```
  Greg Price committed Dec 01, 2014
  7d6dd565 Browse Files
- Merge pull request #6103 from edx/alasdair/ECOM-691-footer-updates · 142c38ed
```
ECOM-691 cleaned up spacing and updated title for about section
```
  AlasdairSwan committed Dec 01, 2014
  142c38ed Browse Files
- removed dev_ike and dev_shared_preview · 970a83d4
  David Baumgold committed Dec 01, 2014
  
  970a83d4 Browse Files
- Merge pull request #6079 from edx/sanchez/logistration-opt-in · de1c0541
```
Hooking the logistration page into the new HTTP endpoint for email opt in
```
  Stephen Sanchez committed Dec 01, 2014
  de1c0541 Browse Files
- Merge pull request #6101 from edx/sarina/20141201-update-translations · a2dd3208
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Dec 01, 2014
  a2dd3208 Browse Files
- Add paver option to specify js-test-tool port · 30d4dc44
```
This includes an upgrade to a newer version of js-test-tool that accepts
an option to specify the port number.
```
  Greg Price committed Dec 01, 2014
  30d4dc44 Browse Files