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

28209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris
e871df555f Merge pull request #6575 from edx/clrux/xuetangx-branding-update 
Video player branding addition for XuetangX
 2015-01-28 09:09:21 -05:00
Chris Rodriguez
9e2494b21d Video player branding addition for XuetangX 2015-01-28 06:39:21 -05:00
Waheed Ahmed
8fb739ee32 Merge pull request #6746 from edx/waheed/tnl935-fix-BOM-in-transcript 
Fixed transcript skip first line if it contains BOM(Byte Order Mark).
 2015-01-28 14:37:21 +05:00
Waheed Ahmed
4ac7b55757 Fixed transcript skip first line if it contains BOM(Byte Order Mark). 
TNL-935
 2015-01-28 12:26:16 +05:00
chrisndodge
5364ccf1c5 Merge pull request #6755 from edx/muhhshoaib/removing-extra-condition-from-pdf-file 
removed the is_invoice condition from the pdf file
 2015-01-28 00:06:14 -05:00
Piotr Mitros
b9b5e05d10 Merge pull request #6773 from edx/danielli/recommender_code_review 
Fix recommenders' bugs: initialization, syntax error, and the incompatibility of the underscore library
 2015-01-27 21:32:02 -05:00
Andy Armstrong
6201af652b Merge pull request #6765 from edx/andya/requirejs-in-lms 
Add RequireJS to the LMS
 2015-01-27 17:57:33 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS 
[second attempt which addresses bug building Studio]
 2015-01-27 17:56:29 -05:00
swdanielli
dbec1d6fc7 Fix recommenders' bugs: template_lookup initialization, syntax error, and the incompatibility of the underscore library 2015-01-27 15:47:52 -05:00
David Baumgold
f6d0918555 Merge pull request #6441 from edx/db/update-pillow 
Update Pillow to 2.7.0
 2015-01-27 14:59:45 -05:00
Anton Stupak
838569d19b Merge pull request #6692 from edx/anton/edxnotes-fix-text-line-breaks 
TNL-1078: Lines don't break correctly in Student Notes.
 2015-01-27 20:49:23 +02:00
Renzo Lucioni
bcf6461e0b Merge pull request #6769 from edx/renzo/fix-flaky-bok-choy-tests 
Fix intermittent failures in bok-choy tests of payment and verification
 2015-01-27 13:32:10 -05:00
Sarina Canelake
9dece9790d Merge pull request #6781 from mitocw/bugfix/cg/gitlog_unicode 
Add missing sysadmin dashboard unicode cast
 2015-01-27 13:12:42 -05:00
Carson Gee
7347e3bd4a Add missing sysadmin dashboard unicode cast 2015-01-27 11:22:45 -05:00
polesye
bd42a39468 TNL-1078: Lines don't break correctly in Student Notes. 2015-01-27 18:09:11 +02:00
Shrhawk
61e9519b53 Merge pull request #6709 from edx/shr/bug/TNL-1229-Burst-errors 
Invalid youtube_id raise NotFoundError for transcripts
 2015-01-27 20:29:13 +05:00
Anton Stupak
175aeaf4f1 Merge pull request #6687 from edx/anton/edxnotes-fix-clicking-bug 
TNL-1116: Fix clicking bug.
 2015-01-27 13:41:52 +02:00
polesye
a2a28880c5 TNL-1116: Fix clicking bug. 2015-01-27 11:22:46 +02:00
Syed Hassan Raza
e2ecb0db46 Invalid youtube_id raise NotFoundError for transcripts 
TNL-1229
 2015-01-27 11:48:08 +05:00
Will Daly
93a3bf555d Merge pull request #6761 from edx/will/toggle-rate-limiting-enrollment-api 
Can disable rate limiting for enrollment API end-points using model-based configuration
 2015-01-26 20:48:21 -05:00
Greg Price
629b0a3c7a Merge pull request #6733 from edx/gprice/video-upload-progress-bar 
Add progress bars for Studio video uploads
 2015-01-26 17:34:37 -05:00
Renzo Lucioni
4f23c31d8b Fix intermittent failures in bok-choy tests of payment and verification 2015-01-26 17:22:21 -05:00
Greg Price
5f341423a3 Add progress bars for Studio video uploads 
The CSS is also restructured a bit to style both the progress bar and
the status text based on the state of the upload using a single class
on the parent element.
 2015-01-26 16:13:45 -05:00
Will Daly
305f0c3338 Can disable rate limiting for enrollment API end-points using model-based configuration. 2015-01-26 15:28:04 -05:00
Sarina Canelake
59f9c001d8 Merge pull request #6756 from edx/sarina/20150126-translations-update 
Update translations (autogenerated message)
 2015-01-26 10:24:49 -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
Muhammad Shoaib
2c1676f2ee removed the is_invoice condition from the pdf file 2015-01-26 12:56:31 +05: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