Commit Graph

  • c83ea18d91 Fix test failing under one shard. Ben Patterson 2015-01-29 17:48:53 -05:00
  • 407e6ec76b LMS Acceptance to one shard. Ben Patterson 2015-01-29 09:21:55 -05:00
  • fd4ada255c Merge pull request #6864 from edx/will/country-access-messaging Will Daly 2015-02-02 15:46:25 -05:00
  • 82d7e25f3e Add views to the embargo app to render messages explaining why students are blocked. Will Daly 2015-02-02 09:31:13 -05:00
  • 19f676a8d7 Merge pull request #6845 from edx/will/country-access-models Will Daly 2015-02-02 14:03:18 -05:00
  • a69c4efd21 Add the ability to send SIGPROF to an edx-platform process to obtain a memory dump Calen Pennington 2015-01-29 14:23:29 -05:00
  • 03594aa3f4 Upgrade pip Calen Pennington 2015-01-30 09:27:08 -05:00
  • 3570e474e0 Merge pull request #5123 from IONISx/tusbar/enable-https-studio Feanil Patel 2015-02-02 13:09:29 -05:00
  • 74ecb84fc5 Merge pull request #6862 from edx/clytwynec/disable_flaky_tests Christine Lytwynec 2015-02-02 12:44:51 -05:00
  • a5867da9de Add new models to embargo to support country access Will Daly 2015-01-30 14:07:25 -05:00
  • 4789c5c9d0 Use HTTP_X_FORWARDED_PROTO header in studio Bertrand Marron 2014-09-08 16:23:51 +02:00
  • e90c66431b disable PayAndVerifyTest.test_immediate_verification_enrollment Christine Lytwynec 2015-02-02 10:40:48 -05:00
  • 4b6c62a85b Merge pull request #6856 from edx/sarina/20150202-translations-update Sarina Canelake 2015-02-02 09:35:26 -05:00
  • 67fbfdc8e0 Update translations (autogenerated message) Sarina Canelake 2015-02-02 09:12:12 -05:00
  • 5e1cc88736 Merge pull request #6825 from edx/benp/bok-choy-4shards Ben Patterson 2015-02-02 09:08:18 -05:00
  • 71d66316fc Courseware search: Change name of results page from "Searching [course name]" Davorin Sego 2015-02-02 13:24:07 +01:00
  • 7601046729 Merge pull request #6852 from edx/dcikatic/SOL-302-hide-reindex Martyn James 2015-02-02 08:34:26 -05:00
  • 98e92bfb12 Merge pull request #6847 from edx/mjames/search_setting Martyn James 2015-02-02 08:31:06 -05:00
  • 64b3768d6b Merge pull request #6837 from edx/anton/fix-flaky-unit-test Anton Stupak 2015-02-02 14:23:41 +02:00
  • 2967f18d3f Merge pull request #6739 from edx/clrux/lms-navigation-accessibility-update Chris 2015-02-02 07:05:00 -05:00
  • 772908d79d SOL-302 Hide reindex button if 'ENABLE_COURSEWARE_INDEX' false Dino Cikatic 2015-02-02 11:22:36 +01:00
  • 1b96a59771 Merge pull request #6833 from edx/zub/bugfix/plat-420-fix-create_child-for-split zubair-arbi 2015-02-02 14:03:42 +05:00
  • bf3740696e TNL-1298: Flaky Jasmine test for Student Notes. polesye 2015-01-30 17:50:53 +02:00
  • 7d7cb7850f don't add xblock with 'detached' tag as direct child of course for split in 'create_child' method PLAT-420 zubair-arbi 2015-01-30 16:10:33 +05:00
  • 41040be7cc Merge pull request #6850 from edx/ned/contributing-tweaks Ned Batchelder 2015-02-01 07:56:35 -05:00
  • a0d4aff5ce Three spelling fixes Ned Batchelder 2015-02-01 07:54:07 -05:00
  • 951773150f updated icons on discussion forums Marco Morales 2015-01-31 18:40:38 -05:00
  • 79ffa0f57f Merge pull request #6838 from edx/will/fix-translator-comments-in-email Will Daly 2015-01-30 17:47:16 -05:00
  • 1b769b53cd Default search engine to None, so that all search/indexing operations are disabled until enabled Martyn James 2015-01-30 15:14:25 -05:00
  • 3f211d3ded Merge pull request #6842 from edx/cptvitamin/add-meself-to-authors Mark Sadecki 2015-01-30 16:09:29 -05:00
  • 73b6f3f8a0 Introduce another bok-choy shard. Ben Patterson 2015-01-29 09:15:00 -05:00
  • beb9602d2a Merge pull request #6841 from edx/benp/fix-all-scripts-bok-choy Ben Patterson 2015-01-30 15:36:43 -05:00
  • bf68daa46b Fix translator comments showing up in redeem code email. Will Daly 2015-01-30 09:57:26 -05:00
  • 8f974ea901 Merge pull request #6815 from edx/renzo/enable-logistration Renzo Lucioni 2015-01-30 15:15:56 -05:00
  • 3c689ea435 Fix test script shard bug. Ben Patterson 2015-01-30 14:53:38 -05:00
  • 74c46d364b adds Mark Sadecki to AUTHORS Mark Sadecki 2015-01-30 15:08:26 -05:00
  • 20eb84d431 Merge pull request #6828 from edx/gprice/video-upload-ordering Greg Price 2015-01-30 15:08:09 -05:00
  • 3acb5c53f0 Accessibility issues addressing UX-1572 Chris Rodriguez 2015-01-22 16:44:33 -05:00
  • ef8b95b98e Merge pull request #6805 from edx/sarina/legal-update-footer-text Sarina Canelake 2015-01-30 14:09:38 -05:00
  • a8bed5ce98 Make logistration generally available if feature flag is active Renzo Lucioni 2014-11-26 15:35:29 -05:00
  • 3978d91644 Sort Studio video uploads by creation date Greg Price 2015-01-29 16:23:47 -05:00
  • 0a0d306b6a Merge pull request #6750 from edx/clrux/lms-navigation-content-focus-update Chris 2015-01-30 12:26:23 -05:00
  • edc37a0418 Merge pull request #6816 from edx/aamir-khan/ECOM-763-invalidkeyerror Will Daly 2015-01-30 11:40:43 -05:00
  • 2fd7657e0f Update text in LMS footer as per legal Sarina Canelake 2015-01-28 16:26:17 -05:00
  • af763c287e Update text in Studio footer as per legal Sarina Canelake 2015-01-28 16:21:15 -05:00
  • 704fd1125f Merge pull request #6830 from edx/merge-release-into-master Adam 2015-01-30 10:48:14 -05:00
  • bfcfbfab2f Merge remote-tracking branch 'origin/release' into merge-release-into-master Adam Palay 2015-01-30 09:44:42 -05:00
  • 869b407e1f Merge pull request #6818 from edx/sanchez/allow_redeem_code_upgrades Stephen Sanchez 2015-01-30 09:36:43 -05:00
  • 0bf348cb28 Merge pull request #6791 from open-craft/bump-xblock-for-unique-id David Baumgold 2015-01-30 09:36:10 -05:00
  • ae102de3be Merge pull request #6777 from edx/muzaffar/student-info-tnl836 Muzaffar yousaf 2015-01-30 19:35:26 +05:00
  • 011a5f9410 Merge pull request #6754 from OmarIthawi/edraak/omarithawi/bulk-mail-rtl Sarina Canelake 2015-01-30 09:12:56 -05:00
  • a001737d8c Merge pull request #6827 from edx/alasdair/logistration-field-focus-fix AlasdairSwan 2015-01-30 08:52:53 -05:00
  • f07cd749e4 Merge pull request #6740 from open-craft/kelketek/better-contentlib-modulestore-warning Xavier Antoviaque 2015-01-30 13:04:29 +01:00
  • f3bf66c1c0 ECOM-763 handling InvalidKeyError exception. Awais 2015-01-29 17:19:52 +05:00
  • da3a3c038c Bump XBlock version Braden MacDonald 2015-01-28 00:37:16 -08:00
  • 13c36c9097 Merge pull request #6821 from edx/hotfix/2015-01-29 Adam 2015-01-29 17:43:34 -05:00
  • b4c66f57d2 Fix the redemption codes to allow upgrading course modes. stephensanchez 2015-01-28 22:11:50 +00:00
  • e24d4d96ad Merge pull request #6720 from edx/renzo/remove-split-verification-session-flag Renzo Lucioni 2015-01-29 16:57:40 -05:00
  • 370eb970b1 Accessibility issues addressing UX-1573 Chris Rodriguez 2015-01-23 14:09:00 -05:00
  • 4ee99f1911 Merge pull request #6824 from edx/clytwynec/TE-728 Christine Lytwynec 2015-01-29 16:12:33 -05:00
  • f1fff439a6 Add clearer error message for library content blocks on incompatible modulestores. Jonathan Piacenti 2015-01-22 21:39:51 +00:00
  • 1562fdbbb4 ECOM-1002 fixed issue of grey background for logistration page. Also fixed focus issue when toggling between forms - as raised by @cptvitamin AlasdairSwan 2015-01-29 15:29:49 -05:00
  • d4d785bfd7 update codejail (TNL-1248) (optionally use a proxy process to spawn subprocesses) Adam Palay 2015-01-29 14:18:38 -05:00
  • c71a183316 Update embargo copy. Diana Huang 2015-01-29 11:41:18 -05:00
  • 4c8ab7dab5 Fix "No data to report" coverage errors in bok choy tests Christine Lytwynec 2015-01-29 14:45:47 -05:00
  • f203651a37 Merge pull request #6817 from edx/renzo/pay-and-verify-fix-flaky-bok-choy Renzo Lucioni 2015-01-29 14:06:43 -05:00
  • 116dba39a8 Merge pull request #6711 from edx/jsa/fix-rerun-exception Jim Abramson 2015-01-29 12:51:02 -05:00
  • 00926740c1 Merge pull request #6819 from edx/benp/fix-pep8-jan291015 Ben Patterson 2015-01-29 12:50:15 -05:00
  • 2dd3cd8659 Fix pep8 violation. Ben Patterson 2015-01-29 12:20:23 -05:00
  • 6134bedfca Merge pull request #6443 from open-craft/kelketek/hide-irrelevant-cohort-menu David Baumgold 2015-01-29 11:49:33 -05:00
  • d5fa69ee54 Fix flaky bok-choy tests caused by malformed URL Renzo Lucioni 2015-01-29 11:30:44 -05:00
  • dd857fb464 Merge pull request #6760 from edx/markhoeber-doc1510 Mark Hoeber 2015-01-29 11:34:03 -05:00
  • 53b22da9bc Merge pull request #6766 from edx/clrux/forums-indicate-current-convo Chris 2015-01-29 11:26:25 -05:00
  • ace2bffae6 avoid database error when recording task exception jsa 2015-01-21 09:21:54 -05:00
  • dc5b88cc22 Merge pull request #6813 from edx/zoldak/ECOM-1007 Jesse Zoldak 2015-01-29 11:18:03 -05:00
  • 80589eab36 Remove old payment and verification flow Renzo Lucioni 2015-01-21 15:22:32 -05:00
  • 1ad0e9fdd8 Merge pull request #6560 from openfun/openfun/studio-csrf-error Adam 2015-01-29 10:52:17 -05:00
  • 20a605f043 Merge pull request #6803 from edx/clytwynec/add-extra-args-opt Christine Lytwynec 2015-01-29 10:35:42 -05:00
  • 1d738527b6 Platform/Mobile API doc updates Mark Hoeber 2015-01-26 10:39:04 -05:00
  • 30966eb618 Merge pull request #6772 from edx/sylvia/docs/EnrollCodesUI srpearce 2015-01-29 10:01:42 -05:00
  • a1ffcc5259 Disable referrer (TNL-1144) Syed Hassan Raza 2015-01-13 17:30:17 +05:00
  • 663d02dd40 skip flaky test - test_immediate_verification_enrollment ECOM-1007 Jesse Zoldak 2015-01-29 09:08:17 -05:00
  • d30088dd0d Using .sr instead of aria-label Chris Rodriguez 2015-01-28 07:53:59 -05:00
  • 42486a5ee6 Adding ARIA label to selected conversation Chris Rodriguez 2015-01-26 14:17:45 -05:00
  • 3a09af07e5 Fixing the broken tests. muzaffaryousaf 2015-01-29 18:37:22 +05:00
  • b17290cd75 Merge pull request #6802 from edx/adam/fix-translation Adam 2015-01-29 08:02:09 -05:00
  • 1d85598336 Change name and email modal couple of accessibilty issues Ahsan Ulhaq 2015-01-27 11:57:51 +00:00
  • c461541d35 Refactoring tests. muzaffaryousaf 2015-01-29 13:33:28 +05:00
  • dce56b135e Make sure login form can't be submitted too early Régis Behmo 2015-01-22 15:40:51 +01:00
  • c3c35f076c Fix csrf error on studio login Régis Behmo 2015-01-12 18:14:12 +01:00
  • 3f4ee28e27 Refactoring the user service test. muzaffaryousaf 2015-01-29 12:51:30 +05:00
  • a260579af9 Merge pull request #6678 from edx/mattdrayer/entexams-follow-up Matt Drayer 2015-01-29 00:53:54 -05:00
  • 1c839cc09d Addressed several outstanding issues related to initial entrance exams feature delivery Matt Drayer 2015-01-16 12:45:16 -05:00
  • 495583ac7d Merge pull request #6782 from edx/mattdrayer/generalize-entrance-exam-scoring Matt Drayer 2015-01-28 23:15:58 -05:00
  • 4c41445bbb Merge pull request #6506 from edx/feature/courseware_search Martyn James 2015-01-28 23:05:06 -05:00
  • 8b03ad3906 Decoupled entrance exam scoring from milestone fulfillment Matt Drayer 2015-01-27 13:21:25 -05:00
  • e09d47b122 Courseware Search integration Davorin Sego 2014-12-08 17:34:54 +01:00
  • a9127c1897 Merge pull request #6804 from edx/will/revert-require-js-optimizer-again Andy Armstrong 2015-01-28 18:30:16 -05:00
  • dbc465a518 reuse instances of OSFS in old mongo jsa 2015-01-28 03:30:25 -05:00
  • 4a76a629f6 Revert "Fix tolerance broken" Adam Palay 2015-01-28 10:21:01 -05:00