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

48914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Audrey
b49dc257b3 Merge pull request #20009 from edx/aekao/REVEM-151/email-question-wording 
REVEM-151 Updating text when asking for learner emails
 2019-03-15 13:22:42 -04:00
Audrey Kao
6a0792f9a0 Updating text when asking for learner emails 2019-03-15 12:23:03 -04:00
Christie Rice
6a6c43cd6b Merge pull request #20002 from edx/crice/REVEM-246_url 
REVEM-246 Use existing method to get basket page URL
 2019-03-15 09:46:29 -04:00
Nimisha Asthagiri
9c3472ab24 Merge pull request #19845 from eduNEXT/fmo/studio_sso_over_lms_flag 
Make the studio login over the lms optional using a feature flag
 2019-03-15 08:23:02 -04:00
Ned Batchelder
53458cd3ea Merge pull request #19999 from edx/nedbat/skip-named-release-help-tests 
Skip named release help tests
 2019-03-14 20:14:54 -04:00
Alex Dusenbery
f35970bb39 EDUCATOR-4189 | Account for undefined values in commerce API Course objects. 2019-03-14 16:47:46 -04:00
Felipe Montoya
923a91734d Fixing lettuce tests 2019-03-14 15:21:03 -05:00
Christie Rice
94b680082a REVEM-246 Use existing method to get basket page URL 2019-03-14 15:12:14 -04:00
Ned Batchelder
561f0752ca Skip tests of help doc links on named release branches. 
@skip_unless_master is used to skip tests because on named release
branches, most work happens leading up to the first release on the
branch, and that is before the docs have been published.  Tests that
check readthedocs for the right doc page will fail during this time, and
it's just a big distraction.  Also, if we bork the docs, it's not the
end of the world, and we can fix it easily, so this is a good tradeoff.
 2019-03-14 14:01:30 -04:00
Calen Pennington
8ecf6d68b5 Merge pull request #19998 from cpennington/revert-aggressive-prefetching 
Revert "Improve the performance of access checking for a specific use…
 2019-03-14 11:40:05 -04:00
Christie Rice
38c559f6c2 Merge pull request #19989 from edx/crice/REVEM-207_programSkus 
REVEM-207 Add program price and purchase url to user metadata
 2019-03-14 11:31:59 -04:00
Calen Pennington
d8cd6135a6 Revert "Improve the performance of access checking for a specific user in CourseViewList by prefetching data" 
This reverts commit a2a340bcd0.
 2019-03-14 10:31:24 -04:00
Christie Rice
b2432ac5aa REVEM-207 Add program price and purchase url to user metadata 2019-03-14 10:15:48 -04:00
adeelehsan
2e369ce476 Merge pull request #19996 from edx/aehsan/removing_logs_added_for_learner-6943 
Removing logs
 2019-03-14 18:15:21 +05:00
adeelehsan
b4f1a774c2 Removing logs 
Removing all the logs added for
the investigation of learner-6943
 2019-03-14 15:23:10 +05:00
Douglas Hall
0c06bd3c20 Merge pull request #19994 from edx/douglashall/per_site_profile_microfrontend_redirect 
Allow profile microfrontend redirect to be configured per site.
 2019-03-13 17:14:01 -04:00
Douglas Hall
7ef33dac6c Allow profile microfrontend redirect to be configured per site. 2019-03-13 16:27:36 -04:00
Calen Pennington
18fc7d573b Merge pull request #19990 from cpennington/fix-org-course-docs 
Update the documentation and validation on org_course to make the for…
 2019-03-13 15:01:27 -04:00
Calen Pennington
12e130667c Merge pull request #19985 from cpennington/log-user-id 
Log current userid in all log messages
 2019-03-13 14:53:13 -04:00
Cali Stenson
01828034c4 Update enrollment course_price to verified price. 2019-03-13 14:52:33 -04:00
David Ormsbee
07e93bc264 Merge pull request #19837 from open-craft/opencraft/edx-platform/devan/show-enroll-links-on-public-courses-only-if-self-enrollment-allowed 
Show enroll links on public courses only if self enrollment allowed
 2019-03-13 14:25:53 -04:00
Calen Pennington
5150775f1c Update the documentation and validation on org_course to make the formatting clear 2019-03-13 14:25:16 -04:00
Zia Fazal
b13eb81e74 Merge pull request #19987 from edx/ziafazal/WL-1895 
WL-1895:updated edx-enterprise version
 2019-03-13 20:08:16 +05:00
Michael Youngstrom
5567c0bb1e Merge pull request #19983 from edx/testeng/bokchoy_auto_cache_update_392ea9f212793c6c53ae42042598bb20f5d70a7b 
Bokchoy db cache update
 2019-03-13 09:57:28 -04:00
