Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,340 Commits 1 Branch 0 Tags
667df875bdb2bb66546b395d3aba2c9e3f40b0f7
Commit Graph

53340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Hallada
684c952f04 Merge pull request #17889 from edx/thallada/switch-to-flag 
Change in-context waffle switch to a flag
 2018-04-06 10:53:33 -04:00
Feanil Patel
24b85ab81d Update to latest 2.x which includes a security fix. 
Changelog: https://docs.newrelic.com/docs/release-notes/agent-release-notes/python-release-notes
 2018-04-06 10:47:26 -04:00
Matthew Piatetsky
7673ea06b1 Hide experiment courses from dashboard if enrolled but not paid 2018-04-06 10:14:29 -04:00
Bill Filler
a0028aa00a Merge pull request #17892 from edx/bfiller/EDUCATOR-2634 
bump version of edx-ora2 to 2.1.14
 2018-04-06 09:57:48 -04:00
Brittney Exline
61820a459d Merge pull request #17835 from edx/bexline/sso_id_verification 
ENT-942 Implement an abstraction layer for PhotoVerification class methods
 2018-04-06 07:49:45 -06:00
Douglas Hall
757657f53e Upgrade edx-enterprise package to 0.67.3. 
https://github.com/edx/edx-enterprise/compare/0.67.1...0.67.3
 2018-04-06 09:36:17 -04:00
Bill Filler
d80aa55cad bump version of edx-ora2 to 2.1.14 2018-04-05 18:39:06 -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
Brittney Exline
42806b3754 Merge pull request #17873 from edx/bexline/refactor_tpa_models 
ENT-943 Refactoring third_party_auth models
 2018-04-05 15:02:56 -06:00
Tyler Hallada
71e74949e9 Change in-context waffle switch to a flag 
Also update studio-frontend to version 1.7.1
 2018-04-05 16:47:42 -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
Brittney Exline
d31d9bd684 ENT-942 Implement an abstraction layer for SoftwareSecurePhotoVerification class methods 2018-04-05 15:48:59 -04:00
Alex Dusenbery
a515277251 EDUCATOR-2451 | Add expand/collapse all button to course outline. 2018-04-05 15:47:33 -04:00
Brittney Exline
682ec886ed ENT-943 Refactoring third_party_auth models 2018-04-05 15:19:58 -04:00
bmedx
634234966a WIP: Refactor registration to improve reliability 2018-04-05 15:11:41 -04:00
McKenzie Welter
361af7ef5a add test coverage for entitlement course run retrieval 2018-04-05 14:49:33 -04:00
Brian Mesick
e60e792720 Merge pull request #17885 from edx/bmedx/fix_fix_ungraded_certs 
Update fix_ungraded_certs to Django 1.11 spec
 2018-04-05 12:57:52 -04:00
Michael Terry
c19d01a994 Add live validation to password reset 
Adds a new React factory for that page to handle the logic. Also
cleans up the UI a little (centers it, stops using serif font, etc).
 2018-04-05 11:59:26 -04:00
bmedx
147663fb6e Update fix_ungraded_certs to Django 1.11 spec 2018-04-05 10:41:08 -04:00
Eric Fischer
32f9902f2e Merge pull request #17834 from edx/thallada/incontext-waffle 
Studio-frontend in-context image selection modal
 2018-04-05 10:34:40 -04:00
Noraiz Anwar
4820a1e56b Merge pull request #17830 from edx/noraiz/EDUCATOR-2587 
permit staff role to rescore, override and delete problem scores for individual learners
 2018-04-05 19:32:09 +05: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
Dmitry Gamanenko
df9dec9b88 Fix "admin/auth/user/add "username" missing field. 
Add test for PR `fix_username_missing_field`

Update test case. Remove blank line whitespace.
 2018-04-05 16:22:18 +03:00
Ned Batchelder
2f52e81d28 Merge pull request #17819 from open-craft/tomaszgy/fix_hawthorn_default_theme_issues 
Fix styling of navtabs.
 2018-04-05 07:59:46 -04:00
Uzair Rasheed
7c466fa620 Merge pull request #17858 from edx/LEARNER-1487/send_email_on_successfull_verification 
Send email to learners to inform verification status
 2018-04-05 16:21:41 +05:00
uzairr
0865e52c32 Send email to learners to inform verification status 
Support Team need to handle bulk of tickets every month about
the verification status of learners.To avoid it,suitable changes
have done to send verification email to the learner.

LEARNER-1487
 2018-04-05 15:17:49 +05:00
