Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5629 Commits

Author SHA1 Message Date
Brian Mesick
1828bf7d6b Merge pull request #17920 from edx/bmedx/fix_retirement_apis 
Update retirement APIs to match spec
 2018-04-25 10:39:26 -04:00
sanfordstudent
03a3147634 Merge pull request #18011 from edx/sstudent/EDUCATOR-2731 
make userorgtag deletable
 2018-04-24 15:26:14 -04:00
Sanford Student
e5a0efbe7b make userorgtag deletable 2018-04-24 14:51:53 -04:00
sandroroux
05a5631869 Allows UnregisteredLearnerCohortAssignments to delete_by_user_value. 2018-04-24 14:00:33 -04:00
Alessandro Roux
e8201c60f4 Merge pull request #18034 from edx/roux/fix-deletable-by-user-value 
Changes the DeletableByUserValue delete algorithm.
 2018-04-24 13:57:33 -04:00
Waheed Ahmed
d82ecad681 Merge pull request #17985 from edx/waheed/LEARNER-4254-update-support-form 
Update support form.
 2018-04-24 22:02:26 +05:00
sandroroux
75e522f222 Changes the mixin's delete algorithm. 2018-04-24 12:00:25 -04:00
Brittney Exline
60f46d5a92 Merge pull request #17930 from edx/bexline/sso_id_verification2 
ENT-945 Apply logic for taking into account SSOVerifications
 2018-04-24 07:40:52 -06:00
Alex Dusenbery
64f1592772 EDUCATOR-2632 | Management command for creating new DOT application model. 2018-04-24 09:17:37 -04:00
Asad Iqbal
6cc13f7f2e Merge pull request #17935 from edx/asadiqbal08/ENT-645 
[ENT-645]- Updated the messages when a learner leave an organization.
 2018-04-24 15:59:55 +05:00
Waheed Ahmed
2c09ebb208 Update support form to make course required. 
Update support form to auto select course and make course
selection required to submit form.

LEARNER-4254
 2018-04-24 14:29:49 +05:00
Uman Shahzad
db5042f084 Merge pull request #18018 from edx/revert-17967-gbabey/revert-ENT-924 
[ENT-924] Revert "Revert "Show Enterprise display name if we should hide sensit…
 2018-04-24 05:43:49 +05:00
bmedx
98742c1c50 Update retirement APIs to match spec 2018-04-23 16:03:29 -04:00
Noraiz Anwar
8515cdf463 Merge pull request #18017 from edx/noraiz/EDUCATOR-2759 
fix outline progress
 2018-04-23 20:38:47 +05:00
irfanuddinahmad
3c40cd39f5 Merge pull request #18021 from edx/iahmad/migrate_video_transcripts 
added admin site settings
 2018-04-23 20:37:46 +05:00
Brittney Exline
ee1c3a4548 ENT-945 Update IDVerification interfaces to accountfor SSOVerification 2018-04-23 10:48:12 -04:00
irfanuddinahmad
0195e9720d added admin site settings 2018-04-23 19:47:40 +05:00
noraiz-anwar
1c2de3d177 fix outline progress 2018-04-23 18:56:51 +05:00
Uman Shahzad
5746729895 Revert "Revert "Show Enterprise display name if we should hide sensitive user…" 2018-04-23 18:27:36 +05:00
zubair-arbi
46960ef358 ENT-960 Fix catalogs creation bug due to request data format 2018-04-23 14:29:06 +05:00
Nimisha Asthagiri
022850d293 Merge pull request #17983 from edx/arch/remove-course-structure-api 
Remove Course Structure API
 2018-04-21 09:04:39 -04:00
Uman Shahzad
7d34099c09 Merge pull request #17969 from edx/uman/enterprise-middleware 
[ENT-962] Add Enterprise middleware that injects customer data.
 2018-04-21 09:55:46 +05:00
