Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,199 Commits 1 Branch 0 Tags
13c36c909742a0ea991f8a42dddd2770367301ac
Commit Graph

28199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
13c36c9097 Merge pull request #6821 from edx/hotfix/2015-01-29 
Hotfix/2015 01 29
 2015-01-29 17:43:34 -05:00
Adam Palay
d4d785bfd7 update codejail (TNL-1248) 
(optionally use a proxy process to spawn subprocesses)
 2015-01-29 15:10:39 -05:00
Diana Huang
c71a183316 Update embargo copy. 
ECOM-963

update copy in tests
 2015-01-29 15:10:35 -05:00
Syed Hassan Raza
a1ffcc5259 Disable referrer (TNL-1144) 2015-01-29 09:53:55 -05:00
AlasdairSwan
753a3be75e Merge pull request #6799 from edx/jsa/reuse-osfs 
reuse instances of OSFS in old mongo
 2015-01-28 13:54:16 -05:00
jsa
513f8cefd8 reuse instances of OSFS in old mongo 2015-01-28 12:45:49 -05:00
AlasdairSwan
9273ee0c72 Merge pull request #6795 from edx/adam/revert-tolerance-fix 
Revert "Fix tolerance broken"
Bok Choy test failure is a known flaky test
 2015-01-28 11:52:24 -05:00
Adam Palay
e20b77b4f8 Revert "Fix tolerance broken" 
This reverts commit 66b949b745.
 2015-01-28 10:21:01 -05:00
Greg Price
3d8fe614e7 Merge pull request #6768 from edx/gprice/fix-video-upload-csv-bugs 
Fix bugs in CSV download of video upload data
 2015-01-27 15:06:28 -05:00
Calen Pennington
9f872d3904 Merge pull request #6779 from edx/cpennington/split-use-request-cache 
Cpennington/split use request cache
 2015-01-27 15:03:03 -05:00
John Eskew
68325f1c2e Add BlockData class to wrap all block data loaded from the Split 
modulestore, in order to separate serializable block data from
out-of-band, non-saved, temporary metadata.

Eliminate the deepcopy causing performance problems with import/export.

https://openedx.atlassian.net/browse/PLAT-416
 2015-01-27 10:01:55 -05:00
Calen Pennington
d9dc82ba41 Stringify ObjectIds before attempting to make a filename out of them 2015-01-27 10:01:55 -05:00
Calen Pennington
c29f3af186 Replace SplitMongo thread_cache usage with use of request_cache 2015-01-27 10:01:54 -05:00
David Baumgold
d7cf5d61d0 Merge pull request #6763 from edx/db/tender-http 
Tender is only accessible via HTTP, not HTTPS
 2015-01-27 09:05:27 -05:00
Greg Price
715979d36b Fix bugs in CSV download of video upload data 
This fixes two bugs:
1. All statuses were listed as "Unknown"
2. Non-ASCII characters in a header column translation resulted in a 500
 2015-01-26 17:28:43 -05:00
David Baumgold
6fca1fd959 Tender is only accessible via HTTP, not HTTPS 2015-01-26 13:29:31 -05:00
AlasdairSwan
b6bf7671f8 Merge pull request #6759 from edx/sarina/20150126-translations-update 
Update translations (autogenerated message)
 2015-01-26 10:50:42 -05:00
Christine Lytwynec
e9759dc2b7 Merge pull request #6717 from edx/clytwynec/remove_jenkins_docs 
removing jenkins doc from platform
 2015-01-26 09:31:24 -05:00
Sarina Canelake
78c5bddd43 Update translations (autogenerated message) 2015-01-26 09:10:25 -05:00
Anton Stupak
5d5d28e63c Merge pull request #6688 from edx/anton/edxnotes-fix-viewer 
TNL-1132: Fix viewer behaviour on hover.
 2015-01-26 16:10:22 +02:00
polesye
df86a3312f TNL-1132: Fix viewer behaviour on hover. 2015-01-26 10:53:44 +02:00
Sarina Canelake
fdb490d121 Merge pull request #6728 from OmarIthawi/edraak/omarithawi/social-login-icons-rtl 
RTL margins for 3rd-party auth button icons
 2015-01-25 09:19:18 -05:00
swdanielli
47b3eae78f Merge pull request #6470 from edx/danielli/recommender_code_review 
code review
 2015-01-23 17:39:09 -05:00
swdanielli
ed8fea79c2 update accessibility 2015-01-23 16:13:26 -05:00
Carlos Andrés Rocha
78375b797b Merge pull request #6738 from edx/rc/2015-01-20 
Rc/2015 01 20
 2015-01-23 16:10:28 -05:00
