Commits · 7f8dd6a11ec530acac133c713d7276303509fce8 · edx / edx-platform · GitLab

25 Sep, 2014 1 commit
- Annotation Tools: Thumbnail check breaks on creation · 7f8dd6a1
```
 - Fixed second similar function.

Conflicts:
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
```
  lduarte1991 committed Sep 25, 2014
  7f8dd6a1 Browse Files
24 Sep, 2014 24 commits
- Merge pull request #5384 from edx/frances/fix/prof-ed-status-AB-tes · e22bd1b6
```
fixes for status for prof ed and verified registration
```
  Andy Armstrong committed Sep 24, 2014
  e22bd1b6 Browse Files
- Merge pull request #5381 from edx/sarina/annotations-fix · 75257083
```
Image Annotation Tool: Fixes _isOpenSeaDragon function
```
  Sarina Canelake committed Sep 24, 2014
  75257083 Browse Files
- Merge pull request #5382 from edx/revert-5380-revert-5359-cdodge/add-microsite-tag-to-zendesk · 74fb8e93
```
Revert "Revert "add an additional tag so we can route zendesk tickets be...
```
  Andy Armstrong committed Sep 24, 2014
  74fb8e93 Browse Files
- Update translations (autogenerated message) · 5cdd4f4c
  Sarina Canelake committed Sep 24, 2014
  
  5cdd4f4c Browse Files
- fixes for status for prof ed and verified registration on both variants of AB test · b889f9ef
  Frances Botsford committed Sep 24, 2014
  
  b889f9ef Browse Files
- Merge pull request #5379 from edx/oleg/lti-add-username-email · 5b72e159
```
Allow students to send username and email to third parties (TNL-405).
```
  Oleg Marshev committed Sep 24, 2014
  5b72e159 Browse Files
- Merge pull request #5375 from rocha/update-oauth2-provider · 617b53cb
```
Update version of edx-oauth2-provider
```
  Carlos Andrés Rocha committed Sep 24, 2014
  617b53cb Browse Files
- Revert "Revert "add an additional tag so we can route zendesk tickets better for..." · c928252b
  chrisndodge committed Sep 24, 2014
  
  c928252b Browse Files
- Image Annotation Tool: Fixes _isOpenSeaDragon function · d3fffde3
  lduarte1991 committed Sep 24, 2014
  
  d3fffde3 Browse Files
- username and email request for lti module · b797c6bd
```
allow username and email can be passed to a lti third party app
ask user permission when lti button is clicked
allow course editor to customize text on lti launch button
```
  Paul Medlock-Walton committed Sep 24, 2014
  b797c6bd Browse Files
- Merge pull request #5380 from edx/revert-5359-cdodge/add-microsite-tag-to-zendesk · d7c715eb
```
Revert "add an additional tag so we can route zendesk tickets better for...
```
  chrisndodge committed Sep 24, 2014
  d7c715eb Browse Files
- Revert "add an additional tag so we can route zendesk tickets better for white l..." · 21933bfb
  chrisndodge committed Sep 24, 2014
  
  21933bfb Browse Files
- Merge pull request #5365 from edx/ormsbee/mobile_deleted_announcement_fix · ba76bbe1
```
Hide deleted course updates from mobile API.
```
  David Ormsbee committed Sep 24, 2014
  ba76bbe1 Browse Files
- Merge pull request #5364 from edx/ormsbee/mobile_username_url_fix · 84f0d8e3
```
Fix to allow usernames with '-', '+', '.' in Mobile API urls.
```
  David Ormsbee committed Sep 24, 2014
  84f0d8e3 Browse Files
- Update version of edx-oauth2-provider · 8d04580a
  Carlos Andrés Rocha committed Sep 24, 2014
  
  8d04580a Browse Files
- Merge pull request #5361 from edx/cdodge/change-invoice-email-and-attachments · ddb0ab90
```
change registration code email and attachments, per product requirements
```
  chrisndodge committed Sep 24, 2014
  ddb0ab90 Browse Files
- Merge pull request #5369 from edx/insights-hotfix · 43b725a1
```
Properly Setting ANALYTICS_DASHBOARD_NAME for AWS
```
  Clinton Blackburn committed Sep 24, 2014
  43b725a1 Browse Files
- Properly Setting ANALYTICS_DASHBOARD_NAME for AWS · 7fa7b527
  Clinton Blackburn committed Sep 24, 2014
  
  7fa7b527 Browse Files