Uman Shahzad
87919f4d53 Add Enterprise middleware that injects customer data. 2018-04-21 08:14:52 +05:00
Nimisha Asthagiri
3d8bce9dc8 Remove Course Structure API 2018-04-20 22:19:57 -04:00
sandroroux
5b9d347317 Adds DeletableByUserValue to CourseEnrollmentAllowed model. 2018-04-20 13:40:10 -04:00
Brian Mesick
fc1f18aa14 Merge pull request #17919 from edx/bmedx/retirement_status 
Add a model and associated API to help control the user retirement flow
 2018-04-20 12:35:16 -04:00
asadiqbal
2e8444e674 Updated the messages when a learner leave an organization. 2018-04-20 15:36:54 +05:00
bmedx
63dcaa4695 Add a model and associated API to help control the user retirement flow 2018-04-19 13:56:42 -04:00
sandroroux
6e5add47b6 Adds retire_user mixin. 2018-04-19 13:15:21 -04:00
Sanford Student
9e482553c1 EDUCATOR-2628: deactivate and logout user 2018-04-18 11:32:31 -04:00
Nimisha Asthagiri
0f29ca2620 Merge pull request #17968 from edx/arch/remove-course-structure-usage-in-completion 
Remove Completion's usage of Course Structures API
 2018-04-18 08:03:25 -04:00
Hasnain
3fca1af171 WL-1518 | Get decline notification context from enterprise. 2018-04-18 15:00:47 +05:00
Nimisha Asthagiri
fd078ae1f5 Remove Completion's usage of Course Structures API 2018-04-17 21:13:39 -04:00
Feanil Patel
139ac68ad3 Merge pull request #17981 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-17 16:31:04 -04:00
Feanil Patel
aa46a245b0 Merge pull request #17967 from edx/gbabey/revert-ENT-924 
Revert "Show Enterprise display name if we should hide sensitive user…
 2018-04-17 12:58:57 -04:00
Alex Dusenbery
f6997f2842 Remove unused imports in user_api.models 2018-04-17 10:03:05 -04:00
George Babey
a155aad01c Revert "Show Enterprise display name if we should hide sensitive username." 
This reverts commit d58bd06928.

This commit caused performance issues due to increased API load from checking the
enterprise association on each page load
 2018-04-17 09:07:17 -04:00
Braden MacDonald
e91bff63d5 Merge pull request #17498 (completion-exclude-discussion) 
Added completion mode to discussion XBlock
 2018-04-14 18:43:36 -07:00
Simon Chen
c02c1d5177 Merge pull request #17902 from edx/rm-new-course-outline-waffle 
EDUCATOR 2283 - Removes the new course outline waffle flag.
 2018-04-14 15:07:00 -04:00
Bill DeRusha
f7dd174873 Merge pull request #17954 from edx/bderusha/generated-pw-complexity 
Update and refactor random password generator
 2018-04-13 17:13:55 -04:00
Nimisha Asthagiri
57ecda7f71 Remove CourseStructure usage in CourseGraph 2018-04-13 14:44:19 -04:00
Bill DeRusha
d1ed33ac23 Update and refactor random password generator 2018-04-13 14:17:21 -04:00
John Hensley
37ce467636 Added completion mode to discussion XBlock 2018-04-13 14:14:54 -04:00
sandroroux
3899b76929 Removes the new course outline waffle flag. 2018-04-13 12:28:14 -04:00
Jeremy Bowman
9ca9aa44c6 PLAT-2060 Use pip-tools to manage requirements files (take 2) 
This reverts commit a7fa0c211d.
 2018-04-12 17:22:48 -04:00
Uman Shahzad
d58bd06928 Show Enterprise display name if we should hide sensitive username. 2018-04-12 19:10:30 +05:00
irfanuddinahmad
e424e04897 Merge pull request #17605 from edx/iahmad/migrate_transcripts_S3 
Iahmad/migrate transcripts s3
 2018-04-12 17:45:08 +05:00
irfanuddinahmad
3e426aca91 New command to migrate transcripts to S3 2018-04-12 16:57:23 +05:00
noraiz-anwar
ef84f2a81f fetch poll component to check for completion 2018-04-12 11:30:11 +05:00
Saleem Latif
d2c97d6402 Fix 500 error when adding viewers to catalog. 2018-04-11 14:49:03 +05:00