Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
25,912 Commits 1 Branch 0 Tags
e738aceeeb94b79e42d4c8dfd720d86cf059f126
Commit Graph

25912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
e738aceeeb Merge pull request #5443 from edx/hotfix/2014-09-29 
Hotfix/2014 09 29
 2014-09-30 17:47:34 -04:00
Adam
a9afba07bb Merge pull request #5442 from edx/adam/update-template 
update password reset template (TNL-503)
 2014-09-30 16:28:34 -04:00
Carlos Andrés Rocha
fe54325c4e Merge pull request #5428 from rocha/enable-insights-link 
Enable analytics dashboard link in instructor dashboard.
 2014-09-29 16:51:01 -04:00
Carlos Andrés Rocha
9145d72ccb Update copy for link to analytics dashboard. 2014-09-29 16:46:51 -04:00
Carlos Andrés Rocha
fa43a4490a Enable analytics dashboard link in instructor dashboard. 2014-09-29 16:24:28 -04:00
Adam Palay
0c4f98a89b update password reset template (TNL-503) 2014-09-29 16:15:31 -04:00
Adam
79a3bfcb98 Merge pull request #5397 from edx/hotfix-annotations 
Hotfix annotations
 2014-09-25 17:31:07 -04:00
Adam
73b3e21823 Merge pull request #5395 from lduarte1991/lduarte-harvardx-pr30 
Annotation Tools: Fixes issue - Thumbnail check breaks tool on creation
 2014-09-25 15:14:52 -04:00
lduarte1991
7f8dd6a11e Annotation Tools: Thumbnail check breaks on creation 
- Fixed second similar function.

Conflicts:
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
 2014-09-25 15:07:43 -04:00
Andy Armstrong
e22bd1b667 Merge pull request #5384 from edx/frances/fix/prof-ed-status-AB-tes 
fixes for status for prof ed and verified registration
 2014-09-24 15:22:09 -04:00
Sarina Canelake
752570832c Merge pull request #5381 from edx/sarina/annotations-fix 
Image Annotation Tool: Fixes _isOpenSeaDragon function
 2014-09-24 14:27:17 -04:00
Andy Armstrong
74fb8e93ed Merge pull request #5382 from edx/revert-5380-revert-5359-cdodge/add-microsite-tag-to-zendesk 
Revert "Revert "add an additional tag so we can route zendesk tickets be...
 2014-09-24 14:21:41 -04:00
Sarina Canelake
5cdd4f4c80 Update translations (autogenerated message) 2014-09-24 14:19:21 -04:00
Frances Botsford
b889f9ef11 fixes for status for prof ed and verified registration on both variants of AB test 2014-09-24 14:11:18 -04:00
Oleg Marshev
5b72e1591d Merge pull request #5379 from edx/oleg/lti-add-username-email 
Allow students to send username and email to third parties (TNL-405).
 2014-09-24 21:10:32 +03:00
Carlos Andrés Rocha
617b53cbb9 Merge pull request #5375 from rocha/update-oauth2-provider 
Update version of edx-oauth2-provider
 2014-09-24 13:52:21 -04:00
chrisndodge
c928252b5a Revert "Revert "add an additional tag so we can route zendesk tickets better for..." 2014-09-24 13:19:51 -04:00
lduarte1991
d3fffde3a0 Image Annotation Tool: Fixes _isOpenSeaDragon function 2014-09-24 13:12:31 -04:00
Paul Medlock-Walton
b797c6bd09 username and email request for lti module 
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
 2014-09-24 20:05:42 +03:00
chrisndodge
d7c715ebee Merge pull request #5380 from edx/revert-5359-cdodge/add-microsite-tag-to-zendesk 
Revert "add an additional tag so we can route zendesk tickets better for...
 2014-09-24 12:47:10 -04:00
chrisndodge
21933bfbd7 Revert "add an additional tag so we can route zendesk tickets better for white l..." 2014-09-24 12:46:05 -04:00
David Ormsbee
ba76bbe1cf Merge pull request #5365 from edx/ormsbee/mobile_deleted_announcement_fix 
Hide deleted course updates from mobile API.
 2014-09-24 12:26:13 -04:00
David Ormsbee
84f0d8e388 Merge pull request #5364 from edx/ormsbee/mobile_username_url_fix 
Fix to allow usernames with '-', '+', '.' in Mobile API urls.
 2014-09-24 12:25:28 -04:00
Carlos Andrés Rocha
8d04580a0c Update version of edx-oauth2-provider 2014-09-24 11:35:33 -04:00
chrisndodge
ddb0ab9027 Merge pull request #5361 from edx/cdodge/change-invoice-email-and-attachments 
change registration code email and attachments, per product requirements
 2014-09-24 10:56:41 -04:00
