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

19868 Commits

Author SHA1 Message Date
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
Jeremy Bowman
4241249119 TE-2524 Stop using nose.plugins 2018-07-30 21:11:05 -04:00
J Eskew
3fe348598f Merge pull request #18657 from open-craft/jill/dont-delete-enrollments 
Do not delete course enrollments
 2018-07-30 11:09:06 -04:00
Ahsan Ulhaq
73857f6039 Added Management command for bulk unenrollment of users 
LEARNER-5852
 2018-07-30 14:26:46 +05:00
muhammad-ammar
c360b4effb fix poster display issue with hls 
EDUCATOR-2606

another approach
 2018-07-30 12:11:00 +05:00
Agha Awais
a4547183da Merge pull request #18497 from edx/awais/lett_2_bc_course_create 
TE-2622: Course Create bokchoy tests
 2018-07-27 14:56:55 +05:00
Jillian Vogel
2667c14e19 Fix failing test 
and use the self.assert* convention used by the other tests
 2018-07-27 13:50:06 +09:30
Jillian Vogel
7a63af9216 Add a test 2018-07-27 11:25:32 +09:30
Jillian Vogel
84eefa0e87 Adds migration 2018-07-27 11:25:32 +09:30
Jillian Vogel
2fd3592586 Do not delete course enrollments 
when the associated CourseOverview gets recreated.
 2018-07-27 09:26:20 +09:30
maiazadhun1
7faf59ff7a course create bokchoy tests 2018-07-26 11:45:06 +00:00
Agha Awais
8b9048bf8c Merge pull request #18498 from edx/awais/lett_2_bc_grading 
TE-2624: Grading bokchoy tests
 2018-07-26 12:50:39 +05:00
Agha Awais
442a0f510a Merge pull request #18515 from edx/awais/lett_2_bc_advanced_settings_II 
TE-2621: Advanced settings bokchoy tests 2
 2018-07-26 11:34:22 +05:00
Jillian Vogel
c5e90464e9 Address PR review: 
* uses openedx waffle_utils instead of straight waffle
* adds student.STUDENT_WAFFLE_NAMESPACE
* improves comment

Also changed the waffle switch to use _ instead of . to respect current conventions.
 2018-07-26 13:30:35 +09:30
Jillian Vogel
7f0bbedba1 Adds a waffle switch which gates access to the CourseEnrollmentAdmin views 2018-07-26 13:30:35 +09:30
Feanil Patel
d29ffce4df Merge pull request #18639 from edx/private_to_public_02d5477 
Mergeback PR from private to public.
 2018-07-25 14:37:57 -04:00
Robert Raposa
edf1c8922e Fix quality errors. 2018-07-25 11:34:10 -04:00
Robert Raposa
02d5477aaa Merge pull request #138 from edx/robrap/EDUCATOR-3206 
EDUCATOR-3206: Fix chemical equations.
 2018-07-25 10:22:50 -04:00
Jeremy Bowman
84dc5c6c2a Merge pull request #18617 from edx/jmbowman/TE-2635 
TE-2635 Upgrade bok-choy
 2018-07-23 16:13:11 -04:00
Stu Young
bace18baa7 Merge pull request #18627 from edx/testeng/bokchoy_auto_cache_update_b28d5405ce2ffb838559cd5e0664bb9e742ad03d 
Bokchoy db cache update
 2018-07-23 15:52:42 -04:00
Jeremy Bowman
41a49f5f07 TE-2635 Upgrade bok-choy 2018-07-23 15:25:01 -04:00
edx-cache-uploader-bot
80d9bec5a4 Updating migrations 2018-07-23 15:12:10 -04:00
Bill Filler
df52ff0038 Merge pull request #18395 from edx/whitelabel/journal 
Add journals support in LMS
 2018-07-23 15:10:38 -04:00
Bill Filler
c746a4e630 Add Journals support 
Enable the journal app in LMS. Add support to display Journals on index
and courseware pages and dashboard.
 2018-07-23 13:11:26 -04:00
Gregory Martin
df23616046 Merge pull request #18613 from edx/yro/LEARNER-5556 
Update entitlement ordering in dash
 2018-07-23 10:40:50 -04:00
Waheed Ahmed
4f3d9e7a0c Merge pull request #18600 from edx/waheed/LEARNER-5620-fix-entitlement-unenroll 
Fix unenroll entitlement from instructor dashboard.
 2018-07-23 18:23:10 +05:00
maiazadhun1
c7c38863dc Grading bokchoy tests 2018-07-23 12:12:33 +00:00
Agha Awais
51a2679333 Advanced settings bokchoy tests II 2018-07-23 10:45:08 +00:00
Gregory Martin
0b7dbeb520 Update entitlement ordering in dash 2018-07-20 16:38:43 -04:00