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

16244 Commits

Author SHA1 Message Date
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
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
Jeremy Bowman
02e4b87421 Merge pull request #18733 from edx/jmbowman/TE-2525 
TE-2525 nose.tools removal part 1/2
 2018-08-07 13:55:04 -04:00
Jeremy Bowman
7e410b0656 TE-2524 Remove remaining nose.plugins usage 2018-08-07 09:36:35 -04:00
Jeremy Bowman
bcaec3c5bb TE-2525 nose.tools removal part 1/2 2018-08-07 08:30:12 -04:00
Awais Jibran
1eba936a9e Merge pull request #18730 from edx/aj/update-log 
Update log for library not found
 2018-08-07 14:21:33 +05:00
Agha Awais
4c966afc71 removed flaky test 2018-08-07 05:39:11 +00:00
Awais Jibran
a53a8a1f77 Update log for library not found 2018-08-06 18:20:14 +05:00
Agha Awais
0acb2289e1 Merge pull request #18688 from edx/awais/lett_2_bc_advance_settings_III 
advanced settings bokchoy tests III
 2018-08-04 00:52:29 +05:00
Agha Awais
202e990498 Merge pull request #18686 from edx/awais/lett_2_bc_grading_II 
Grading bokchoy tests II
 2018-08-04 00:52:09 +05:00
Daniel Clemente Laboreo
1e2a69e22e Add CourseFields.other_course_settings to store custom fields 2018-08-03 15:40:06 +03:00
Agha Awais
e6a63b5693 Grading bokchoy tests II 2018-08-03 12:09:21 +00:00
Agha Awais
be5ccf92e7 advanced settings bokchoy tests III 2018-08-03 12:06:23 +00:00
Kevin Falcone
8594c904fe Reset to master's migrations 
I rolled back to when we added the oauth2_provider migrations and caused
deployment issues, but they were added to the bok choy cache.

Since we're re-applying those migrations, this should reset bok choy to
a point where it can run our new migrations.
 2018-08-02 14:09:57 -04:00
Kevin Falcone
5050d8c629 Revert "Updating migrations" 
This reverts commit a21b963446.
 2018-08-02 14:01:36 -04:00
Kevin Falcone
8b739fc411 Revert "Updating migrations" 
This reverts commit b890399257.
 2018-08-02 14:01:29 -04:00
Kevin Falcone
e9f6e5ab49 Revert "Updating migrations" 
This reverts commit 80d9bec5a4.
 2018-08-02 14:01:20 -04:00
Michael Roytman
edd4bed081 Merge pull request #18695 from edx/mroytman/course-validation-default-grading-policy 
mroytman/course validation default grading policy
 2018-08-02 12:53:20 -04:00
Michael Roytman
6083a11a5e add has_grading_policy to course validation API 2018-08-02 12:17:58 -04:00
Daniel Clemente Laboreo
370501d156 Add feature to send an e-mail to staff when a student enrolls 2018-08-02 11:43:17 -04:00
Awais Jibran
62559011dc Revert "fix poster display issue with hls" 
This reverts commit b9ebe5ea686fc1b16fccd0f276fbc1d53a5c3468.
 2018-08-02 19:53:40 +05:00
Awais Jibran
e1d27d56f8 Merge pull request #18692 from edx/aj/fix-single-blackout-date 
Fix discussion blackout date pasrsing.
 2018-08-02 18:58:23 +05:00
Agha Awais
469d871994 Merge pull request #18702 from edx/awais/lett_2_bc_textbook 
bokchoy tests for textbook page
 2018-08-02 16:43:41 +05:00
Jillian Vogel
e1dcdd8ed9 Adds test 2018-08-02 13:40:19 +09:30
John Hensley
aeec52a9ae Improve CourseEnrollment admin search presentation 
When searching CourseEnrollments in the admin, list the enrollments
whose usernames were an exact match first.
 2018-08-02 10:42:15 +09:30
Cole Rogers
2a438df3b1 Merge pull request #18641 from edx/colelrogers/LEARNER-5922-cache-pathways 
Add credit pathway caching
 2018-08-01 11:13:44 -04:00
Ned Batchelder
74c6c7aa75 Merge pull request #18638 from open-craft/jill/reinstate-enrollments-admin 
Gate access to the CourseEnrollmentAdmin view with a waffle switch
 2018-08-01 10:35:31 -04:00
Cole Rogers
1c05308d4a Add credit pathway caching 2018-08-01 10:18:10 -04:00
Agha Awais
2f94817118 bokchoy tests for textbook page 2018-08-01 12:42:47 +00:00
Agha Awais
a3f8fe49cb Merge pull request #18690 from edx/awais/lett_2_bc_discussion_components 
discussion component bokchoy tests
 2018-08-01 16:44:54 +05:00
Awais Jibran
cab6c9fcbd Fix discussion blackout date pasrsing. 
EDUCATOR-3260
 2018-08-01 16:31:11 +05:00
Michael Roytman
e5521d9ec2 Merge pull request #18661 from edx/mroytman/bok-choy-tests-course-outline 
bok choy tests for course outline status section
 2018-07-31 13:08:31 -04:00
Michael Roytman
7e8de93d05 bok choy tests for course outline status section 2018-07-31 12:00:44 -04:00
Agha Awais
a72beed4ec discussion component bokchoy tests 2018-07-31 14:29:49 +00:00