Commits · 64fb434dbfb25c4f1e66883ff691fc9292afbc35 · edx / edx-platform · GitLab

24 Dec, 2014 1 commit
- Merge pull request #6330 from edx/cdodge/filter-unpurchased-coupons · 64fb434d
```
[WL-186] only display the count for coupon redemptions that actually went through...
```
  chrisndodge committed Dec 24, 2014
  64fb434d Browse Files
23 Dec, 2014 7 commits
- Merge pull request #6366 from edx/christina/fix-editing-bug · d97bf059
```
Revert #6192. It was causing a JS error on devstack.
```
  Christina Roberts committed Dec 23, 2014
  d97bf059 Browse Files
- Revert #6192. It was causing a JS error on devstack. · 6846e25b
```
TNL-1070
```
  cahrens committed Dec 23, 2014
  6846e25b Browse Files
- Merge pull request #6309 from edx/db/edx-studio-as-format-string · fa6299cf
```
Replace "edX Studio" with "{studio_name}"
```
  David Baumgold committed Dec 23, 2014
  fa6299cf Browse Files
- Add settings comment about STUDIO_NAME and STUDIO_SHORT_NAME · 320941e8
  David Baumgold committed Dec 23, 2014
  
  320941e8 Browse Files
- Use STUDIO_SHORT_NAME for Studio · 34c64155
```
STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
```
  David Baumgold committed Dec 23, 2014
  34c64155 Browse Files
- Merge pull request #6350 from edx/jeskew/asset_md_contract_fix · 0d874def
```
Change contracts to allow user_id with type long().
```
  John Eskew committed Dec 23, 2014
  0d874def Browse Files
- Merge pull request #6355 from edx/release · cc0789a1
```
Release
```
  Fred Smith committed Dec 23, 2014
  cc0789a1 Browse Files
22 Dec, 2014 16 commits
- Merge pull request #6343 from jzoldak/zoldak/quiet-factory-debug-msgs · 05ca4c46
```
Quiet factory debug msgs for troubleshooting failing lms unit tests
```
  Jesse Zoldak committed Dec 22, 2014
  05ca4c46 Browse Files
- Change contracts to allow user_id with type long(). Add tests. · 1ad08cc3
  John Eskew committed Dec 22, 2014
  
  1ad08cc3 Browse Files
- Merge pull request #6345 from edx/hotfix/third-party-auth-inactive-linked-fix · de22ccd5
```
Send the user to the login page if registering with a linked but inactiv...
```
  Will Daly committed Dec 22, 2014
  de22ccd5 Browse Files
- Merge pull request #6344 from jzoldak/zoldak/better-ff-msg · 8f6cb60c
```
Improve the message to console for the wrong FireFox version
```
  Jesse Zoldak committed Dec 22, 2014
  8f6cb60c Browse Files
- Merge pull request #6333 from edx/will/pay-and-verify-js-tests · fe01291d
```
Jasmine tests for verification / payment; small bugfixes
```
  Will Daly committed Dec 22, 2014
  fe01291d Browse Files
- Add Jasmine tests for the payment/verification flow. · d3459be0
  Will Daly committed Dec 22, 2014
  
  d3459be0 Browse Files
- Send the user to the login page if registering with a linked but inactive account · 30549bd7
  Will Daly committed Dec 22, 2014
  
  30549bd7 Browse Files
- fix pylint errors in test.py · 55d7125f
  Jesse Zoldak committed Dec 22, 2014
  
  55d7125f Browse Files
- Silence noisy factory loggers in lms unit tests · 16fe8478
  Jesse Zoldak committed Dec 22, 2014
  
  16fe8478 Browse Files
- Merge pull request #6327 from edx/sanchez/logging-verified-split · 9bd1f3a8
```
Adding a number of logging messages for verification process.
```
  Stephen Sanchez committed Dec 22, 2014
  9bd1f3a8 Browse Files
- Merge pull request #6323 from edx/awais786/ECOM-759 · cf83a3cc
```
ECOM-759  if course is none return 404 error code.
```
  Awais Qureshi committed Dec 22, 2014
  cf83a3cc Browse Files
