Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
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
Diana Huang
c14f0b14ea Course jump tos should go to the main course home page. 2017-04-25 11:33:14 -04:00
Jesse Zoldak
e3d2259be4 Mark test as flaky LEARNER-689 2017-04-25 10:40:50 -04:00
Jesse Zoldak
37fbf17360 Revert "Mark test as flaky LEARNER-689" 
This reverts commit ecc50f6f05.
 2017-04-25 10:39:53 -04:00
Jesse Zoldak
ecc50f6f05 Mark test as flaky LEARNER-689 2017-04-25 10:38:47 -04:00
Qubad786
c28d7cd5f9 Add utm parameters to course sharing url 2017-04-24 23:01:21 +05:00
AlasdairSwan
7689fee03f Merge pull request #14778 from edx/alasdair/ECOM-7386-program-progress-circle 
ECOM-7386 Added a program progress circle to program details page
 2017-04-24 10:10:52 -04:00
Calen Pennington
e733179d49 Store Learner language preferences into a cookie rather than the session 
This modifies the lang-pref django app to:
a) Use the current value of the 'edx-language-preference' cookie to set the
   users Accept-Language header on an incoming request.
b) At the end of the request, update the 'edx-language-preference' cookie
   to reflect the users current Language Preference choice, if any.

[LEARNER-542]
 2017-04-24 07:37:19 -04:00
Saleem Latif
0361b50286 Change Account Activation UI on Dashboard 2017-04-24 10:22:35 +05:00
AlasdairSwan
a466b437f6 ECOM-7386 Added a program progress circle to program details page 2017-04-21 14:45:55 -04:00
Asad Iqbal
7493c11ec2 Merge pull request #14890 from edx/asadiqbal08/ENT-188 
ENT-188 Enterprise Learner support requests from LMS to Zendesk queue
 2017-04-21 17:22:42 +05:00
asadiqbal
8cea65b2d7 ENT-188 2017-04-21 16:30:23 +05:00
Muhammad Ammar
c3d0a50d42 Merge pull request #14514 from edx/ammar/tnl-6513-frontend-hls-support 
HLS playback support in video player
 2017-04-21 12:38:11 +05:00
Jeremy Bowman
f2f9874f73 Upgrade to bok-choy 0.7.0 2017-04-20 11:25:59 -04:00
Ivan Ivic
b682c43d48 Update Order History page to reflect bundled purchase 
LEARNER-381
 2017-04-20 12:24:34 +00:00
Qubad786
b2cfad1650 Add Configuration Models for HLS Playback Feature. 2017-04-20 16:35:46 +05:00
cahrens
5e14a35607 Change "Choose one" to "Select a group type". 2017-04-19 14:32:44 -04:00
sanfordstudent
bd2025d60d Merge pull request #14912 from edx/sstudent/TNL-6833 
use higher of two available grades
 2017-04-19 14:27:51 -04:00
Christina Roberts
5599a4513d Merge pull request #14803 from edx/aj/TNL-6743_GroupConfigEnrollmentPartition 
Aj/tnl 6743 group config enrollment partition
 2017-04-19 14:27:06 -04:00
Jesse Shapiro
3f05d2e64d Merge pull request #14900 from open-craft/haikuginger/sso-provider-session-expiry 
[ENT-327] Allow per-SSO-provider session expiration limits
 2017-04-19 13:52:41 -04:00
Albert St. Aubin
59c6218885 Show Enrollment Tracks in Group Configurations. 
TNL-6743
 2017-04-19 12:35:15 -04:00
Sanford Student
a1a8023b4e use higher of two available grades for TNL-6833 2017-04-19 11:39:55 -04:00
Cliff Dyer
28d36b5276 Merge pull request #14813 from edx/neem/backfill-problem-completion 
Estimate first_attempted for grades.
 2017-04-19 09:36:10 -04:00
Eugeny Kolpakov
e03b3914f8 Merge pull request #14737 from open-craft/mit-capa-hide-correct 
MIT CAPA improvements: Add show_correctness field
 2017-04-19 07:03:46 +08:00
J. Cliff Dyer
4f6d5d9ce9 Estimate creation time for subsections grades based on timestamp of 
incoming scores.

TNL-6697
 2017-04-18 16:51:17 -04:00
Christina Roberts
529df7c6d9 Merge pull request #14863 from edx/christina/tnl-6746 
Show messages about component visibility.
 2017-04-18 14:53:58 -04:00