Commit Graph

  • 25fa2ffc2d Separate verification deadline from upgrade deadline Will Daly 2015-07-09 13:18:36 -07:00
  • 527def32e4 Update edx-oauth2-provider to 0.5.5 Renzo Lucioni 2015-07-21 11:37:07 -04:00
  • 3ede0b0d0a Merge pull request #8988 from edx/max/update-oauth2-provider Max Rothman 2015-07-21 11:23:48 -04:00
  • 231059c24b Merge pull request #8989 from edx/utkjad/fixtemp Utkarsh 2015-07-21 11:07:12 -04:00
  • 8e1686c8cf Merge pull request #8980 from cpennington/cache-ccx-lookups Calen Pennington 2015-07-21 11:06:43 -04:00
  • 22e4fb30f5 Merge pull request #8987 from edx/ormsbee/inline_discussion_ccx_perf_hotfix Calen Pennington 2015-07-21 11:06:33 -04:00
  • f50f045bcf Update edx-oauth2-provider to 0.5.4 Renzo Lucioni 2015-07-17 14:48:36 -04:00
  • 497d76fa54 Optimize edxnotes files. cahrens 2015-06-27 07:15:48 -04:00
  • c8339072dd Fixup for tests. Jonathan Piacenti 2015-07-03 22:48:35 +00:00
  • eab0cbdd85 Better fix for open ended grading. Jonathan Piacenti 2015-07-03 20:57:02 +00:00
  • 405b266fa7 Addressed notes. Jonathan Piacenti 2015-07-03 20:52:45 +00:00
  • a6ae44a0db Add ability to activate a child block via jump_to_id. Jonathan Piacenti 2015-07-01 17:57:44 -05:00
  • 274e6de22b PLAT-734 Fix slow transaction due to multiple calls to unpickling utkjad 2015-07-14 20:19:04 +00:00
  • 93e31e6149 Merge pull request #8573 from edx/sylvia/docs/InstDashHousekeeping srpearce 2015-07-21 09:27:34 -04:00
  • 3ab45fba0c Clean up some e-commerce strings on the Instructor Dashboard Sylvia Pearce 2015-06-18 15:54:32 -04:00
  • a725e84233 Merge pull request #8983 from edx/will/ecom-1912-and-1913 Will Daly 2015-07-20 14:14:53 -07:00
  • 4619e9f458 Merge pull request #8927 from edx/renzo/enrollment-api-sans-modulestore Renzo Lucioni 2015-07-20 17:01:13 -04:00
  • d3f58b689f Credit progress page formatting bugfixes. Will Daly 2015-07-19 15:34:11 -07:00
  • 693901529c Instead of calculating the course's usage key, just follow the parent chain. David Ormsbee 2015-07-13 17:54:01 -04:00
  • abcdc05af4 Return just the CourseDescriptor in discussions get_course() David Ormsbee 2015-07-13 11:10:57 -04:00
  • 0e8b303d2e Cache CcxFieldOverrides on a per-request basis Calen Pennington 2015-07-10 13:58:34 -04:00
  • 63ddbd9b03 Cache CustomCourseForEdX object lookup per-request Calen Pennington 2015-07-10 13:43:00 -04:00
  • 1e84ad9941 Make CcxFactory fill in a coach if one isn't supplied Calen Pennington 2015-07-10 13:19:00 -04:00
  • 7b0c22afe9 Make request_cache easier to use Calen Pennington 2015-07-10 14:34:09 -04:00
  • ad16f9f968 Optimize search usages. cahrens 2015-07-02 09:20:27 -04:00
  • a9c4774fe7 PLA-749 Fix student dashboard for users enrolled in CCX courses Kyle McCormick 2015-07-20 10:29:37 -04:00
  • eff80baed2 Convert cohort JS to use RequireJS. Diana Huang 2015-06-30 15:16:18 -04:00
  • 1ceb8a0d66 Optimize finish_auth_factory. Peter Fogg 2015-07-01 12:37:30 -04:00
  • 4f0ab6f9c8 Optimize account settings and learner profile. cahrens 2015-07-01 15:21:45 -04:00
  • 7b5f9b8009 Implement RequireJS Optimizer in the LMS Andy Armstrong 2015-06-23 18:49:38 -04:00
  • b50c905865 Remove modulestore dependency from Enrollment API Renzo Lucioni 2015-07-13 15:30:14 -04:00
  • 80cf4d6ecb Merge pull request #8969 from edx/release-merge-test Max Rothman 2015-07-20 10:38:37 -04:00
  • 5cebad26e9 Additional configuration options for LTI provider feature. Carson Gee 2015-07-20 10:37:24 -04:00
  • 4c0b00f45e Merge pull request #8952 from edx/ziafazal/SOL-1045 Matt Drayer 2015-07-20 10:22:02 -04:00
  • babf2420b3 Fix test failure due to missing settings import Max Rothman 2015-07-20 09:54:00 -04:00
  • 4fc3ee4773 Merge pull request #8838 from edx/lliu/has-access-rebased tlindaliu 2015-07-19 22:41:19 -04:00
  • 0c837adfce Refactor auth.has_access to auth.user_has_role tlindaliu 2015-06-23 14:44:19 -04:00
  • e0840d2d43 MA-849: Change has_access return type tlindaliu 2015-06-23 11:15:08 -04:00
  • 24edec35a9 Fixing footer printing (LMS) Jolyon Bloomfield 2015-07-18 18:25:56 -04:00
  • 4b4ce5f122 Merge pull request #8965 from edx/renzo/update-edx-oauth2-provider Renzo Lucioni 2015-07-18 12:13:23 -04:00
  • 45ff29653b Update edx-oauth2-provider to 0.5.4 Renzo Lucioni 2015-07-17 14:48:36 -04:00
  • c97314413b Merge branch 'release' into release-merge-test Max Rothman 2015-07-17 17:42:03 -04:00
  • 72ab1fbc8d Merge pull request #8967 from edx/max/release-merge-conflicts Max Rothman 2015-07-17 17:23:47 -04:00
  • 54b97c6065 Merge pull request #8966 from edx/revert-7404-waheed/plat407-decorate-instructor-dashboard-with-sudo-required Adam 2015-07-17 16:59:51 -04:00
  • 9d344f6753 Merge branch 'rc/2015-07-14' into release Max Rothman 2015-07-17 16:29:55 -04:00
  • 2d0504c453 Fixing spacing within inline Jolyon Bloomfield 2015-04-03 17:04:18 -04:00
  • 0c05f00526 Fixing spans inside inline divs Jolyon Bloomfield 2015-04-03 16:28:12 -04:00
  • 2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." Adam 2015-07-17 12:11:38 -04:00
  • b12d3f6303 Merge pull request #8773 from edx/sylvia/docs/DOC-2102 srpearce 2015-07-17 15:42:59 -04:00
  • 2d216fc610 Merge pull request #8960 from edx/release-2015-07-08-conflict Max Rothman 2015-07-17 14:42:47 -04:00
  • 626d3fb02d Merge pull request #8964 from edx/zoldak/MA-1038 Jesse Zoldak 2015-07-17 13:57:39 -04:00
  • c2b4cf210f Skip test that had a hardcoded date expectation MA-1038 Jesse Zoldak 2015-07-17 13:05:58 -04:00
  • 913a5dfe29 Merge pull request #8943 from edx/zoldak/more-flaky-js Jesse Zoldak 2015-07-17 12:13:38 -04:00
  • eea3b31105 Delete white spaces that are causing test failures Sylvia Pearce 2015-07-17 16:12:53 +00:00
  • 41350002ba Merge pull request #8940 from edx/zoldak/SOL-1053-skip Jesse Zoldak 2015-07-17 12:12:34 -04:00
  • 2cf3390ba8 Merge pull request #8837 from edx/benmcmorran/discussion-caching-3 Ben McMorran 2015-07-17 11:33:02 -04:00
  • d7b57309da Merge branch 'release' into release-2015-07-08-conflict Max Rothman 2015-07-17 11:32:01 -04:00
  • ec6258a7ec Mark too-flaky test for skipping Jesse Zoldak 2015-07-15 16:16:49 -04:00
  • da68af5c04 Disable potentially flaky jasmine tests SOL-1065 Jesse Zoldak 2015-07-15 17:15:48 -04:00
  • c0de94295a Merge pull request #8953 from edx/vkaracic/TNL-394-additional-testing Vedran Karačić 2015-07-17 16:20:46 +02:00
  • f5234b1a9b TNL-394: Additional testing vkaracic 2015-07-16 08:07:30 +00:00
  • e89d8e14d4 Merge pull request #8955 from edx/zoldak/cleanup-js-includes Jesse Zoldak 2015-07-16 19:56:04 -04:00
  • 035aa4976f Merge pull request #8947 from edx/renzo/resolve-failures Renzo Lucioni 2015-07-16 16:52:06 -04:00
  • 2d19eafa7c Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required Awais Jibran 2015-07-16 21:12:43 +05:00
  • 937ca38fb5 Merge pull request #8867 from edx/aamir-khan/ECOM-1816-credit-info-recept-page Awais Qureshi 2015-07-16 19:47:15 +05:00
  • d5dda6470e ECOM-1816: added the provider detail on the receipt page. aamir-khan 2015-07-10 01:19:35 +05:00
  • 21832bb99a modify the whitelist cert script to take list of users arbabnazar 2015-07-09 13:20:34 +05:00
  • ba06ab1939 Merge pull request #8932 from edx/tasawer/story/ecom-1858-provider-and-eligibility-details tasawernawaz 2015-07-16 13:57:06 +05:00
  • bed7d80777 enable certificate generation for html certificates Zia Fazal 2015-07-16 10:11:56 +05:00
  • 1ded8b546c Update code of get_eligibility api. ECOM-1858 Tasawer 2015-07-15 15:17:58 +05:00
  • bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page Waheed Ahmed 2015-01-13 09:36:08 -05:00
  • ae0e21b32a Merge pull request #8945 from ubc/wmono/update-authors Sarina Canelake 2015-07-15 21:13:17 -04:00
  • 60c818f030 Import missing settings module in tests of commerce views Renzo Lucioni 2015-07-15 19:03:26 -04:00
  • c2420b0940 Final tweaks to API documentation updates Sylvia Pearce 2015-07-15 21:46:11 +00:00
  • 7f6e61b189 Merge pull request #8938 from edx/renzo/update-edx-oauth2-provider Renzo Lucioni 2015-07-15 17:22:45 -04:00
  • 3c489c857a Update AUTHORS William Ono 2015-07-14 14:03:31 -07:00
  • 7aebf0684a Remove unused includes Jesse Zoldak 2015-07-15 17:17:55 -04:00
  • 7673bde898 Merge pull request #8941 from edx/jsa/commerce-api-rc Max Rothman 2015-07-15 16:49:12 -04:00
  • bb7ba752bd Merge pull request #7322 from edx/sarina/remove-old-analytics-dashboard Sarina Canelake 2015-07-15 16:36:28 -04:00
  • 7449f68522 Support setting email opt-in in calls to the Otto shim jsa 2015-07-14 11:28:59 -04:00
  • d4a5ad4818 Mark basket creation and order retrieval endpoints as v0 Renzo Lucioni 2015-07-10 17:36:27 -04:00
  • 7c5cc14a32 Merge pull request #8939 from edx/clintonb/jwt-envs-fix Clinton Blackburn 2015-07-15 16:07:12 -04:00
  • 6088bc3401 Pulling JWT settings from envs tokens Clinton Blackburn 2015-07-15 16:06:17 -04:00
  • ea37ada4db Update edx-oauth2-provider to 0.5.3 Renzo Lucioni 2015-07-15 15:58:00 -04:00
  • 738146f87c Merge pull request #8935 from edx/mekkz/course-overviews-grading-fix Kyle McCormick 2015-07-15 15:29:57 -04:00
  • 0f2a36a62a Merge pull request #8908 from edx/asadiqbal08/SOL-1050 Matt Drayer 2015-07-15 15:05:53 -04:00
  • d2b6ac84d3 Reorganize and update API documentation Sylvia Pearce 2015-06-24 17:17:16 -04:00
  • e1472080da MA-1036 Make CourseOverviews handle malformed grading policies Kyle McCormick 2015-07-15 13:46:55 -04:00
  • 19d9ccbf67 asadiqbal08/SOL-1050: Support split mongo course id for Twitter sharing URL asadiqbal 2015-07-14 12:47:49 +05:00
  • b5c32ec4f1 ziafazal/SOL-980: Fix error while generating certificates Zia Fazal 2015-07-13 14:25:33 +05:00
  • 3f432d49a8 Merge pull request #8912 from edx/asadiqbal08/SOL-1046 Matt Drayer 2015-07-15 12:07:57 -04:00
  • 8c4bb8bf3c Merge pull request #8933 from edx/revert-setuptools David Baumgold 2015-07-15 11:13:56 -04:00
  • 376fe0a57c Remove outdated Analytics scripts, code, and css Sarina Canelake 2015-03-17 13:35:56 -04:00
  • 4f2be41a48 Add messaging about Insights to Analytics instructor tab Sarina Canelake 2015-03-17 13:25:29 -04:00
  • 9b905ae729 Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag Sarina Canelake 2015-03-12 10:19:20 -04:00
  • d36eb83a03 Add query count tests Ben McMorran 2015-07-15 14:56:04 +00:00
  • 56015fecf3 asadiqbal08/SOL-1046: Convert LinkedIn anchor tag to button asadiqbal 2015-07-14 13:14:00 +05:00
  • 66e1b11a58 Merge pull request #8931 from edx/ziafazal/fix-SOL-1008 Matt Drayer 2015-07-15 10:03:17 -04:00
  • 2ff0f636ed Revert MySQL-python upgrade David Baumgold 2015-07-14 16:42:08 -04:00
  • 1a3f0958b9 Revert setuptools upgrade David Baumgold 2015-07-14 16:35:20 -04:00