Commit Graph

  • 48507af229 Merge pull request #13971 from edx/ned/make-clean Ned Batchelder 2016-11-15 08:04:27 -05:00
  • 3c29ecbf57 WL-633 | refactor pay_and_verify.html template. Hasnain 2016-11-14 18:17:11 +05:00
  • 07b6cdc215 Merge pull request #13954 from edx/jia/MA-2554 wajeeha-khalid 2016-11-15 15:07:50 +05:00
  • b837427bd5 MA-2554: DiscussionAPI - fixed unread_comment_count wajeeha-khalid 2016-11-09 12:48:51 +05:00
  • 18e7322e8d Revert "Refactor discussion tab UI code into parts to be reusable for inline discussions" alisan617 2016-11-14 21:43:03 -05:00
  • f8b90f2235 Merge pull request #13983 from edx/yro_resolve_translation_settings Gregory Martin 2016-11-14 18:33:54 -05:00
  • af410963c6 Merge pull request #13984 from edx/yro_fix-js Gregory Martin 2016-11-14 16:32:48 -05:00
  • 5b4048ddff fix for send to transifex Gregory Martin 2016-11-14 14:19:35 -05:00
  • 1fa805a052 js bundling error Gregory Martin 2016-11-14 14:33:23 -05:00
  • b8bc4c8700 Merge pull request #13950 from edx/clintonb/verification-admin-update Clinton Blackburn 2016-11-14 13:02:19 -05:00
  • 3e9e000842 Merge pull request #13976 from edx/revert-13860-bjacobel/susy Brian Jacobel 2016-11-14 12:51:18 -05:00
  • f5d556e745 Allow to store multiple anonymous ids for each (user, course). Sven Marnach 2016-10-18 17:52:33 +02:00
  • 4e773095c3 Merge pull request #13941 from edx/hash-update/drag-and-drop-v2 Eugeny Kolpakov 2016-11-14 10:17:19 +03:00
  • 896856fe76 Merge pull request #13874 from edx/jia/MA-2871 wajeeha-khalid 2016-11-11 10:22:46 +05:00
  • c8135adf12 Merge pull request #13910 from open-craft/haikuginger/sol-2071 Jesse Shapiro 2016-11-10 21:23:13 -05:00
  • 09947ab094 Revert "Update to UXPL 0.17 (grids compilation performance work)" Brian Jacobel 2016-11-10 15:49:33 -05:00
  • 492d417dca Merge pull request #13975 from edx/revert-13860-bjacobel/susy Brian Jacobel 2016-11-10 18:31:41 -05:00
  • d39f7197c3 Revert "Update to UXPL 0.17 (grids compilation performance work)" Brian Jacobel 2016-11-10 15:49:33 -05:00
  • dffe3e0780 Update wait for mini-notification in testing to be more fine-grained; remove flaky test decorator Jesse Shapiro 2016-11-10 15:07:32 -05:00
  • b4c61e87aa Merge pull request #13967 from edx/ibrahimahmed443/WL-785-password-reset-message Douglas Hall 2016-11-10 13:34:13 -05:00
  • f85aa4773e Merge pull request #13956 from edx/hasnain-naveed/WL-615 Douglas Hall 2016-11-10 12:53:09 -05:00
  • 1ec55113af Merge pull request #13969 from edx/release Christopher Lee 2016-11-10 12:51:51 -05:00
  • 562b48cfb2 Merge pull request #13911 from edx/benp/nodeenv Ben Patterson 2016-11-10 12:46:29 -05:00
  • c42d207e48 Merge pull request #13965 from edx/release-candidate Douglas Hall 2016-11-10 11:31:20 -05:00
  • 2c86a6ddd6 Merge pull request #13963 from edx/beryl/date-passed Cliff Dyer 2016-11-10 11:26:19 -05:00
  • 781d3c9b30 Merge pull request #13925 from stvstnfrd/up/settings/zendesk Ned Batchelder 2016-11-10 11:12:49 -05:00
  • 45f92f73de A perhaps too-baroque way to clean files but also keep some. Ned Batchelder 2016-11-10 10:55:11 -05:00
  • 2bc35396fb Add date_passed column to PersistentCourseGrade model. J. Cliff Dyer 2016-11-08 16:05:32 -05:00
  • c643c124c8 Merge pull request #13855 from edx/benp/correct-verbose-settings-i18ntests Ben Patterson 2016-11-10 10:23:01 -05:00
  • b3a3d729a1 Use nodeenv to manage node version in Jenkins builds Ben Patterson 2016-11-03 21:32:13 -04:00
  • 4454899821 WL-615 | Fix the preview certificate link. Hasnain 2016-11-09 16:18:12 +05:00
  • 7e4c7d8c33 Merge pull request #13942 from edx/clintonb/verification-status-api Vedran Karačić 2016-11-10 15:02:34 +01:00
  • e26849891d Merge pull request #13939 from edx/aj/fix-discussion-user-roles Awais Jibran 2016-11-10 18:41:12 +05:00
  • daf6314782 make password reset message customizable Ibrahim 2016-11-10 15:59:54 +05:00
  • 92b99c7dc3 Fix discussion user roles Awais Jibran 2016-11-04 23:36:01 +05:00
  • 71cc602d93 Merge pull request #13863 from edx/ammar/tnl-4163-reduce-annotatorjs-search-calls Muhammad Ammar 2016-11-10 16:23:59 +05:00
  • 3224c027e3 Merge pull request #13955 from edx/ibrahimahmed443/WL-669-education-dropdown-capitalization Douglas Hall 2016-11-10 05:46:00 -05:00
  • 12e2650630 Added photo verification status API endpoint Clinton Blackburn 2015-10-03 01:29:39 -04:00
  • 47a22b23bc Merge pull request #13940 from edx/hasnain-naveed/WL-613 Douglas Hall 2016-11-09 20:55:10 -05:00
  • 5122b27967 Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for copy_id_photo_from field Clinton Blackburn 2016-11-07 17:44:57 -05:00
  • edd66a7f46 Merge pull request #13951 from edx/alisan/fix-minor-wrap-new-post-discussion alisan617 2016-11-09 20:26:54 -05:00
  • 496aaa5455 Merge pull request #13959 from edx/ned/update-translations Ned Batchelder 2016-11-09 18:18:37 -05:00
  • 2b9e921bd0 Merge pull request #13964 from edx/patch/2016-11-09 Douglas Hall 2016-11-09 17:45:10 -05:00
  • a97a56af58 Merge pull request #13962 from edx/release-candidate Douglas Hall 2016-11-09 17:44:16 -05:00
  • 8a1825a4d0 Update translations (autogenerated message) Ned Batchelder 2016-11-09 22:24:10 +00:00
  • 6bf2c37144 Update translations (autogenerated message) Ned Batchelder 2016-11-09 21:47:55 +00:00
  • 0dd673b0c2 Allow for not showing course modes on student dashboard Douglas Hall 2016-11-07 14:40:13 -05:00
  • f05899b2ba Merge pull request #13930 from edx/PLAT-1074 Jeremy Bowman 2016-11-09 15:11:26 -05:00
  • 92995b42ec Merge pull request #13935 from edx/douglashall/WL-798 Douglas Hall 2016-11-09 14:36:04 -05:00
  • 3ee8fc130c PLAT-1074 Add support for django-user-tasks Jeremy Bowman 2016-11-07 11:06:27 -05:00
  • 9728759df2 Merge pull request #13662 from edx/atiya/TNL-5621-Duplicate-discussion Attiya Ishaque 2016-11-09 23:30:24 +05:00
  • 2da026996d Merge pull request #13938 from open-craft/hotfix/2016-11-08 Christopher Lee 2016-11-09 13:20:06 -05:00
  • 76e1d4a75c TNL-5621 Fix discussion topics in MIT course. attiyaishaque 2016-10-06 12:09:59 +05:00
  • c873be0f55 Merge pull request #13868 from edx/mrehan/tnl-5721-nonetype-no-attr-course-id M. Rehan 2016-11-09 22:19:59 +05:00
  • 8c9aa7d3f3 Allow configuring TLS for celery broker Brandon DeRosier 2016-11-09 12:14:42 -05:00
  • ec7245537a Allow for not showing course modes on student dashboard Douglas Hall 2016-11-07 14:40:13 -05:00
  • a0c5cc7e4f Update translations (autogenerated message) Ned Batchelder 2016-11-09 15:55:41 +00:00
  • c7364a06a4 handle if required module(s) for conditional module are staff only Qubad786 2016-10-31 16:30:07 +05:00
  • 7ae05625ee MA-2871: return response_count on thread patch wajeeha-khalid 2016-11-01 15:30:51 +05:00
  • 122f718ce5 fix inconsistent capitalization in education drop down Ibrahim 2016-11-09 14:58:15 +05:00
  • f6ac90e873 Bumped DnDv2 to v2.0.12 (+fixed grading test, as DnDv2 now properly participates in scoring) E. Kolpakov 2016-11-08 17:44:09 +03:00
  • a29a2d4dbb Wl-613 | Removing the example theme. Hasnain 2016-11-08 12:42:05 +05:00
  • 237ef00a2b edxnotes stub server to support multiple usage id search - TNL-5605 Mushtaq Ali 2016-10-26 13:23:26 +05:00
  • 07b2b1a919 Merge pull request #13944 from edx/bbeggs/pillow-upgrade Brian Beggs 2016-11-08 23:46:32 -05:00
  • 2d4feeac43 Merge pull request #13943 from edx/beryl/opt-grade-task Nimisha Asthagiri 2016-11-08 22:22:01 -05:00
  • e6240c56fc Update generate_course_blocks management command. Nimisha Asthagiri 2016-02-18 18:33:31 -05:00
  • 266bfb1ab3 Optimize async grades computation TNL-5909 Nimisha Asthagiri 2016-11-08 09:56:25 -05:00
  • 55e4813f3a Upgrade Pillow CVE-2016-9190 CVE-2016-9189 Brian Beggs 2016-11-08 11:30:31 -05:00
  • f47b4cd8ff no float alisan617 2016-11-08 15:46:09 -05:00
  • 8a784eef24 Merge pull request #13949 from edx/release-2016-11-08-conflict Christopher Lee 2016-11-08 15:32:16 -05:00
  • 371c5a244e Merge pull request #13843 from edx/alisan/testing-discussion alisan617 2016-11-08 15:30:39 -05:00
  • 753d78210a single search request to fetch notes for HTML components per unit muhammad-ammar 2016-10-28 16:49:42 +05:00
  • 1c5d1f1c0d Merge pull request #13867 from edx/efischer/grades_bug_bash sanfordstudent 2016-11-08 15:16:47 -05:00
  • f796cf7262 Merge pull request #13860 from edx/bjacobel/susy Brian Jacobel 2016-11-08 15:15:45 -05:00
  • cd522358f2 Merge pull request #13706 from edx/jeskew/move_embargo_out_of_common John Eskew 2016-11-08 14:38:24 -05:00
  • d3c3a9a63d Merge branch 'release' into release-2016-11-08-conflict christopher lee 2016-11-08 14:23:57 -05:00
  • e80d9b5792 Refactor discussion tab UI code into parts to be reusable for inline discussions TNL-5669 alisan617 2016-10-20 21:47:31 -04:00
  • 6e52fd791f fixes from robust grades bug bash Sanford Student 2016-10-28 13:56:55 -04:00
  • 246bd19ee4 Merge pull request #13948 from edx/revert-13936-clintonb/verification-admin-update Jesse Zoldak 2016-11-08 13:33:42 -05:00
  • 3027db4b5b Revert "Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for id_copy_id_photo_from field" Jesse Zoldak 2016-11-08 13:31:14 -05:00
  • af71a2710b Merge pull request #13919 from edx/release-candidate Christopher Lee 2016-11-08 12:55:52 -05:00
  • ba1aadca99 Merge pull request #13936 from edx/clintonb/verification-admin-update Clinton Blackburn 2016-11-08 12:33:38 -05:00
  • fd0880ae23 Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for id_copy_id_photo_from field Clinton Blackburn 2016-11-07 17:44:57 -05:00
  • 08c5a35899 Merge pull request #13923 from edx/yro_fix-PR-13794 Gregory Martin 2016-11-08 10:06:16 -05:00
  • f29a508d4f Merge pull request #13928 from edx/bugfix/forums-enable-data-migration Toby Lawrence 2016-11-08 09:16:56 -05:00
  • 6f44bbedbc Merge pull request #13912 from edx/mzfr/rmv-form-tnl5402 Muzaffar yousaf 2016-11-08 17:54:16 +05:00
  • 8c6df4a363 Merge pull request #13878 from edx/TNL-5769 noraiz-anwar 2016-11-08 16:52:47 +05:00
  • 6b954efabd Changing form to div for CAPA problem types. muzaffaryousaf 2016-11-04 14:50:43 +05:00
  • 633eefb221 use CourseCreatorRole to determine if user can create a library jagonzalr 2016-11-08 10:14:07 +02:00
  • bc3cbf57b5 Video download button does not appear in course (TNL-5769) Noraiz 2016-11-01 18:10:24 +05:00
  • 8d6243ff0f Updates problem-builder to v2.6.1, which fixes the instructor_task import errors. Jillian Vogel 2016-11-08 10:45:01 +10:30
  • e05cb31b87 fix leading zero bok choy Gregory Martin 2016-11-04 14:53:55 -04:00
  • 0c5b7ab32d Merge pull request #13883 from edx/andya/long-error-messages Andy Armstrong 2016-11-07 18:35:38 -05:00
  • 697ec3402d Migrate Discussions, Certificates and Programs to susy-less grids Brian Jacobel 2016-11-03 17:10:56 -04:00
  • a68b37499b Upgrade to UX Pattern Library v0.17 Brian Jacobel 2016-10-27 11:57:34 -04:00
  • f0cd29f02a Revert "Merge pull request #13915 from edx/revert-13794-yro_implement-dateutil" Gregory Martin 2016-11-04 14:49:25 -04:00
  • 8ffc9197e8 Merge pull request #13881 from edx/efischer/tnl-5314 sanfordstudent 2016-11-07 16:08:06 -05:00
  • c24cdfb035 Merge pull request #13931 from edx/diana/update-proctoring Diana Huang 2016-11-07 15:13:17 -05:00
  • 183d741b9b Merge pull request #13934 from edx/bugfix/forums-enable-data-migration Toby Lawrence 2016-11-07 15:02:28 -05:00
  • 3969f0cad9 Provide a default configuration for forums if none already exists. Toby Lawrence 2016-11-07 10:18:32 -05:00