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

16277 Commits

Author SHA1 Message Date
Michael Youngstrom
b614c19e16 Merge pull request #18833 from edx/youngstrom/bok-choy-flaky 
Remove flaky bok-choy tests
 2018-08-24 15:06:26 -04:00
Michael Youngstrom
e79ffb3b39 Merge pull request #18831 from edx/youngstrom/celery-enrollment-task-tests 
Switch where we create the mock in test_tasks
 2018-08-24 14:37:50 -04:00
Michael Youngstrom
29c312854d Remove test acceptance.tests.lms.test_lms.LoginFromCombinedPageTest.test_login_failure 2018-08-24 14:34:08 -04:00
Michael Youngstrom
b343b2dcb2 Remove acceptance.tests.lms.test_account_settings.AccountSettingsPageTest.test_preferred_language_field 2018-08-24 14:32:27 -04:00
Michael Youngstrom
eadf3650a7 Switch where we create the mock 2018-08-24 12:53:54 -04:00
Diana Huang
0cd312b4d2 Merge pull request #18827 from edx/diana/update-cache-programs 
Switch to using Pathways instead of CreditPathways.
 2018-08-24 11:48:58 -04:00
Diana Huang
18403d2382 Switch to using Pathways instead of CreditPathways. 2018-08-23 15:15:50 -04:00
Albert St. Aubin
8c26b4eefb Update the geoIP.dat files for more accurate identification of Country 
by IP

[LEARNER-6174]

Our .dat files for GeoIP identification should be updated more
frequently or we run the risk of incorrectly identifying Users
locations.
 2018-08-23 14:22:54 -04:00
Stu Young
9ffced6c30 Merge pull request #18811 from edx/testeng/bokchoy_auto_cache_update_446ca1f49b46ee2aa82263fd6a190181702d6c6e 
Bokchoy db cache update
 2018-08-21 16:34:26 -04:00
Jeremy Bowman
3ff3eee2f2 TE-2689 Remove useless pylint suppressions part 4 2018-08-20 12:54:22 -04:00
edx-cache-uploader-bot
f7d4bea21b Updating migrations 2018-08-20 12:38:55 -04:00
ayub-khan
cae99f9e4d bulk change enrollment using csv file 2018-08-20 16:39:05 +05:00
noraiz-anwar
21907d4759 add typeset operation in mathjax queue on response list render 2018-08-20 11:04:40 +05:00
Michael Youngstrom
c195df3c60 Merge pull request #18781 from edx/youngstrom/xdist-test-cleanup 
Don't store invalid file types from sample course in repo
 2018-08-17 16:39:09 -04:00
Michael Youngstrom
52a8c9703b Maintain ignore file tests without storing themn on platform 2018-08-17 16:05:28 -04:00
Robert Raposa
99c9eb7343 Migrate to edx-django-utils monitoring. 
ARCH-220
 2018-08-17 15:39:04 -04:00
Michael Youngstrom
75bd297337 Merge pull request #18795 from edx/youngstrom/try-unique-db 
Use a unique name for test mongo dbs
 2018-08-17 11:23:15 -04:00
Michael Youngstrom
4575c351cc Use unique db names for mongo tests 2018-08-17 10:38:37 -04:00
Calen Pennington
228868acc7 Merge pull request #18799 from edx/cale/fix-educator-3262-again 
Cale/fix educator 3262 again
 2018-08-17 09:54:30 -04:00
Calen Pennington
865e43edf3 Delay initialization of XBlocks until after all fragments have been rendered 2018-08-17 09:16:47 -04:00
Jeremy Bowman
30fb8da65f Delete another flaky LEARNER-71 test 2018-08-16 15:22:38 -04:00
Jeremy Bowman
8db01323b5 Fix some eslint warnings about global _ 2018-08-16 14:20:31 -04:00
Jeremy Bowman
509e0fdf45 Merge pull request #18794 from edx/jmbowman/delete_flaky_test 
Delete flaky test due for removal anyway
 2018-08-16 09:29:39 -04:00
mduboseedx
6bc8b4dcfa Merge pull request #18344 from open-craft/symbolist/navigation-for-anonymous-users 
Fixes for courseware anonymous access.
 2018-08-16 08:44:00 -04:00
