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

1704 Commits

Author SHA1 Message Date
Saleem Latif
55df657000 Merge pull request #16086 from edx/saleem-latif/ENT-656 
ENT-656: Create API View for ApiAccessRequest model
 2017-09-28 13:31:53 +05: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
Saleem Latif
cb7d8dcb86 Create API View for ApiAccessRequest model 2017-09-28 12:27:13 +05: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
Robert Raposa
23fbde8ef1 Refactor Goal Enum to Choices. 2017-09-26 15:59:07 -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
Ned Batchelder
ed9b93ff1a Merge pull request #16100 from edx/nedbat/lazy_format 
Have to format lazily for translated constant messages
 2017-09-26 13:05:16 -04:00
Ned Batchelder
f8f911ae5c Have to format lazily for translated constant messages 2017-09-26 11:39:36 -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
Uman Shahzad
ff0374e695 Remove any trace of enterprise_customer_users in ENT API. 2017-09-26 15:22:18 +05: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
Diana Huang
b5a0d0ce0a Remove waffle flag for showing certs on profile. 
Certs are displayed by default to everyone.
 2017-09-25 15:38:16 -04:00
Gabe Mulley
a2dc27e6b1 fix multi-course emails and update ACE 2017-09-25 14:07:08 -04:00
John Eskew
2194d390c8 Remove memory dump signal until meliae packaging issues are resolved. 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
Diana Huang
ab44ea2b26 Merge pull request #16079 from edx/HarryRein/messaging-within-messaging-bug 
Fix issue with course message classes.
 2017-09-22 16:01:41 -04:00
Diana Huang
925cc7b850 Merge pull request #16078 from edx/diana/hide-explore-courses 
LEARNER-2521 - Only show 'Explore New Courses' button when courses are browsable.
 2017-09-22 14:44:51 -04:00
Harry Rein
fcf5f03b2d Fix issue with course message classes. 2017-09-22 14:38:04 -04:00
Diana Huang
f7b5066bf9 Only show 'Explore New Courses' button when courses are browsable. 2017-09-22 13:50:55 -04:00
Harry Rein
2fa8fa2249 Merge branch 'master' into HarryRein/LEARNER-2471-safari-sock-issue 2017-09-22 12:17:15 -04:00
Harry Rein
990a8cbfe6 Merge pull request #16008 from edx/HarryRein/LEARNER-2307-course-goal-messaging 
LEARNER-2307: Course Goal Messaging
 2017-09-22 11:53:11 -04:00
Harry Rein
afe35acf80 Fixing sock issue on master in safari. 2017-09-22 11:02:36 -04:00
Alex Dusenbery
00dadc3a3a EDUCATOR-1402 | Fix flaky generate_course_overview test. 2017-09-22 09:59:56 -04:00
Harry Rein
bc76ffe5dc Add message for setting course goal. 
LEARNER-2307
 2017-09-22 09:56:27 -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
McKenzie Welter
cc15081399 Merge pull request #16068 from edx/McKenzieW/learner-2457 
Fixing util to gather course_run data from catalog
 2017-09-21 14:27:05 -04:00
Gabe Mulley
fab1769be4 update nudge templates 2017-09-21 13:41:51 -04:00
McKenzie Welter
f846442233 language --> content_language and get_fields() actually returns 2017-09-21 13:25:40 -04:00
Andy Armstrong
de0380ca0e Merge pull request #16017 from edx/diana/profile-messaging 
LEARNER-2530: Messaging changes on Learner Profile
 2017-09-21 11:35:42 -04:00
Alex Dusenbery
d89afa0832 EDUCATOR-1207 | Run generate_course_overview command via celery task, in batches. 2017-09-21 11:26:59 -04:00
Diana Huang
cbfea6515d Add new info message to profile page. 2017-09-21 10:19:40 -04:00
Douglas Hall
610a4100af Revert "Initialize enterprise api client with provided user" 2017-09-20 09:55:02 -04:00
Alex Dusenbery
42829bd272 EDUCATOR-1103 | Restrict the number of courses to run a single opt-in query for. 2017-09-19 15:27:54 -04:00
Ned Batchelder
253c6fba24 Have to use ugettext_lazy for import-time translations 2017-09-19 14:11:05 -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
zubair-arbi
16120efaeb Initialize enterprise api client with provided user 
ENT-624
 2017-09-19 14:56:43 +05:00
Nimisha Asthagiri
813007bb49 Schedules/ACE - support debug logging via waffle 2017-09-16 22:03:28 -04:00
McKenzie Welter
531a51f75c Added util method to retrieve individual course_run data from Catalog 2017-09-15 15:03:20 -04:00
Douglas Hall
c243fb52f3 Upgraded edx-enterprise to 0.45.0. 
ENT-638
 2017-09-14 14:35:45 -04:00
Michael LoTurco
5b349333c8 Merge pull request #15999 from edx/MLoTurco/learner-1993-alt 
Add Configuration to Enable Translated Web-Certificates
 2017-09-14 13:04:21 -04:00
Sanford Student
e4735a6aba switch over to unified waffle switch 
for EDUCATOR-1313
 2017-09-14 09:58:39 -04:00
Michael LoTurco
2399f0ab16 Added Fields to CertificateGenerationCourseSetting 2017-09-13 12:42:51 -04:00
Nimisha Asthagiri
67a246ad93 Merge pull request #15998 from edx/ret/update-schedule-date-change 
Update schedule start only if new course start date is in the future
 2017-09-12 11:26:43 -04:00
Gabe Mulley
58f0be290b Merge pull request #15990 from edx/ret/compact-footer 
Make the footer more visually compact
 2017-09-12 08:24:36 -04:00
Calen Pennington
cd4ebaf23c Only send one email even if there are multiple enrollments by the same user on the same day 2017-09-12 08:23:21 -04:00
Gabe Mulley
acd50cfe69 tighten up the footer of the re-engagement emails 2017-09-11 17:10:06 -04:00
Nimisha Asthagiri
65f8731a73 Update schedule start only if new course start date is in the future 2017-09-11 16:19:46 -04:00