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

41191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Asad Iqbal
8540e8f471 Merge pull request #15091 from edx/asadiqbal08/ENT-374 
ENT-374 Ticket should be created without enterprise tags for anonymous users
 2017-05-15 15:20:18 +05:00
rabiaiftikhar
ffa9b7efe3 EDUCATOR-217-364 add logs in bulk email 2017-05-15 09:50:58 +00:00
asadiqbal
8fc31b42e3 ENT-374 Support ticket is created without enterprise tags for Anonymous users. 2017-05-15 13:24:45 +05:00
Renzo Lucioni
6d1c23b7dc Treat empty upgrade deadlines consistently 
The course and program dashboards interpret an empty upgrade deadline to mean that a given seat is available. Previously, program dashboard pages interpreted empty upgrade deadlines to mean that a given seat was not available.

LEARNER-935
 2017-05-14 13:23:13 -04:00
Gregory Martin
70905c8aab compute grades task register 
https://openedx.atlassian.net/browse/EDUCATOR-388
 2017-05-12 16:25:14 -04:00
Cliff Dyer
8312abdb3a Merge pull request #13263 from edx/cdyer/xblock3-integration 
Update xblock requirement
 2017-05-12 15:35:39 -04:00
J. Cliff Dyer
c61f2ddc69 Update xblock requirement to 1.0.0. 2017-05-12 14:51:02 -04:00
Brian Jacobel
9c6d94ada0 Require and Webpack can eat the same files 2017-05-12 14:40:31 -04:00
Brian Jacobel
480a3ca60b Move course import JS to Webpack 2017-05-12 14:40:31 -04:00
Renzo Lucioni
49b11cb697 Exclude UTM parameters from marketing URLs when caching programs 
LEARNER-382
 2017-05-12 12:26:54 -04:00
Zubair Afzal
4919868c79 Merge pull request #15100 from edx/zub/ENT-277-enterprise-version-bump-to-0.33.15 
bump enterprise version from 0.33.13 to 0.33.15
 2017-05-12 20:49:50 +05:00
Edward Zarecor
5fccde3e4f Fix the actual template we use 2017-05-12 11:32:23 -04:00
Brittney Exline
69d85dc103 Merge pull request #14985 from open-craft/jill/update-registration-login 
ENT-332/ENT-333 Updates Register and Login as per new design
 2017-05-12 11:07:10 -04:00
Renzo Lucioni
78a9b1f0ae Remove use of read_cached_programs switch 
The read_cached_programs switch was used to control the release of changes for reading programs exclusively from the cache. With those changes stable, the switch is no longer necessary.

LEARNER-382
 2017-05-12 11:06:08 -04:00
Matt Drayer
278fea9d75 Merge pull request #15055 from edx/mattdrayer/ENT-307 
ENT-307: Add waffle switch to disable account activation requirement for onboarding
 2017-05-12 09:49:46 -04:00
Edward Zarecor
4d1694d0e5 Merge pull request #15090 from edx/e0d/icp-footer 
Basic support for an optional ICP number in the footer
 2017-05-12 09:28:01 -04:00
Jillian Vogel
71ba54a963 Updates combined Register, Login, and Password Reset views as per new design 
* Reorders form fields, and updates labels, placeholders, and tip text
* Increases clickable area for links and labels.
* Removes "*" markers from required fields, and instead adds
  "(optional)" labels to visible optional fields.
* Updates font colors and sizes, and removes box shadows
* Adds custom drop-down styles
* Improves responsive design scaling for small screens
* Make Terms of Service and Honor Code open in new window to avoid losing form
  field values.
 2017-05-12 09:18:36 -04:00
adeel khan
18268e6f38 Merge pull request #15039 from edx/adeel/ECOM_7772_log_time_for_sailthru_api_call 
Logging Sailthru api call time for exploring optimal connection timeout time
 2017-05-12 17:49:24 +05:00
Adeel Khan
73e6029de7 Logging Sailthru api call time for exploring optimal connection timeout value. 
ECOM-7772
 2017-05-12 17:06:55 +05:00