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

28258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renzo Lucioni
d5fa69ee54 Fix flaky bok-choy tests caused by malformed URL 2015-01-29 11:36:03 -05:00
Chris
53b22da9bc Merge pull request #6766 from edx/clrux/forums-indicate-current-convo 
Adding ARIA label to selected conversation
 2015-01-29 11:26:25 -05:00
Jesse Zoldak
dc5b88cc22 Merge pull request #6813 from edx/zoldak/ECOM-1007 
skip flaky test - test_immediate_verification_enrollment
 2015-01-29 11:18:03 -05:00
Adam
1ad0e9fdd8 Merge pull request #6560 from openfun/openfun/studio-csrf-error 
Fix csrf error on studio login
 2015-01-29 10:52:17 -05:00
Christine Lytwynec
20a605f043 Merge pull request #6803 from edx/clytwynec/add-extra-args-opt 
Add cov_args and extra_args to python unittest commands
 2015-01-29 10:35:42 -05:00
srpearce
30966eb618 Merge pull request #6772 from edx/sylvia/docs/EnrollCodesUI 
Update UI text for enrollment codes
 2015-01-29 10:01:42 -05:00
Jesse Zoldak
663d02dd40 skip flaky test - test_immediate_verification_enrollment 
ECOM-1007
 2015-01-29 09:08:20 -05:00
Chris Rodriguez
d30088dd0d Using .sr instead of aria-label 2015-01-29 08:39:54 -05:00
Chris Rodriguez
42486a5ee6 Adding ARIA label to selected conversation 2015-01-29 08:39:54 -05:00
Adam
b17290cd75 Merge pull request #6802 from edx/adam/fix-translation 
fix settings page not handling unicode (TNL-1237)
 2015-01-29 08:02:09 -05:00
Régis Behmo
dce56b135e Make sure login form can't be submitted too early 
Tyhe sign in form should not be submitted before the submit event is
ready to be intercepted. This can occur if the user clicks too fast on
the sign in button.
 2015-01-29 09:10:59 +01:00
Régis Behmo
c3c35f076c Fix csrf error on studio login 
Context: We have witnessed multiple, seemingly random "CSRF verification
failed" errors while signing in (with valid ID) to the Studio.

Explanation: The login form does not initially include a CSRF field.
The CSRF header of the request is appended to the studio login request
headers by intercepting the form validation. This intercept is performed
by the login.js script. Unfortunately, the login.js script is loaded
pretty late (at the end of the template). So if the login form is
validated sufficiently fast, the login.js script has no time to load and
append the X-CSRFToken header to the request.

Proposed solution: the CSRF token is already passed to the template via
the login view, so we just add a hidden field to the login form to
include the csrf token.
 2015-01-29 09:10:59 +01:00
Matt Drayer
a260579af9 Merge pull request #6678 from edx/mattdrayer/entexams-follow-up 
Make entrance exam field non-editable
 2015-01-29 00:53:54 -05:00
Matt Drayer
1c839cc09d Addressed several outstanding issues related to initial entrance exams feature delivery 2015-01-28 23:56:32 -05:00
Matt Drayer
495583ac7d Merge pull request #6782 from edx/mattdrayer/generalize-entrance-exam-scoring 
Decoupled entrance exam scoring from milestone fulfillment
 2015-01-28 23:15:58 -05:00
Martyn James
4c41445bbb Merge pull request #6506 from edx/feature/courseware_search 
Courseware search
 2015-01-28 23:05:06 -05:00
Matt Drayer
8b03ad3906 Decoupled entrance exam scoring from milestone fulfillment 2015-01-28 22:00:25 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Andy Armstrong
a9127c1897 Merge pull request #6804 from edx/will/revert-require-js-optimizer-again 
Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
 2015-01-28 18:30:16 -05:00
jsa
dbc465a518 reuse instances of OSFS in old mongo 2015-01-28 18:23:23 -05:00
Adam Palay
4a76a629f6 Revert "Fix tolerance broken" 
This reverts commit 66b949b745.
 2015-01-28 18:23:22 -05:00
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
Will Daly
b467ae8cde Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit b8184d188f.
 2015-01-28 17:26:46 -05:00
Christine Lytwynec
1f17fe1203 Add cov_args and extra_args to python unittest commands 2015-01-28 17:10:06 -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
Adam Palay
bfb173507c fix settings page not handling unicode (TNL-1237) 2015-01-28 15:55:45 -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