Commit Graph

  • 288ae94857 Added language field to certificate template McKenzie Welter 2017-09-05 11:25:59 -04:00
  • 51beb277d1 Merge pull request #16024 from edx/douglashall/ENT-638 Douglas Hall 2017-09-15 05:31:42 -04:00
  • a904324f6d Merge pull request #16021 from edx/tasawer/learner-388-fix-attribute-error-in-password-reseting Tasawer Nawaz 2017-09-15 11:12:37 +05:00
  • 3b680cb8c5 Merge pull request #16023 from edx/jibsheet/bump-pygments Kevin Falcone 2017-09-14 15:59:08 -04:00
  • 63d78e3c41 Merge pull request #16020 from edx/nedbat/update-translations Ned Batchelder 2017-09-14 14:49:37 -04:00
  • c243fb52f3 Upgraded edx-enterprise to 0.45.0. Douglas Hall 2017-09-14 14:35:45 -04:00
  • 6263a5743f Fix attribute error while reseting password LEARNER-388 tasawernawaz 2017-09-14 16:55:43 +05:00
  • 5b349333c8 Merge pull request #15999 from edx/MLoTurco/learner-1993-alt Michael LoTurco 2017-09-14 13:04:21 -04:00
  • ef13c0cb4f pygments < 2.1 had a shell injection attack Kevin Falcone 2017-09-14 12:49:36 -04:00
  • dd0ea544db Merge pull request #16018 from edx/clintonb/studio-api-partial-update Simon Chen 2017-09-14 12:44:59 -04:00
  • 386b1fc21b Merge pull request #16013 from edx/sstudent/universal_waffle_switch sanfordstudent 2017-09-14 11:44:52 -04:00
  • e4735a6aba switch over to unified waffle switch for EDUCATOR-1313 Sanford Student 2017-09-13 12:28:04 -04:00
  • 8f7fbbf094 Merge pull request #16004 from edx/LEARNER-2165 Ayub khan 2017-09-14 18:12:12 +05:00
  • 79b199bce9 Updated set_user_attribute method ayub-khan 2017-09-12 18:01:16 +05:00
  • 5c21261aa3 Update translations (autogenerated message) Ned Batchelder 2017-09-14 11:42:32 +00:00
  • 4b9f017d4a Fixed bug for partial updates for Studio API course runs endpoint Clinton Blackburn 2017-09-13 18:04:29 -04:00
  • d6604ebb02 EDUCATOR-1354 | Get cert display date a little more safely; include course when updating cert webview context. Alex Dusenbery 2017-09-13 15:05:23 -04:00
  • f25674a606 Added pagination to Studio API course runs list endpoint Clinton Blackburn 2017-09-13 14:52:31 -04:00
  • 19b8723f38 Merge pull request #15980 from edx/LEARNER-748/Discussion-tab Uzair Rasheed 2017-09-14 01:37:35 +05:00
  • ddb8dfc979 Merge pull request #15685 from edx/jeskew/upgrade_edx_oauth2_provider John Eskew 2017-09-13 15:47:08 -04:00
  • 8b54c13fbc Fix inconsistency in the active tab colors uzairr 2017-09-08 14:31:28 +00:00
  • e62aa716f3 Merge pull request #15991 from edx/robrap/LEARNER-2517-full-name-desc Robert Raposa 2017-09-13 15:29:19 -04:00
  • 0eba0078e2 Bump versions of edx-django-oauth2-provider and edx-oauth2-provider John Eskew 2017-07-27 17:43:10 -04:00
  • 2399f0ab16 Added Fields to CertificateGenerationCourseSetting Michael LoTurco 2017-09-11 21:36:22 -04:00
  • 14b8c12e88 Added Studio API endpoint to update course image Clinton Blackburn 2017-09-09 17:59:32 -04:00
  • 317f719d3c Added Studio API endpoint to re-run course runs Clinton Blackburn 2017-09-02 22:41:53 -04:00
  • 256849950d Added Studio API endpoint to support course creation Clinton Blackburn 2017-09-01 16:19:34 -04:00
  • f1b91cb871 Merge pull request #16007 from edx/aj/LEARNER-2291 Albert (AJ) St. Aubin 2017-09-13 10:34:24 -04:00
  • 04a61ff6a5 Merge pull request #15970 from open-craft/uman/enterprise-support-url Douglas Hall 2017-09-13 09:11:31 -04:00
  • 9d0a1e80c7 Set formatting to show 2 decimal places on Program Purchase button [LEARNER-2291] Albert St. Aubin 2017-09-12 14:08:27 -04:00
  • 5fc4bad9ee Add ENTERPRISE_SUPPORT_URL to environment config and bump edx-enterprise to 0.44.0. Uman Shahzad 2017-09-07 01:54:05 +05:00
  • 393361e700 Merge pull request #15982 from edx/andya/sass-linting Andy Armstrong 2017-09-12 17:19:41 -04:00
  • 8de47f247c Address feedback Andy Armstrong 2017-09-12 15:28:12 -04:00
  • bdd4f23204 Merge pull request #15994 from edx/sstudent/fix_certs_tests sanfordstudent 2017-09-12 15:15:40 -04:00
  • c2e10e562c Merge pull request #15997 from edx/aj/audit-course-with-course-info Awais Jibran 2017-09-13 00:05:42 +05:00
  • 0bd8b199e1 fix cert test Sanford Student 2017-09-11 11:45:53 -04:00
  • b4d4041fc9 Auto-certs: Courses w/o certificates still display certificate issue date to learners Awais Jibran 2017-09-11 23:07:00 +05:00
  • 67a246ad93 Merge pull request #15998 from edx/ret/update-schedule-date-change Nimisha Asthagiri 2017-09-12 11:26:43 -04:00
  • 281c59daf8 Merge pull request #15958 from edx/bmedx/add_edx_lang_map_zh_hans Brian Mesick 2017-09-12 10:19:41 -04:00
  • 0066dee0ea Merge pull request #15984 from edx/asadiqbal08/ENT-604 Asad Iqbal 2017-09-12 18:15:21 +05:00
  • 58f0be290b Merge pull request #15990 from edx/ret/compact-footer Gabe Mulley 2017-09-12 08:24:36 -04:00
  • 6156fe929e Add tests of recurring nudge template rendering Calen Pennington 2017-09-07 11:16:22 -04:00
  • cd4ebaf23c Only send one email even if there are multiple enrollments by the same user on the same day Calen Pennington 2017-09-06 14:55:21 -04:00
  • a3a105cb2c ENT-604 Fix SAML Error on UI asadiqbal 2017-09-11 14:56:15 +05:00
  • 8c37dff1a8 Merge pull request #15475 from OmarIthawi/omar/default-english-transcripts M. Rehan 2017-09-12 12:22:41 +05:00
  • 9330f14dfb Merge pull request #15983 from edx/tasawer/learner-2474/send-welcome-email-to-only-active-users Tasawer Nawaz 2017-09-12 12:17:47 +05:00
  • 2f98f8af63 Use django storage mechanism to determine file size Jillian Vogel 2017-09-11 23:50:51 +09:30
  • 9d7a1d5b53 send welcome email to only activated users LEARNER-2474 tasawernawaz 2017-09-11 14:12:19 +05:00
  • 3bb6316620 Fix Sass quality issues in lms/static/sass/features Andy Armstrong 2017-09-10 23:23:11 -04:00
  • e5cab61897 Lint Sass files using the rules in stylelint-config-edx Andy Armstrong 2017-09-08 18:31:02 -04:00
  • 96e704e47c Allow theme template block override Chandrakant Gopalan 2017-08-31 13:37:05 -04:00
  • acd50cfe69 tighten up the footer of the re-engagement emails Gabe Mulley 2017-09-11 08:37:13 -04:00
  • 65f8731a73 Update schedule start only if new course start date is in the future Nimisha Asthagiri 2017-09-11 14:32:19 -04:00
  • 302e1d923e Allow displaying videos without transcripts Omar Al-Ithawi 2017-07-06 11:09:50 +03:00
  • 76d3b62bb5 Merge pull request #15989 from edx/robrap/lower-thresholds Robert Raposa 2017-09-11 13:40:08 -04:00
  • 1936ab6f5c Lower xss thresholds. Robert Raposa 2017-09-11 09:38:09 -04:00
  • 939d03bc10 Update full name help text. Robert Raposa 2017-09-11 10:07:26 -04:00
  • 999fa418e5 Merge pull request #15979 from open-craft/uman/ent-0.43.5 Uman Shahzad 2017-09-11 21:01:47 +05:00
  • c441244f66 Merge pull request #15993 from edx/sstudent/delete_test sanfordstudent 2017-09-11 11:40:00 -04:00
  • 7e037b5a66 temporarily delete test failing on master Sanford Student 2017-09-11 11:23:44 -04:00
  • 5cada093f1 Merge pull request #15870 from edx/noraiz/EDUCATOR-1089 Noraiz Anwar 2017-09-11 19:18:02 +05:00
  • 7de96486e7 Merge pull request #15961 from edx/ret/update-schedules-on-course-start-changes Nimisha Asthagiri 2017-09-11 09:31:46 -04:00
  • 1203eb5835 Do not override Default Video URL with value from VAL noraiz-anwar 2017-08-18 15:11:21 +05:00
  • 56eee715c1 Added support for deleting assets to delete_course management command Clinton Blackburn 2017-09-08 16:31:32 -04:00
  • 5193649956 Update Schedules when start date changes on non-live courses Nimisha Asthagiri 2017-09-07 10:51:30 -04:00
  • 0543748380 Merge pull request #15978 from edx/marcotuts/openedx-course-index/org-label-styling Marco Morales 2017-09-08 18:09:29 -04:00
  • ccf8d13725 Merge pull request #15941 from edx/ret/update-nudge-templates Gabe Mulley 2017-09-08 13:02:13 -04:00
  • 8a8c9747a7 update template Gabe Mulley 2017-08-31 17:14:39 -04:00
  • 28fd39f7b1 Merge pull request #15975 from edx/sstudent/EDUCATOR-1317 sanfordstudent 2017-09-08 11:21:33 -04:00
  • feaee089d5 Bump edx-enterprise to 0.43.5 Uman Shahzad 2017-09-08 20:03:16 +05:00
  • 6c3924b40b Org label styling on openedx course about pages Marco Morales 2017-09-08 11:03:02 -04:00
  • 4f977fb228 common function for cert display date Sanford Student 2017-09-07 12:02:43 -04:00
  • e6f807b0d7 Merge pull request #15977 from edx/revert-15924-ai/EDUCATOR-1267-add-logs Noraiz Anwar 2017-09-08 15:09:41 +05:00
  • 2d026d587e Revert "EDUCATOR-1267 Add logs in importing the course." Noraiz Anwar 2017-09-08 11:08:41 +05:00
  • 91ac97518b Merge pull request #15974 from edx/ssemenova/ed-1260 Sofiya Semenova 2017-09-07 16:41:22 -04:00
  • 14364dc7eb Merge pull request #15955 from edx/yro/update_mobile_api_certs Gregory Martin 2017-09-07 15:53:52 -04:00
  • 9f2e96d4a0 ed-1260 Course teams unable to save changes to dates Sofiya Semenova 2017-09-06 11:55:05 -04:00
  • 6062e45e2f Merge pull request #15976 from edx/andya/open-edx-theme Andy Armstrong 2017-09-07 15:05:50 -04:00
  • c1dcb54a66 Update 'downloadable' status for mobile/other API Gregory Martin 2017-09-05 15:32:41 -04:00
  • 94add3a49f Provide a first class Open edX theme Andy Armstrong 2017-09-07 13:03:41 -04:00
  • 454649c44d Add language mapping for zh_CN to zh_HANS, upgrade i18n-tools bmedx 2017-09-07 13:28:16 -04:00
  • 8d89bdaa50 Merge pull request #15971 from edx/bexline/enterprise_version_bump Brittney Exline 2017-09-07 12:53:31 -04:00
  • 053639ab62 ENT-615/ENT-617 Upgrade enterprise package to latest version Brittney Exline 2017-09-06 16:31:23 -04:00
  • c9f75f6bc8 Merge pull request #15926 from edx/HarryRein/FEDX-375-bootstrap-beta Harry Rein 2017-09-07 10:12:05 -04:00
  • 5ac5149bef Merge pull request #15967 from edx/ret/no-schedules-for-instructor-led Nimisha Asthagiri 2017-09-07 09:22:22 -04:00
  • 75ca7342fe Merge pull request #15966 from edx/derf/reduce_celery_heartbeat_frequency Fred Smith 2017-09-07 08:17:28 -04:00
  • 6e10d2a556 Update to use Bootstrap beta release Andy Armstrong 2017-09-01 14:59:04 -04:00
  • a51b9597e2 Merge pull request #15953 from edx/yro/update_cert_display_date Gregory Martin 2017-09-06 16:10:41 -04:00
  • f15a686775 Merge pull request #15965 from edx/jmbowman/pytest_compatibility Jeremy Bowman 2017-09-06 16:03:26 -04:00
  • 804dc36164 Merge pull request #15964 from edx/efischer/ora_again Eric Fischer 2017-09-06 15:48:49 -04:00
  • 9429128776 do not create schedules for instructor led courses Gabe Mulley 2017-09-06 11:56:52 -04:00
  • 2d40854391 Merge pull request #15957 from edx/andya/learner-certificate-filtering Andy Armstrong 2017-09-06 15:21:25 -04:00
  • 4d59eff8f6 Update cert display date Gregory Martin 2017-09-05 13:47:48 -04:00
  • f891c0fae8 reduce celery heartbeat frequency Fred Smith 2017-09-06 14:58:34 -04:00
  • 179774e107 edx-ora2 2.1.1 Eric Fischer 2017-09-06 14:40:11 -04:00
  • ded294c420 pytest compatibility fixes Jeremy Bowman 2017-09-06 14:20:34 -04:00
  • d342a56286 Merge pull request #15962 from edx/jmbowman/pytest_database Jeremy Bowman 2017-09-06 14:14:07 -04:00
  • 97f5fe035b Fixes for pytest database usage Jeremy Bowman 2017-09-06 13:15:34 -04:00
  • cebf6d3ea9 Merge pull request #15960 from edx/jmbowman/fragile_test_fixes Jeremy Bowman 2017-09-06 13:06:04 -04:00
  • d05b62a283 Only show passing certificates on a learner profile Andy Armstrong 2017-09-05 16:18:46 -04:00