Tasawer Nawaz
072b5c5079 Merge pull request #17870 from edx/tasawer/learner-3783/update-support-form-for-logged-out-usrs 
add note on for logged out users on support form
 2018-04-05 11:34:47 +05:00
Stu Young
50744e0aac Merge pull request #17876 from edx/testeng/bokchoy_auto_cache_update_cffbf0280304e9c331e8ea1fe87f020ea6a3a329 
Bokchoy db cache update
 2018-04-04 14:53:34 -05:00
Tyler Hallada
d31249ba20 Studio-frontend in-context image selection modal 
Open edit image modal via a custom signal

Send img tag attributes in open signal

Send natural image dimensions if no attr specified

Add new modal button in addition to old button

Also load built CSS when waffle switch on

Swap out TinyMCE toolbar button on waffle switch

Pass LANGUAGE_CODE from Django to template to studio-frontend

Define request.LANGUAGE_CODE in test_container_page.py
 2018-04-04 15:48:36 -04:00
Brian Mesick
e71cfb2813 Merge pull request #17879 from edx/bmedx/remove_default_site_from_attributes 
Exclude the default site from UserAttribute 'created_on_site'
 2018-04-04 15:46:58 -04:00
bmedx
88153b7ac2 Exclude the default site from UserAttribute 'created_on_site' 
This table is getting slammed and causing deadlocks, since 90% of it
is just this one setting on the default site we're going to stop saving
those and make it a default assumption going forward.
 2018-04-04 15:00:59 -04:00
edx-cache-uploader-bot
62d8ae5cc2 Updating migrations 2018-04-04 13:42:03 -05:00
Douglas Hall
eb00772071 Merge pull request #17875 from edx/douglashall/ENT-952 
Upgrade edx-enterprise package to 0.67.1.
 2018-04-04 13:32:38 -04:00
Michael Youngstrom
382f8200be Merge pull request #17862 from edx/testeng/bokchoy_auto_cache_update_6e2e48398da9f11a3fe7ac599d6110034865b901 
Bokchoy db cache update
 2018-04-04 11:39:42 -04: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
hamzamunir7300
315c06c633 Merge pull request #17857 from edx/LEARNER-4858 
Border Appearing on wiki and Progress page.
 2018-04-04 18:48:42 +05:00
Douglas Hall
d238a2de96 Upgrade edx-enterprise package to 0.67.1. 
https://github.com/edx/edx-enterprise/compare/0.67.0...0.67.1
 2018-04-04 09:17:20 -04: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
Waheed Ahmed
80efe99df4 Merge pull request #17869 from edx/waheed/LEARNER-1220-fix-enabling-debug-allows-api-access-without-authentication 
Fix enabling debug allows api access without authentication.
 2018-04-04 16:50:04 +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
Tasawer Nawaz
67962748b2 add note on for logged out users on support form 
LEARNER-3783
 2018-04-04 12:43:07 +05:00
Attiya Ishaque
1a76384959 Merge pull request #17856 from edx/ai/EDUCATOR-2436-due-date-format 
Fix due date display format according to set in advanced settings.
 2018-04-04 11:13:52 +05:00
Jillian Vogel
4af929fb8b Fixes test failures 2018-04-04 10:22:39 +09:30
Jillian Vogel
761acdfc6d Shows the account activation message in the main content area 
if HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED is enabled.
 2018-04-04 09:33:32 +09:30
Jillian Vogel
e417c5f8c2 Adds EMPTY_DASHBOARD_MESSAGE Site Configuration flag 
When set, displays the configured text/markup under "You are not enrolled in any courses yet."

Adjusts left/right padding on .empty-dashboard-message to keep our extra message from hitting the sides.
 2018-04-04 09:33:32 +09:30
Jillian Vogel
22ee400b15 Adds HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED 
Site Configuration and feature flag

When set, it hides the Courses list on the Learner Dashboard page if the
learner has not yet activated their account.
 2018-04-04 09:33:32 +09:30
Jillian Vogel
b44114d171 Shows the account activation message in the sidebar 
and removes the DISPLAY_ACCOUNT_ACTIVATION_MESSAGE_ON_SIDEBAR flag, since this
feature is now always on.

Marks the top banner as deprecated.
 2018-04-04 09:33:32 +09:30
Eric Fischer
398700a1af Merge pull request #17863 from edx/dahlia/sfe-1.6.3 
studio-frontend 1.6.3
 2018-04-03 16:43:09 -04:00