Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
Albert (AJ) St. Aubin
f1b91cb871 Merge pull request #16007 from edx/aj/LEARNER-2291 
Set formatting to show 2 decimal places on Program Purchase button
 2017-09-13 10:34:24 -04:00
Douglas Hall
04a61ff6a5 Merge pull request #15970 from open-craft/uman/enterprise-support-url 
[ENT-486] Add `ENTERPRISE_SUPPORT_URL` to environment config & version bump edx-enterprise to 0.44.0.
 2017-09-13 09:11:31 -04:00
Albert St. Aubin
9d0a1e80c7 Set formatting to show 2 decimal places on Program Purchase button 
[LEARNER-2291]
 2017-09-13 08:38:12 -04:00
Uman Shahzad
5fc4bad9ee Add ENTERPRISE_SUPPORT_URL to environment config and bump edx-enterprise to 0.44.0. 2017-09-13 07:42:09 -04:00
Andy Armstrong
393361e700 Merge pull request #15982 from edx/andya/sass-linting 
Lint Sass files using the rules in stylelint-config-edx
 2017-09-12 17:19:41 -04:00
sanfordstudent
bdd4f23204 Merge pull request #15994 from edx/sstudent/fix_certs_tests 
fix cert test
 2017-09-12 15:15:40 -04:00
Awais Jibran
c2e10e562c Merge pull request #15997 from edx/aj/audit-course-with-course-info 
EDUCATOR-1333 - Auto-certs: Courses w/o certificates still display certificate issue date
 2017-09-13 00:05:42 +05:00
Sanford Student
0bd8b199e1 fix cert test 2017-09-12 14:12:25 -04:00
Awais Jibran
b4d4041fc9 Auto-certs: Courses w/o certificates still display certificate issue date to learners 2017-09-12 22:52:23 +05:00
Calen Pennington
6156fe929e Add tests of recurring nudge template rendering 2017-09-12 08:23:21 -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
M. Rehan
8c37dff1a8 Merge pull request #15475 from OmarIthawi/omar/default-english-transcripts 
Allow displaying videos without transcripts
 2017-09-12 12:22:41 +05:00
tasawernawaz
9d7a1d5b53 send welcome email to only activated users 
LEARNER-2474
 2017-09-12 10:44:05 +05:00
Andy Armstrong
3bb6316620 Fix Sass quality issues in lms/static/sass/features 
Sass fixes
 2017-09-11 22:03:00 -04:00
Omar Al-Ithawi
302e1d923e Allow displaying videos without transcripts 2017-09-11 21:29:58 +03:00
Robert Raposa
939d03bc10 Update full name help text. 
LEARNER-2517
 2017-09-11 12:15:33 -04:00
sanfordstudent
c441244f66 Merge pull request #15993 from edx/sstudent/delete_test 
temporarily delete test failing on master
 2017-09-11 11:40:00 -04:00
Sanford Student
7e037b5a66 temporarily delete test failing on master 2017-09-11 11:23:44 -04:00
Noraiz Anwar
5cada093f1 Merge pull request #15870 from edx/noraiz/EDUCATOR-1089 
Do not overwrite external YouTube with value from VAL
 2017-09-11 19:18:02 +05:00
noraiz-anwar
1203eb5835 Do not override Default Video URL with value from VAL 2017-09-11 17:27:53 +05:00
Nimisha Asthagiri
5193649956 Update Schedules when start date changes on non-live courses 2017-09-10 08:41:26 -04:00
Marco Morales
0543748380 Merge pull request #15978 from edx/marcotuts/openedx-course-index/org-label-styling 
Org label styling on openedx course about pages
 2017-09-08 18:09:29 -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
Marco Morales
6c3924b40b Org label styling on openedx course about pages 
Modify organization label on openedx course index pages to not look like a button. 

Current: 


With Changes:
 2017-09-08 11:03:02 -04:00
Sanford Student
4f977fb228 common function for cert display date 2017-09-08 10:05:30 -04:00
Gregory Martin
c1dcb54a66 Update 'downloadable' status for mobile/other API 2017-09-07 14:25:01 -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
Fred Smith
75ca7342fe Merge pull request #15966 from edx/derf/reduce_celery_heartbeat_frequency 
reduce celery heartbeat frequency
 2017-09-07 08:17:28 -04:00
Andy Armstrong
6e10d2a556 Update to use Bootstrap beta release 
FEDX-375
 2017-09-06 22:49:05 -04:00
Gregory Martin
a51b9597e2 Merge pull request #15953 from edx/yro/update_cert_display_date 
Update Cert Display Date
 2017-09-06 16:10:41 -04:00
Jeremy Bowman
f15a686775 Merge pull request #15965 from edx/jmbowman/pytest_compatibility 
pytest compatibility fixes
 2017-09-06 16:03:26 -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
Gregory Martin
4d59eff8f6 Update cert display date 
EDUCATOR-1266
 2017-09-06 15:17:27 -04:00
Fred Smith
f891c0fae8 reduce celery heartbeat frequency 2017-09-06 14:58:34 -04:00
Jeremy Bowman
ded294c420 pytest compatibility fixes 2017-09-06 14:20:34 -04:00
Jeremy Bowman
97f5fe035b Fixes for pytest database usage 2017-09-06 13:15:34 -04:00
Andy Armstrong
d05b62a283 Only show passing certificates on a learner profile 
LEARNER-2486
 2017-09-06 12:32:15 -04:00
Sofiya Semenova
038d5182ec Merge pull request #15922 from edx/ssemenova/ed-1101 
"View/Request Certificate" button logic on progress page and dashboard
 2017-09-06 11:20:21 -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
Alex Dusenbery
0137e38e97 EDUCATOR-1241 | make a separate file to make decisions about auto generated certs. 2017-09-05 16:15:43 -04:00
Sofiya Semenova
f3f7e78e24 educator-1101 view/request certificate button logic on progress page and dashboard 2017-09-05 15:29:22 -04:00
Harry Rein
d0bc499f66 Fix styling issues on learner profile. 
LEARNER-2485

1) Joined Date is shown in bold and there is no line below to separate
it from the next section.
2) The bio shows up below the certificates.
3) Switching to 'limited profile' does not correctly hide the language,
location and joined date fields.
 2017-09-05 15:15:07 -04:00
Brian Mesick
94400d21b6 Merge pull request #15936 from edx/bmedx/oauth_token_delete_setting 
Add default OAUTH_DELETE_EXPIRED to LMS settings
 2017-09-05 11:04:13 -04:00
bmedx
bad68f8b1e Add default OAUTH_DELETE_EXPIRED to LMS settings 2017-09-01 11:06:54 -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