Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,281 Commits 1 Branch 0 Tags
06a11c2ed76ab9bfcea51300ceadedbabcd385b2
Commit Graph

46281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
06a11c2ed7 Update model. 2018-05-27 12:12:10 -04:00
irfanuddinahmad
5e77dfd5b7 Merge pull request #18245 from edx/ENT-982-Typos-in-API-terms-of-service 
ENT-982 Fixed typos in API terms of service
 2018-05-24 16:29:40 +05:00
edX Transifex Bot
b91a9dbb19 Update translations 2018-05-24 07:07:30 -04:00
Feanil Patel
8519a867e0 Merge pull request #18264 from edx/feanil/remove_flaky_entrance_exam_test 
Remove this flaky entrance exam test.
 2018-05-23 16:15:10 -04:00
Feanil Patel
a8f562e88b Merge pull request #18262 from edx/feanil/flaky_studio_outline_tests 
Remove two flaky tests for the studio outline.
 2018-05-23 16:07:46 -04:00
Feanil Patel
8b25553590 Remove two flaky tests for the studio outline. 2018-05-23 15:02:18 -04:00
Feanil Patel
f2554fe15f Remove this flaky entrance exam test. 2018-05-23 15:00:49 -04:00
Michael Youngstrom
8b884164d6 Merge pull request #18261 from edx/youngstrom/remove-flaky-tests 
Remove flaky bok-choy tests
 2018-05-23 14:56:48 -04:00
Simon Chen
c78879572f Merge pull request #18250 from edx/schen/inline_discussion_performance 
Remove the expansive category_map call from inline discussion view
 2018-05-23 14:48:34 -04:00
Simon Chen
7f05114752 Remove the expansive category_map call from inline discussion view 2018-05-23 14:14:05 -04:00
Feanil Patel
82a7106e60 Merge pull request #18259 from edx/feanil/update_rfc6266_parser 
Feanil/update rfc6266 parser
 2018-05-23 13:53:04 -04:00
Michael Youngstrom
5d9431dc0d Remove flaky tests 2018-05-23 13:24:25 -04:00
Farhanah Sheets
b2fd9eedb9 Merge pull request #18242 from edx/fsheets/EDUCATOR-2928 
Reformat Layout on Studio Schedules Page
 2018-05-23 11:57:46 -04:00
J Eskew
28577246b6 Merge pull request #18260 from edx/revert-18251-jeskew/retry_sailthru_email_deletion 
Revert "Retry upon Sailthru optout timeout."
 2018-05-23 11:02:40 -04:00
J Eskew
c87ba77233 Revert "Retry upon Sailthru optout timeout." 2018-05-23 10:59:28 -04:00
J Eskew
9efeb23f64 Merge pull request #18251 from edx/jeskew/retry_sailthru_email_deletion 
Retry upon Sailthru optout timeout.
 2018-05-23 10:39:30 -04:00
Feanil Patel
9f6ac8a3af Run make upgrade. 2018-05-23 10:35:03 -04:00
Michael Youngstrom
4c09b2a786 Merge pull request #18258 from edx/youngstrom/bump-plugins 
Update python requirements
 2018-05-23 10:24:45 -04:00
Bill Filler
54888a1ba5 Merge pull request #18247 from edx/bfiller/add-cat-integration-command 
add new mgmt command for catalog integrations
 2018-05-23 10:14:59 -04:00
Christopher Lee
ac6ddd8473 Merge pull request #18224 from edx/clee/addthrottletest 
Added enrollment API test for throttle rates
 2018-05-23 09:37:32 -04:00
Feanil Patel
0872d2b591 Move off of our fork onto a published fork of the rfc6266. 
The published fork seems to be getting updates more regularly than the original project
and has the bugfix we forked for.
 2018-05-23 09:28:03 -04:00
Jae Bradley
bc25ce44a3 Merge pull request #18252 from edx/update-cookie-policy-banner 
Upgrade cookie-policy-banner to 1.1.10
 2018-05-23 09:08:10 -04:00
Michael Youngstrom
7dc6be2242 Update python requirements 2018-05-23 09:00:18 -04:00
jaebradley
bd203374d9 upgrade cookie-policy-banner to 1.1.10 2018-05-22 16:53:10 -04:00
Bill Filler
2dfec1c467 Add mgmt command for creating catalog integrations 2018-05-22 16:52:08 -04:00
John Eskew
597e6c66d5 Add backoff module as a new requirement. 
Use backoff when calling Sailthru API to retry upon optout timeouts.
 2018-05-22 16:03:41 -04:00
