Commit Graph

  • 877ec3f963 some minor improvements to embargo Alan Boudreault 2014-05-20 09:50:41 -04:00
  • 50e05eb6a0 Merge pull request #3785 from mlkwaqas/waqas/lms2646-revert Adam 2014-05-20 09:39:48 -04:00
  • 95636a9556 Revert "Handle the indexerror exception on create_order" It was merged by mistake during the code freeze. Waqas Khalid 2014-05-20 18:33:54 +05:00
  • d87fa2ce97 Merge pull request #3641 from mlkwaqas/waqas/lms2646-list-index-error Waqas Khalid 2014-05-20 17:29:12 +05:00
  • 67a20d6536 Fix message. polesye 2014-05-20 14:15:01 +03:00
  • 33871e4515 Handle the indexerror exception on create_order LMS-2646 Waqas Khalid 2014-05-12 18:38:48 +05:00
  • 807f8e9a9a fix cms subsection tests STUD-1624 zubair-arbi 2014-05-19 13:35:36 +05:00
  • f3371643ee i18n: Make translation works for video editor tabs louyihua 2014-05-20 11:20:22 +08:00
  • 299046a86f Add logging of search quality information Greg Price 2014-05-19 17:37:26 -04:00
  • 411dc09af7 Autoactivate inactive users on external_auth login Jason Bau 2014-05-19 13:35:35 -07:00
  • 61b28f560b remove broken docs link David Baumgold 2014-05-08 12:53:12 -04:00
  • 189f53bc71 Fix grades management commands Sarina Canelake 2014-05-19 15:08:28 -04:00
  • db161543d8 Modified EMBARGO_SITE to SITE_EMBARGOED, improved logs Alan Boudreault 2014-05-19 15:53:45 -04:00
  • bd609be043 Add autodocs of modulestores Calen Pennington 2014-05-19 15:48:52 -04:00
  • 9ca09db469 Fix missing semicolon in annotation html Calen Pennington 2014-05-19 15:34:29 -04:00
  • 25948e3694 Fix minor typo in a test Alan Boudreault 2014-03-01 21:45:45 -05:00
  • ba6e61b907 Extended Embargo feature to support site access restriction and ip network Alan Boudreault 2014-03-01 18:44:58 -05:00
  • a7139a84b6 Add stevedore requirements for RTD builds Mark Hoeber 2014-05-19 14:58:54 -04:00
  • 1e27f177da Adding opaque keys module to system path in doc configuration Mark Hoeber 2014-05-19 13:45:58 -04:00
  • 5a62c83d05 Handle some records not having lower_id Don Mitchell 2014-05-19 13:31:03 -04:00
  • 30f2c9331d Merge pull request #3763 from cpennington/opaque-keys-merge-master Calen Pennington 2014-05-19 13:10:55 -04:00
  • 36f4e55e2b added check for modal to disappear in _change_lang_promise Christine Lytwynec 2014-05-19 12:45:45 -04:00
  • a3b6ef8bae Rename variables to make type clearer Calen Pennington 2014-05-19 10:58:38 -04:00
  • 263cf647ad Added totals for different student tracks Han Su Kim 2014-05-06 14:53:32 -04:00
  • 4df122a92e Update annotations modules to use the course_id from the runtime, rather than extracting it from the page Calen Pennington 2014-05-19 09:37:53 -04:00
  • 2ce6719153 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master Calen Pennington 2014-05-19 09:29:34 -04:00
  • 8f72394e81 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master Calen Pennington 2014-05-19 09:20:08 -04:00
  • 6c7ca7ae89 Merge pull request #3768 from edx/will/ora2-release-2014-05-19 Will Daly 2014-05-19 08:44:02 -04:00
  • 03496b5da1 Merge pull request #3771 from edx/sarina/051914-language-update Sarina Canelake 2014-05-19 08:43:37 -04:00
  • 593f591847 Update translations (autogenerated message) Sarina Canelake 2014-05-19 08:35:08 -04:00
  • 5fd2eef58d Add Croatian language Sarina Canelake 2014-05-19 08:13:18 -04:00
  • 8b3992bf4b ORA2 release 2014-05-19 Will Daly 2014-05-19 08:05:13 -04:00
  • b3fb545b10 Merge pull request #3716 from edx/anton/i18n-symbolic-response Anton Stupak 2014-05-19 11:23:07 +03:00
  • 934b8dbcf9 Add translators. polesye 2014-05-14 13:48:09 +03:00
  • aedde3397e SymbolicResponse fix error message. polesye 2014-05-14 14:30:53 +03:00
  • 237fca067f CustomResponse: fix log message. polesye 2014-05-15 14:47:29 +03:00
  • b3233f2932 Merge pull request #3619 from edx/markhoeber/documentatoin/online-help-system Nimisha Asthagiri 2014-05-16 22:02:23 -04:00
  • 73275eeb82 Updated tests for online help Nimisha Asthagiri 2014-05-16 16:05:49 -04:00
  • 27ff0db57b Added new context sensitive link and updated text Sock template changes Mark Hoeber 2014-05-14 16:29:30 -04:00
  • 84d8fcf1b5 Acceptance tests for online help. Nimisha Asthagiri 2014-05-13 16:54:00 -04:00
  • 8fcbdaed03 Update of all templates Changed help button to link and removed drop-down items Mark Hoeber 2014-05-13 13:41:19 -04:00
  • b7440a51e8 Dev support for context-sensitive help. Nimisha Asthagiri 2014-05-06 11:54:46 -04:00
  • 3b25801881 Merge pull request #3615 from jazkarta/devstack-local-filestorage Carson Gee 2014-05-16 17:10:05 -04:00
  • 1c6a0f0a6c Merge pull request #3761 from edx/dhm/opaque-export Don Mitchell 2014-05-16 16:40:06 -04:00
  • db8b33d04d Use path already created by ansible. Chris Rossi 2014-05-16 10:33:13 -04:00
  • 42e8e3068e Use local storage instead of S3 for uploads in devstack. Chris Rossi 2014-05-06 11:41:57 -04:00
  • 4a842131d6 Merge pull request #3760 from edx/sarina/fix-split-test-child-id Sarina Canelake 2014-05-16 16:12:53 -04:00
  • afac5145e3 Merge pull request #3757 from edx/sarina/fix-git_import Sarina Canelake 2014-05-16 16:12:33 -04:00
  • ba7abf4291 Fix test_import_export.py Calen Pennington 2014-05-16 15:41:14 -04:00
  • dd6609fa2c Fix dashboard data tests Calen Pennington 2014-05-16 15:38:59 -04:00
  • d636c56af2 xml export of drafts was exporting everything now only exports the drafts into the draft subdir STUD-1627 Don Mitchell 2014-05-16 14:04:14 -04:00
  • 56a6b99f61 Merge pull request #3759 from cpennington/opaque-keys-rtfd-requirements Calen Pennington 2014-05-16 15:10:27 -04:00
  • 6d5478a483 Migrate new code from merge to use OK standards Calen Pennington 2014-05-16 14:20:35 -04:00
  • d4280e8529 Fix merge conflicts Calen Pennington 2014-05-16 14:10:50 -04:00
  • ed672f079e made is_browser_on_page actually check for the right page in AutoAuthPage Christine Lytwynec 2014-05-16 14:06:47 -04:00
  • 0c1b045f3c Using Edx version of tinymce lduarte1991 2014-05-16 14:02:25 -04:00
  • 18c91d0f1d Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master Calen Pennington 2014-05-16 14:01:20 -04:00
  • 2549551e3c Merge pull request #3752 from edx/db/doc-cognitive-load David Baumgold 2014-05-16 13:59:39 -04:00
  • 8afe315ce4 link to code considerations page from contributor doc David Baumgold 2014-05-16 13:59:21 -04:00
  • 1919df71a2 Fix split test child id Sarina Canelake 2014-05-16 13:52:42 -04:00
  • bad2941f09 Add napoleon to the requirements to build our docs Calen Pennington 2014-05-16 13:49:55 -04:00
  • 6396373bd5 Merge pull request #3758 from edx/clytwynec/disable-XBlockAcidNoChildTest clytwynec 2014-05-16 12:01:05 -04:00
  • 64909df1de Merge pull request #3740 from edx/sylvia/docs/BLD-1032 srpearce 2014-05-16 11:52:47 -04:00
  • 14f3bcfe66 Update Video docs to reflect new UI Sylvia Pearce 2014-05-15 11:08:03 -04:00
  • b3462d1c67 Fix issues with psychometrics and git import Sarina Canelake 2014-05-16 09:39:53 -04:00
  • af8cab2a37 Fix doc typos from #3746 Calen Pennington 2014-05-16 11:35:56 -04:00
  • 0e4f29a87a Merge pull request #3746 from cpennington/opaque-keys-docs-link Calen Pennington 2014-05-16 11:34:03 -04:00
  • 0533859366 disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block Christine Lytwynec 2014-05-16 11:17:26 -04:00
  • 4ec689ed5e Merge pull request #3640 from edx/zub/bugfix/std1595-importcoursepermission zubair-arbi 2014-05-16 19:05:46 +05:00
  • 12ae70b091 Merge pull request #3753 from edx/diana/update-forums-cmd Diana Huang 2014-05-16 09:42:43 -04:00
  • 576df83974 Merge pull request #3756 from edx/zoldak/disable-flaky-test Jay Zoldak 2014-05-16 09:36:52 -04:00
  • 867ea2b637 renamed cognitive_load.rst to code-considerations.rst David Baumgold 2014-05-16 09:28:50 -04:00
  • adf6df224e address review comments from @nedbat David Baumgold 2014-05-16 09:28:05 -04:00
  • 7f5c810ac8 Skip language changing tests Jay Zoldak 2014-05-16 09:00:12 -04:00
  • f3fb82f88f Merge pull request #3750 from edx/dhm/opaque-delete-course Don Mitchell 2014-05-16 08:42:29 -04:00
  • 74aa3a5ba0 create course gorups properly on course import STUD-1595 zubair-arbi 2014-05-08 14:28:20 +05:00
  • 84da71d923 Ensure all cms commands accept either deprecated or new syntax for keys LMS-2712 Don Mitchell 2014-05-15 15:58:00 -04:00
  • fb9b38b7e3 Merge pull request #3584 from edx/dcadams/metrics_tab_download_csv David Adams 2014-05-15 13:47:52 -07:00
  • 138bd78e93 add So You Want to Deploy a New Service David Baumgold 2014-05-15 16:44:53 -04:00
  • 7a87179dc2 Update get_discussion_link command to use CourseKeys Diana Huang 2014-05-15 16:34:27 -04:00
  • 52bc2aa070 Added rst version of cognitive load page David Baumgold 2014-05-15 16:35:05 -04:00
  • f35379a838 Update opaque_keys docs Calen Pennington 2014-05-15 14:31:05 -04:00
  • 921cac6ed6 Fix for 500 error (undefined) in annotation tool lduarte1991 2014-05-15 15:25:30 -04:00
  • e911d57911 Revert "Revert pull request #3466" lduarte1991 2014-05-15 15:23:28 -04:00
  • 9bc7a518ee Fixes issue with metrics tab click handlers Click handlers were not getting attached to DOM elements in some cases on slow running machines. Added logic to attach handlers when elements are ready. David Adams 2014-04-18 12:16:10 -07:00
  • aacbc5eddb Merge branch 'release' (after release-2014-05-14). Brian Wilson 2014-05-15 14:34:22 -04:00
  • a584015bca Merge pull request #3742 from edx/zoldak/disable-failing-cms-test Jay Zoldak 2014-05-15 14:27:37 -04:00
  • 76d511ad72 Merge pull request #3705 from edx/markhoeber/documentation/doc-400 Mark Hoeber 2014-05-15 14:10:51 -04:00
  • 529d2fa33f Release Notes file setup Mark Hoeber 2014-05-13 13:54:23 -04:00
  • 77b895cb98 Merge pull request #3673 from cpennington/opaque-keys-merge-master Calen Pennington 2014-05-15 13:24:50 -04:00
  • 026e6e4a6d Disable failing cms acceptance tests Jay Zoldak 2014-05-15 11:51:06 -04:00
  • 75e7cbac10 Merge pull request #3736 from edx/dhm/opaque-no-asset Don Mitchell 2014-05-15 11:22:43 -04:00
  • b99dd920be Merge pull request #3737 from edx/ahodges/documentation/fixup Alison Hodges 2014-05-15 11:07:32 -04:00
  • daf35bed8f Fix instructor csv download Calen Pennington 2014-05-15 10:30:36 -04:00
  • 2a4b3c969a Fix merge conflicts Calen Pennington 2014-05-15 10:25:20 -04:00
  • ff026ea8af Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master Calen Pennington 2014-05-15 10:25:08 -04:00
  • 524079b42d Merge pull request #3735 from edx/usman/lms2557-bulk-email-hack brianhw 2014-05-15 10:00:26 -04:00
  • 3b5e5741d0 Merge pull request #3732 from edx/waheed/lms2706-reset-delete-not-working-staff-debug brianhw 2014-05-15 10:00:09 -04:00
  • 356723a634 Correcting "make html" errors Alison Hodges 2014-05-15 09:23:05 -04:00
  • de637f329e Merge pull request #3725 from carsongee/cg/transcript_xmlmodulestore_fix Carson Gee 2014-05-15 08:50:36 -04:00