Commit Graph

  • eb73057d90 EDUCATOR-333: Grade each course subsection exactly once; ensure that our stashed, unsaved subsection grades are unique. Alex Dusenbery 2017-06-19 13:36:59 -04:00
  • fd86e1b4b2 Merge pull request #15357 from edx/jeskew/django1.11_future_templates_PLAT_1562 John Eskew 2017-06-20 14:02:36 -04:00
  • 2b81a9409d Merge pull request #15327 from edx/sarahkf/python-template sarahkf 2017-06-20 13:42:45 -04:00
  • dc121e54cb Merge pull request #15326 from edx/sarahkf/ARIA-roles sarahkf 2017-06-20 13:41:48 -04:00
  • 8b65ca17c5 Migrate to latest, split python-social-auth. Uman Shahzad 2017-05-19 20:46:01 -04:00
  • 4dd4f97900 Merge pull request #15370 from edx/douglashall/edx-enteprise_0_35_2 Douglas Hall 2017-06-20 13:00:41 -04:00
  • bf577fffa3 Merge pull request #15298 from edx/sofiya/preregister-cohorts Sofiya Semenova 2017-06-20 11:59:23 -04:00
  • c22aeceab7 Truncate title in thread created event to 1000 chars Kyle McCormick 2017-06-19 12:54:17 -04:00
  • f58277cc10 Upgrading the edx-enterprise package to 0.35.2. Douglas Hall 2017-06-20 11:33:31 -04:00
  • 540af5edcd Fixed legal aria-label to be a valid label Sarah Fischmann 2017-06-14 16:08:28 -04:00
  • 03c725ef9a Merge pull request #15281 from edx/nedbat/footer-edx-link Ned Batchelder 2017-06-20 11:15:06 -04:00
  • cb4ae4619b Use standard 'url' templatetag - deprecated/removed from future. John Eskew 2017-06-19 17:49:23 -04:00
  • 6adca0ff11 Add a link to edx.org in the default Open edX footer Ned Batchelder 2017-06-19 10:50:43 -04:00
  • f0b2a91789 Bump problem builder to v2.6.9. Matjaz Gregoric 2017-01-13 08:32:04 +01:00
  • 58bb4fbc61 Fixed CC logo text alternative Sarah Fischmann 2017-06-14 16:40:58 -04:00
  • f318661df5 Updated CatalogIntegration to use a site-specific URL Clinton Blackburn 2017-05-23 17:39:55 -04:00
  • be23aa47ed Fix the hyphen separators in the footer so they separate all the items Ned Batchelder 2017-06-19 10:50:31 -04:00
  • b8ba64cbe1 Set copyright year dynamically Salah Alomari 2017-04-17 12:42:21 +03:00
  • 31d99e8d2d ED-549 Assign learner to a cohort before registration. cahrens 2017-06-05 16:45:14 -04:00
  • 84aa4a2631 Merge pull request #15367 from edx/efischer/celeryutils_pypi_fun_times Eric Fischer 2017-06-20 10:48:24 -04:00
  • 22a5bd3501 Merge pull request #15324 from ravi-ojha/educator_273 Adam 2017-06-20 10:34:07 -04:00
  • 112a5662ec edx-celeryutils 0.2.4 Eric Fischer 2017-06-20 10:13:03 -04:00
  • 49c0342e73 Merge pull request #15167 from edx/efischer/update_celeryutils Eric Fischer 2017-06-20 09:45:07 -04:00
  • fe9cce59ab Merge pull request #15350 from edx/HarryRein/LEARNER-1483-bookmarks-styling Harry Rein 2017-06-20 09:20:15 -04:00
  • dc25688096 Merge pull request #15349 from edx/douglashall/ENT-448 Douglas Hall 2017-06-20 05:37:14 -04:00
  • dc3a423389 Merge pull request #15293 from edx/saleem-latif/ENT-367 Douglas Hall 2017-06-19 21:42:35 -04:00
  • d1f4e9b0a6 Updated messaging for denied verification submissions Clinton Blackburn 2017-06-15 18:41:17 -04:00
  • 02d7b794bb Added border highlight to pending verification status display Clinton Blackburn 2017-06-15 18:12:35 -04:00
  • 56cf90f8e9 Bump version of xblock-poll that resolves EDUCATOR-273 Ravi Ojha 2017-06-14 22:51:20 +05:30
  • c3b9a0efd7 Fixing styling issue on bookmarks page. Harry Rein 2017-06-19 12:24:03 -04:00
  • 62680bf7c6 Merge pull request #15305 from open-craft/uman/OC-2682 Jesse Shapiro 2017-06-19 10:44:11 -04:00
  • d5c85331c5 Automatically populate additional fields for SSO scenarios. Uman Shahzad 2017-06-13 16:20:41 +05:00
  • 9ecc2938f5 Merge pull request #15347 from edx/douglashall/edx-enteprise_0_35_0 Douglas Hall 2017-06-16 16:49:52 -04:00
  • 7ba5e17f92 Enterprise sign in page UI improvements. Douglas Hall 2017-06-16 13:49:54 -04:00
  • 6910a3a0b7 Upgrading edx-enterprise package to 0.35.0 Douglas Hall 2017-06-16 13:39:33 -04:00
  • e57e4e0c54 Merge pull request #15335 from edx/HarryRein/LEARNER-198 Harry Rein 2017-06-16 09:42:17 -04:00
  • d5ed3de388 Hiding 'Resume Course' button for users that are not enrolled in the course and adding test to assure behavior. Harry Rein 2017-06-15 10:11:23 -04:00
  • ceb126ef27 Merge pull request #15336 from edx/neem/cert_celery_task sanfordstudent 2017-06-15 16:46:15 -04:00
  • f226caf585 Merge pull request #15262 from edx/HarryRein/LEARNER-531-upgrade-sock Harry Rein 2017-06-15 15:14:02 -04:00
  • 691d6872c7 Merge pull request #15294 from edx/adam/add-precedes-to-coursegraph-3 Adam 2017-06-15 15:10:11 -04:00
  • 47db17c79e instructor task for auto cert creation Sanford Student 2017-06-15 14:14:52 -04:00
  • bdf38ae00e Implemented an upgrade verification sock. Harry Rein 2017-06-05 17:24:06 -04:00
  • 0b90c60b5f Merge pull request #15301 from edx/andya/webpack-jquery Andy Armstrong 2017-06-15 12:11:28 -04:00
  • 626f015a2e Added experiments app and API endpoint Clinton Blackburn 2017-06-13 17:34:21 -04:00
  • 0dc5000eb7 Disabled Enterprise integration for devstack Clinton Blackburn 2017-06-14 23:05:31 -04:00
  • 8185b5cea1 Merge pull request #15328 from edx/schen/learner-1464 Simon Chen 2017-06-15 08:29:58 -04:00
  • 7914a00915 Show Enterprise Logistration for coupon users Saleem Latif 2017-06-12 14:50:40 +05:00
  • 4ce1222e99 Revert "fix valid signature" Simon Chen 2017-06-14 16:46:54 -04:00
  • c21b3c8f7a Merge pull request #15323 from edx/ret/exclude-non-english-courses Nimisha Asthagiri 2017-06-14 15:41:05 -04:00
  • 1904a93ad2 Merge pull request #15315 from edx/HarryRein/LEARNER-1297-course-date-formatting Harry Rein 2017-06-14 14:58:34 -04:00
  • 3b70b9b7f4 Merge pull request #15322 from edx/robrap/bokchoy-comment Robert Raposa 2017-06-14 14:19:01 -04:00
  • ff1a9a1590 Add cryptography package to sandbox environment Isaac Slavitt 2017-06-14 14:13:29 -04:00
  • d465d6f779 Planning Prompts experiment: exclude non-English courses Nimisha Asthagiri 2017-06-14 12:57:23 -04:00
  • 09e22f373b Merge pull request #15312 from edx/christina/share-template Christina Roberts 2017-06-14 13:36:36 -04:00
  • 47f42fdc10 Merge pull request #14591 from mitodl/pdpinch/better-error-from-codejail Ned Batchelder 2017-06-14 12:58:58 -04:00
  • 6cbfb6c9f5 1) Updating version two of styling variables to use a file layout similar to the initial version. 2) Updating the course experience sass file to use variables it can reference in the version two variable sass file. 3) Updating date styling on course home page as explained in LEARNER-1297. 4) Expanding side outline panel to take up a third and not a quarter of the content size. Harry Rein 2017-06-13 14:07:37 -04:00
  • 340fb2b082 Add comment to save future self time. Robert Raposa 2017-06-14 10:22:59 -04:00
  • 0ee7600696 Merge pull request #15321 from edx/ri/EDUCATOR-394-disable-self-generated-certs Rabia Iftikhar 2017-06-14 20:35:42 +05:00
  • 7bf0674de8 EDUCATOR-394 disable self-generated certificates when course is reset to instructor-paced rabiaiftikhar 2017-06-14 18:53:05 +05:00
  • 23d480f457 Merge pull request #15306 from edx/christina/edu-511 Christina Roberts 2017-06-14 09:15:11 -04:00
  • 7d6ab17385 Merge pull request #15316 from edx/ret/planning-prompt-population Nimisha Asthagiri 2017-06-14 09:10:03 -04:00
  • 5b400bc0b3 Merge pull request #15319 from edx/revert-15163-ri/EDUCATOR-394-disable-self-generation-certificates Noraiz Anwar 2017-06-14 18:04:30 +05:00
  • d4e1e3eb22 Merge pull request #15272 from edx/asadiqbal08/ENT-368 Asad Iqbal 2017-06-14 16:54:24 +05:00
  • 371c422aaf Revert "EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced." Noraiz Anwar 2017-06-14 15:57:07 +05:00
  • c2c32e7231 Merge pull request #15163 from edx/ri/EDUCATOR-394-disable-self-generation-certificates Rabia Iftikhar 2017-06-14 15:27:10 +05:00
  • 2eab85ebf7 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates rabiaiftikhar 2017-06-14 13:38:29 +05:00
  • a42f930614 Merge pull request #15288 from edx/mrehan/fix-studio-header-menu M. Rehan 2017-06-14 13:35:33 +05:00
  • cd896501ca ENT-368 asadiqbal 2017-06-08 17:42:43 +05:00
  • afd45996d9 fix studio header menu Qubad786 2017-06-09 12:47:56 +05:00
  • b9e768410f return only error value to students when codejail raises an exception Peter Pinch 2017-02-01 17:35:03 -05:00
  • 4ed9776a4b Handle issues with JQuery in Studio and LMS Andy Armstrong 2017-05-26 12:27:16 -04:00
  • 1592ee2b15 Merge pull request #15173 from edx/andya/course-search-page Andy Armstrong 2017-06-13 17:41:26 -04:00
  • 3bbeb75c58 Planning Prompts experiment: check content availability date Nimisha Asthagiri 2017-06-13 16:24:32 -04:00
  • 764c310c80 Merge pull request #15314 from edx/ret/add-todo-comments-ivp Nimisha Asthagiri 2017-06-13 17:28:38 -04:00
  • c8de3af589 Merge pull request #15313 from edx/carol/DOC-3687 Carol Tong 2017-06-13 16:48:26 -04:00
  • c0007a11f3 Add new course search results page Andy Armstrong 2017-05-23 18:23:58 -04:00
  • 086b503b51 Merge pull request #15219 from edx/sarahkf/courseware-lang sarahkf 2017-06-13 16:06:59 -04:00
  • 82b8cf40b3 Change help target for enrollment track groups Carol Tong 2017-06-13 14:04:25 -04:00
  • 0096c80a13 Refactor course search into openedx/features Andy Armstrong 2017-05-23 16:08:51 -04:00
  • 39048048da Add comments around In-course verification prompt throwaway code Calen Pennington 2017-06-13 14:43:22 -04:00
  • 04bf257d91 Remove flaky decorator. cahrens 2017-06-13 09:38:37 -04:00
  • 7721237989 Merge pull request #15310 from edx/sylvia/update_help_tokens Eric Fischer 2017-06-13 14:43:52 -04:00
  • eafb79defc Added lang attribute in LMS and Studio; added language col to course_overviews Sarah Fischmann 2017-05-31 16:56:46 -04:00
  • 3fbe60ef57 Merge pull request #14463 from edx/robrap/edx-search-upgrade Feanil Patel 2017-06-13 14:32:26 -04:00
  • c60cb6a604 Merge pull request #15299 from edx/efischer/ora_rc Eric Fischer 2017-06-13 14:03:03 -04:00
  • 3ea7a18994 Revert "Merge pull request #15309 from edx/efischer/fix_studio_link_tests" Eric Fischer 2017-06-13 13:52:31 -04:00
  • fe3105cc38 Update Studio help tokens following doc reorg for Publisher Sylvia Pearce 2017-06-13 11:32:44 -04:00
  • 0272b84fd0 Open Response Assessment tab for Instructor Dashboard - bugfix (prevent loading ORA Block more than one time) Dmitry Viskov 2017-06-13 14:12:01 +03:00
  • 4af499cdd5 edx-ora2 1.4.2 release Eric Fischer 2017-06-12 16:08:30 -04:00
  • 8ca5c11a2b Merge pull request #15309 from edx/efischer/fix_studio_link_tests Eric Fischer 2017-06-13 12:50:45 -04:00
  • 1acb51559a Prevent footer loaded via branding API from loading unused CSS Renzo Lucioni 2017-06-13 11:45:35 -04:00
  • 9e6b449a62 Skip failing tests Eric Fischer 2017-06-13 10:38:18 -04:00
  • fdc9ebe809 Remove extra div. cahrens 2017-06-13 11:51:42 -04:00
  • 7d2d0657fe Merge pull request #15290 from edx/bbaker/educator-344 Brandon Baker 2017-06-13 10:42:35 -04:00
  • 22d3b02807 respond to comments rabiaiftikhar 2017-06-13 16:29:17 +05:00
  • b84d4c0209 Review Rehan rabiaiftikhar 2017-06-13 15:43:36 +05:00
  • 511e653627 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates rabia23 2017-06-13 06:54:38 +00:00
  • a8913f9a66 Review Alex rabia23 2017-06-13 06:51:38 +00:00
  • 54eb9e84b4 Merge pull request #15292 from edx/christina/add-middleware-guid Christina Roberts 2017-06-12 15:18:18 -04:00
  • 2e675fdc4b Merge pull request #15256 from edx/ammar/edu-292-move-dialog-fix Muhammad Ammar 2017-06-12 23:54:52 +05:00