Commit Graph

30917 Commits

Author SHA1 Message Date
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
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
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
stephensanchez
fbbe307f17 Small css changes to the ecommerce tab 2015-01-27 18:47:16 +00: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
stephensanchez
5788a74291 Fix ecommerce test for text changes. 2015-01-27 18:13:36 +00: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
Christine Lytwynec
b7e5a52d1d updating bokchoy version 2015-01-27 10:06:23 -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
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
Omar Al-Ithawi
38db6e695d Giant fixups for the editors around the studio 2015-01-27 11:11:55 +02:00
Syed Hassan Raza
e2ecb0db46 Invalid youtube_id raise NotFoundError for transcripts
TNL-1229
2015-01-27 11:48:08 +05:00
Sylvia Pearce
0f9b501d0b Update UI text for enrollment codes 2015-01-26 22:31: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
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
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
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
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
Omar Al-Ithawi
1714d23ae8 TinyMCE RTL in course bulk email 2015-01-25 18:07:08 +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