Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,069 Commits 1 Branch 0 Tags
08dcbace0f9fbeecb4da46fb5d2b4d006ff93e4e
Commit Graph

14665 Commits

Author SHA1 Message Date
Diana Huang
e12a704cea Add new course dates fragment. 
Also add it to the course home page.
 2017-05-04 20:53:42 -04:00
Andy Armstrong
97c084514f Merge pull request #15044 from edx/bjacobel/mako-bundle-nonfatal 
Mako should be able to render even if webpack hasn't run
 2017-05-04 17:55:40 -04:00
Andy Armstrong
70f4bcc619 Merge pull request #15040 from edx/andya/feature-test-coverage 
Make tests and coverage work with openedx/features
 2017-05-04 17:52:12 -04:00
Brian Jacobel
69dd20ffed Mako should be able to render even if webpack hasn't run 2017-05-04 12:56:21 -04:00
Matt Drayer
5097bd6e54 mattdrayer/ENT-328: Update account activation message on sign-in form. 2017-05-04 10:58:42 -04:00
Andy Armstrong
2e8c68e609 Make tests and coverage work with openedx/features 2017-05-04 09:28:16 -04:00
Robert Raposa
963519b86f Merge pull request #15032 from edx/robrap/TNL-6906-mark-flaky 
Mark test_proctored_exam_flow as flaky.
 2017-05-04 09:14:34 -04:00
Muzaffar yousaf
2f293ccc68 Merge pull request #14901 from OmarIthawi/omar/commentable-id-unicode 
Unicode fixes for django_comment_client and request_cached decorator
 2017-05-04 15:07:22 +05:00
Ned Batchelder
6be4337c7d Merge pull request #14898 from edx/nedbat/help-tokens-app 
Use a new external app for help tokens
 2017-05-03 18:08:27 -04:00
Robert Raposa
a47e1a84de Mark test_proctored_exam_flow as flaky. 2017-05-03 15:57:23 -04:00
Robert Raposa
3b31270e07 Fix Start Course vs Resume Course using Course Blocks. 2017-05-03 15:02:42 -04:00
Asad Iqbal
4a4f135f47 Merge pull request #14989 from edx/asadiqbal08/ENT-342 
asadiqbal08/Logged in user may not have access rights for catalogs api endpoint
 2017-05-03 23:02:10 +05:00
Albert (AJ) St. Aubin
185bac1837 Merge pull request #15012 from edx/aj/EDUCATOR-60 
Updated the message and style of the status notification when a user …
 2017-05-03 13:29:03 -04:00
Albert St. Aubin
d9b8d51dab Updated the message and style of the status notification when a user enters text into numerical input 2017-05-03 11:50:40 -04:00
asadiqbal
47cdf39266 ENT-342 2017-05-03 15:03:34 +05:00
sanfordstudent
bcc3d16589 Merge pull request #14929 from edx/neem/capa-refactor 
Refactor CAPA to use scorable XBlock mixin
 2017-05-02 09:43:06 -04:00
Omar Al-Ithawi
ad4e3d50a5 Allow uploading subtitles with unicode filenames 2017-05-02 10:53:58 +03:00
Andy Armstrong
2167584e5e Unify the home and course tabs 
LEARNER-609
 2017-05-01 17:22:28 -04:00
Brian Jacobel
a2323797f5 Work on sandbox bundling for webpack 2017-05-01 17:09:32 -04:00
Brian Jacobel
3b43fb38a4 Paver runs Webpack (incl watcher) in dev and test 2017-05-01 17:09:32 -04:00
Brian Jacobel
ef4b5cb8c3 Clean up spec and feature; both pass lint and run in Karma 2017-05-01 17:09:32 -04:00
Brian Jacobel
c5df4aa6b7 Work on getting Karma to run 2017-05-01 17:09:32 -04:00
Brian Jacobel
57e8250619 Webpack in LMS 2017-05-01 17:09:32 -04:00
J. Cliff Dyer
ea0027f338 refactor CAPA to use scorable xblock mixin 
for TNL-6594
 2017-05-01 15:08:17 -04:00
Ben Patterson
ec6dfeeac4 Merge pull request #15011 from edx/benp/update-lettuce-db-cache 
Update lettuce db cache for faster test set-up.
 2017-05-01 14:10:47 -04:00