Diana Huang
7e852fbf3b Merge pull request #18249 from edx/diana/mobile-registration-endpoint 
LEARNER-5402: Fix the GDPR registration form for the mobile app.
 2018-05-22 14:58:31 -04:00
Diana Huang
6de5c09239 Fix the GDPR registration form for the mobile app. 2018-05-22 14:23:48 -04:00
Attiya Ishaque
5b48921f6d Merge pull request #18238 from edx/ai/fixed-failing-firefox-tests 
Fixed tests that are flaky on fireFox 59
 2018-05-22 22:43:52 +05:00
edX Transifex Bot
62f5364ddc Update translations 2018-05-22 13:12:34 -04:00
Farhanah Sheets
9f0e99d549 Fix test 2018-05-22 09:44:24 -04:00
Albert (AJ) St. Aubin
842afd5056 Merge pull request #18241 from edx/aj/LEARNER-5145 
Added credit as an option to change_enrollment command
 2018-05-22 08:43:40 -04:00
attiyaishaque
9039ece7ba Fixed tests that are flaky on fireFox 59 2018-05-22 16:58:49 +05:00
irfanuddinahmad
7812185d8a fixed typos 2018-05-22 15:23:39 +05:00
Uman Shahzad
4f6d9e57d9 Merge pull request #18243 from edx/uman/bump 
[ENT-986] Update edx-enterprise to 0.68.6.
 2018-05-22 15:09:26 +05:00
irfanuddinahmad
2cd1b9d792 Merge pull request #18234 from edx/iahmad/ENT-988-Update-API-Terms-of-Service 
ENT-988 Update API Terms of Service
 2018-05-22 14:08:46 +05:00
Muhammad Ammar
c949b2222e Merge pull request #18232 from edx/ammar/ENT-989-update-api-request-form 
update api request form
 2018-05-22 14:07:46 +05:00
Uman Shahzad
244576bcb3 Update edx-enterprise to 0.68.6. 2018-05-22 13:41:58 +05:00
Farhanah Sheets
577bd1ec0d Move pacing above schedule dates and remove invalid help text 2018-05-21 16:51:39 -04:00
sanfordstudent
d4a338d4af Merge pull request #18113 from edx/sofiya/ed-2802-2 
EDUCATOR-2802 Different LMS api endpoint to finish GDPR retirement for the user
 2018-05-21 15:26:10 -04:00
J Eskew
572b8a0be4 Merge pull request #17670 from open-craft/MCKIN-7023-xblock-i18n-templates 
[MCKIN-7023] Improve XBlock i18n by allowing template translations
 2018-05-21 13:49:13 -04:00
Albert St. Aubin
1b72974fb8 Added credit as an option to change_enrollment command 2018-05-21 13:14:14 -04:00
Gabe Mulley
959ddaa98d Merge pull request #18181 from edx/mulby/ace-password-reset 
Use edx-ace for password reset emails
 2018-05-21 11:42:56 -04:00
Sofiya Semenova
cd18206167 EDUCATOR-2802: P2 gdpr endpoint 2018-05-21 11:12:54 -04:00
Omar Al-Ithawi
73af914cfc Use edx-ace for password reset email 2018-05-21 09:49:14 -04:00
Tasawer Nawaz
b8daeb22ba Merge pull request #18239 from edx/tasawer/learner-5369/fix-error-concatenate-str-with-none 
Fix TypeError: cannot concatenate 'str' and 'NoneType' objects
 2018-05-21 18:46:37 +05:00
Tasawer Nawaz
b21fec305a fix TypeError: cannot concatenate 'str' and 'NoneType' objects 
LEARNER-5369
 2018-05-21 17:35:54 +05:00
irfanuddinahmad
741f75d7fe updated TOS 2018-05-21 15:00:57 +05:00
Jeremy Bowman
93809a8497 Merge pull request #18236 from edx/jmbowman/sure_upgrade 
Upgrades to avoid sure install bug
 2018-05-19 10:58:07 -04:00
Troy Sankey
6872671436 Merge pull request #18136 from edx/pwnage101/registration-with-half-retired-user-email 
Disallow registration when the proposed email is retired
 2018-05-18 16:53:30 -04:00