Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
42,931 Commits 1 Branch 0 Tags
956cb919554c8103149fa6442254bdfed0ce32d1
Commit Graph

15096 Commits

Author SHA1 Message Date
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
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
Harry Rein
f534e01888 Merge pull request #16096 from edx/HarryRein/LEARNER-2308-update-course-goal 
Harry rein/learner 2308 update course goal
 2017-10-06 14:11:23 -04:00
Sofiya Semenova
dbfdff090d Checking if CAD exists before using it 2017-10-06 13:24:56 -04:00
Harry Rein
f3f3edf4bd Allow user to update course goal on course home page. 
LEARNER-2308

Once a goal has been set for a user on the course home message,
allow them to update it on the course home side bar. Automatically
sets a course goal for users when enrolling in a verifiable course.
 2017-10-06 13:07:03 -04:00
adeel khan
27a73f77da Merge pull request #16124 from edx/adeel/LEARNER_2607_untranslatedtooltip_progresstab_chart 
Adds translation for lms progress chart tooltip.
 2017-10-06 19:28:02 +05:00
Robert Raposa
91bf523920 Merge pull request #16175 from edx/robrap/LEARNER-2026-clean-up 
LEARNER-2026: Revert remains of 'upgrade upsell to course info banner'.
 2017-10-06 10:02:49 -04:00
Adeel Khan
9ef887c547 Adds translation for lms progress chart tooltip. 
Tooltip text under lms->courseview->progress tab->chart
was not under any translation, causing it to appear untranslated for
learners. This would enable its translation to any language.

LEARNER-2607
 2017-10-06 18:32:02 +05: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
Rabia Iftikhar
b245fa0374 Merge pull request #16159 from edx/ri/EDUCATOR-139-add-charset-webOb-response 
EDUCATOR-139 Add charset to the WebOb response
 2017-10-05 22:42:43 +05: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
Sofiya Semenova
4cd7a886be Merge pull request #16109 from edx/ssemenova/ed-1315-part2 
Remove "final course details" message, replace with another
 2017-10-05 12:40:45 -04:00
John Eskew
0890193d6b PLAT-1408: Import csrf from new path. 2017-10-05 11:12:53 -04:00
John Eskew
7dfb6cc681 Change all UTC timezones to import from pytz instead of Django. 2017-10-05 11:12:52 -04:00
John Eskew
02f26f55ce Remove unused imports. Push model imports down into relevant methods. 
Mock out the static_replace modules in the proper location.
 2017-10-05 11:12:52 -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
Robert Raposa
07061caf91 Revert remains of 'upgrade upsell to course info banner'. 
TNL-6381 added an upgrade upsell to course info. In PR #15265, this was
partially removed/moved, but some clean-up work remained.

LEARNER-2026
 2017-10-05 10:54:08 -04:00
rabiaiftikhar
ee558581e2 EDUCATOR-139 Add charset to the WebOb response 2017-10-05 15:36:49 +05:00
Nimisha Asthagiri
b5435e6f5a Course Grade reports: eliminate CSM calls, user-transformed structures 
EDUCATOR-558
 2017-10-05 01:12:49 -04:00
Andy Armstrong
7dfe12a1f3 Show course home messages for important course dates 
LEARNER-2073
 2017-10-02 17:27:51 -04:00
Matthew Piatetsky
1aff33dcdd Merge pull request #16044 from edx/LEARNER-2546 
LEARNER-2546 Take users from track selection to course home instead of dashboard
 2017-10-02 17:03:56 -04:00
Matt Tuchfarber
9de5cbea12 Bump enterprise to 0.48.2 2017-10-02 13:40:31 -04:00
Matthew Piatetsky
d394c05236 Take users from track selection to course home instead of dashboard 
LEARNER-2546
 2017-10-02 12:15:12 -04:00
Michael Frey
3e24572664 increase staff user rate limit 2017-10-02 09:03:46 -04:00
Nimisha Asthagiri
8721dad500 Merge pull request #16083 from edx/naa/grades-remove-read-only 
Grades: remove read_only param and create method
 2017-09-29 14:50:43 -04:00
rabia23
ec105008b6 EDUCATOR-139 add log to identify the cause of error 2017-09-28 13:12:21 +00:00
Nimisha Asthagiri
1febdbfac9 Grades cleanup: remove read_only param and create method 
EDUCATOR-171
 2017-09-28 07:48:25 -04:00
Zubair Afzal
24df31402e Merge pull request #16067 from edx/zub/ENT-624-update-enterprise-api-support 
Ent 624 update enterprise api support
 2017-09-28 13:29:41 +05:00
Robert Raposa
643d7d2151 Merge pull request #16103 from edx/HarryRein/bok-choy-removal-flaky 
Remove Flaky StudentAdminTest test.
 2017-09-27 21:38:16 -04:00
zubair-arbi
4040c45f06 update enterprise api support for request users and enterprise service user 
ENT-624
 2017-09-27 18:04:44 +05:00
McKenzie Welter
190b2c36fe Changed lookup logic to consider language learner-1995 2017-09-27 07:53:39 -04:00
Uman Shahzad
f94558f464 Merge pull request #16094 from open-craft/uman/ent-0.48.1 
[WL-1240] [ENT-640] [ENT-628] [ENT-629] [ENT-630] [ENT-631] [ENT-634] [ENT-644] Bump to edx-enterprise to 0.48.1
 2017-09-27 00:16:34 +05:00
Harry Rein
6ba34f463a Remove Flaky StudentAdminTest test. 
EDUCATOR-552
 2017-09-26 13:42:29 -04:00
Robert Raposa
fb1d688670 Merge pull request #16091 from edx/robrap/LEARNER-2641 
LEARNER-2641: Add course goals bokchoy test.
 2017-09-26 11:30:49 -04:00
John Eskew
fe8f7f553d Merge pull request #16022 from edx/jeskew/toxify_edx_platform_testing 
Add tox testing to edx-platform.
 2017-09-26 11:14:11 -04:00
Diana Huang
d696677ce8 Merge pull request #15968 from edx/diana/header-updates 
LEARNER-2318: As a learner I should have an easy way to get to my learner profile
 2017-09-26 10:40:41 -04:00
Robert Raposa
407a43f827 Add course goals bokchoy test. 
LEARNER-2641
 2017-09-26 09:12:50 -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
083ccdb95a Remove unneeded WRITE_ONLY_IF_ENGAGED waffle switch 2017-09-25 16:13:07 -04:00
Uman Shahzad
a27688afd0 Bump to edx-enterprise to 0.48.1 2017-09-26 00:43:09 +05:00
John Eskew
4de2ad4c25 Upgrade lxml to use pre-built pkg - no longer requires Cython. 2017-09-25 10:33:15 -04:00
John Eskew
550c1e0725 Use simpler contract spec to fix parsing error. 2017-09-25 10:33:14 -04:00
Brian Beggs
2d19136beb Merge pull request #16009 from edx/jmbowman/pytest_unit_tests 
PLAT-1677 Switch to pytest for unit tests
 2017-09-25 08:57:01 -04:00
Jeremy Bowman
ca97e946a6 Switch to pytest for unit tests 2017-09-22 16:07:53 -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