Carlos Andrés Rocha
6db7a7e688 Merge pull request #6751 from edx/release 
Release
 2015-01-23 16:10:00 -05:00
Carlos Andrés Rocha
bd1b322cdc Merge pull request #6734 from edx/hotfix/2015-01-22 
When changing quantities, be sure to return the new CyberSource submit f...
 2015-01-23 13:09:07 -05:00
Sarina Canelake
28ced73d29 Merge pull request #6737 from edx/cptvitamin/OPEN-485-alt-in-api-doc 
adds alt text to sample api response
 2015-01-23 12:51:18 -05:00
Stephen Sanchez
6616b7b5c9 Merge pull request #6731 from edx/sanchez/cache_course_enrollment_details 
Adding caching to the course details endpoint for the Enrollment API.
 2015-01-23 08:55:02 -05:00
chrisndodge
8d6f094438 Merge pull request #6732 from edx/cdodge/add-filter-to-coupon-download 
Change coupon CSV download to only include counts for coupons redeemed a...
 2015-01-22 17:34:56 -05:00
Stephen Sanchez
267ec24f0a Merge pull request #6735 from edx/sanchez/allow_enrollment_without_username 
Enrollment API to be used without knowing the current user name.
 2015-01-22 16:37:45 -05:00
Mark Sadecki
06bc55549f Updates sample FAQ to match edx-demo-course 2015-01-22 16:29:55 -05:00
David Baumgold
ccc2dd8327 Merge pull request #6722 from Stanford-Online/giulio/shorten-course-module-py-line-lengths 
Shortened line length of studio help strings
 2015-01-22 16:16:33 -05:00
stephensanchez
896bc1c859 Adding caching to the course details endpoint for the Enrollment API. 2015-01-22 20:58:22 +00:00
Mark Sadecki
f0f0cb7659 adds alt text to sample api response 2015-01-22 15:42:02 -05:00
stephensanchez
2d1d58225a Allow the enrollment API to be used without knowing the authenticted user name. 2015-01-22 19:50:02 +00:00
Chris Dodge
74f6380e9e Change coupon CSV download to only include counts for coupons redeemed all the way through purchase 
updated the failed unit test case and removed the unnessary import
 2015-01-23 00:21:58 +05:00
Chris Dodge
6bfe20b9a9 When changing quantities, be sure to return the new CyberSource submit form html. Also, to ensure that any browser content is fully refreshed when clicking the back button, force a page refresh to reset client state 2015-01-22 13:33:23 -05:00
Giulio Gratta
47a0e3441e Shortened line length of studio help strings 2015-01-22 09:48:41 -08:00
David Baumgold
d89f677f3c Merge pull request #6727 from edx/proxy-tender-domain-rc 
Proxy TENDER_DOMAIN variable from environment to Studio settings
 2015-01-22 12:15:51 -05:00
David Baumgold
f2d549b619 Proxy TENDER_DOMAIN variable from environment to Studio settings 2015-01-22 10:56:30 -05:00
Omar Al-Ithawi
a5c0b6e29a RTL margins for 3rd-party auth button icons 2015-01-22 17:49:47 +02:00
Usman Khalid
3d4a853e00 Merge pull request #5926 from Stanford-Online/kluo/lti-grades-past-due 
Make LTI grade submissions respect deadlines
 2015-01-22 19:55:21 +05:00
Kevin Luo
af9dce82a3 Make LTI grade submissions respect deadlines 2015-01-21 17:05:46 -08:00
Will Daly
fcd7736d29 Merge pull request #6721 from edx/will/revert-requirejs-changes 
Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
 2015-01-21 19:07:34 -05:00
Braden MacDonald
4198da1ae1 Merge pull request #6657 from open-craft/fix-library-old-mongo-default 
Fix errors with libraries when old mongo is default (first) modulestore (SOL-234)
 2015-01-21 15:05:12 -08:00
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit 1d6fceda50.
 2015-01-21 17:13:27 -05:00
Sarina Canelake
e70a5e265c Merge pull request #6082 from openfun/edx/translate-enrollment-emails 
Render enrollment emails in the student's language
 2015-01-21 16:40:51 -05:00
chrisndodge
e617ce927d Merge pull request #6713 from edx/cdodge/no-tax-id-on-cc-receipts 
Only put the TaxID for Invoices, not Credit Card based receipts
 2015-01-21 16:16:24 -05:00
Will Daly
1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms 
Add RequireJS and RequireJS Optimizer configuration to the LMS
 2015-01-21 15:23:35 -05:00