Zia Fazal
2ecb436360 WL-1895:updated edx-enterprise version 2019-03-13 18:13:10 +05:00
Nimisha Asthagiri
4d70669d4d Merge pull request #19981 from edx/arch/jwt-expiration 
JWT cookies: remove refresh cookie, cookies expiration
 2019-03-12 18:18:27 -04:00
Devan Rehunathan
c6f87d49f2 Show Enroll links on public courses only if self-enrollment is allowed 
This commit updates the Info messages on the course page to display
more informative messages to the user. Specifically, messages for Public
and Invitation-only courses.
 2019-03-12 21:24:56 +00:00
Michael Roytman
23b3229e36 Merge pull request #19979 from edx/mroytman/EDUCATOR-4085-exam-code-button-styling 
add some styling to copy exam code button and bump version of edx-pro…
 2019-03-12 16:26:54 -04:00
Calen Pennington
b2d213ec08 fixup! Log current userid in all log messages 2019-03-12 15:13:57 -04:00
Calen Pennington
f9ff332a16 Merge pull request #19984 from cpennington/fbe/add-org-course-config 
Add org-course (and any future KEY_FIELDS) to FBE django admin pages
 2019-03-12 14:37:02 -04:00
Calen Pennington
e6dada4b52 fixup! Log current userid in all log messages 2019-03-12 14:13:13 -04:00
Calen Pennington
721dd3bc8a Log current userid in all log messages 
REVMI-60
 2019-03-12 13:55:08 -04:00
Calen Pennington
c21e01e3ee Add org-course (and any future KEY_FIELDS) to FBE django admin pages 2019-03-12 13:52:56 -04:00
Michael Roytman
79c179d11d add some styling to copy exam code button and bump version of edx-proctoring 2019-03-12 13:16:00 -04:00
edx-cache-uploader-bot
d89c34369c Updating migrations 2019-03-12 12:29:28 -04:00
Matthew Piatetsky
d5c50533e1 Merge pull request #19968 from edx/PROD-58 
handle incorrectly set schedules
 2019-03-12 12:16:03 -04:00
Calen Pennington
27dfbd0240 Merge pull request #19673 from cpennington/fbe-per-course-config 
Allow overriding Content Type Gating and Course Duration Limits on a …
 2019-03-12 12:05:22 -04:00
Alex Dusenbery
ac38d5b413 Create a local .coveragerc file, update testing docs. 2019-03-12 10:05:04 -04:00
Waheed Ahmed
6fa5893abb Merge pull request #19963 from edx/waheed/LEARNER-6643-fix-change-enrollment-command 
Fix change enrollment command for credit.
 2019-03-12 18:37:23 +05:00
Michael Youngstrom
c70b3a91ac Merge pull request #19977 from edx/testeng/bokchoy_auto_cache_update_13080d96bcf2669477fd3b39f4dcd3e7b7a5f3a8 
Bokchoy db cache update
 2019-03-12 09:33:02 -04:00
Nimisha Asthagiri
e4f935aab3 JWT Cookie updates: remove refresh cookie, cookie expires with JWT 
ARCH-418, ARCH-548
 2019-03-12 09:14:33 -04:00
AsadAzam
fa3b294b30 Merge pull request #19953 from edx/asad/Educator-4013-add-logs 
Added logs
 2019-03-12 17:43:40 +05:00
asadazam93
a4071324e0 Added logs 2019-03-12 16:55:00 +05:00
Waheed Ahmed
458e8482ea Fix change enrollment command for credit. 
Get provider id from ecommerce upon changing enrollment to credit
instead of setting course_key org.

LEARNER-6643
 2019-03-12 15:30:48 +05:00
DawoudSheraz
8f6cde89cd Merge pull request #19962 from edx/dsheraz/educator_3926 
Update completion api version
 2019-03-12 15:00:48 +05:00
DawoudSheraz
616c92106a update the completion app version 2019-03-12 13:37:09 +05:00
Nimisha Asthagiri
82d828a42e Merge pull request #19974 from edx/arch/profile-name-field-visibility 
Account API: per-field visibility of "name" field
 2019-03-11 19:37:01 -04:00
Nimisha Asthagiri
944f47e957 Account API: per-field visibility of "name" field 
ARCH-482
 2019-03-11 17:49:56 -04:00
Cali Stenson
ed30dcd294 Move dashboard_metadata to edX theme template. 2019-03-11 17:32:05 -04:00
Matthew Piatetsky
dac0eec385 handle incorrectly set schedules 2019-03-11 16:46:29 -04:00