Commit Graph

  • a374419079 Merge pull request #7489 from edx/hotfix/2015-03-26 Adam 2015-03-26 11:38:46 -04:00
  • b03c4eca63 Opening wiki editor should be extracted into a method. Ben Patterson 2015-03-26 11:05:31 -04:00
  • 6e2e40cc14 Add course wiki acceptance tests. Ben Patterson 2015-03-20 16:39:12 -04:00
  • d66bb883ac Fix footer stylings for RTL Sarina Canelake 2015-03-25 15:36:58 -04:00
  • 67168869f5 Adjust styling for Open edX footer details Brian Talbot 2015-02-13 11:32:54 -05:00
  • 8abfe4a850 Put Open edX logo in CMS footer David Baumgold 2015-02-09 09:51:58 -05:00
  • 89252ec12d Put Open edX logo in LMS edx.org footer David Baumgold 2015-01-22 12:59:18 -05:00
  • 84f6e11830 Don't use the working tree as storage for test-created files. Ned Batchelder 2015-03-26 09:38:09 -04:00
  • 9edda95096 Merge pull request #7481 from edx/clytwynec/flaky-mathjax Christine Lytwynec 2015-03-26 08:57:11 -04:00
  • 43abe399f1 default discussion modules' discussion_id field to xblock's UNIQUE_FIELD (TNL-1771) Adam Palay 2015-03-24 16:12:38 -04:00
  • 3a8716a36f update bokchoy with fix for TNL-1770 Christine Lytwynec 2015-03-25 17:02:10 -04:00
  • 609b114443 Merge pull request #7475 from edx/adjust-indentation David Baumgold 2015-03-25 15:58:01 -04:00
  • 3b150da1d7 MA-169 return requested val encoded video profiles christopher lee 2015-03-20 10:57:00 -04:00
  • 3f07660d27 Merge pull request #7454 from edx/andya/user-api-transaction-handling Christina Roberts 2015-03-25 15:08:21 -04:00
  • a9dce7c331 Clean up transactional behavior in User API Andy Armstrong 2015-03-23 14:10:04 -04:00
  • 8107f803f5 Merge branch 'release' Matt Drayer 2015-03-25 13:38:43 -04:00
  • 6840ced41f Fix whitespace David Baumgold 2015-03-25 13:18:02 -04:00
  • aeff0880ac Merge pull request #7453 from edx/will/ecom-1198 Will Daly 2015-03-25 11:46:04 -04:00
  • dfcb3f2b6e Dashboard styling cleanup/changes, including: Marco Morales 2015-02-25 19:49:18 -05:00
  • 735b400998 Login/Registration page can skip track selection. Will Daly 2015-03-23 13:10:40 -04:00
  • e1251bfecd Merge pull request #7416 from edx/cptvitamin/UX-1838-dashboard-heading-structure-n-context Mark Sadecki 2015-03-24 13:51:33 -04:00
  • 7f137487cc Merge pull request #7463 from edx/clytwynec/flaky-mathjax Christine Lytwynec 2015-03-24 13:50:57 -04:00
  • 65356f8a36 Merge pull request #7446 from edx/ned/clean-up-eo Ned Batchelder 2015-03-24 13:28:19 -04:00
  • 6401f453ca Change how conf/locale/eo is cleaned up, so that it always happens Ned Batchelder 2015-03-23 09:45:28 -04:00
  • 5204fd6519 wait for both window.MathJax and window.MathJax.onReady Christine Lytwynec 2015-03-24 11:03:09 -04:00
  • 990f6a0b76 Merge pull request #7462 from edx/clrux/logistration-text-alignment-fix Chris 2015-03-24 10:55:46 -04:00
  • 0bdb43a45f Centering social media buttons Chris Rodriguez 2015-03-24 10:04:28 -04:00
  • dadc78aabd Merge pull request #7336 from open-craft/eugeny/course-team-to-backbone Eugeny Kolpakov 2015-03-24 17:06:38 +03:00
  • 230287d43f Merge pull request #7334 from edx/ahsan/tnl-1699-remove-buttons-from-aria-live-region Ahsan Ulhaq 2015-03-24 16:14:49 +05:00
  • 9a56b800ee Unified Course Team and Library Users page. Converted both to Backbone. Converted lettuce Course Team page tests to bok choy E. Kolpakov 2015-03-10 18:08:30 +03:00
  • 2e0d35f180 Remove submission buttons from aria-live region Ahsan Ulhaq 2015-03-13 16:22:00 +05:00
  • c6ab15c64c Merge pull request #7352 from edx/sarina/pep8-quality-report Sarina Canelake 2015-03-23 21:10:58 -04:00
  • e77211b713 Run pep8 on all files, and fix uncovered errors Sarina Canelake 2015-03-23 15:50:29 -04:00
  • 0f0ee6a394 Merge pull request #7455 from edx/aleffert/video_web_only Greg Price 2015-03-23 15:38:18 -04:00
  • bd090a6e58 Fix paver quality tests to reflect removed diff-quality call Sarina Canelake 2015-03-20 16:20:44 -04:00
  • 838060f30c Update course_publish event to: * Only fire on bulk operation if something therein was published * Wrap calls that use the following repeated pattern: if self.signal_handler and not bulk_record.active: self.signal_handler.send() * Ensure consistent firing of signal between split and draft implementations * Updated tests to use typical course nesting structures * Added tests within bulk operations Martyn James 2015-03-11 16:31:14 -04:00
  • 4900d7a5ab Merge pull request #7452 from edx/cdodge/get-courses-filter chrisndodge 2015-03-23 15:07:09 -04:00
  • a1e446d4ef Merge pull request #7445 from edx/will/ecom-803 Will Daly 2015-03-23 15:05:08 -04:00
  • 438ce5f7a4 Add web-only setting to video module Greg Price 2015-03-23 14:45:17 -04:00
  • c08ccee45a Merge pull request #7450 from edx/ned/common-lib-to-openedx-core-lib Ned Batchelder 2015-03-23 14:00:35 -04:00
  • 798f91ca5a Merge pull request #7434 from edx/sanchez/track_internal_request_errors Stephen Sanchez 2015-03-23 13:26:06 -04:00
  • 99430113e3 Fix pre-existing pylint violations Ned Batchelder 2015-03-23 12:36:35 -04:00
  • a84735057d Move common/lib/*.py to openedx/core/lib Ned Batchelder 2015-03-23 12:11:48 -04:00
  • b6a333f323 do the ORG filtering as part of the mongo query. Also, don't trigger metadata inheritence calculations when just trying to load 'about' information, which is not tied into the course tree anyhow (i.e. no parent/child relationship) Chris Dodge 2014-09-17 11:44:30 -04:00
  • c01602f094 Change implementation of improved logging based on new API. Stephen Sanchez 2015-03-23 16:16:48 +00:00
  • c6eef03258 Update aria label on edX footer Will Daly 2015-03-23 09:35:19 -04:00
  • e66409be45 Merge pull request #7444 from edx/will/self-gen-certs-docstring-cleanup Will Daly 2015-03-23 12:13:53 -04:00
  • 072dbcd50f Merge pull request #7412 from edx/will/ecom-1233 Will Daly 2015-03-23 11:34:54 -04:00
  • 7af1ee3e5f Change error handling to report back internal errors. Stephen Sanchez 2015-03-20 17:32:35 +00:00
  • 30058b913c Merge pull request #7425 from edx/clrux/ux-1784-generate-certificates Will Daly 2015-03-23 11:23:43 -04:00
  • a51fbc8123 Refactor pep8 to run instead of diff-quality pep8 Sarina Canelake 2015-03-16 21:09:52 -04:00
  • 1b65afdd04 Give run_pep8 more readable output Sarina Canelake 2015-03-14 00:48:28 -04:00
  • 8710c63839 Merge pull request #7447 from edx/sarina/20150323-update-translations Sarina Canelake 2015-03-23 10:51:08 -04:00
  • 71486fc45b Update translations (autogenerated message) Sarina Canelake 2015-03-23 10:49:33 -04:00
  • 6fb48eb159 Merge pull request #6706 from edx/ammar/tnl-181 Usman Khalid 2015-03-23 19:49:03 +05:00
  • f8da29b9cf Styling for automatic cert generation on Progress page Chris Rodriguez 2015-03-19 15:22:08 -04:00
  • e8cf0a35df Merge pull request #7423 from edx/mjames/update_search_hash Martyn James 2015-03-23 10:39:31 -04:00
  • 775de9e818 Merge pull request #7150 from edx/dcikatic/courseware_search_tracking Martyn James 2015-03-23 10:37:23 -04:00
  • 7426102de1 Merge pull request #7017 from edx/ammar/move-cohort-management-tnl-1268 Usman Khalid 2015-03-23 19:05:53 +05:00
  • c50f828187 Fixes after rebase. Usman Khalid 2015-03-23 16:36:48 +05:00
  • 659535365d Update error messaging for progress page self-gen certs Will Daly 2015-03-23 08:32:54 -04:00
  • cb21a0819c A11y fixes for EdX header. Will Daly 2015-03-17 15:16:25 -04:00
  • 3f2cd706e8 Merge pull request #7437 from edx/will/ecom-1229 Will Daly 2015-03-23 08:32:15 -04:00
  • e6c75529c0 Cohort discussion topics via UI in instructor dashboard. muzaffaryousaf 2015-02-17 16:51:27 +05:00
  • e07f45b5dd Removed cohort_config from advanced settings page. Usman Khalid 2015-03-02 16:32:28 +05:00
  • eee6250fb2 Use RequestCache to cache cohorts information. Usman Khalid 2015-03-01 21:40:54 +05:00
  • d382f569c8 Refactor django_comment_client.utils.prepare_content() to query course cohort settings only once. Usman Khalid 2015-02-27 15:47:19 +05:00
  • a9e0082c7c Cache cohort info during requests to reduce SQL queries. Usman Khalid 2015-02-26 00:14:18 +05:00
  • d59be9949e Use cohort settings from CourseCohortSettings. Usman Khalid 2015-02-21 20:06:59 +05:00
  • b56e123350 Change labels muhammad-ammar 2015-03-05 23:46:32 +05:00
  • 9ce66c78fd Rename Cohort Management to Cohorts Move Cohorts section after Membership section muhammad-ammar 2015-03-03 13:17:01 +05:00
  • 70efd28483 Changes after Andy's Review Muhammad Ammar 2015-02-27 20:30:33 +05:00
  • 3ce494f5c5 Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab Muhammad Ammar 2015-02-11 21:35:01 +05:00
  • d839692437 Added get_cohort_associated_assignment_type method. muzaffaryousaf 2015-03-21 19:24:35 +05:00
  • 0ebd8c29b0 Allow Instructor To Rename Cohorts And Set Cohort Assignment Method muhammad-ammar 2015-02-11 14:07:43 +05:00
  • ec6cc04b90 Merge pull request #7440 from edx/nimisha/fix-account-creation-merge-issue Nimisha Asthagiri 2015-03-21 14:06:56 -04:00
  • dd8aba8fc9 Fixes merge conflict with account creation transaction. Nimisha Asthagiri 2015-03-21 09:23:27 -04:00
  • c35cd5d841 Merge pull request #7420 from open-craft/fix-library-analytics Braden MacDonald 2015-03-20 21:40:35 -07:00
  • 7764f364cd Fix two content library analytics issues (SOL-521) Braden MacDonald 2015-03-18 18:43:52 -07:00
  • 289469dd3a Merge pull request #7353 from edx/mobile/third-party-oauth-reg Nimisha Asthagiri 2015-03-20 17:04:37 -04:00
  • 8a1877f0ad Merge pull request #7436 from edx/ned/upgrade-pylint Ned Batchelder 2015-03-20 16:34:52 -04:00
  • 5a414914e4 Lower the pylint threshold Ned Batchelder 2015-03-20 15:49:47 -04:00
  • f396c11579 Fix unidiomatic type checking Ned Batchelder 2015-03-20 14:35:31 -04:00
  • dfcef9ddcb MA-95: Update Registration endpoint to support 3rd party credentials Automatically link edX account with social account in login mobile API path Nimisha Asthagiri 2015-03-17 15:00:33 -04:00
  • c01ab4a824 Merge pull request #7430 from edx/talbs/fix-certs-csspath Brian Talbot 2015-03-20 15:41:44 -04:00
  • 89620a33c3 Merge pull request #7378 from edx/clintonb/pay-with-oscar Clinton Blackburn 2015-03-20 15:39:34 -04:00
  • 704e8836f0 Course info page no longer creates enrollments. Will Daly 2015-03-20 15:22:20 -04:00
  • 306a267de7 Updated create_order endpoint to use E-Commerce API for order creation and enrollment Clinton Blackburn 2015-03-16 13:50:18 -04:00
  • 6c70f30dec pylint --> 1.4.2, and pin astroid Ned Batchelder 2015-03-20 14:35:11 -04:00
  • 5d65f577eb Merge pull request #7431 from edx/zoldak/SOL-336 Jesse Zoldak 2015-03-20 13:20:22 -04:00
  • 58876edb0f fixes whitespace Mark Sadecki 2015-03-20 11:43:33 -04:00
  • d012428c34 Merge pull request #7426 from edx/adam/merge-release-to-master Adam 2015-03-20 10:42:22 -04:00
  • bb4e57762f Decorate flaky test SOL-336 Jesse Zoldak 2015-03-20 10:13:11 -04:00
  • f4c3a732be certificates: revising compiled CSS paths to match existing LMS patterns Brian Talbot 2015-03-20 09:54:58 -04:00
  • f30d2a1516 Update path.py to version 7.2 David Baumgold 2015-03-20 09:51:02 -04:00
  • 60cb7cf33a Merge pull request #7325 from edx/ahsan/tnl-1693-standarize-button-on-assessment-types Ahsan Ulhaq 2015-03-20 18:50:27 +05:00
  • 90a0459e50 Merge pull request #7380 from OmarIthawi/edraak/platform-name-in-password-reset-confirm Sarina Canelake 2015-03-20 09:14:40 -04:00
  • 1e73c272f5 Merge pull request #7405 from edx/shr/bug/PLAT-466-Bad-course-about-page-value-500-error Shrhawk 2015-03-20 17:57:48 +05:00
  • d17a0c6ad2 handle invalid-key exception for split courses Syed Hassan Raza 2015-03-18 17:36:35 +05:00
  • 5d54036090 Fix pylint violation Martyn James 2015-03-06 13:31:01 -05:00