Commit Graph

  • 40976cef76 Merge pull request #9720 from edx/sarina/flaky-cert-test Sarina Canelake 2015-09-11 11:31:59 -04:00
  • 034a7261e8 Merge pull request #9715 from edx/ziafazal/SOL-1192 Matt Drayer 2015-09-11 11:22:47 -04:00
  • a7cec3283a Fix of Flaky test in proctored exams. Muhammad Shoaib 2015-09-10 15:32:10 +05:00
  • 39bfe27191 Merge pull request #9718 from edx/sarina/20150911-translations-update Sarina Canelake 2015-09-11 10:36:57 -04:00
  • 463d425c7a Mark test as flaky (SOL-1199) Sarina Canelake 2015-09-11 10:30:42 -04:00
  • a4904b38d8 Merge pull request #9686 from jolyonb/feqanswer Sarina Canelake 2015-09-11 10:27:21 -04:00
  • 68ee28f8b0 update edx-proctoring to 0.9.x Chris Dodge 2015-09-10 08:57:47 -04:00
  • fe1c44afaf Merge pull request #9637 from edx/shr/bug/ccx_plat-795 Peter Pinch 2015-09-11 09:56:51 -04:00
  • c8dc10b2d7 added wait for loading js files Saleem Latif 2015-09-10 12:12:58 +05:00
  • 222c3ba01e Merge pull request #9713 from edx/diana/eventing-updates Diana Huang 2015-09-11 09:16:06 -04:00
  • 49dfee0e44 save_cxx slow transaction Syed Hassan Raza 2015-09-06 05:45:40 -07:00
  • da86964ff4 Update translations (autogenerated message) Sarina Canelake 2015-09-11 08:56:36 -04:00
  • 3613d0f0c3 Merge pull request #9701 from edx/ahsan/Update-reverification-block-version-hash Ahsan Ulhaq 2015-09-11 12:17:51 +05:00
  • 673e7ea553 Merge pull request #9658 from edx/saleem/SOL-1053 Matt Drayer 2015-09-11 00:04:05 -04:00
  • 84442697f0 Merge pull request #9706 from edx/andya/remove-stray-breadcrumb Andy Armstrong 2015-09-10 22:45:29 -04:00
  • 5f5310446f Remove unnecessary breadcrumbs for Teams tab Andy Armstrong 2015-09-10 11:57:54 -04:00
  • 7f14a151b9 Modifying template for formulaequationinput and fixing CSS Jolyon Bloomfield 2015-09-09 14:46:46 -04:00
  • 4be8aa5d5d Initial implementation of API for listing a user's third party auth providers Braden MacDonald 2015-09-08 19:10:45 -07:00
  • f37ffc2f03 Add the course as part of the context for teams events. Diana Huang 2015-09-09 13:59:08 -04:00
  • 17e6453546 Merge pull request #9520 from edx/efischer/teams-instructor-toolbar Eric Fischer 2015-09-10 17:24:39 -04:00
  • 65cbab739a Team deleted and learner removed events Eric Fischer 2015-09-03 14:58:19 -04:00
  • 6edadc2acc Developer-quality css Eric Fischer 2015-08-31 17:05:32 -04:00
  • 3662fbc133 Edit Membership functionality and tests cahrens 2015-08-31 17:11:38 -04:00
  • 55b2ea374f Merge pull request #9684 from edx/andya/fix-teams-i18n Andy Armstrong 2015-09-10 16:27:00 -04:00
  • d33f237644 Fix and cleanup of API doc Mark Hoeber 2015-09-10 15:55:17 -04:00
  • f8bbbc8729 Merge pull request #9698 from edx/clrux/lms-global-sr-contrast clrux 2015-09-10 14:32:04 -04:00
  • 0a01a35b24 Merge pull request #9711 from edx/mjfrey/authors-update Michael Frey 2015-09-10 14:14:58 -04:00
  • 6f1a1c9104 Add Michael Frey Michael Frey 2015-09-10 14:06:00 -04:00
  • e2bffc793d LMS: setting fore/background colors for all sr elements Chris Rodriguez 2015-09-10 08:32:20 -04:00
  • f8da90e533 Merge pull request #9667 from edx/peter-fogg/join-team-redirect Peter Fogg 2015-09-10 12:46:29 -04:00
  • 0c3be8e121 Delete Team functionality and tests Peter Fogg 2015-08-31 10:47:54 -04:00
  • 8942b31d31 Introducing instructor toolbar Eric Fischer 2015-08-28 11:39:07 -04:00
  • 04714d0d65 Merge pull request #9634 from edx/use-latest-gitpython David Baumgold 2015-09-10 12:18:41 -04:00
  • b03ba6f997 Merge pull request #9705 from edx/dan-f/remove-silly-debugger-statement Daniel Friedman 2015-09-10 11:58:52 -04:00
  • 146078e2c6 Fix redirecting to topics page after joining a team. Peter Fogg 2015-09-08 17:48:13 -04:00
  • 4d8f4bad53 Merge pull request #9648 from edx/jia/MA-1182_newPR wajeeha-khalid 2015-09-10 20:54:31 +05:00
  • 68060d5139 Remove debugger statement from JS spec Daniel Friedman 2015-09-10 11:15:41 -04:00
  • 439ddfa97e Merge pull request #9668 from edx/andya/team-search-i18n-bug Andy Armstrong 2015-09-10 11:09:17 -04:00
  • 85a18e28e5 Use latest version of GitPython David Baumgold 2015-09-04 15:07:23 -04:00
  • 1455882b4f Allows username and user email to be sent to an LTI. lduarte1991 2015-09-10 10:53:36 -04:00
  • d1d44e7bd0 Merge pull request #9611 from edx/dan-f/add-team-page-viewed-events Daniel Friedman 2015-09-10 10:37:59 -04:00
  • 1059456d69 added GET method for Threads in Dicussion API wajeeha-khalid 2015-09-02 14:05:35 +05:00
  • 3d2b6c40cb Update edX Reverification Block hash to the updated version Ahsan Ulhaq 2015-09-10 19:04:54 +05:00
  • 83e6da0683 Merge pull request #9691 from edx/tasawer/bugfix/ecom-1730-integrityError-on-course-enrollment tasawernawaz 2015-09-10 18:33:37 +05:00
  • 530312ab6d Merge pull request #9676 from edx/clrux/hotfix-lms-dashboard-link-hover clrux 2015-09-10 09:17:30 -04:00
  • 16ae0df38d LMS: updating hover colors for visited links Chris Rodriguez 2015-09-09 08:12:43 -04:00
  • 02d4606e57 Fixing IntegrityError happened on concurrent requests for course enrollment ECOM-1730 Tasawer 2015-09-10 13:05:54 +05:00
  • 4d08cfd4e2 include Null in filters Zia Fazal 2015-09-10 15:29:32 +05:00
  • 3b957a7ee9 Add page viewed events to teams app. Daniel Friedman 2015-09-03 15:50:57 -04:00
  • 1c910cfbbb Merge pull request #9631 from edx/peter-fogg/teams-ajax-errors Peter Fogg 2015-09-09 18:49:39 -04:00
  • 6817e89f4a Fix i18n for last activity date on team cards Andy Armstrong 2015-09-09 17:59:25 -04:00
  • 95339311b0 Respond to AJAX errors in Teams UI. Peter Fogg 2015-09-04 13:29:57 -04:00
  • 34e01581c1 Merge pull request #9680 from edx/cdodge/only-show-proctoring-download-when-enabled chrisndodge 2015-09-09 15:01:18 -04:00
  • 0afa0ab764 Merge pull request #9674 from edx/muhhshoaib/PHX-141-proctoring-timer-count-down-acccessibility chrisndodge 2015-09-09 14:28:43 -04:00
  • 321a0ea6a0 Fix searching with Chinese characters Andy Armstrong 2015-09-09 14:16:05 -04:00
  • 6164c20a0f Make studio forgot password link focusable Christine Lytwynec 2015-09-09 12:40:31 -04:00
  • b5d6b210fd Merge pull request #9681 from edx/release Clinton Blackburn 2015-09-09 12:38:15 -04:00
  • f5057b841c Merge pull request #9597 from edx/cdodge/adjust-log-level chrisndodge 2015-09-09 12:29:43 -04:00
  • 5591101a18 only show proctoring download button when the course has proctoring enabled Chris Dodge 2015-09-09 10:53:35 -04:00
  • 020e16495d Merge pull request #9630 from edx/rc/2015-09-09 Clinton Blackburn 2015-09-09 11:04:27 -04:00
  • 2ee10a6c1d fixed the allowances table css issue in instructor dashboard Muhammad Shoaib 2015-09-09 19:22:41 +05:00
  • 7eb41ed840 Merge pull request #9590 from openfun/openfun/fix-dropdown-problem-template Sarina Canelake 2015-09-09 10:15:06 -04:00
  • c5bca132bd Merge pull request #9670 from edx/sarina/fix-inherited-tests Sarina Canelake 2015-09-09 10:06:21 -04:00
  • 8d0bc488e1 Merge pull request #9664 from edx/clytwynec/AC-166 Christine Lytwynec 2015-09-09 09:43:37 -04:00
  • b19a0e71d3 Fix pylint issues in spoc_gradebook test Sarina Canelake 2015-09-08 20:11:49 -04:00
  • 3a05726eaf Fix Pylint warning for monkey_patch tests Sarina Canelake 2015-09-08 20:07:24 -04:00
  • 24195c12ea PHX-141 added the accessibility element for timer count down Muhammad Shoaib 2015-09-09 15:51:14 +05:00
  • 4aa38330b8 Merge pull request #9622 from edx/muzaffar/upgrade-django-sekizai Muzaffar yousaf 2015-09-09 15:41:20 +05:00
  • 2521e379b9 update python-social-auth muhammad-ammar 2015-09-09 15:04:30 +05:00
  • 282b9449a4 ECOM-2150: Added the ga client fetching as a customer header in middleware aamir-khan 2015-09-02 18:20:11 +05:00
  • e33d1dc563 Upgrading django-sekizai muzaffaryousaf 2015-09-04 16:37:24 +05:00
  • d17bff1cbb Merge pull request #9645 from edx/muzaffar/upgrade-django-ses Muzaffar yousaf 2015-09-09 14:19:40 +05:00
  • b8c33e7b30 Add Julien Paillé to AUTHORS. jpaille 2015-09-04 08:34:48 +00:00
  • ef2a855e93 Fix dropdown problem (optioninput) template. jpaille 2015-09-02 15:23:51 +00:00
  • 86553c2f13 Upgrading django-ses muzaffaryousaf 2015-09-07 15:29:51 +05:00
  • 0ee2112b78 Merge pull request #9573 from edx/muzaffar/upgrade-mock-django Muzaffar yousaf 2015-09-09 12:40:50 +05:00
  • de6d49701b Merge pull request #9447 from edx/ahsan/ECOM-2118-Credit-Eligible-Assessments-Appear-in-Incorrect-Order Ahsan Ulhaq 2015-09-09 12:28:54 +05:00
  • 0ed729b0ca Upgrading edx-search version in platform muzaffaryousaf 2015-09-04 11:33:10 +05:00
  • 6be65f6595 Upgrade mock-django to 0.6.9. muzaffaryousaf 2015-09-02 14:23:41 +05:00
  • 4c2dc816bb Merge pull request #9617 from edx/muzaffar/django-upgrade-simple-history Muzaffar yousaf 2015-09-09 11:38:23 +05:00
  • 6c09ceaef9 Merge pull request #9669 from edx/bderusha/teams-search-flag Bill DeRusha 2015-09-08 20:58:30 -04:00
  • bc685451ea Merge pull request #9568 from edx/bbeggs/lettuce-1.8-upgrade Brian Beggs 2015-09-08 20:30:52 -04:00
  • 8bfa4e9c21 Add ENABLE_SEARCH_TEAMS flag to tests Bill DeRusha 2015-09-08 19:12:48 -04:00
  • 72ea41f9c7 Don't localize search indexes for teams Andy Armstrong 2015-09-08 18:26:12 -04:00
  • daa4c67339 Adding trailing_text to formulaequationinput Jolyon Bloomfield 2015-09-06 19:10:44 -04:00
  • fb874f4805 Merge pull request #9665 from edx/bderusha/teams-search-config Bill DeRusha 2015-09-08 17:39:07 -04:00
  • 49807ab6a5 Add search specific feature flag in front of search features Bill DeRusha 2015-09-08 17:13:12 -04:00
  • a08fe9fb06 Merge pull request #9059 from edx/andya/faster-update-assets Andy Armstrong 2015-09-08 16:48:11 -04:00
  • ab6e76c19b Add in a comment describing the reasoning for the names Gabe Mulley 2015-09-08 09:45:43 -04:00
  • ee7d47c7ec Merge pull request #9640 from edx/jibsheet/lti-consumer-default-token Kevin Falcone 2015-09-08 16:15:59 -04:00
  • 9a45e831ac Merge pull request #9497 from edx/clytwynec/AC-155 Christine Lytwynec 2015-09-08 15:43:46 -04:00
  • b7006533a2 updating lettuce to work with Django 1.4 - 1.8 Brian Beggs 2015-09-01 17:26:07 -04:00
  • 3aff77021a Remove unicode quotes in courseware html attrs Christine Lytwynec 2015-09-08 15:41:31 -04:00
  • 0b78ffdf83 Merge pull request #9632 from edx/diana/teams-changed-event Diana Huang 2015-09-08 15:21:49 -04:00
  • c45b8a1720 Merge pull request #9657 from edx/ammar/remove-django-robots-from-requiremtns.txt Brian Beggs 2015-09-08 14:52:58 -04:00
  • ef032e9ab4 Merge pull request #9652 from edx/ammar/remove-django-kombu Brian Beggs 2015-09-08 14:38:23 -04:00
  • 2557e4714b Merge pull request #9644 from edx/ammar/remove-django-masquerade Brian Beggs 2015-09-08 14:36:11 -04:00
  • 56f0043877 reduce logging severity from exception to error Chris Dodge 2015-09-03 09:02:32 -04:00
  • ade4734308 Merge pull request #9661 from edx/bderusha/teams-search-index Bill DeRusha 2015-09-08 14:31:41 -04:00
  • c430422fca Merge pull request #9643 from edx/ammar/remove-django-settings-context-processor Brian Beggs 2015-09-08 14:30:14 -04:00