Commit Graph

  • de23d6defe Clear cached children when binding an XModuleDescriptor/XBlock to a particular user Calen Pennington 2015-02-20 13:11:53 -05:00
  • 9379fd2711 Add tests of XBlocks/XModules with filtered children Calen Pennington 2015-02-20 12:59:14 -05:00
  • 71ab971c72 Revert "Lms should be independent of mathjax" Adam Palay 2015-03-17 10:44:48 -04:00
  • 1529c1e956 Update social media links in EdX footer. Will Daly 2015-03-16 14:15:22 -04:00
  • 59ad3ccb73 Merge pull request #7357 from edx/ned/remove-unused-imports Ned Batchelder 2015-03-17 09:34:26 -04:00
  • 7d799e34f3 Remove unused imports Ned Batchelder 2015-03-15 08:06:42 -04:00
  • 3acf503e2b Merge pull request #7376 from edx/ned/fix-test-instructor-dashboard Ned Batchelder 2015-03-17 06:50:06 -04:00
  • 3d107c04eb Keep platform_name in the password_reset_confirm.html always TNL-1654 Omar Al-Ithawi 2015-03-17 10:24:20 +02:00
  • 37dd0ec840 Merge pull request #7327 from edx/andya/preferences-api Andy Armstrong 2015-03-17 00:57:01 -04:00
  • 6976a33a85 Add the preferences endpoint to the User API Andy Armstrong 2015-03-03 17:49:25 -05:00
  • b50e004b2d Merge pull request #7375 from edx/sanchez/update_aws_settings_for_ecommerce Stephen Sanchez 2015-03-16 17:00:20 -04:00
  • f552df3363 Modify commerce view to work without ecommerce configuration. Stephen Sanchez 2015-03-16 20:21:12 +00:00
  • b3354dda31 Merge pull request #7372 from edx/clintonb/no-honor-mode-fix Clinton Blackburn 2015-03-16 15:50:30 -04:00
  • c40ab513ff Merge pull request #7373 from edx/usman/ora-release-2015-03-16 Usman Khalid 2015-03-17 00:45:28 +05:00
  • 85d0a45b14 Fix test_instructor_dashboard.py tests Ned Batchelder 2015-03-16 15:32:17 -04:00
  • 081f5b4e53 Add E-Commerce settings to AWS settings. Stephen Sanchez 2015-03-16 19:29:22 +00:00
  • ba85f82edc Merge pull request #7370 from edx/zoldak/TE-783 Jesse Zoldak 2015-03-16 15:00:47 -04:00
  • 2d51f6435e Add query count tests to DjangoKeyValueStore/FieldDataCache Calen Pennington 2015-03-06 14:57:55 -05:00
  • d6046d786d Fixed bug for courses without an honor mode Clinton Blackburn 2015-03-16 13:50:18 -04:00
  • 6e8d075dd7 Merge pull request #7355 from edx/ned/fix-capitalization Ned Batchelder 2015-03-16 14:45:36 -04:00
  • 5fdc8d666d Update ora2 to release-2015-03-16T17.59. Usman Khalid 2015-03-16 15:23:21 +05:00
  • d2786a6423 Merge pull request #7181 from stvstnfrd/debt/envs Sarina Canelake 2015-03-16 13:25:47 -04:00
  • a35264aff2 Merge pull request #7368 from edx/clytwynec/fix_test_python_opts Christine Lytwynec 2015-03-16 12:41:54 -04:00
  • 261629d7dd Copy over context from settings file stv 2015-03-14 11:10:39 -07:00
  • aae9e821ed Remove dev_int LMS env settings stv 2015-02-28 21:27:55 -08:00
  • 88d9b87150 Remove dev_ike LMS env settings stv 2015-02-28 21:26:59 -08:00
  • 1dad4c8f9f Remove edx4edx LMS env settings stv 2015-02-28 21:25:47 -08:00
  • 015053cb9b Remove antiquated LMS envs files stv 2015-02-28 00:51:25 -08:00
  • 2cbe6fdecb Merge pull request #7371 from edx/will/django-rest-framework-cors-csrf Will Daly 2015-03-16 12:30:30 -04:00
  • e4a08fb868 Update the bok-choy version being used. TE-783 Jesse Zoldak 2015-03-16 11:57:06 -04:00
  • b625e8e37e Skip CSRF referer check for cross-domain requests. Will Daly 2015-03-13 16:41:47 -04:00
  • 8324fd0209 Merge remote-tracking branch 'origin/release' into rc/2015-03-17 Brian Wilson 2015-03-16 11:43:26 -04:00
  • 659e90ea95 pass opts From PythonTestSuite to NoseTestSuite Christine Lytwynec 2015-03-16 11:13:31 -04:00
  • c6992688ac Merge pull request #7314 from edx/load-tender-js-from-tenderapp-subdomain David Baumgold 2015-03-16 10:44:00 -04:00
  • 0a385c04f1 Merge pull request #7366 from edx/sarina/20150316-update-translations Sarina Canelake 2015-03-16 10:35:34 -04:00
  • 3569e7fef5 Update translations (autogenerated message) Sarina Canelake 2015-03-16 10:32:14 -04:00
  • 90211a137a Merge pull request #7367 from edx/revert-6167-patch-5 Jesse Zoldak 2015-03-16 10:27:40 -04:00
  • 26afdf768c Revert "To support UNICODE xblock.location" Jesse Zoldak 2015-03-16 10:15:41 -04:00
  • 1b44f1e237 Merge pull request #7044 from edx/waqas/make-lms-mathjax-independent Waqas Khalid 2015-03-16 18:47:32 +05:00
  • a8457c4fb4 Merge pull request #6871 from edx/waqas/studio-mathjax-unit-problem Waqas Khalid 2015-03-16 18:47:06 +05:00
  • 8247ace595 Revert "Merge pull request #7258 from cpennington/lms-field-data-query-counts" Calen Pennington 2015-03-16 09:41:40 -04:00
  • 5efabb1c4b Merge pull request #7307 from edx/markhoeber-enrollment-api-doc-fix Mark Hoeber 2015-03-16 09:28:29 -04:00
  • dadc47c22a Merge pull request #6167 from fmyzjs/patch-5 Sarina Canelake 2015-03-16 09:05:10 -04:00
  • 729dd24c82 Unit page doesn't load when mathjax is down Waqas Khalid 2015-02-03 16:03:50 +05:00
  • 4a086f54d5 Lms should be independent of mathjax Waqas Khalid 2015-02-19 16:17:08 +05:00
  • fd0e389c3f Merge pull request #7063 from stvstnfrd/pylint/medium Sarina Canelake 2015-03-14 21:51:29 -04:00
  • a8da7946b3 Simple capitalization fix Ned Batchelder 2015-03-14 17:46:22 -04:00
  • 4e2927f146 Lower Pylint threshold to 5800 violations stv 2015-03-02 20:20:31 -08:00
  • 181eed241f Silence unrelated warnings stv 2015-02-27 21:30:18 -08:00
  • f03b943b95 Fix Pylint: W0612(unused-variable) stv 2015-02-16 06:55:08 -08:00
  • 79f9d1a70f Fix Pylint: E1121(too-many-function-args) stv 2015-02-16 06:57:28 -08:00
  • e7e9a16379 Fix Pylint: W0403(relative-import) stv 2015-02-23 00:12:36 -08:00
  • 268cb46d97 Fix Pylint: E0211(no-method-argument) stv 2015-02-15 17:26:24 -08:00
  • b9ed4b6561 Fix Pylint: E1305(too-many-format-args) stv 2015-02-15 19:58:09 -08:00
  • 83fec5d092 Fix Pylint: W0109(duplicate-key) stv 2015-02-16 01:36:57 -08:00
  • 0248660214 Fix Pylint: W0631(undefined-loop-variable) stv 2015-02-16 08:16:03 -08:00
  • 6c06f8ce5d Fix Pylint: C1001(old-style-class) stv 2015-02-16 09:37:36 -08:00
  • 90b3318d01 Fix Pylint: I0010(bad-inline-option) stv 2015-02-16 07:19:59 -08:00
  • 63341287ca Merge pull request #7343 from edx/andya/openedx-dir-coverage Andy Armstrong 2015-03-13 16:09:17 -04:00
  • 4856ef78d3 Merge pull request #7258 from cpennington/lms-field-data-query-counts Calen Pennington 2015-03-13 15:55:57 -04:00
  • 96528be65b Merge pull request #7348 from edx/christina/account-empty-email Christina Roberts 2015-03-13 15:50:53 -04:00
  • 5b2dd87a07 Merge pull request #7333 from edx/clintonb/commerce-json-fix Clinton Blackburn 2015-03-13 15:42:28 -04:00
  • 63bf151074 Merge pull request #7339 from edx/zoldak/TNL-1679 Jesse Zoldak 2015-03-13 15:22:49 -04:00
  • 257462aa9c Merge pull request #7344 from edx/sarina/fix-sarina Sarina Canelake 2015-03-13 15:19:51 -04:00
  • 207e500a23 Don't allow empty string or None for email. cahrens 2015-03-13 14:59:02 -04:00
  • eb72ab58f9 Validating event emission by the commerce app Clinton Blackburn 2015-03-13 14:09:31 -04:00
  • 28ad138829 Merge pull request #7311 from edx/mobile/MA-345-FB-URL Nimisha Asthagiri 2015-03-13 13:56:42 -04:00
  • 8ff4886888 Merge pull request #7337 from edx/clytwynec/flaky-tests-test_password_reset_success Christine Lytwynec 2015-03-13 13:21:55 -04:00
  • cb2c8bc8c7 Merge pull request #7113 from edx/mattdrayer/certs-web-view Matt Drayer 2015-03-13 13:08:52 -04:00
  • fe4c053c25 Remove old comment from file Sarina Canelake 2015-03-13 12:47:20 -04:00
  • a75186dafe Add coverage to openedx directory Andy Armstrong 2015-03-13 12:41:54 -04:00
  • 16e63c9e1e Added Certficates Web/HTML View Matt Drayer 2015-02-18 22:28:15 -05:00
  • 02fc7fd8e7 Removed sr span inside the show answer button Ahsan Ulhaq 2015-03-13 17:14:05 +05:00
  • a715bd7053 Standrize buttons in assessment problems Ahsan Ulhaq 2015-03-12 20:28:07 +05:00
  • 766663eefa Merge pull request #7217 from edx/ziafazal/fix-studio-settings-flaky-test Jesse Zoldak 2015-03-13 11:19:50 -04:00
  • e77bcab571 MA-345 Mobile Enrollment API: add course' Facebook URL Nimisha Asthagiri 2015-01-09 10:15:33 -05:00
  • 7565825714 Disable flaky lettuce test TNL-1679 Jesse Zoldak 2015-03-13 11:04:12 -04:00
  • fd6d135052 decorate flaky test Christine Lytwynec 2015-03-13 10:53:09 -04:00
  • 4e454ccaed Merge pull request #7267 from edx/awais786/ECOM-911-enable-noid-paid-course Awais Qureshi 2015-03-13 18:39:05 +05:00
  • 4bab316bb9 ECOM-911 no-id-professional mode registration flow Awais 2015-03-07 00:17:52 +05:00
  • acb141a990 Corrected data sent to E-Commerce API Clinton Blackburn 2015-03-13 02:36:22 -04:00
  • cff9a5aa78 Merge pull request #7318 from edx/clintonb/register-with-oscar Clinton Blackburn 2015-03-13 01:32:26 -04:00
  • 935323a879 Enrolling via E-Commerce API for combined login-registration page Clinton Blackburn 2015-03-12 12:50:35 -04:00
  • eaa7a22058 Added commerce/purchase endpoint Clinton Blackburn 2015-03-08 13:21:40 -04:00
  • a7e1f9caf3 Merge pull request #7301 from open-craft/course-import-page-fix Kelketek 2015-03-12 18:15:32 -05:00
  • 41cab6d49f Merge pull request #7320 from edx/mattdrayer/add-milestones-app-check Matt Drayer 2015-03-12 17:36:35 -04:00
  • dd82a40aa9 Merge pull request #7317 from edx/cptvitamin/TNL-1674-fix-invalid-aria-role-dialogalert Mark Sadecki 2015-03-12 16:35:54 -04:00
  • 6d3631df98 Merge pull request #7330 from edx/release Adam 2015-03-12 16:17:26 -04:00
  • 8c920b469c Replace broken logic in import template with working logic in view. Jonathan Piacenti 2015-03-11 15:11:06 +00:00
  • cd05391335 Cleaned up milestones API references Matt Drayer 2015-03-11 23:15:46 -04:00
  • 7abbbb443a Merge pull request #7324 from edx/hotfix/2015-03-12 Adam 2015-03-12 15:13:41 -04:00
  • cce00e6933 Merge pull request #7310 from edx/mobile/MA-125 Nimisha Asthagiri 2015-03-12 15:01:39 -04:00
  • 9f0d6c006d MA-125 Mobile Enrollment API: add certificate info Nimisha Asthagiri 2015-01-15 22:13:29 -05:00
  • 3c4252e79c Merge branch 'release' alawibaba 2015-03-12 13:21:53 -04:00
  • 5107d463c7 Merge branch 'master' into release alawibaba 2015-03-12 13:20:45 -04:00
  • d7fd454bce Merge pull request #7316 from edx/video-pipeline/setting-display-fix Nimisha Asthagiri 2015-03-12 11:25:27 -04:00
  • c2ec7cc6e7 fixes invalid aria-role dialogalert which should be alertdialog Mark Sadecki 2015-03-11 17:32:50 -04:00
  • bb2f7dedfd update schoolyourself xblock (TNL-1395) Adam Palay 2015-03-12 10:50:32 -04:00
  • fd312ab13b Merge pull request #7302 from edx/alawibaba/hotfix-cdn-experiment Ali Mohammad 2015-03-12 10:46:59 -04:00
  • 4289ecd341 Merge pull request #7104 from edx/shr/bug/AN-4618-Browser-events-are-being-dropped Shrhawk 2015-03-12 19:17:01 +05:00