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

3876 Commits

Author SHA1 Message Date
Saleem Latif
896da1020b Activation email received when skip_email_verification flag is 'True' 2017-10-30 14:13:42 +05:00
Brian Beggs
3608b86273 Merge pull request #16309 from edx/bbeggs/PLAT-1411 
Replace SubfieldBase functionality PLAT-1411
 2017-10-27 10:41:32 -04:00
Brian Beggs
ca92ffe21d Remove SubfieldBase metaclass 2017-10-26 16:59:51 -04:00
Tyler Hallada
52897d5808 Merge pull request #16346 from edx/thallada/ret-org-opt-out 
Org-level schedule upgrade deadline opt-out
 2017-10-26 13:31:21 -04:00
Tyler Hallada
806114a3ef Check org before course deadline config w/ tests 2017-10-25 17:54:47 -04:00
Matthew Piatetsky
2cb2e5e3eb Merge pull request #16344 from edx/LEARNER-2412 
Fix request to currency endpoint
 2017-10-25 16:41:45 -04:00
Matthew Piatetsky
e1c24084e9 Fix request to currency endpoint 2017-10-25 15:38:10 -04:00
Hasnain Naveed
b9cd1043df Merge pull request #16320 from edx/hasnain-naveed/WL-1060 
WL-1060 | Made the dashboard social sharing site aware.
 2017-10-25 16:01:41 +05:00
Albert (AJ) St. Aubin
93c3ff2a98 Merge pull request #16273 from edx/aj/LEARNER-1733 
Implement Entitlement Model for Course Centric Architecture
 2017-10-25 07:00:32 -04:00
Albert St. Aubin
a9011fde58 Implement Entitlement Model for Course Centric Architecture 
[LEARNER-1733]
 2017-10-24 19:12:55 -04:00
Gabe Mulley
e6abdf7e63 Merge pull request #16328 from edx/mulby/fix-course-sock 
Merge PR 16260 back into master with a fix for the course sock
 2017-10-24 15:08:05 -04:00
Harry Rein
ed2e6dc889 Merge pull request #16306 from edx/HarryRein/responsive-dashboard 
Harry rein/responsive dashboard
 2017-10-24 12:33:12 -04:00
Gabe Mulley
44e5afba1e Revert "Revert "Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging"" 
This reverts commit b541dfa3fd.
 2017-10-24 11:18:06 -04:00
Harry Rein
889e9880f5 Responsive dashboard and learner profile. 2017-10-24 11:08:35 -04:00
Hasnain
2277aaca3f WL-1060 | Made the dashboard social sharing site aware. 2017-10-24 16:35:44 +05:00
Sanford Student
fd8a9fdb02 EDUCATOR-1511: credit users added to verified user partition irrespective of upgrade deadline 2017-10-23 13:14:47 -04:00
Jillian Vogel
1b63bd9cd7 Merge pull request #16155 from open-craft/jill/enable_enterprise_integration 
Lets ENABLE_ENTERPRISE_INTEGRATION be configurable
 2017-10-23 20:09:43 +10:30
Harry Rein
160dba9505 Merge pull request #16210 from edx/HarryRein/responsive-header 
Adding a responsive, unified header to the LMS.
 2017-10-20 17:12:00 -04:00
Harry Rein
3d79e3e05d Adding unified, responsive header. 2017-10-20 16:24:31 -04:00
edx-pipeline-bot
d8620c952a Merge pull request #16296 from edx/release-mergeback-to-master 
Merge release back to master
 2017-10-20 14:52:24 -04:00
John Eskew
ce37e6d77e Merge pull request #16286 from edx/jeskew/move_third_party_auth_startup_code 
Move third_party_auth settings code to ready method.
 2017-10-20 11:45:37 -04:00
Eric Fischer
b541dfa3fd Revert "Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging" 
This reverts commit a13595352f, reversing
changes made to 68d5fe8922.
 2017-10-20 10:45:40 -04:00
Nimisha Asthagiri
41862cf163 Merge pull request #16035 from proversity-org/proverity/NVN-enrollment-search-instructor-dashboard-fix 
FIX: course enrollment search, FIX: hidden tabs on instructor dashboard
 2017-10-19 17:50:06 -04:00