- only display the count for coupon redemptions that actually went through to purchase completion · 6198b900
  Chris Dodge committed Dec 22, 2014
  
  6198b900 Browse Files
- Merge pull request #6319 from edx/hotfix/analytics-mobile-shim · a7042ca3
```
Update segment.io shim for mobile event syntax change.
```
  Fred Smith committed Dec 22, 2014
  a7042ca3 Browse Files
- Improve the message to console for wrong FireFox version · da1d0870
  Jesse Zoldak committed Dec 22, 2014
  
  da1d0870 Browse Files
- Merge pull request #6326 from edx/renzo/split-verification-dashboard-analytics · 1fa1d357
```
Split verification dashboard analytics
```
  Renzo Lucioni committed Dec 22, 2014
  1fa1d357 Browse Files
- ECOM-759 if course is none return 404 error code. · 9d9f0c2f
  Awais committed Dec 22, 2014
  
  9d9f0c2f Browse Files
19 Dec, 2014 16 commits
- Merge pull request #6244 from wwj718/patch-1 · ccb5bfbc
```
variable name error
```
  Sarina Canelake committed Dec 19, 2014
  ccb5bfbc Browse Files
- Merge pull request #6329 from edx/dhm/bug_split_index · 5ef27703
```
Fix get_courses to handle inflight changes
```
  Don Mitchell committed Dec 19, 2014
  5ef27703 Browse Files
- Update virtual pageview event categories, general polish · aeeb45cf
  Renzo Lucioni committed Dec 19, 2014
  
  aeeb45cf Browse Files
- Track upsell copy interaction, upgrade button and verify now button clicks on the dashboard · 3d717a89
  Renzo Lucioni committed Dec 19, 2014
  
  3d717a89 Browse Files
- Adding a number of logging messages for verification process. · 33f62685
  stephensanchez committed Dec 19, 2014
  
  33f62685 Browse Files
- Fix get_courses to handle inflight changes · e1035aa8
```
more rigorously.
```
  Don Mitchell committed Dec 19, 2014
  e1035aa8 Browse Files
- Refactor sock HTML to have text in Mako template · 5360d77b
  David Baumgold committed Dec 19, 2014
  
  5360d77b Browse Files
- Replace "edX Studio" with "{studio_name}" · 7366d2b1
```
For theming and internationalization
```
  David Baumgold committed Dec 19, 2014
  7366d2b1 Browse Files
- Merge pull request #6259 from edx/renzo/split-verification-payment-hookup · c42c2573
```
Hook up new payment and verification flow
```
  Renzo Lucioni committed Dec 19, 2014
  c42c2573 Browse Files
- Merge pull request #6314 from edx/release · 251407d7
```
Release
```
  Fred Smith committed Dec 19, 2014
  251407d7 Browse Files
- Merge pull request #6325 from cpennington/update-db-for-cms · 1cf5aa0c
```
Make paver update_db run against both LMS and Studio models
```
  Calen Pennington committed Dec 19, 2014
  1cf5aa0c Browse Files
- Update segment.io shim for mobile event syntax change. · ad7a67da
  Nimisha Asthagiri committed Dec 19, 2014
  
  ad7a67da Browse Files
- Merge pull request #6306 from edx/hotfix/2014-12-18 · dbc6166f
```
Tender widget inavailability stops loading studio page
```
  Adam committed Dec 19, 2014
  dbc6166f Browse Files
- Merge pull request #6324 from edx/benp/remove-tddium · 59eba959
```
Remove Solano artifacts, Solano-only logic.
```
  Ben Patterson committed Dec 19, 2014
  59eba959 Browse Files
- Make paver update_db run against both LMS and Studio models · 519b0f5e
  Calen Pennington committed Dec 19, 2014
  
  519b0f5e Browse Files
- Merge pull request #6231 from edx/adam/fix-unenroll-enroll-inst-dash · 526bc963
```
fix enrollment issue in instructor dash (ECOM-776)
```
  Adam committed Dec 19, 2014
  526bc963 Browse Files