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

41210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Palay
1ad643acc5 allow sending emails to course modes even if they've expired (EDUCATOR-364) 2017-05-19 12:10:37 -04:00
Jesse Shapiro
73c41388ce Merge pull request #15025 from open-craft/haikuginger/enterprise-branded-logistration 
[ENT-336][ENT-337][ENT-338] Enterprise registration/login form updates
 2017-05-18 17:20:56 -04:00
Braden MacDonald
466ceb9912 Merge pull request #15137 from open-craft/uman/EDUCATOR-338 
Fix [EDUCATOR-338]: Errors: "'float' object is not callable"
 2017-05-18 14:12:02 -07:00
edx-pipeline-bot
42be67078c Merge pull request #15146 from edx/release-mergeback-to-master 
Merge release back to master
 2017-05-18 14:26:35 -04:00
Christina Roberts
816ba4e6f7 Merge pull request #15134 from edx/christina/ed-61 
Christina/ed 61
 2017-05-18 11:09:18 -04:00
Diana Huang
8f6203f1ac Merge pull request #15119 from edx/diana/masquerade-issues 
Only show preview bar if student can view it.
 2017-05-18 10:37:38 -04:00
Diana Huang
3e71a45349 Only show preview bar if student can view it. 2017-05-18 09:16:28 -04:00
Jesse Shapiro
65dafe9fe5 Add Enterprise sidebar to login and registration views; remove unneeded fields; make registration form more narrow 2017-05-17 20:49:05 -04:00
Cliff Dyer
31e00d5821 Merge pull request #15116 from edx/neem/memory-middleware 
Middleware for Monitoring Memory
 2017-05-17 16:46:42 -04:00
Adam
c9189d73d7 Merge pull request #15140 from edx/adam/up-course-overviews-version 
up course overviews version to force refresh of table
 2017-05-17 16:12:34 -04:00
Anthony Mangano
c6c5958056 Merge pull request #15097 from edx/LEARNER-264-footer-language-selector-api 
Update branding api to add support for footer language selector
 2017-05-17 15:17:25 -04:00
Adam Palay
f5a3df6e20 up course overviews version to force refresh of table 2017-05-17 15:04:18 -04:00
Diana Huang
6f326f7245 Merge pull request #15136 from edx/diana/replace-welcome-message-urls 
Replace urls in the welcome message.
 2017-05-17 14:02:04 -04:00
Anthony Mangano
70d8c5c22c update footer endpoint in branding api to support inclusion of language selector 2017-05-17 12:33:00 -04:00
Diana Huang
9ecbc9bf48 Replace urls in the welcome message. 2017-05-17 12:26:30 -04:00
UmanShahzad
0eb6b2a6be Rename ActiveTable max_score to maximum_score to avoid conflicts. 
See https://openedx.atlassian.net/browse/EDUCATOR-338
We defined max_score as a Float XBlock field, while
a method max_score exists that was getting conflicts
with it.
 2017-05-17 10:48:53 -04:00
cahrens
33b2549155 Styling and a11y cleanup. 
EDUCATOR-61
 2017-05-16 15:40:04 -04:00
Douglas Hall
aa4eba337e Merge pull request #15130 from edx/douglashall/ENT-388 
ENT-388 Fix formatting issues with LMS account activation email.
 2017-05-16 13:54:37 -04:00
Douglas Hall
d22afb8c92 Fix formatting issues with LMS account activation email. 
This removes extra whitespace in the body of the LMS account activation email.

ENT-388
 2017-05-16 12:53:43 -04:00
Renzo Lucioni
ef80a84574 Add README for catalog app 2017-05-16 12:51:48 -04:00
Cliff Dyer
af4cf7bfd9 Merge pull request #15061 from edx/neem/retry-compute-grades 
Add single retry to compute_grades tasks.
 2017-05-16 12:31:36 -04:00
sanfordstudent
3278fcf1d6 Merge pull request #15045 from edx/neem/handle_unrescorable 
400 for non-rescorable blocks
 2017-05-16 10:36:33 -04:00
Renzo Lucioni
5314784a4d Handle expired enrollments on the program detail page 
Learners should be able to enroll in future runs of courses in which they have an expired enrollment. Previously, the course card model populated itself by selecting the first course run in which the user was enrolled. When the user tried to enroll in another run, nothing would happen because they were already enrolled in the run the page was trying to enroll them in.

Instead of blindly choosing the first run in which the user is enrolled, we now fall through to the same behavior we use for courses in which the user is not enrolled when the user has expired enrollments.

LEARNER-933
 2017-05-16 10:02:28 -04:00
Gregory Martin
1bc34a63ae Merge pull request #15120 from edx/yro_implement-gradingpolicysig 
Implement GPC signal
 2017-05-16 06:57:58 -07:00