John Eskew
a6757e47a4 Move third_party_auth settings code to ready method. 2017-10-19 16:17:31 -04:00
Gabe Mulley
dafeca5770 Change upgrade deadline messaging 2017-10-19 10:59:44 -04:00
Jillian Vogel
425239a509 Disables Enterprise Integration feature by default 
Moves ENABLE_ENTERPRISE_INTEGRATION to settings.FEATURES,
and changes the default value to False.
 2017-10-19 15:58:13 +10:30
John Eskew
e28932c74a Merge pull request #16262 from edx/jeskew/fix_historical_deletion_mgmt_cmd 
Fixes to mgmt cmds which delete django-simple-history data.
 2017-10-18 10:30:46 -04:00
Brian Mesick
9e91d3d0be Merge pull request #16070 from edx/bmedx/settings_tuple_to_list_PLAT-1530 
Change Django settings from tuples to lists to prep for 1.11 upgrade
 2017-10-18 09:20:14 -04:00
John Eskew
41aaaab584 Fixes to mgmt cmds which delete django-simple-history data. 2017-10-18 09:15:37 -04:00
Brian Mesick
ba4c6ca2aa Merge pull request #16256 from edx/bmedx/django111_models_and_migrations_cleanup 
Remove empty models.py files
 2017-10-18 09:03:32 -04:00
John Eskew
eb99657770 Merge pull request #16220 from edx/jeskew/delete_historical_data 
Mgmt commands to clear data from historical tables.
 2017-10-18 09:00:21 -04:00
Uman Shahzad
b7011ec85c Merge pull request #16199 from edx/mattdrayer/ENT-698 
mattdrayer/ENT-698: Log additional context for SuccessFactors errors.
 2017-10-18 15:01:03 +05:00
Matt Drayer
8e51c69a51 Log additional context for SuccessFactors errors. 2017-10-18 12:41:35 +05:00
Gabe Mulley
02aae86b30 Merge pull request #16244 from edx/fix-flaky-test 
fix flaky throttling test
 2017-10-17 21:48:10 -04:00
bmedx
763fa4de99 Remove empty models.py files 2017-10-17 16:21:21 -04:00
John Eskew
f3e089bd3f Mgmt commands to clear data from historical tables. 2017-10-17 15:27:59 -04:00
Sofiya Semenova
b8d73df5a4 Cleaning up dashboard_certificate_information template. 2017-10-17 13:27:19 -04:00
bmedx
21791ccb58 Change Django settings from tuples to lists to prep for 1.11 upgrade 2017-10-17 12:53:02 -04:00
Gabe Mulley
34cc63d993 remove slow and flaky throttling tests 2017-10-17 09:25:22 -04:00
Gabe Mulley
7d6aa950e9 fix flaky throttling test 2017-10-16 12:46:00 -04:00
Aamish Baloch
02ab4a0364 Merge pull request #16146 from edx/aamishbaloch/YONK-776 
YONK-776: added thread_followed and thread_unfollowed signals
 2017-10-16 11:54:49 +05:00
Nimisha Asthagiri
43c7a5171f Merge pull request #16219 from edx/ret/dynamic-pacing-email 
Course Update emails (initial)
 2017-10-13 17:28:36 -04:00
John Eskew
e7f288882d Merge pull request #16188 from edx/jeskew/remove_django_simple_history 
Remove all usage of the django-simple-history module.
 2017-10-13 13:22:52 -04:00
Calen Pennington
12e1af275a Merge pull request #16092 from edx/upsell-nudges-for-unverified-users 
Upsell nudges for unverified users
 2017-10-13 11:32:29 -04:00
Nimisha Asthagiri
741917e92b Course Update emails 2017-10-13 10:53:44 -04:00
sandroroux
40d3f4f2fc Unit tests for "_add_upsell_button_to_email_template". 2017-10-13 10:08:52 -04:00
Calen Pennington
8468357ac4 Separate the date and link logic out of VerifiedUpgradeDeadlineBlock, so that it can be called directly with prefetched data for check_and_get_upgrade_link_and_date 2017-10-13 10:01:34 -04:00
John Eskew
194413cdf9 Add migrations which remove HistoricalRecord tables. 2017-10-12 11:20:25 -04:00
Matthew Piatetsky
c741bcbee7 Implement local currency in lms 
LEARNER-2412
 2017-10-11 14:37:18 -04:00
Robert Raposa
344e13b1ce Merge pull request #16179 from edx/robrap/refactor-site-enrollment-filter 
Refactor site course enrollment filtering.
 2017-10-11 14:10:08 -04:00