Calen Pennington
3deb3a3c1b Merge pull request #14977 from cpennington/cale/fix-learner-542 
Cale/fix learner 542
 2017-05-01 12:18:03 -04:00
Ben Patterson
449228ec31 Update lettuce db cache for faster test set-up. 2017-05-01 11:32:57 -04:00
Ben Patterson
0959399849 Merge pull request #14998 from edx/benp/update_bokchoy_db_cache 
Update bok-choy cache files.
 2017-05-01 09:24:02 -04:00
Ned Batchelder
ecce0f1513 Merge pull request #14996 from edx/nedbat/remove-useless-super-delegation 
Remove a number of unneeded super()-delegation methods
 2017-04-28 13:04:43 -04:00
Christina Roberts
61316c3807 Merge pull request #14972 from edx/christina/ed11 
Renaming prep for allow discussions to be divided by enrollment tracks
 2017-04-28 11:00:09 -04:00
M. Rehan
ce93ad2af4 Merge pull request #14973 from edx/mrehan/educator-122-enable-course-sharing-in-future-courses 
EDUCATOR-112 – Enable sharing icons for future courses
 2017-04-28 18:33:53 +05:00
Qubad786
4b2488b5ee Add config models and a configuration service to configure LTI Consumer. 2017-04-28 15:59:23 +05:00
Qubad786
4b73bac9b2 Enable sharing icons for future courses 2017-04-28 15:45:24 +05:00
Ben Patterson
4d3f4f8596 Update bok_choy_data_default.json 
Fix errors
 2017-04-27 16:04:38 -04:00
cahrens
31fbde9c1f Rename cohort methods to divided. 2017-04-27 14:58:08 -04:00
Ben Patterson
7bafafac84 Update bok-choy cache files. 
This should provide some performance improvements when running
bok-choy tests, particularly during set-up.
 2017-04-27 14:44:38 -04:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -04:00
Uzair Rasheed
c1e63cb086 Merge pull request #14935 from edx/uzairr/ECOM-7252-refund 
ECOM-7252-fix refund discrepancy after the course mode expiry
 2017-04-27 20:58:21 +05:00
Ned Batchelder
2f1936ce73 Replace context processor with new help-tokens app 
This makes it possible to refer to multiple book from a single app.

This also means that Open edX branches will be able to pass bok-choy
tests (at least if the books have already been built.)
 2017-04-27 10:34:09 -04:00
Calen Pennington
33fee20c3a Reapply "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 65f13ddec4.
 2017-04-27 09:25:02 -04:00
muhammad-ammar
47490d4ee5 video player js cleanup 
EDUCATOR-114
 2017-04-27 11:14:46 +05:00
edx-pipeline-bot
38c0fbd638 Merge pull request #14975 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-26 15:29:32 -04:00
uzairr
d5064413c1 fix of refund after course mode expiry 2017-04-26 18:29:59 +00:00
Calen Pennington
65f13ddec4 Revert "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 88dd85caec, reversing
changes made to bf8aef33fc.
 2017-04-26 11:29:56 -04:00
muhammad-ammar
7da2091aaf fix flaky js video test 
EDUCATOR-126
 2017-04-26 15:45:05 +05:00
M. Rehan
19961dc750 Merge pull request #14918 from edx/mrehan/course-sharing-utm-parameters 
Add utm parameters to course sharing url
 2017-04-26 13:00:56 +05:00
attiyaishaque
4316731f70 TNL-4412 user is not enrolled as a beta tester when account is unactivated. 2017-04-26 10:54:15 +05:00
Christina Roberts
3908512a0b Merge pull request #14786 from OmarIthawi/omar/reset-css-rtl 
RTL fixes for HTML xmodule and the LMS reset file
 2017-04-25 14:33:49 -04:00
Calen Pennington
88dd85caec Merge pull request #14868 from cpennington/learner-542 
Store Learner language preferences into a cookie rather than the session
 2017-04-25 14:08:13 -04:00
Diana Huang
bf8aef33fc Merge pull request #14945 from edx/diana/correct-course-redirects 
Course jump tos should go to the main course home page.
 2017-04-25 13:40:31 -04:00