Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

19803 Commits

Author SHA1 Message Date
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
rabiaiftikhar
0438c1b535 EDUCATOR-3030 add temperory logs 2018-07-20 21:51:05 +05:00
Usman Khalid
36b3316ebc Fixes to sequence module for anonymous courseware access. 2018-07-20 14:26:22 +05:00
Waheed Ahmed
2849d8f572 Fix unenroll entitlement from instructor dashboard. 
LEARNER-5620
 2018-07-19 14:52:23 +05:00
Noraiz Anwar
2f12e0b4c4 Merge pull request #18581 from edx/noraiz/EDUCATOR-3016-fix 
add python getter in capa system
 2018-07-19 11:53:18 +05:00
edx-cache-uploader-bot
b890399257 Updating migrations 2018-07-18 17:03:03 -04:00
noraiz-anwar
593c2d1ae8 add python getter in capa system 2018-07-18 18:44:56 +05:00
Robert Raposa
0840fe8e5c Escape chemical equation in advanced problems. 
EDUCATOR-3206
 2018-07-17 16:01:41 -04:00
Kshitij Sobti
bf6af13ed1 Add UI to browse and browse course structure and select the course/chapter/section... to generate a report of 2018-07-18 00:37:29 +05:30
Uzair Rasheed
4b4a8632bb Merge pull request #18598 from edx/refactor-code-of-LEARNER-5257 
Refactor Code for LEARNER-5257
 2018-07-17 20:24:27 +05:00
Uzair Rasheed
0c610749c9 Refactor Code for LEARNER-5257 
Course key object was not serializable before sending to celery
task.
 2018-07-17 18:20:39 +05:00
lduarte1991
a9b61c06d3 Remove the annotations feature introduced by Harvard. 
There are other annotations features still in the platform but this one
is the one that works with an annotations server that was specialized
and not generally used by most instances of the platform.

The initial PR to remove this was made by 'lduarte1991' and can be found
here: https://github.com/edx/edx-platform/pull/17299

The work done based on the squashed commits:
removed advanced modules config for annotations
remove module files and config for annotations
remove js and css files related to annotations, under ova folders
removed js and css annotator file configs for cms and lms
remove template html files for annotations
removed annotations options from static html book
Added back some files that were originally marked "for OVA" but others used as per acceptance tests
Added back css file configs incorrectly marked as ova
Remove annotation related advanced settings from test.
Correct hls require.js pathing.
 2018-07-16 16:55:08 -04:00
edx-cache-uploader-bot
a21b963446 Updating migrations 2018-07-13 09:51:40 -04:00
irfanuddinahmad
ead8a78e29 disabled activation email 2018-07-13 12:48:02 +05:00
Robert Raposa
d410d6d8ff Remove flaky test_edit_raw_html. 
EDUCATOR-3186
 2018-07-12 13:08:29 -04:00
Robert Raposa
e784f439bb Merge pull request #18570 from edx/feanil/remove_flaky_test 
Remove flaky studio unit test.
 2018-07-12 12:40:05 -04:00