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

15861 Commits

Author SHA1 Message Date
McKenzie Welter
435c3c6338 mark support (re)issued entitlements as unrefundable 2018-04-12 12:16:37 -04:00
Jeff LaJoie
c3bb21c714 Merge pull request #17904 from edx/jlajoie/LEARNER-4578 
LEARNER-4578: Adds in JQuery password validation on Studio
 2018-04-12 12:12:56 -04:00
Uman Shahzad
6dcf3ca7b0 Merge pull request #17910 from edx/uman/show-enterprise-displayname 
[ENT-924] Replace sensitive SSO usernames with generic Enterprise displayname
 2018-04-12 20:20:18 +05:00
Uman Shahzad
d58bd06928 Show Enterprise display name if we should hide sensitive username. 2018-04-12 19:10:30 +05:00
edx-cache-uploader-bot
46d14c233c Updating migrations 2018-04-12 09:49:32 -04:00
Brittney Exline
3f3f8699a4 Merge pull request #17911 from edx/bexline/tpa_model_cleanup 
ENT-943 Cleanup of old third_party_auth provider slug fields
 2018-04-11 10:56:07 -06:00
Farhanah Sheets
d8d7e33879 Merge pull request #17905 from edx/fsheets/sfe-search-cleanup 
Remove Studio Assets Search Waffle & Add test
 2018-04-10 17:14:21 -04:00
Feanil Patel
a7fa0c211d Revert "PLAT-2060 Use pip-tools to manage requirements files" 2018-04-10 12:54:41 -04:00
Brittney Exline
9a86a67ae0 ENT-943 Cleanup of old third_party_auth provider slug fields 2018-04-10 09:58:31 -04:00
Jeremy Bowman
432347b881 PLAT-2060 Use pip-tools to manage requirements files 2018-04-09 17:07:02 -04:00
Jeff LaJoie
aeb85c59d3 LEARNER-4578: Adds in password validation on Studio 2018-04-09 15:26:12 -04:00
sanfordstudent
db5d118269 Merge pull request #17878 from edx/sstudent/unenroll_api 
Sstudent/unenroll api
 2018-04-09 15:25:11 -04:00
Farhanah Sheets
facb03ebd3 Remove search settings and add test to validate search visibility 2018-04-09 14:38:35 -04:00
Sanford Student
9526bbc9eb Create API endpoint to unenroll user from all courses; EDUCATOR-2603 2018-04-09 14:37:32 -04:00
Feanil Patel
c5b0a104d6 Merge pull request #17772 from edx/feanil/cleanup_pre 
Feanil/cleanup pre
 2018-04-09 13:17:26 -04:00
Michael Terry
1c1b8451ba Use unicode passwords when validating 
Requiring that up front lets us properly validate length and such.
 2018-04-09 09:43:30 -04:00
Michael Youngstrom
e166a9c01f Merge pull request #17854 from edx/youngstrom/increase-bokchoy-shards 
Double the number of bok-choy shards
 2018-04-06 16:20:43 -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
Michael Youngstrom
7820d2509c Increase the number of bok-choy shards 2018-04-06 15:38:14 -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
McKenzie Welter
b011bdabb4 Merge pull request #17895 from edx/McKenzieW/learner-3716 
add test coverage for entitlement course run retrieval
 2018-04-06 12:15:50 -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
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
Brittney Exline
d31d9bd684 ENT-942 Implement an abstraction layer for SoftwareSecurePhotoVerification class methods 2018-04-05 15:48:59 -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
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
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
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
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
edx-cache-uploader-bot
c420603913 Updating migrations 2018-04-03 13:24:54 -04: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
Brian Beggs
161bf6943d Merge pull request #17850 from mitodl/fix_aq_no_name_notmigrations 
Fixed error: ImportError: No module named notmigrations
 2018-04-02 14:07:26 -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
Jeremy Bowman
d622380cc5 Account for Django block on DDL in transactions 2018-04-02 11:47:54 -04:00
Amir Qayyum Khan
b6c6535f15 Fixed error: ImportError: No module named notmigrations 2018-04-02 17:44:59 +05:00
Alex Dusenbery
1cbf7ab0fb EDUCATOR-1290 | Remove over-limit block keys randomly for library content blocks. 2018-03-31 13:43:11 -04:00
Albert (AJ) St. Aubin
13e7ec6aa5 Merge pull request #17804 from edx/aj/LEARNER-4493 
Aj/learner 4493
 2018-03-30 12:24:31 -04:00
McKenzie Welter
2762a6114b allow site and mode to be nullable in admin form 2018-03-30 10:24:31 -04:00
Albert (AJ) St. Aubin
545c86a0a7 Merge pull request #17829 from edx/aj/LEARNER-4567 
Protection for when there is no CourseOverview data available.
 2018-03-30 07:30:22 -04:00
Troy Sankey
2e05eeca54 reorder 0017_auto_20180327_1631 to be after the other 0017 
The migration 0017_remove_icon_class_image_secondary_fields was in
conflict with 0017_auto_20180327_1631, so we bump the latter to 0018.
 2018-03-29 14:35:55 -04:00
edx-pipeline-bot
70ae23d4c2 Merge pull request #17831 from edx/release-mergeback-to-master 
Merge release back to master
 2018-03-29 13:58:22 -04:00