Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • aa7a4cedaa BlockUsageLocators are not AssetKeys. Don Mitchell 2014-05-15 08:39:58 -04:00
  • a9649973aa Merge pull request #3648 from edx/oleg/fix-download-transcript Oleg Marshev 2014-05-15 15:18:42 +03:00
  • 6b84f8ab86 Fixed on instructor dash too. Waheed Ahmed 2014-05-15 17:07:10 +05:00
  • 7192fce2f5 A hack to get instructor email to work in Firefox while the video annotator tool is refactored to not bundle its own tinymce globally. Usman Khalid 2014-05-15 16:01:29 +05:00
  • b9cd6cd6ec Add sjson and srt to type map. Oleg Marshev 2014-05-05 23:54:55 +03:00
  • 1648442052 Reset attempts, delete state and rescore buttons not working on staff debug. LMS-2706 Waheed Ahmed 2014-05-15 12:47:51 +05:00
  • e70ea9a115 Merge pull request #3722 from edx/ahodges/documentation/DOC156 Alison Hodges 2014-05-14 16:42:54 -04:00
  • ca1afe4695 Reformatted tables, copy edited, and proofread. Alison Hodges 2014-05-06 16:59:15 -04:00
  • ddf1874ca4 Fix merge conflicts Calen Pennington 2014-05-14 15:59:25 -04:00
  • 661f37ecd6 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master Calen Pennington 2014-05-14 15:57:38 -04:00
  • 44b15619e9 Fix spoc_gradebook Calen Pennington 2014-05-14 15:23:58 -04:00
  • 52d8317ab5 Fix bug affecting video transcripts in XMLModulesStore courses Carson Gee 2014-05-14 15:01:13 -04:00
  • 0a6ea26c25 Merge pull request #3703 from edx/sanchez/course-anonymous-ids-in-csv Stephen Sanchez 2014-05-14 15:04:42 -04:00
  • 0888e32716 Merge pull request #3723 from edx/db/revert-pr-3466 brianhw 2014-05-14 14:13:28 -04:00
  • 59e3cae4c9 Revert pull request #3466 David Baumgold 2014-05-14 13:55:26 -04:00
  • ac01da61ed Merge pull request #3720 from edx/ahodges/documentation/LMS2591 Alison Hodges 2014-05-14 12:55:07 -04:00
  • 5c5994816c Changes for LMS-2591, Instructor Dash switchover Alison Hodges 2014-05-14 10:30:02 -04:00
  • 00fb23d5ed Merge pull request #3689 from edx/ahodges/documentation/DOC405 Alison Hodges 2014-05-14 11:32:51 -04:00
  • 614494aa1a DOC-405: privileges in Studio=privileges in LMS Alison Hodges 2014-05-12 16:47:50 -04:00
  • 8ffc51689e Merge pull request #3598 from edx/zoldak/rebalance-cms-shards Jay Zoldak 2014-05-14 11:29:31 -04:00
  • ce8e6cd0d0 Merge pull request #3711 from edx/flowerhack/fix-subhist Julia Hansbrough 2014-05-14 11:19:12 -04:00
  • 8b38d9d382 Merge pull request #3698 from edx/ahodges/documenttion/DOC387 Alison Hodges 2014-05-14 11:18:11 -04:00
  • aa7de7e2be Staff Debug includes links to reset/rescore/delete state for a student Alison Hodges 2014-05-12 17:31:06 -04:00
  • 08eb8fa7c1 Merge pull request #3706 from edx/adam/fix-non-ascii-grade-range Adam 2014-05-14 10:52:28 -04:00
  • ba7171b013 Merge pull request #3719 from edx/markhoeber/documentation/change-log-fix Mark Hoeber 2014-05-14 10:48:00 -04:00
  • f321d7a8ee May change log fix Mark Hoeber 2014-05-14 10:27:04 -04:00
  • faefba9182 Add ADDL_INSTALLED_APPS to studio for parity with lms Carson Gee 2014-05-14 10:20:21 -04:00
  • 6ca0a7a1d6 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master Calen Pennington 2014-05-14 10:00:25 -04:00
  • 7e55d5eb5c Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master Calen Pennington 2014-05-14 10:00:16 -04:00
  • 40e7cab8fb Fix failing mongo modulestore unit tests Calen Pennington 2014-05-14 09:59:54 -04:00
  • 5cc41a6c9b Changing Student Anon ID Dump to return Course Specific IDs. Stephen Sanchez 2014-05-13 13:32:11 -04:00
  • 43b2d670e7 Merge pull request #3713 from edx/fix-ora-errors Diana Huang 2014-05-14 09:40:35 -04:00
  • ecdb9ec461 Address review comments Calen Pennington 2014-05-14 09:37:38 -04:00
  • df3d6e3b06 Merge pull request #3714 from edx/waheed/lms1596-change-text-admin-dash Waheed Ahmed 2014-05-14 18:30:51 +05:00
  • 2b8fafec56 Text changed in admin_dashboard for course enrollments. LMS-1596 Waheed Ahmed 2014-05-14 15:36:15 +05:00
  • 71c447768d returning enrollment mode for both active and inactive users John Jarvis 2014-05-13 17:47:52 -04:00
  • 25e026438d More missing ORA fixes. Diana Huang 2014-05-13 17:46:07 -04:00
  • 72b27c1800 Merge pull request #3709 from edx/fix-ora-errors Diana Huang 2014-05-13 17:37:03 -04:00
  • 2eda8a677a Merge pull request #3699 from edx/flowerhack/fix-safe-exec Julia Hansbrough 2014-05-13 17:36:44 -04:00
  • 6c46fb98ca Compare stringified course_ids to regexes for courses allowed to execute unsafe code Julia Hansbrough 2014-05-13 16:07:48 +00:00
  • 542dff194e Fix improper parsing of location string Julia Hansbrough 2014-05-13 20:32:08 +00:00
  • f8f542b677 Merge pull request #3710 from edx/db/add-to-authors-file David Baumgold 2014-05-13 17:16:09 -04:00
  • c6ea63d3fd Added @ksteph to AUTHORS file David Baumgold 2014-05-13 17:14:07 -04:00
  • b39278309d More ORA fixes for opaque-keys. Diana Huang 2014-05-13 16:39:56 -04:00
  • 2c9a7b51fd Merge pull request #3696 from edx/talbs/fix-lms-dashboard-images Brian Talbot 2014-05-13 16:35:58 -04:00
  • 8534ef559d Fix cms tests after merge from master Calen Pennington 2014-05-13 16:33:14 -04:00
  • cd1ec5fd58 resolving display issue where older/smaller courses images wouldn't fill designated area on the student dashboard Brian Talbot 2014-05-13 09:52:13 -04:00
  • 5c345b3b00 Fix more broken tests after merge from master Calen Pennington 2014-05-13 16:21:18 -04:00
  • 7fcaa20c61 Merge pull request #3702 from edx/will/opaque-keys-ora-fixes Will Daly 2014-05-13 16:01:20 -04:00
  • 073115442c Merge pull request #3700 from edx/andya/split_test_has_children Andy Armstrong 2014-05-13 15:45:39 -04:00
  • 9b313d732f fix bug Adam Palay 2014-05-13 15:32:46 -04:00
  • 2b95b0ba36 add failing tests for non-ascii characters in grade cutoffs on progress page (LMS-2687) Adam Palay 2014-05-13 15:32:23 -04:00
  • 6c546fbf1f Fix merge conflicts Calen Pennington 2014-05-13 15:31:40 -04:00
  • 240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master Calen Pennington 2014-05-13 15:30:56 -04:00
  • 16faafded9 Fix ssl redirection test Calen Pennington 2014-05-13 14:13:45 -04:00
  • c6a02870e1 Update instructor dash to support ora2 submissions API with opaque keys Will Daly 2014-05-13 11:53:58 -04:00
  • 9407102b45 Merge pull request #3697 from edx/e0d/revert-mysql-upgrade e0d 2014-05-13 13:04:27 -04:00
  • a247bb7b9e Fix StaffDebug javascript tests Calen Pennington 2014-05-13 12:57:22 -04:00
  • 4adc608f48 Specify that split_test_modules support children. Andy Armstrong 2014-05-13 12:36:45 -04:00
  • 6fcf65ef62 Fix staff debug view Calen Pennington 2014-05-13 11:58:56 -04:00
  • 0a51b2ad12 Merge pull request #3695 from edx/sylvia/docs/DOC-359 srpearce 2014-05-13 11:13:42 -04:00
  • c6f80bff2f Update Vital Source and LTI component information Sylvia Pearce 2014-05-12 14:06:57 -04:00
  • dcf27a9b74 Merge branch 'release' Brian Wilson 2014-05-13 11:11:22 -04:00
  • d6a74a644d Merge branch 'master' into release Brian Wilson 2014-05-13 11:10:48 -04:00
  • 209c0d703f Merge pull request #3685 from edx/sarina/051314-language-update Sarina Canelake 2014-05-13 10:52:10 -04:00
  • eced86d6ce reverting the upgrade e0d 2014-05-13 10:36:07 -04:00
  • 09e3a86d43 Merge branch 'shindere/fix-debug-toolbar-lms' for PR #3401 David Baumgold 2014-05-13 10:32:59 -04:00
  • 7c078e04d3 Add myself to AUTHORS. Sébastien Hinderer 2014-04-18 18:15:10 +02:00
  • ec31a42637 CMS: debug toolbar should be displayed on dev stack. Sébastien Hinderer 2014-04-18 18:08:13 +02:00
  • 484c529d99 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master Calen Pennington 2014-05-13 10:23:24 -04:00
  • 7a96faf9a3 Merge pull request #3585 from dragonfi/master Waheed Ahmed 2014-05-13 19:06:40 +05:00
  • 24756bdbea Update translations (autogenerated message) Sarina Canelake 2014-05-12 13:42:08 -04:00
  • eadf3b59e2 Merge pull request #3464 from mitocw/cg/course_image_fixes Carson Gee 2014-05-13 09:19:07 -04:00
  • 489eceee83 Merge pull request #3690 from edx/ahodges/documentation/DOC326 Alison Hodges 2014-05-13 09:13:57 -04:00
  • f3d11250ee Added username as option for batch enrollment/unenroll Alison Hodges 2014-05-12 17:01:25 -04:00
  • a3004de974 Merge pull request #3488 from edx/alex/paver_dev Alexander Kryklia 2014-05-13 10:53:29 +03:00
  • c30665fb59 Merge pull request #3677 from edx/nick/fix-feedback-bug Nick Parlante 2014-05-12 15:23:44 -07:00
  • f48e470f54 Fix targeted-feedback bug Nick Parlante 2014-05-09 13:03:59 -07:00
  • 7d6e3319eb Merge pull request #3595 from edx/adam/fix-typo-2 Adam 2014-05-12 17:10:41 -04:00
  • 741cdf9557 Merge pull request #3688 from edx/dhm/opaque-keys-bugs Don Mitchell 2014-05-12 17:06:10 -04:00
  • 4ecf41126a Merge pull request #3626 from edx/adam/fix-import-bug Adam 2014-05-12 16:54:21 -04:00
  • ae542aee3c Merge pull request #3664 from edx/adam-inherit-max-attempts Adam 2014-05-12 16:44:17 -04:00
  • f247adc4b7 Merge pull request #1 from edx/ned/tweaks-for-pr-3464 Carson Gee 2014-05-12 16:37:51 -04:00
  • 37b1a2f738 Remove calls to loc_mapper Calen Pennington 2014-05-12 16:34:53 -04:00
  • 8430be3d18 Fix #3347: "Run Code" reloads page in Matlab Problem dragonfi 2014-05-03 19:15:23 +02:00
  • c07b360528 Add my name to the authors file dragonfi 2014-05-06 16:54:47 +02:00
  • 45e8984997 Merge pull request #3530 from edx/dhm/opaque-locator Don Mitchell 2014-05-12 16:26:12 -04:00
  • bf8ca487bb fix staff_grading server error Don Mitchell 2014-05-12 15:09:24 -04:00
  • a51a0c558e fix importing bug (STUD-1599) Adam Palay 2014-05-06 16:35:18 -04:00
  • e5fa0c5dd9 add max-attempts to inheritance.py (LMS-2130) Adam Palay 2014-05-08 14:14:14 -04:00
  • 2f7adda00d Simple fixes Ned Batchelder 2014-05-12 15:52:57 -04:00
  • 66bbe17e86 Merge pull request #3687 from edx/flowerhack/fix-discussion-opaque Julia Hansbrough 2014-05-12 15:45:48 -04:00
  • ded28af8b4 Make Locators comply with UsageKey accessors Don Mitchell 2014-04-29 16:27:11 -04:00
  • a4df0e1515 Fix failing tests Calen Pennington 2014-05-12 14:45:38 -04:00
  • d9817117ed Merge pull request #3647 from edx/gprice/comment-client-allow-extra-fields Greg Price 2014-05-12 14:42:26 -04:00
  • f6f802f3db Pass deprecated course keys through Julia Hansbrough 2014-05-12 18:35:40 +00:00
  • b00fa60ba5 Merge pull request #3686 from edx/markhoeber/documentation/release-notes-date-fix Mark Hoeber 2014-05-12 14:01:09 -04:00
  • 2c83e77c05 Release notes date fix Mark Hoeber 2014-05-12 13:56:28 -04:00
  • 65e9efb5ec Merge pull request #3601 from edx/markhoeber/documentation/doc-331 Mark Hoeber 2014-05-12 13:49:40 -04:00
  • 57f14bded1 Allow extra fields returned from comments service Greg Price 2014-04-09 15:06:11 -04:00