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

42617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Awais Jibran
b4d4041fc9 Auto-certs: Courses w/o certificates still display certificate issue date to learners 2017-09-12 22:52:23 +05: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
Brian Mesick
281c59daf8 Merge pull request #15958 from edx/bmedx/add_edx_lang_map_zh_hans 
Add language mapping for zh_CN to zh_HANS
 2017-09-12 10:19:41 -04:00
Asad Iqbal
0066dee0ea Merge pull request #15984 from edx/asadiqbal08/ENT-604 
ENT-604 Updated the log level
 2017-09-12 18:15:21 +05: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
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
asadiqbal
a3a105cb2c ENT-604 Fix SAML Error on UI 2017-09-12 14:50:52 +05: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
Tasawer Nawaz
9330f14dfb Merge pull request #15983 from edx/tasawer/learner-2474/send-welcome-email-to-only-active-users 
send welcome email to only activated users
 2017-09-12 12:17:47 +05:00
tasawernawaz
9d7a1d5b53 send welcome email to only activated users 
LEARNER-2474
 2017-09-12 10:44:05 +05: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
Omar Al-Ithawi
302e1d923e Allow displaying videos without transcripts 2017-09-11 21:29:58 +03:00
Robert Raposa
76d3b62bb5 Merge pull request #15989 from edx/robrap/lower-thresholds 
Lower xss thresholds.
 2017-09-11 13:40:08 -04:00
Robert Raposa
1936ab6f5c Lower xss thresholds. 2017-09-11 12:17:38 -04:00
Uman Shahzad
999fa418e5 Merge pull request #15979 from open-craft/uman/ent-0.43.5 
[ENT-587] Bump edx-enterprise to 0.43.5
 2017-09-11 21:01:47 +05: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
Nimisha Asthagiri
7de96486e7 Merge pull request #15961 from edx/ret/update-schedules-on-course-start-changes 
Update Schedules when start date changes on non-live courses
 2017-09-11 09:31:46 -04:00
noraiz-anwar
1203eb5835 Do not override Default Video URL with value from VAL 2017-09-11 17:27:53 +05:00
Clinton Blackburn
56eee715c1 Added support for deleting assets to delete_course management command 
The command now has an option to delete assets. This is relevant for
users of the split Mongo module store, which does not delete assets by
default.

Additionally, tests and docstrings have been updated.

LEARNER-2460
 2017-09-11 08:25:19 -04: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
ccf8d13725 Merge pull request #15941 from edx/ret/update-nudge-templates 
update recurring nudge templates
 2017-09-08 13:02:13 -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
Uman Shahzad
feaee089d5 Bump edx-enterprise to 0.43.5 2017-09-08 20:03:16 +05: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
Noraiz Anwar
e6f807b0d7 Merge pull request #15977 from edx/revert-15924-ai/EDUCATOR-1267-add-logs 
Revert "EDUCATOR-1267 Add logs in importing the course."
 2017-09-08 15:09:41 +05:00
Noraiz Anwar
2d026d587e Revert "EDUCATOR-1267 Add logs in importing the course." 2017-09-08 11:08:41 +05:00
Sofiya Semenova
91ac97518b Merge pull request #15974 from edx/ssemenova/ed-1260 
Educator-1260 - Course teams unable to save changes to dates
 2017-09-07 16:41:22 -04:00
Gregory Martin
14364dc7eb Merge pull request #15955 from edx/yro/update_mobile_api_certs 
Update 'downloadable' status for mobile/other API
 2017-09-07 15:53:52 -04:00
Sofiya Semenova
9f2e96d4a0 ed-1260 Course teams unable to save changes to dates 2017-09-07 15:18:13 -04:00
Andy Armstrong
6062e45e2f Merge pull request #15976 from edx/andya/open-edx-theme 
Provide a first class Open edX theme
 2017-09-07 15:05:50 -04:00
Gregory Martin
c1dcb54a66 Update 'downloadable' status for mobile/other API 2017-09-07 14:25:01 -04:00
Andy Armstrong
94add3a49f Provide a first class Open edX theme 
LEARNER-2513
 2017-09-07 13:44:02 -04:00
bmedx
454649c44d Add language mapping for zh_CN to zh_HANS, upgrade i18n-tools 
- Bump version of i18n_tools to v0.3.10
- Add mapping to allow i18n_tools to copy the zh_CN translations to
zh_HANS in preparation for the Django 1.11 upgrade.
 2017-09-07 13:28:16 -04:00
Brittney Exline
8d89bdaa50 Merge pull request #15971 from edx/bexline/enterprise_version_bump 
ENT-615/ENT-617 Upgrade enterprise package to latest version
 2017-09-07 12:53:31 -04:00
Brittney Exline
053639ab62 ENT-615/ENT-617 Upgrade enterprise package to latest version 2017-09-07 11:02:33 -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
Nimisha Asthagiri
5ac5149bef Merge pull request #15967 from edx/ret/no-schedules-for-instructor-led 
do not create schedules for instructor led courses
 2017-09-07 09:22:22 -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
Eric Fischer
804dc36164 Merge pull request #15964 from edx/efischer/ora_again 
edx-ora2 2.1.1
 2017-09-06 15:48:49 -04:00