Sanford Student
8cfff9a883 400 for non-rescorable blocks 2017-05-16 09:45:37 -04:00
Attiya Ishaque
0b098ef274 Merge pull request #15124 from edx/ai/EDUCATOR-312-remove-flaky 
EDUCATOR-312 Remove flaky decorator from test_timed_exam_flow.
 2017-05-16 17:55:47 +05:00
Attiya Ishaque
6a8bdbb3a7 Merge pull request #15109 from edx/ai/EDUCATOR-278-remove-flaky 
EDUCATOR-278 Remove flaky decorator from test_can_reset_attempts.
 2017-05-16 17:42:11 +05:00
attiyaishaque
5d3cbc76d1 EDUCATOR-312 Remove flaky decorator from test_timed_exam_flow. 2017-05-16 14:31:57 +05:00
Renzo Lucioni
efbb5ed673 Tighten up program details view 
Condense view logic left over from removal of Waffle switch.

ECOM-6602
 2017-05-15 18:01:23 -04:00
Gregory Martin
70b83f9f20 elim datetime 2017-05-15 16:49:59 -04:00
Matthew Piatetsky
131cc0bdbb Remove old program detail page and Waffle switch gating the new page 
The new page is released and stable. The switch and old code are no longer necessary.

ECOM-7482
 2017-05-15 16:35:03 -04:00
Gregory Martin
0a4931ec5d Implement GPC signal 2017-05-15 16:13:00 -04:00
Christina Roberts
21a5a42571 Merge pull request #15113 from edx/christina/ed396 
Update version of proctoring.
 2017-05-15 15:48:58 -04:00
Nimisha Asthagiri
e09b362628 add waffle switch to enable dynamically. 2017-05-15 15:38:11 -04:00
cahrens
94ed50cb52 Update version of proctoring. 
EDUCATOR-396
 2017-05-15 14:01:40 -04:00
Brittney Exline
fa2eaa0c67 Merge pull request #15114 from edx/bexline/enterprise_version_bump 
ENT-359 Bump enterprise package version
 2017-05-15 13:52:29 -04:00
Nimisha Asthagiri
b16e75bcd3 Middleware for Monitoring Memory 
EDUCATOR-274
 2017-05-15 13:17:01 -04:00
Brittney Exline
cb2fa7610b ENT-359 Bump enterprise package version 2017-05-15 12:05:07 -04:00
attiyaishaque
6ee2c9543c EDUCATOR-278 Remove flaky decorator from test_can_reset_attempts. 2017-05-15 20:07:08 +05:00
Adam
93616b0881 Merge pull request #15108 from edx/adam/fix-bulk-email-for-track 
fix for issue where emails to students in one track are sent to users…
 2017-05-15 10:43:24 -04:00
Edward Zarecor
fd33b38afe Merge pull request #15105 from edx/e0d/icp-footer-for-reals 
Fix the actual template we use
 2017-05-15 10:08:03 -04:00
Gregory Martin
277fb1d291 Merge pull request #15103 from edx/yro-register_compute_grades 
Register compute grades task in CMS
 2017-05-15 07:00:26 -07:00
Calen Pennington
6c4fbd3c11 Merge pull request #15088 from cpennington/footer-support-lang-variants 
Support fallback to supported language variants in the footer
 2017-05-15 09:00:00 -04:00
Calen Pennington
fe7c9a1476 Merge pull request #15087 from cpennington/cale/capture-lang-pref-on-login 
Capture the language preference set by an anonymous user when the reg…
 2017-05-15 08:59:44 -04:00
Adam Palay
c478e796d2 fix for issue where emails to students in one track are sent to users in other tracks, too (EDUCATOR-217) 2017-05-15 08:48:11 -04:00
Ned Batchelder
2dfb6ad2b4 Merge pull request #15101 from open-craft/mtyaka/matplotlib-install-fix 
Move matplotlib to post requirements.
 2017-05-15 07:57:37 -04:00
Muzaffar yousaf
067e33e6a6 Merge pull request #14838 from OmarIthawi/omar/video-player-fullscreen-rtl 
Fix RTL video player and subtitles misplacement in full screen
 2017-05-15 16:55:59 +05:00
Calen Pennington
c9f6872be3 Capture the language preference set by an anonymous user when the register or login 
[LEARNER-168]
 2017-05-15 07:36:56 -04:00
Calen Pennington
03b23da980 Support fallback to supported language variants in the footer 2017-05-15 07:36:38 -04:00
Rabia Iftikhar
875deed507 Merge pull request #15092 from edx/ri/EDUCATOR-217-364-add-logs-bulk-email 
EDUCATOR-217-364 add logs in bulk email
 2017-05-15 16:04:25 +05:00