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

1687 Commits

Author SHA1 Message Date
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
Nimisha Asthagiri
5193649956 Update Schedules when start date changes on non-live courses 2017-09-10 08:41:26 -04:00
Gabe Mulley
8a8c9747a7 update template 2017-09-08 12:09:13 -04:00
sanfordstudent
28fd39f7b1 Merge pull request #15975 from edx/sstudent/EDUCATOR-1317 
common function for cert display date
 2017-09-08 11:21:33 -04:00
Sanford Student
4f977fb228 common function for cert display date 2017-09-08 10:05:30 -04:00
Andy Armstrong
94add3a49f Provide a first class Open edX theme 
LEARNER-2513
 2017-09-07 13:44:02 -04:00
Harry Rein
c9f75f6bc8 Merge pull request #15926 from edx/HarryRein/FEDX-375-bootstrap-beta 
Harry rein/fedx 375 bootstrap beta
 2017-09-07 10:12:05 -04:00
Andy Armstrong
6e10d2a556 Update to use Bootstrap beta release 
FEDX-375
 2017-09-06 22:49:05 -04:00
Gabe Mulley
9429128776 do not create schedules for instructor led courses 2017-09-06 15:25:10 -04:00
Andy Armstrong
2d40854391 Merge pull request #15957 from edx/andya/learner-certificate-filtering 
Only show passing certificates on a learner profile
 2017-09-06 15:21:25 -04:00
Jeremy Bowman
97f5fe035b Fixes for pytest database usage 2017-09-06 13:15:34 -04:00
Jeremy Bowman
cebf6d3ea9 Merge pull request #15960 from edx/jmbowman/fragile_test_fixes 
Fixes for test order dependence
 2017-09-06 13:06:04 -04:00
Andy Armstrong
d05b62a283 Only show passing certificates on a learner profile 
LEARNER-2486
 2017-09-06 12:32:15 -04:00
Diana Huang
50c287ad90 Merge pull request #15949 from edx/diana/update-sock-copy 
Update sock copy.
 2017-09-06 12:16:27 -04:00
Jeremy Bowman
6fb7d63c9e Fixes for test order dependence 2017-09-06 11:31:37 -04:00
Jeremy Bowman
ae44f1840c Merge pull request #15951 from edx/jmbowman/ddt_cleanup 
ddt usage cleanup
 2017-09-06 11:19:39 -04:00
Harry Rein
d6e89e7bde Merge pull request #15956 from edx/HarryRein/LEARNER-2485-profile-issues 
LEARNER-2485: Fix styling issues on learner profile.
 2017-09-06 11:02:19 -04:00
Jeremy Bowman
fd6af6b05e ddt usage cleanup 2017-09-05 17:25:51 -04:00