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

2509 Commits

Author SHA1 Message Date
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
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
Feanil Patel
a7fa0c211d Revert "PLAT-2060 Use pip-tools to manage requirements files" 2018-04-10 12:54:41 -04:00
Jeremy Bowman
432347b881 PLAT-2060 Use pip-tools to manage requirements files 2018-04-09 17:07:02 -04:00
Gregory Martin
49a82cc397 Merge pull request #17860 from edx/yro/EDUCATOR-2333 
Delete visual_progress_enabled waffle flag.
 2018-04-06 15:55:32 -04:00
Brian Mesick
5782119341 Merge pull request #17867 from edx/bmedx/registration_deadlocks 
WIP: Refactor registration to improve reliability
 2018-04-06 15:24:13 -04:00
Gregory Martin
62775c891a Delete visual_progress_enabled waffle flag. 
https://openedx.atlassian.net/browse/EDUCATOR-2333
 2018-04-06 15:07:16 -04:00
Brian Mesick
14af7f948a Merge pull request #17722 from edx/bmedx/retirement_sailthru 
PLAT-2028 - Create mailing list retirement API endpoint
 2018-04-05 17:20:35 -04:00
bmedx
65147386c0 PLAT-2028 - Create mailing list retirement API endpoint 
- Removes "email-optin" UserOrgTags for the user
- Creates and uses a new "UserRetireMailingsSignal" signal
- Creates and uses a new "CanRetireUser" permission
- Creates and uses a new setting "RETIREMENT_SERVICE_WORKER_USERNAME"
- Creates a signal handler to globally opt-out the user from Sailthru
 2018-04-05 15:52:26 -04:00
Alex Dusenbery
a515277251 EDUCATOR-2451 | Add expand/collapse all button to course outline. 2018-04-05 15:47:33 -04:00
bmedx
634234966a WIP: Refactor registration to improve reliability 2018-04-05 15:11:41 -04:00
noraiz-anwar
0dd4978f37 permit staff role to rescore, override and delete problem scores for individual learners 2018-04-05 18:40:55 +05:00
Awais Jibran
02973250ea Merge pull request #17872 from edx/revert-17796-aj/COURSE_LOADING_ERROR 
Revert "Logging: Error getting the course from modulestore"
 2018-04-04 19:14:06 +05:00
Awais Jibran
03f5aceda5 Merge pull request #17871 from edx/revert-17795-aj/use-get-or-create-EDUCATOR-2549 
Revert "Use get or create rather than create"
 2018-04-04 18:07:12 +05:00
Awais Jibran
e12120befe Revert "Logging: Error getting the course from modulestore" 2018-04-04 16:46:29 +05:00
Awais Jibran
52fba9840a Revert "Use get or create rather than create" 2018-04-04 16:44:12 +05:00
Waheed Ahmed
20e7a15ac6 Fix enabling debug allows api access without authentication. 
LEARNER-1220
 2018-04-04 12:54:52 +05:00
attiyaishaque
438ecceb01 Fix due date display format according to set in advanced settings. 2018-04-03 16:03:15 +05:00
Brian Mesick
4841ff7943 Merge pull request #17790 from edx/bmedx/user_retirement_utils 
Add some common functionality for retiring users
 2018-04-02 14:41:52 -04:00
Diana Huang
fd733a9611 Merge pull request #17800 from edx/diana/update-registration 
LEARNER-4403: Update TOS and Privacy Policy field on registration form for GDPR.
 2018-04-02 14:01:23 -04:00
bmedx
b26d7913f5 Add some common functionality for retiring users 
- Methods for getting hashed retired users and usernames
- A DRF permission for retiring users
 2018-04-02 13:48:52 -04:00
Diana Huang
6ceb7e1500 Update TOS and Privacy Policy field on registration from for GDPR. 2018-04-02 10:01:18 -04:00