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

3861 Commits

Author SHA1 Message Date
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
Robert Raposa
112938e4ac Refactor site course enrollment filtering. 2017-10-11 12:21:42 -04:00
John Eskew
737ebccb74 Remove django-simple-history and all HistoricalRecords. 2017-10-11 11:36:06 -04:00
Douglas Hall
612d962962 Merge pull request #16196 from edx/douglashall/update_enterprise_0_51_2 
Updating edx-enterprise to 0.51.3.
 2017-10-11 10:37:39 -04:00
Jesse Shapiro
c4767e253b Add middleware classes dynamically from configuration and switch MIDDLEWARE_CLASSES to use a list 2017-10-11 09:16:41 -04:00
Douglas Hall
ca903278f5 Updating edx-enterprise to 0.51.2. 
https://github.com/edx/edx-enterprise/compare/0.51.0...0.51.2
 2017-10-11 08:47:50 -04:00
Alex Dusenbery
4489745475 Check if cert_info dict is empty before rendering dashboard_certificate_information.html 2017-10-10 14:17:58 -04:00
Aamish Baloch
7c3dab08a7 YONK-776: added thread_followed and thread_unfollowed signals 2017-10-09 19:14:38 +05:00
Calen Pennington
dd53edc6e0 Cache upgrade_deadline on CourseEnrollment objects 2017-10-06 15:23:42 -04:00
Sofiya Semenova
3fcd7c69de Merge pull request #16183 from edx/ssemenova/ed-1315-part3 
Checking if CAD exists before using it in dashboard
 2017-10-06 14:50:05 -04:00
Troy Sankey
f44f304559 Merge pull request #16176 from edx/pwnage101/remove-1.4-shims_PLAT-1424 
[WIP] cleanup django 1.4 shims and mentions
 2017-10-06 14:27:31 -04:00
Sofiya Semenova
dbfdff090d Checking if CAD exists before using it 2017-10-06 13:24:56 -04:00
Troy Sankey
e94d265fa7 Remove our copy of the slugify() implementation 2017-10-05 15:37:01 -04:00
Jesse Shapiro
f160980008 Remove unused generic Enterprise-related enrollment logic 2017-10-05 14:47:21 -04:00
John Eskew
b07826cbc0 Merge pull request #16148 from edx/jeskew/initial_django_1.11_startup_changes 
Initial Django 1.11 startup changes
 2017-10-05 12:48:26 -04:00
John Eskew
0890193d6b PLAT-1408: Import csrf from new path. 2017-10-05 11:12:53 -04:00