Clinton Blackburn
43b725a11a Merge pull request #5369 from edx/insights-hotfix 
Properly Setting ANALYTICS_DASHBOARD_NAME for AWS
 2014-09-24 10:35:38 -04:00
Clinton Blackburn
7fa7b52732 Properly Setting ANALYTICS_DASHBOARD_NAME for AWS 2014-09-24 10:24:09 -04:00
Chris Dodge
0c72e37374 change registration code email and attachments, per product requirements 
remove extra lines

conditionalize address line 2
 2014-09-24 09:13:37 -04:00
chrisndodge
7b88863b4d Merge pull request #5359 from edx/cdodge/add-microsite-tag-to-zendesk 
add an additional tag so we can route zendesk tickets better for white l...
 2014-09-24 08:52:43 -04:00
chrisndodge
d2d1f7b391 Merge pull request #5357 from edx/cdodge/allow-zero-percent-discount 
per product, allow for zero percentage coupons
 2014-09-24 08:47:21 -04:00
David Ormsbee
9f8cf1c321 Hide deleted course updates from mobile API. 2014-09-24 07:00:36 -04:00
David Ormsbee
eb297d4863 Fix to allow usernames with '-', '+', '.' in Mobile API urls. 2014-09-24 06:45:04 -04:00
chrisndodge
d8e5fca3b3 Merge pull request #5358 from edx/cdodge/add-meta-to-profile-download 
Add the 'meta' column from the UserProfile table to the CSV download
 2014-09-23 21:17:29 -04:00
Andy Armstrong
04ed6c9c12 Merge pull request #5356 from edx/revert-pr-3747-release 
Revert #3747
 2014-09-23 19:39:23 -04:00
David Baumgold
9542b0a885 Revert "Puts course listings in a sane order" 
This reverts commit 1955aade36675289bdbc01554b6f74242754a746.
 2014-09-23 18:45:59 -04:00
Sarina Canelake
4551244265 Merge pull request #5348 from edx/sarina/09232014-translations-update 
Update translations (autogenerated message)
 2014-09-23 15:59:47 -04:00
Andy Armstrong
fe6668a550 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt
 2014-09-23 15:53:10 -04:00
Sarina Canelake
701d709b65 Update translations (autogenerated message) 2014-09-23 15:41:41 -04:00
Chris Dodge
e08040aa75 add an additional tag so we can route zendesk tickets better for white label sites 
add tests

fix

use org
 2014-09-23 15:39:21 -04:00
Chris Dodge
a28b45c46d per product, allow for zero percentage coupons 2014-09-23 15:29:26 -04:00
Usman Khalid
ed84c1b27a Merge pull request #5246 from edx/usman/plat104-static-content-server 
Improvements to byte range handling in StaticContentServer.
 2014-09-24 00:15:46 +05:00
Usman Khalid
44f952daf5 Merge pull request #5293 from edx/usman/tnl388-invalid-xml-in-code-response 
If matlab grader sent unparsable response, show error message.
 2014-09-24 00:14:34 +05:00
Chris Dodge
f34a1c9d11 Add the 'meta' column from the UserProfile table to the CSV download 
add special case logic to get the 'meta' field into the downloaded CSV

wip

wip
 2014-09-23 15:08:38 -04:00
Adam
96ac506f6f Merge pull request #5296 from edx/adam/hide-very-long-answers 
keep large answers from appearing (TNL-441)
 2014-09-23 14:01:03 -04:00
chrisndodge
c79a68486e Merge pull request #5306 from edx/cdodge/fix-delete-item-with-coupon 
be sure to constrain the select to the course_id that is being delete
 2014-09-23 13:46:14 -04:00
Jim Abramson
ad002f526b Merge pull request #5323 from edx/jsa/tnl444 
fix 404s when students access group-less threads in cohorted topics
 2014-09-23 13:10:17 -04:00
David Baumgold
15b8aa4b6c Merge pull request #3747 from edx/pmitros/sane-course-listing-order 
Puts course listings in a sane order
 2014-09-23 13:09:09 -04:00
frances botsford
4e1aa77b99 Merge pull request #5303 from edx/diana/update-prof-ed-flow 
Change some text when in professional ed flow
 2014-09-23 12:44:58 -04:00
Usman Khalid
5af162ebdf Refactored ContentServer tests to use ddt. 
PLAT-104
 2014-09-23 21:36:46 +05:00
Usman Khalid
7e29a5a65c Added tests for parse_range_header() in contentserver. 
PLAT-104
 2014-09-23 21:36:45 +05:00