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

1654 Commits

Author SHA1 Message Date
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
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
Gabe Mulley
dafeca5770 Change upgrade deadline messaging 2017-10-19 10:59:44 -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
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
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
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
Alex Dusenbery
4489745475 Check if cert_info dict is empty before rendering dashboard_certificate_information.html 2017-10-10 14:17:58 -04:00
Calen Pennington
dd53edc6e0 Cache upgrade_deadline on CourseEnrollment objects 2017-10-06 15:23:42 -04:00
Sofiya Semenova
dbfdff090d Checking if CAD exists before using it 2017-10-06 13:24:56 -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
John Eskew
6294766c24 Split emitted signals from the student models file. 2017-10-05 11:12:50 -04:00
Sofiya Semenova
34e3ec6afe Ed-1315 part 2, removing progress message entirely and replacing with another 2017-10-05 11:06:22 -04:00
Nimisha Asthagiri
1febdbfac9 Grades cleanup: remove read_only param and create method 
EDUCATOR-171
 2017-09-28 07:48:25 -04:00
Diana Huang
1cfefe2457 Modify the header to show the learner profile. 
Remove the profile from the user dropdown.

LEARNER-2318
 2017-09-25 17:06:08 -04:00
Nimisha Asthagiri
56676d821d Merge pull request #16077 from edx/naa/grades-refactor 
Grades: move out of temporary new folder
 2017-09-22 14:03:05 -04:00
Gabe Mulley
3088c70f25 only override the upgrade deadline in self-paced courses 2017-09-22 12:48:38 -04:00
Nimisha Asthagiri
22edaf7d24 Grades: move out of temporary new folder 
EDUCATOR-1400
 2017-09-22 11:49:46 -04:00
sanfordstudent
5c88600fbf Merge pull request #16048 from edx/sstudent/EDUCATOR-1288 
Sstudent/educator 1288
 2017-09-21 16:48:46 -04:00
Sanford Student
d0e68f2d24 recalculate course grade on user partition change 2017-09-21 15:32:07 -04:00
Sofiya Semenova
b40ba4437b Merge pull request #16042 from edx/ssemenova/ed-1233 
Replace flakey PreRequisiteCourseTest.test_dashboard_message with Python unit test
 2017-09-20 10:22:11 -04:00
Sofiya Semenova
19e7d1e0cf Ed-1233 replace flaky bokchoy test with python test 2017-09-19 16:12:40 -04:00
Alex Dusenbery
ab71318104 EDUCATOR-1316 | Refactor courseware.views.views._get_cert_data and related functions. 2017-09-19 11:11:37 -04:00
Nico van Niekerk
f2d51639ba FIX: course enrollment search, FIX: hidden tabs on instructor dashboard 2017-09-18 09:34:46 +02:00
tasawernawaz
6263a5743f Fix attribute error while reseting password 
LEARNER-388
 2017-09-14 22:55:29 +05:00
ayub-khan
79b199bce9 Updated set_user_attribute method 2017-09-14 17:09:09 +05:00
asadiqbal
a3a105cb2c ENT-604 Fix SAML Error on UI 2017-09-12 14:50:52 +05:00
Jeremy Bowman
6fb7d63c9e Fixes for test order dependence 2017-09-06 11:31:37 -04:00
Jeremy Bowman
fd6af6b05e ddt usage cleanup 2017-09-05 17:25:51 -04:00
Andy Armstrong
ff5c6f0c30 Merge pull request #15868 from edx/andya/profile-certificates 
LEARNER-1860: Course certificates on the learner profile
 2017-09-01 07:12:03 -04:00
Andy Armstrong
6f888d6995 Add course certificates on the learner profile 
LEARNER-1860
 2017-08-31 20:58:35 -04:00
Gabe Mulley
6a36eb0183 Use ACE to 'send' Recurring Nudge emails 2017-08-31 16:58:08 -04:00
Clinton Blackburn
0a6029f7a7 Added verified upgrade hero to course run homepage 
Audit learners are now shown a prompt to upgrade to the verified track
of the course run. This message goes away after the learner upgrades.
 2017-08-30 17:01:27 -04:00
Hasnain Naveed
e4deef9dd6 Merge pull request #15451 from edx/mjevtic/remove-waffle-switches 
LEARNER-1146 | Remove populate-multitenant-programs waffle switch
 2017-08-30 15:06:46 +05:00
Harry Rein
9f88427f9b Add social links to learner profile. 
LEARNER-1859

Added fields to add social links to the user account settings file.
Added icons to the user profile when these links are set, only shown
when users show their entire profile. Added jasmine tests for account
settings and learner profile pages. Added python unit tests to test
validation on the user account.
 2017-08-29 13:53:08 -04:00
Nimisha Asthagiri
d23ed5e2e4 Merge pull request #15878 from edx/ret/foreign-key-course-key 
Ret/foreign key course key
 2017-08-29 09:00:51 -04:00
Saleem Latif
f087672d4b On edx.org instances, next URL for login page cannot contain 'edx.org'. 2017-08-25 17:31:35 +05:00
Calen Pennington
ceb0814fff Force the CourseKey alter tables to be noops from the SQL perspective 2017-08-24 11:38:05 -04:00