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

28231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Eskew
e600d6e3b1 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-28 18:23:22 -05:00
Calen Pennington
6cb55e1a36 Stringify ObjectIds before attempting to make a filename out of them 2015-01-28 18:23:22 -05:00
Calen Pennington
1160306438 Replace SplitMongo thread_cache usage with use of request_cache 2015-01-28 18:23:22 -05:00
Greg Price
ef8843ab1a 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-28 18:23:22 -05:00
David Baumgold
d00c3d0deb Tender is only accessible via HTTP, not HTTPS 2015-01-28 18:23:22 -05:00
Matt Drayer
9d2a0a4e9d Merge pull request #6705 from edx/mattdrayer/update-milestones-hash 
Bok Choy test now passes
 2015-01-28 17:38:18 -05:00
Matt Drayer
e5f00e626a Bok Choy test now passes 2015-01-28 17:37:49 -05:00
Matt Drayer
dc0816669d Merge pull request #6792 from edx/ziafazal/make-course-requirements-links 
make course requirement as link
 2015-01-28 16:56:35 -05:00
Matt Drayer
40d109e981 Merge pull request #6718 from edx/mattdrayer/hide-isentexam-field 
Added 'is_entrance_exam' to FILTERED_LIST plus a new bokchoy test
 2015-01-28 16:52:20 -05:00
Sarina Canelake
b2330c3739 Update byte-sized bugs filter link 2015-01-28 16:43:55 -05:00
Sarina Canelake
0f0b2cbd49 Merge pull request #6801 from edx/sarina/update-dummy-command 
Update "paver i18n_dummy" to compile assets
 2015-01-28 16:31:41 -05:00
Christine Lytwynec
739322d469 Merge pull request #6780 from edx/clytwynec/update_bokchoy_version 
updating bokchoy version
 2015-01-28 16:30:51 -05:00
Renzo Lucioni
64d0c00e76 Merge pull request #6800 from edx/renzo/redeem-code-conflict-copy 
Change instances of 'register' to 'enroll'
 2015-01-28 15:59:09 -05:00
Sarina Canelake
88fdf5f641 Update "paver i18n_dummy" to compile assets 2015-01-28 15:13:29 -05:00
Renzo Lucioni
3f8ca96f02 Change instances of 'register' to 'enroll' 2015-01-28 14:37:26 -05:00
Matt Drayer
ce5c7948fa Added field to FILTERED_LIST plus a new bokchoy test 2015-01-28 13:11:36 -05:00
Mark Sadecki
dce62ed600 Merge pull request #6783 from edx/cptvitamin/TNL-1264-Skip-to-main-content 
[TNL-1264] changes the skip link text to the industry standard Skip to main content
 2015-01-28 12:12:20 -05:00
Mark Sadecki
8cffa152d8 changes the skip link text to the industry standard Skip to main content 2015-01-28 11:07:10 -05:00
Anton Stupak
f1fbd0f969 Merge pull request #6789 from edx/anton/edxnotes-fix-tests 
Fix unit tests.
 2015-01-28 16:32:10 +02:00
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
Zia Fazal
ba5fd98aaf make course requirement as link 2015-01-28 14:26:27 +05:00
polesye
689d7bc8a1 Fix unit tests. 2015-01-28 09:29:02 +02: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
Christine Lytwynec
b7e5a52d1d updating bokchoy version 2015-01-27 10:06:23 -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