Commit Graph

  • ffd5c1fcd8 Merge pull request #8071 from edx/db/remove-sample-feature-flag David Baumgold 2015-05-18 11:20:58 -04:00
  • 11ca11a411 Merge pull request #8035 from edx/talbs/sass+css-file-names Brian Talbot 2015-05-18 10:43:17 -04:00
  • 20a32a7e4f Merge pull request #8043 from edx/dcikatic/SOL-487-filter-staff-view-rebase Martyn James 2015-05-18 10:40:57 -04:00
  • 3f739b05b1 Merge pull request #7997 from openfun/rmoch/i18n_problem_explanation_title Sarina Canelake 2015-05-18 10:11:01 -04:00
  • 8ce222ed74 Add Richard Moch to AUTHORS Richard Moch 2015-05-18 13:10:25 +00:00
  • 3e0342cbb3 i18n lon-capa problem explanation title Richard Moch 2015-05-18 13:10:08 +00:00
  • 392937d9e1 MAYN-68 fixed the bug, total credit card purchases amount does not include the bulk purchases. Muhammad Shoaib 2015-05-18 15:51:19 +05:00
  • 41363ead93 Merge pull request #8020 from edx/aamir-khan/ECOM-1471-hidden-text-behind-cam-issue Awais Qureshi 2015-05-18 11:40:10 +05:00
  • 4f531f6fbc Merge pull request #7750 from edx/danielli/recommender_xml swdanielli 2015-05-15 19:30:08 -04:00
  • 2ba5d483fc Merge pull request #8078 from edx/release Renzo Lucioni 2015-05-15 17:40:05 -04:00
  • 85e8fa5dbc Merge pull request #8074 from edx/hotfix/2015-05-15 Renzo Lucioni 2015-05-15 16:28:34 -04:00
  • b6164b5702 Merge pull request #7595 from jolyonb/jolyonb/printing_cleanup Marco Morales 2015-05-15 15:42:36 -04:00
  • 8a7c2d66d8 Merge pull request #8068 from edx/db/remove-mathplayer-message David Baumgold 2015-05-15 15:30:24 -04:00
  • 8f22b51117 Merge pull request #8056 from edx/clytwynec/TE-868 Christine Lytwynec 2015-05-15 15:12:01 -04:00
  • 90daffe33d Merge pull request #8057 from edx/db/reorg-main-html-imports David Baumgold 2015-05-15 15:00:34 -04:00
  • b147117d22 Merge pull request #8055 from edx/diana/team-advanced-setting Diana Huang 2015-05-15 14:55:34 -04:00
  • dd20badcf7 Merge pull request #7996 from edx/shr/bug/TNL-2119-Unicode-error-in-templating-bulk-course Shrhawk 2015-05-15 23:31:01 +05:00
  • 358aa7754b Add "Teams Configuration" advanced setting Andy Armstrong 2015-05-13 18:34:47 -04:00
  • 09b7fee38e update xml swdanielli 2015-04-19 12:57:51 -04:00
  • c940b61531 Refine error page regexes such that they only match 404 and 500 Renzo Lucioni 2015-05-15 13:42:41 -04:00
  • e7a348d6d9 Merge pull request #8062 from edx/ahsan/AC-108-no-role-inside-courseware-lms Ahsan Ulhaq 2015-05-15 13:23:30 -04:00
  • a01e92c2e8 Merge pull request #8072 from edx/sarina/20150515-translations-update Sarina Canelake 2015-05-15 13:21:34 -04:00
  • 87954cd1e0 Update translations (autogenerated message) Sarina Canelake 2015-05-15 13:08:02 -04:00
  • 2e1534d75a The SAMPLE feature flag is not used anywhere David Baumgold 2015-05-15 12:49:04 -04:00
  • 99a3053918 Merge pull request #8067 from edx/talbs/lms-update-browser-links Brian Talbot 2015-05-15 12:43:06 -04:00
  • 85839b5801 Reorganize imports in main HTML templates for Studio and LMS David Baumgold 2015-05-14 16:23:28 -04:00
  • e97b94bde2 Merge pull request #8060 from edx/ned/add-supers Ned Batchelder 2015-05-15 12:29:14 -04:00
  • c3095235ff Remove MathPlayer message David Baumgold 2015-05-15 11:23:30 -04:00
  • 76fa485230 LMS: updating recommended/modern browser links Brian Talbot 2015-05-15 11:22:17 -04:00
  • 4aceb0259b add more detailed comment about exit status Christine Lytwynec 2015-05-15 11:09:55 -04:00
  • a57f0d7410 Merge pull request #7794 from edx/clee/gated_content_mobile_api Christopher Lee 2015-05-15 10:24:04 -04:00
  • 3e247cd63a Merge pull request #8061 from edx/talbs/update-ie-conditionals Brian Talbot 2015-05-15 10:16:58 -04:00
  • ab912fa811 Merge pull request #7956 from edx/muzaffar/tnl2047-profile-tweaks Muzaffar yousaf 2015-05-15 19:15:20 +05:00
  • 71bc1476e8 start paver quality tests with clean paver task environment Christine Lytwynec 2015-05-15 10:08:23 -04:00
  • 5cef287c5d MA-635 Block Mobile Content for unfulfilled milestones christopher lee 2015-04-13 16:33:01 -04:00
  • cae5623fd9 Updating the django-countries version to support sorting. Adding the pyuca to support sorting in differnet languages. muzaffaryousaf 2015-05-14 11:13:39 +05:00
  • 378cf9bb7a Sending preferences and accounts data to template. Fixing the pencil icon issue. muzaffaryousaf 2015-05-07 15:35:16 +05:00
  • 2d08d669ca Learner Profile page tweaks. muzaffaryousaf 2015-05-07 15:14:19 +05:00
  • 7922858526 No role inside of courseware Ahsan Ulhaq 2015-05-15 11:20:25 +05:00
  • bac56af74c Studio: updating use of IE-conditional comments Brian Talbot 2015-05-14 23:38:15 -04:00
  • aad7c52f41 LMS: updating use of IE-conditional comments Brian Talbot 2015-05-14 14:15:04 -04:00
  • 78e9445aa1 Add super() calls to setUp/tearDown that are missing them Ned Batchelder 2015-05-14 18:14:21 -04:00
  • 36060f3f9b Merge pull request #8053 from edx/jsa/xcom-1606 Jim Abramson 2015-05-14 17:36:02 -04:00
  • 31a232edc7 Update ecommerce-api-client and add regression test for XCOM-1606 jsa 2015-05-13 17:11:01 -04:00
  • b98d85fda0 Merge pull request #7943 from edx/ned/move-xmodule-modifiers Ned Batchelder 2015-05-14 16:51:46 -04:00
  • 05cd3316d3 Fix pre-existing pylint errors. Diff-quality won't let me move the file otherwise. Ned Batchelder 2015-05-06 09:33:09 -04:00
  • 7c704f3959 Move xmodule_modifiers.py to openedx/core/lib/xblock_utils.py Ned Batchelder 2015-05-06 08:05:13 -04:00
  • 25eb6942b6 Merge pull request #8051 from edx/sarina/add-flaky-TNL-2199 Sarina Canelake 2015-05-14 15:26:43 -04:00
  • 657f15638d use mock_open for paver quality tests Christine Lytwynec 2015-05-14 14:51:08 -04:00
  • a455d9d50a SOL-495 Cohort-Aware content search Davorin Sego 2015-04-18 14:52:42 +02:00
  • c043e8dcf7 LMS: removing now unnecessary IE-specific _ie.scss Sass partial Brian Talbot 2015-05-13 22:04:52 -04:00
  • d09d0a2c36 Studio: renaming Sass/CSS files for consistency and clarity Brian Talbot 2015-05-13 21:46:39 -04:00
  • 2899885711 LMS: renaming Sass/CSS files for consistency and clarity Brian Talbot 2015-05-13 21:26:46 -04:00
  • 6ed752e5de Enable HTML in note tags and support highlighting Ben McMorran 2015-05-13 13:46:44 +00:00
  • 161d89a723 Merge pull request #8045 from edx/clrux/new-extend-for-outline Christina Roberts 2015-05-14 12:54:43 -04:00
  • 3f2c370d58 Merge pull request #7923 from edx/christina/show-notes Christina Roberts 2015-05-14 12:30:38 -04:00
  • 4f9c50e226 Merge pull request #8047 from edx/talbs/fix-lms-dupe-sass-base Brian Talbot 2015-05-14 12:30:12 -04:00
  • f3f0f08422 Add flaky test decorator (TNL-2199) Sarina Canelake 2015-05-14 12:10:42 -04:00
  • 57143d60de Merge pull request #8050 from edx/db/remove-ie9-rule-limit-comment David Baumgold 2015-05-14 12:08:48 -04:00
  • 930b4f6a7a Remove outdated comment referencing IE9 rule limit David Baumgold 2015-05-14 11:56:14 -04:00
  • d5d7fbf786 Moving no-outline use to be more global Chris Rodriguez 2015-05-14 10:46:56 -04:00
  • abd25b8b45 Add a "tags" view in student notes. cahrens 2015-04-29 13:38:16 -04:00
  • aee3281d4d clean up all-tests.sh script Christine Lytwynec 2015-05-13 15:48:25 -04:00
  • 8ad01535b5 LMS: removing redundant Sass base/base partial call in build compile Brian Talbot 2015-05-14 10:47:05 -04:00
  • 1021151efd Complete printing cleanup, rebased into one Jolyon Bloomfield 2015-04-03 17:27:01 -04:00
  • 269432ae34 Merge pull request #8033 from caijim/patch-2 Sarina Canelake 2015-05-13 17:24:06 -04:00
  • 708eb97c74 Update AUTHORS Jim 2015-05-13 14:22:23 -07:00
  • 3f5b154d18 Merge pull request #8025 from edx/diana/fix-flaky-bok-choy-test Diana Huang 2015-05-13 16:13:02 -04:00
  • b328a2e893 Merge pull request #8029 from edx/clytwynec/all-tests-exit-status Christine Lytwynec 2015-05-13 15:09:01 -04:00
  • 905309a6fb Merge pull request #7995 from edx/alasdair/ECOM-986-the-wayward-caret AlasdairSwan 2015-05-13 14:53:13 -04:00
  • 887c4f4522 Merge pull request #8028 from edx/kyle/add-to-author-file Kyle McCormick 2015-05-13 14:36:11 -04:00
  • 5b8482f345 add exit status back Christine Lytwynec 2015-05-13 14:27:23 -04:00
  • 8d0ac31e38 ECOM-986 updated class being used by JS for carats to use classes being loaded on the page via lms-style-course-vendor.css AlasdairSwan 2015-05-11 15:07:35 -04:00
  • f0dcf7e213 add self to author file Kyle McCormick 2015-05-13 13:30:18 -04:00
  • c2772e4aac Merge pull request #8026 from edx/ned/tweak-contributing Ned Batchelder 2015-05-13 12:36:39 -04:00
  • b34a48f09a Merge pull request #8023 from edx/zoldak/update-bok-choy Jesse Zoldak 2015-05-13 12:30:20 -04:00
  • 362c632ad7 Catch BSON errors as well as PyMongo errors when emitting MongoDB events. Diana Huang 2015-05-13 11:00:31 -04:00
  • b5fbf853c7 Add pointers to guidelines of specific concern. Ned Batchelder 2015-05-13 11:21:16 -04:00
  • 788991629d Merge pull request #7991 from edx/adam/update-release-py Adam 2015-05-13 11:13:25 -04:00
  • 6d02beeff9 add troubleshooting for logging into stage to release script Adam Palay 2015-05-11 13:15:31 -04:00
  • e15590d28a Update bok-choy version to the latest release Jesse Zoldak 2015-05-13 10:10:40 -04:00
  • ac8b75ca7f Merge pull request #7804 from edx/diana/progress-summary-refactor Diana Huang 2015-05-13 09:10:02 -04:00
  • 9115960eac Merge pull request #8013 from edx/merge-release-into-master Adam 2015-05-13 08:39:23 -04:00
  • 3acd7a008c Refactor and add tests for new grade report. Daniel Friedman 2015-05-05 17:55:55 +00:00
  • 806e2b3901 Merge pull request #7985 from edx/talbs/sass-build-files Brian Talbot 2015-05-13 05:33:43 -04:00
  • f31746e76c ECOM-1471 Hiding the text. Awais 2015-05-13 13:44:55 +05:00
  • b8efb5423a Merge pull request #7951 from edx/awais786/ECOM-1531-fake-page-ssecure Awais Qureshi 2015-05-13 12:02:32 +05:00
  • 220b8d1cdb LMS: removing conditional search Sass logic + simplifying _build-*.scss files Brian Talbot 2015-05-12 22:13:31 -04:00
  • 24673aa128 LMS: moving shared/redundant Sass partial calls to _build-*.scss partials Brian Talbot 2015-05-11 09:50:27 -04:00
  • 0550e39516 Studio: moving shared/redundant Sass partial calls to _build.scss partial Brian Talbot 2015-05-11 09:19:23 -04:00
  • 84f3c33df7 Address doc review Daniel Friedman 2015-05-11 13:31:47 -04:00
  • 67fdca1847 Monitor performance through datadog Daniel Friedman 2015-04-28 15:55:05 +00:00
  • 2fafaec053 Implement grade report analytics Andy Armstrong 2015-04-24 17:06:45 -04:00
  • 9269ec3b00 Add new instructor task for weighted problems Daniel Friedman 2015-04-22 16:06:32 -04:00
  • 9c32b1e878 Refactor course_structure_api to have separate API Layer. Diana Huang 2015-04-21 14:57:56 -04:00
  • 7df9ab9c14 Extend the Score namedtuple to know about module locations. Diana Huang 2015-04-17 13:09:34 -04:00
  • 53da306c00 Merge pull request #8010 from edx/christina/update-bok-choy Christina Roberts 2015-05-12 16:29:39 -04:00
  • 9ce9da8b1d Merge pull request #8008 from schoolyourself/schoolyourself-xblock-update Ned Batchelder 2015-05-12 16:01:47 -04:00
  • 42fb7bd6cb Merge remote-tracking branch 'origin/release' into merge-release-into-master Adam Palay 2015-05-12 15:13:28 -04:00
  • 608ca88f0e Merge pull request #8007 from edx/gprice/discussion-api-thread-list-fix-type Greg Price 2015-05-12 15:02:04 -04:00