Jeremy Bowman
e6ee4e6940 Delete flaky test due for removal anyway 2018-08-16 08:08:56 -04:00
Jeremy Bowman
3929536612 Fix sudden breakage of expectedFail 2018-08-15 21:57:25 -04:00
Jeremy Bowman
713d64e1e2 TE-2702 Update Read the Docs links to HTTPS 2018-08-15 17:34:01 -04:00
mduboseedx
a9b2814ac0 Merge pull request #18785 from jolyonb/jolyonb/fix_textline_css 
Fixing textline CSS issue
 2018-08-15 14:09:13 -04:00
Brian Mesick
5e5b50e4c1 Merge pull request #18783 from edx/bmedx/fix_sandbox_user_create 
Fix failures due to creating users during initial migrations
 2018-08-15 12:01:01 -04:00
Jolyon Bloomfield
9673db692d Fixing textline CSS issue 2018-08-14 20:40:51 -04:00
Jeremy Bowman
de7e2e18b7 Merge pull request #18776 from edx/jmbowman/TE-2526 
TE-2526 Remove dependency on needle and nose
 2018-08-14 16:31:45 -04:00
bmedx
c17a5d5eae Fix failures due to creating users during initial migrations 2018-08-14 14:21:42 -04:00
Calen Pennington
13a54b7046 Merge pull request #18750 from edx/cale/fix-educator-3262 
Render all parts of XBlock fragments in a Conditional Module
 2018-08-14 10:53:00 -04:00
Jeremy Bowman
fda571fedb TE-2526 Remove dependency on needle and nose 2018-08-13 16:21:47 -04:00
Michael Youngstrom
086affe1d5 Merge pull request #18771 from edx/youngstrom/fix-xdist-test-errors 
Fix commonlib-unit test collection errors in xdist
 2018-08-13 14:01:31 -04:00
Michael Youngstrom
c58aac352c Fix commonlib-unit test collection errors 2018-08-13 12:40:53 -04:00
Brian Mesick
4afad3db77 Merge pull request #18747 from edx/bmedx/PLAT-2278_retirement_case_differences 
Stop username re-use, update retirement for multiple UserRetirementStatuses
 2018-08-13 12:40:26 -04:00
bmedx
2d71697823 Stop acct creation from using usernames still in the retirement queue 2018-08-13 11:13:21 -04:00
Calen Pennington
0aeec133fc Render all parts of XBlock fragments in a Conditional Module 
[EDUCATOR-3262]
 2018-08-10 13:32:55 -04:00
rabiaiftikhar
8286dcce88 EDUCATOR-3030 remove temperory logs 2018-08-10 10:46:29 +05:00
Jeremy Bowman
2fb3805f56 Merge pull request #18739 from edx/jmbowman/TE-2525 
TE-2525 Finish removing nose.tools usage
 2018-08-09 15:56:28 -04:00
Simon Chen
c5347afd05 Merge pull request #18762 from edx/schen/revert_email_send 
Revert "Add feature to send an e-mail to staff when a student enrolls"
 2018-08-09 15:28:09 -04:00
Cole Rogers
eef63fdd81 Merge pull request #18756 from edx/colelrogers/LEARNER-6075-pathway-caching-pages 
Fix pathway caching to work with multiple pages returned from endpoint
 2018-08-09 11:11:03 -04:00
Agha Awais
187d488059 Merge pull request #18753 from edx/awais/fix_grading_flaky_test 
fixed flaky test from grading
 2018-08-09 19:49:05 +05:00
mduboseedx
bf5aac7a14 Merge pull request #17477 from open-craft/ciuin/improve-courseenrollment-admin-search-upstream 
Improve CourseEnrollment admin search presentation
 2018-08-09 10:33:30 -04:00
Simon Chen
951b1f8408 Revert "Add feature to send an e-mail to staff when a student enrolls" 
This reverts commit 370501d156.
 2018-08-08 16:35:40 -04:00
Cole Rogers
11cd2ef557 Update pathway caching to work with multiple pages returned from endpoint 2018-08-08 14:35:41 -04:00
Kevin Falcone
834c2eb1b3 Merge pull request #18665 from edx/jibsheet/reset-db-cache 
Recreate caches because we rolled back a migration that was added
 2018-08-08 13:57:04 -04:00
Agha Awais
556a88e5fa fixed flaky test from grading 2018-08-08 16:19:05 +00:00
Jeremy Bowman
17f54fbaff TE-2525 Finish removing nose.tools usage 2018-08-07 21:39:02 -04:00