- change registration code email and attachments, per product requirements · 0c72e373
```
remove extra lines

conditionalize address line 2
```
  Chris Dodge committed Sep 24, 2014
  0c72e373 Browse Files
- Merge pull request #5359 from edx/cdodge/add-microsite-tag-to-zendesk · 7b88863b
```
add an additional tag so we can route zendesk tickets better for white l...
```
  chrisndodge committed Sep 24, 2014
  7b88863b Browse Files
- Merge pull request #5357 from edx/cdodge/allow-zero-percent-discount · d2d1f7b3
```
per product, allow for zero percentage coupons
```
  chrisndodge committed Sep 24, 2014
  d2d1f7b3 Browse Files
- Hide deleted course updates from mobile API. · 9f8cf1c3
  David Ormsbee committed Sep 24, 2014
  
  9f8cf1c3 Browse Files
- Fix to allow usernames with '-', '+', '.' in Mobile API urls. · eb297d48
  David Ormsbee committed Sep 24, 2014
  
  eb297d48 Browse Files
- Merge pull request #5358 from edx/cdodge/add-meta-to-profile-download · d8e5fca3
```
Add the 'meta' column from the UserProfile table to the CSV download
```
  chrisndodge committed Sep 23, 2014
  d8e5fca3 Browse Files
23 Sep, 2014 15 commits
- Merge pull request #5356 from edx/revert-pr-3747-release · 04ed6c9c
```
Revert #3747
```
  Andy Armstrong committed Sep 23, 2014
  04ed6c9c Browse Files
- Revert "Puts course listings in a sane order" · 9542b0a8
```
This reverts commit 1955aade36675289bdbc01554b6f74242754a746.
```
  David Baumgold committed Sep 23, 2014
  9542b0a8 Browse Files
- Merge pull request #5348 from edx/sarina/09232014-translations-update · 45512442
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Sep 23, 2014
  45512442 Browse Files
- Merge branch 'release' · fe6668a5
```
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt
```
  Andy Armstrong committed Sep 23, 2014
  fe6668a5 Browse Files
- Update translations (autogenerated message) · 701d709b
  Sarina Canelake committed Sep 23, 2014
  
  701d709b Browse Files
- add an additional tag so we can route zendesk tickets better for white label sites · e08040aa
```
add tests

fix

use org
```
  Chris Dodge committed Sep 23, 2014
  e08040aa Browse Files
- per product, allow for zero percentage coupons · a28b45c4
  Chris Dodge committed Sep 23, 2014
  
  a28b45c4 Browse Files
- Merge pull request #5246 from edx/usman/plat104-static-content-server · ed84c1b2
```
Improvements to byte range handling in StaticContentServer.
```
  Usman Khalid committed Sep 24, 2014
  ed84c1b2 Browse Files
- Merge pull request #5293 from edx/usman/tnl388-invalid-xml-in-code-response · 44f952da
```
If matlab grader sent unparsable response, show error message.
```
  Usman Khalid committed Sep 24, 2014
  44f952da Browse Files
- Add the 'meta' column from the UserProfile table to the CSV download · f34a1c9d
```
add special case logic to get the 'meta' field into the downloaded CSV

wip

wip
```
  Chris Dodge committed Sep 23, 2014
  f34a1c9d Browse Files
- Merge pull request #5296 from edx/adam/hide-very-long-answers · 96ac506f
```
keep large answers from appearing (TNL-441)
```
  Adam committed Sep 23, 2014
  96ac506f Browse Files
- Merge pull request #5306 from edx/cdodge/fix-delete-item-with-coupon · c79a6848
```
be sure to constrain the select to the course_id that is being delete
```
  chrisndodge committed Sep 23, 2014
  c79a6848 Browse Files
- Merge pull request #5323 from edx/jsa/tnl444 · ad002f52
```
fix 404s when students access group-less threads in cohorted topics
```
  Jim Abramson committed Sep 23, 2014
  ad002f52 Browse Files
- Merge pull request #3747 from edx/pmitros/sane-course-listing-order · 15b8aa4b
```
Puts course listings in a sane order
```
  David Baumgold committed Sep 23, 2014
  15b8aa4b Browse Files
- Merge pull request #5303 from edx/diana/update-prof-ed-flow · 4e1aa77b
```
Change some text when in professional ed flow
```
  frances botsford committed Sep 23, 2014
  4e1aa77b Browse Files