Commit Graph

  • 5d03cad700 Merge pull request #3883 from edx/anton/fix-youtube-regexp Anton Stupak 2014-05-27 14:48:24 +03:00
  • ed5c36ee2d Add Gujarati language Sarina Canelake 2014-05-21 10:13:10 -04:00
  • 84ecac97bd Add Oriya language Sarina Canelake 2014-05-19 15:24:36 -04:00
  • 510d0ae153 Bok-Choy Tests for Video Start Time, End Time and Finish Time Muhammad Ammar 2014-05-23 13:10:07 +00:00
  • db213bf325 BLD-967: Fix regExp. polesye 2014-05-27 13:31:18 +03:00
  • 1208908b57 i18n: Fix an i18n string extraction error in 02_html5_video.js louyihua 2014-05-27 12:59:23 +08:00
  • 559a2c8888 i18n: Make XBlock buttons & components have localizable display names louyihua 2014-05-27 11:15:18 +08:00
  • 926ce567a6 Merge pull request #3878 from louyihua/master Andy Armstrong 2014-05-26 15:08:14 -04:00
  • 1ecfac3f84 Added trailing slashes otherwise the course_id regex sometimes eats up get parameters. Usman Khalid 2014-05-22 20:54:00 +05:00
  • c08e21c391 Merge pull request #3678 from edx/anton/refactor-volume-control Anton Stupak 2014-05-26 12:04:30 +03:00
  • 63ef3bd05a i18n: More extractable & localizable strings in xmodules louyihua 2014-05-26 15:30:01 +08:00
  • 8c26fc6805 Refactor video volume control. polesye 2014-04-16 18:43:23 +03:00
  • f048a58408 i18n: Make values that has 'display_name' be displayed localized in editor louyihua 2014-05-25 14:27:41 +08:00
  • 78ed9e9512 Fixed some TODOs, removed irrelevant ones Julia Hansbrough 2014-05-23 18:48:34 +00:00
  • 46d7f99004 StaffFactories accept course_keys, not courses. Make that clear in the interface. Sarina Canelake 2014-05-22 16:12:50 -04:00
  • d1672e31f7 Opaque-keys: fix pylint violations Sarina Canelake 2014-05-22 14:43:06 -04:00
  • c535a6b933 Opaque-keys: fix pep8 violations Sarina Canelake 2014-05-22 14:35:19 -04:00
  • d01af063a6 Merge pull request #3861 from edx/sarina/fix-quality Sarina Canelake 2014-05-24 19:34:25 -04:00
  • 6f7bc7e174 Fixed some TODOs, removed irrelevant ones Julia Hansbrough 2014-05-23 18:48:34 +00:00
  • 110719deae StaffFactories accept course_keys, not courses. Make that clear in the interface. Sarina Canelake 2014-05-22 16:12:50 -04:00
  • b56e12ff03 Merge pull request #3843 from edx/zoldak/fix-brittle-checklist-acceptance-tests Jay Zoldak 2014-05-23 17:02:19 -04:00
  • 6844575e08 Merge pull request #3676 from edx/f/forum-flag-digest Steven Burch 2014-05-23 13:33:59 -07:00
  • a49cf537e7 Merge pull request #3867 from edx/will/ora2-release-2014-05-23T16.59 Will Daly 2014-05-23 16:29:06 -04:00
  • 01a4f3a21f Merge pull request #3863 from edx/sarina/feature-flag-analytics-dash Sarina Canelake 2014-05-23 16:21:19 -04:00
  • e4df2c2ceb Add 'forum_roles' endpoint to user_api stv 2014-05-05 15:50:13 -07:00
  • a74502bd33 ORA2 release-2014-05-23T16.59 Will Daly 2014-05-23 15:59:53 -04:00
  • dd8d8fc5dd Merge pull request #3831 from lduarte1991/lduarte-harvardx-image Sarina Canelake 2014-05-23 15:40:39 -04:00
  • 94f050c418 Show the menus at the top of the page. cahrens 2014-05-23 15:32:27 -04:00
  • 682191c474 Hide beta dash Analytics score distribution widget behind feature flag Sarina Canelake 2014-05-23 15:00:12 -04:00
  • 074c4b6681 Merge pull request #3860 from edx/ahodges/documentation/DOC394 Alison Hodges 2014-05-23 15:01:20 -04:00
  • e3bf3d8f9a Adding enrollment upgrade events Alison Hodges 2014-05-22 16:43:10 -04:00
  • e4e4b32c62 Image Annotation Tool: Add linkback functionality to image thumbnails lduarte1991 2014-05-22 00:05:19 -04:00
  • 0318c95537 Image Annotation Tool Fixes - Added component to view lduarte1991 2014-05-21 16:25:37 -04:00
  • 008bbc224b Image Annotation Tool: Add static images for openseadragon navigation lduarte1991 2014-05-21 16:19:15 -04:00
  • 32e96681f6 Image Annotation Tool: create xmodule and install js files lduarte1991 2014-05-21 16:12:31 -04:00
  • c24252001c Annotation Tools: Add helper functions and fixed pep8/pylint errors lduarte1991 2014-05-21 15:47:45 -04:00
  • 265fa826ca Opaque-keys: fix pylint violations Sarina Canelake 2014-05-22 14:43:06 -04:00
  • bf32f5a7b9 Opaque-keys: fix pep8 violations Sarina Canelake 2014-05-22 14:35:19 -04:00
  • b19acf693b Add the needed wait for ajax statements to checklist acceptance test methods Jay Zoldak 2014-05-22 16:14:56 -04:00
  • fffdeeb95b Merge pull request #3845 from edx/zoldak/brittle-html-editor-tests Jay Zoldak 2014-05-23 13:28:41 -04:00
  • f9f6e09644 fix for pylint/pep8 defaults Christine Lytwynec 2014-05-23 12:53:12 -04:00
  • 550d054300 added and updated pavelib/quality.py from dglance branch, deprecated rake quality tasks Christine Lytwynec 2014-05-06 20:35:03 -04:00
  • ecb05e6b03 Merge pull request #2905 from edx/opaque-keys Calen Pennington 2014-05-23 12:58:20 -04:00
  • c96bf07be6 Merge pull request #3817 from edx/gprice/forum-search-event-page Greg Price 2014-05-23 12:51:38 -04:00
  • 38e882e8d9 Merge pull request #3857 from edx/markhoeber/documentation/doc-484 Mark Hoeber 2014-05-23 12:36:49 -04:00
  • eb0e6c909b Add page num to forum search tracking log events Greg Price 2014-05-21 15:44:12 -04:00
  • 753189f4d5 Merge pull request #3854 from edx/zoldak/skip-flaky-js-video-tests Jay Zoldak 2014-05-23 11:54:19 -04:00
  • 8c4be448aa Fixed typo in Studio Home Page panel help text Mark Hoeber 2014-05-23 11:46:19 -04:00
  • 05ca40b4f9 Merge pull request #3856 from cpennington/ok-merge-from-master Calen Pennington 2014-05-23 11:42:26 -04:00
  • 8c8cf4705a Resolve conflicts Calen Pennington 2014-05-23 11:39:17 -04:00
  • 6225f4d0bd Merge remote-tracking branch 'edx/master' into ok-merge-from-master Calen Pennington 2014-05-23 11:38:33 -04:00
  • 9feff62857 Merge pull request #3834 from cpennington/ok-merge-from-master Calen Pennington 2014-05-23 11:36:52 -04:00
  • bb4f9148e0 Skip intermittently failing js video tests Jay Zoldak 2014-05-23 11:21:57 -04:00
  • 21ddc7db00 Fixed DeleteComponent on Container Page. Nimisha Asthagiri 2014-05-23 10:27:18 -04:00
  • 234550422d Merge pull request #3805 from edx/sanchez/TIM-563-Check-Django-Admin Will Daly 2014-05-23 10:41:31 -04:00
  • 29f7fe14fb Merge remote-tracking branch 'edx/master' into ok-merge-from-master Calen Pennington 2014-05-23 10:05:56 -04:00
  • ff1e9466be Merge pull request #3849 from edx/ammar/uniqe-course-fix muhammad-ammar 2014-05-23 19:04:07 +05:00
  • 3919b4a47b Unique Course Fix Muhammad Ammar 2014-05-23 12:39:18 +00:00
  • 0054b79d5a Merge pull request #3306 from edx/zub/bugfix/std1523-uploadassetbutton zubair-arbi 2014-05-23 18:24:24 +05:00
  • afd55164e6 Adding new attribute to the xmodule_runtime to check admin privileges on users Stephen Sanchez 2014-05-20 14:50:44 -04:00
  • a0799f38bf Merge pull request #3844 from edx/sarina/lms-2748 Sarina Canelake 2014-05-23 09:18:50 -04:00
  • 33a2725919 Merge pull request #3850 from edx/zoldak/revert-paver-quality Jay Zoldak 2014-05-23 08:42:55 -04:00
  • 4771242d57 Revert "added and updated pavelib/quality.py from dglance branch, deprecated rake quality tasks" Jay Zoldak 2014-05-23 08:39:08 -04:00
  • 77c3233f29 Merge pull request #3824 from edx/anton/fix-transcript-on-ipad Anton Stupak 2014-05-23 10:49:56 +03:00
  • 2133ebd0a2 BLD-1033: Fix transcript displaying on iPad. polesye 2014-05-22 13:05:41 +03:00
  • b6f933a1f5 Merge pull request #3838 from louyihua/translation-fix Andy Armstrong 2014-05-23 00:30:22 -04:00
  • faeee559fd Fix Instructor Dash UX (LMS-2748) Sarina Canelake 2014-05-22 16:36:51 -04:00
  • 4a86b926c5 Wait for ajax to complete when editing components in Studio acceptance tests Jay Zoldak 2014-05-22 16:45:18 -04:00
  • 35083ad9f9 Fix bad uses of course_id/location/locator in new code on master Calen Pennington 2014-05-22 12:01:28 -04:00
  • 240fcc1d5a Fix merge conflicts Calen Pennington 2014-05-22 11:15:04 -04:00
  • d24a777067 Remove package_id and remove lower_ stuff from migrator STUD-1603 Don Mitchell 2014-05-15 13:35:55 -04:00
  • 9588689bfb Updates to problem location for opaque keys Alison Hodges 2014-05-22 16:00:57 -04:00
  • 16f0c9d1ee Merge pull request #3840 from antoviaque/mentoring-opaque-keys Diana Huang 2014-05-22 15:45:48 -04:00
  • 9f6d0594d3 Merge pull request #3835 from edx/zoldak/skip-brittle-test Jay Zoldak 2014-05-22 15:45:09 -04:00
  • db0cd78152 Remove some outdated code. Diana Huang 2014-05-22 15:39:29 -04:00
  • 9df7e1d1cf mentoring-opaque-keys: Adds support for opaque keys Xavier Antoviaque 2014-05-22 15:31:59 -04:00
  • 72cb5ec93f Merge pull request #3828 from edx/ammar/flaky-for-video-tests Jay Zoldak 2014-05-22 15:12:11 -04:00
  • 956b4c4569 Merge pull request #3837 from edx/sylvia/docs/movePA srpearce 2014-05-22 14:23:09 -04:00
  • a6bae4d238 i18n: Make static strings in xmodule files extractable louyihua 2014-05-23 01:56:39 +08:00
  • fb6dc771b4 Update index file; change link in PA for Students Sylvia Pearce 2014-05-22 13:50:18 -04:00
  • cc0832750d Adding django default log handlers into logging configuration Carson Gee 2014-05-22 12:45:05 -04:00
  • afe306439f Merge pull request #3592 from edx/markhoeber/documentation/doc-389 Mark Hoeber 2014-05-22 12:39:25 -04:00
  • 608eef2750 Merge pull request #3800 from edx/markhoeber/documentation/release-notes-fix Mark Hoeber 2014-05-22 12:37:58 -04:00
  • ad8a314aad Modified description of transcript bug fix Mark Hoeber 2014-05-20 18:56:09 -04:00
  • 7db6e639e2 Skip brittle test Jay Zoldak 2014-05-22 12:22:55 -04:00
  • a69e42dd5a Merge pull request #3830 from edx/diana/fix-cohorting Diana Huang 2014-05-22 12:13:15 -04:00
  • ae95e07cce Deserialze values coming into course_groups views Diana Huang 2014-05-22 10:52:30 -04:00
  • fb65aad11e Merge pull request #3826 from cpennington/ok-use-deprecated-for-instructor-api Calen Pennington 2014-05-22 12:07:16 -04:00
  • b2647dab43 Set up for new Open edX Installation and Operations Guide Mark Hoeber 2014-05-02 11:42:03 -04:00
  • 7bbffd8bee Merge pull request #3254 from edx/dcs/a11y-dragdrop Dave St.Germain 2014-05-22 11:45:04 -04:00
  • c7bf96f048 Merge pull request #3822 from edx/sarina/course-modes-display Sarina Canelake 2014-05-22 11:40:15 -04:00
  • 8699a13b09 Use old deprecated form for instructor api calls, and in staff debug info Calen Pennington 2014-05-22 10:11:54 -04:00
  • dfbfd7b204 Merge pull request #3802 from louyihua/translation-fix Andy Armstrong 2014-05-22 11:22:04 -04:00
  • 7044cbb800 Merge pull request #3790 from edx/ahodges/documentation/DOC156 Alison Hodges 2014-05-22 10:58:55 -04:00
  • 7d8b5ad2c3 Merge pull request #3796 from edx/benpatterson/disable-course-export-acc-test Ben Patterson 2014-05-22 10:56:29 -04:00
  • 1223c8a08d has_course was incorrect, fixed Don Mitchell 2014-05-22 09:35:38 -04:00
  • cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys Calen Pennington 2014-05-22 10:52:00 -04:00
  • 33d01232de Flaky is a plugin for nose that automatically reruns flaky tests. Muhammad Ammar 2014-05-22 14:51:57 +00:00
  • 9955e9e383 Merge pull request #3798 from edx/ahodges/documentation/DOC402 Alison Hodges 2014-05-22 10:50:47 -04:00
  • dc00ade1f0 Adaptive hint correct_answer must be lc Alison Hodges 2014-05-20 16:40:57 -04:00