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

Commit Graph

  • 6292e55997 Merge pull request #3204 from edx/db/upgrade-django-nose David Baumgold 2014-04-04 10:43:37 -04:00
  • 40d5f1e564 Merge pull request #3195 from edx/anton/force-flash Anton Stupak 2014-04-04 15:29:48 +03:00
  • d55554705f BLD-958: Force video player in flash mode. polesye 2014-04-03 09:31:42 +03:00
  • da470afc4f Merge pull request #3187 from edx/adam/fix-alter-xblock-student-state Usman Khalid 2014-04-04 15:29:34 +05:00
  • b3075e286b Merge pull request #3205 from edx/usman/lms2498-mako-template-tests Usman Khalid 2014-04-04 15:22:12 +05:00
  • ec6388b87d Merge pull request #3153 from edx/anton/caption_refactor Anton Stupak 2014-04-04 13:03:02 +03:00
  • 011a2fcf13 This should enable logging of codejail on prod Dave St.Germain 2014-04-03 16:33:37 -04:00
  • dd7bae432d Merge pull request #3164 from edx/flowerhack/better-xmodule-metrics Julia Hansbrough 2014-04-03 16:04:06 -04:00
  • dfed60fa8c Merge pull request #3163 from edx/christina/advanced-settings-font Christina Roberts 2014-04-03 14:58:56 -04:00
  • aa41635f79 XModule datadog metrics Julia Hansbrough 2014-04-01 16:41:24 +00:00
  • 3d7915fa56 Use monospaced font for CodeMirror editor. cahrens 2014-04-01 13:58:23 -04:00
  • 63c58bb26d Merge pull request #3189 from edx/db/upgrade-pyparsing David Baumgold 2014-04-03 13:02:54 -04:00
  • 394e9efbac make sure new lms/tests.py file is run Adam Palay 2014-04-02 16:47:26 -04:00
  • 12c2e1bfee Test TemplateLookup dirs are not cleared during lms startup. Usman Khalid 2014-04-03 00:01:47 +05:00
  • 751bd71a7b Merge remote-tracking branch 'origin/release' Stephen Sanchez 2014-04-03 11:06:09 -04:00
  • 9e00d6f0c4 Merge pull request #3172 from edx/markhoeber/documentation/doc-248 Mark Hoeber 2014-04-03 10:54:05 -04:00
  • 176392225f Upgrade django_nose to 1.2 David Baumgold 2014-04-03 10:48:52 -04:00
  • d6a0d6f06c Merge pull request #3180 from edx/christina/iframe_binding_bug Christina Roberts 2014-04-03 10:11:43 -04:00
  • c202e2aa6f Merge pull request #3177 from edx/dcs/paver-one-watcher Dave St.Germain 2014-04-03 10:02:58 -04:00
  • 6dc4640f92 Release notes for 4/2/14 Mark Hoeber 2014-04-02 09:56:46 -04:00
  • 048962874e Merge pull request #3150 from edx/waheed/stud1483-cannot-handle-more-than-9-lines-advanced-settings zubair-arbi 2014-04-03 18:42:39 +05:00
  • 4be9c06d1b Merge pull request #3078 from edx/markhoeber/documentation/stud-1443 Mark Hoeber 2014-04-03 09:29:09 -04:00
  • 0a8d07c0c3 Documentation for Pages and Wiki changes Mark Hoeber 2014-03-26 16:20:58 -04:00
  • b0859941e6 Merge pull request #3181 from edx/zoldak/fix-acid Jay Zoldak 2014-04-03 09:24:09 -04:00
  • 70db47a73d Merge pull request #3201 from edx/alex/fix_971 Alexander Kryklia 2014-04-03 16:13:09 +03:00
  • 2f572a86ea Refactor video caption module. polesye 2014-03-31 13:40:50 +03:00
  • 668134de4a Merge pull request #3169 from edx/alex/fix_more_flaky_tests Alexander Kryklia 2014-04-03 15:34:18 +03:00
  • 41695def9e Merge pull request #3136 from edx/alex/display_native_language_2 Alexander Kryklia 2014-04-03 15:06:04 +03:00
  • cf3e2c860b Fix flaky video tests: speed up youtube api loading and wait for controls. Alexander Kryklia 2014-04-01 14:06:22 +03:00
  • 221f4e2363 Fix flaky video test #21: increase timeout. Alexander Kryklia 2014-04-03 14:34:12 +03:00
  • fab43e1a68 Merge pull request #3199 from edx/alex/fix_flaky_video_test_20 Alexander Kryklia 2014-04-03 14:32:06 +03:00
  • e3902cbebc Merge pull request #3198 from edx/alex/fix_flaky_video_test_12 Alexander Kryklia 2014-04-03 14:31:06 +03:00
  • c3f9943802 Fix lms video #20: scroll view to be clickable. Alexander Kryklia 2014-04-03 13:17:32 +03:00
  • 2a39d28348 Fix flaky test #12 Alexander Kryklia 2014-04-02 17:05:04 +03:00
  • 80635a9995 Merge pull request #3149 from edx/alex/fix_flaky_test Alexander Kryklia 2014-04-03 12:20:42 +03:00
  • 11d078a9cc Merge pull request #3192 from edx/ned/fix-encode-error-when-hashing-resources Ned Batchelder 2014-04-02 22:03:00 -04:00
  • 732bf3f307 Fix hash_resource to avoid encode errors. Ned Batchelder 2014-04-02 20:13:50 -04:00
  • f275f5424b Merge pull request #3165 from edx/markhoeber/documentation/doc-188 Mark Hoeber 2014-04-02 16:26:49 -04:00
  • 69ed998474 Reorganizatio of Setting up Course Mark Hoeber 2014-04-01 15:21:29 -04:00
  • bda1471cdf Merge pull request #3178 from edx/ned/private-requirements-in-paver Ned Batchelder 2014-04-02 16:23:42 -04:00
  • 65a9ce24dd Merge pull request #3170 from edx/valera/remove_ipython_dependent_methods Valera Rozuvan 2014-04-02 23:18:51 +03:00
  • cb5e3c8111 Upgrade pyparsing to 2.0.1 David Baumgold 2014-04-02 16:09:53 -04:00
  • aefa456ed5 add failing tests Adam Palay 2014-04-02 16:07:46 -04:00
  • eb4096f1a6 Merge pull request #3186 from edx/sanchez/update_ora2_hash Stephen Sanchez 2014-04-02 16:07:17 -04:00
  • e6e818a5a2 Updating the hash of the ORA2 release candidate in the requirements Stephen Sanchez 2014-04-02 16:05:54 -04:00
  • 7b2cbfc5c5 make beta dash compute module_state_key like legacy dash (LMS-2491) Adam Palay 2014-04-02 15:46:32 -04:00
  • af486423c8 Merge pull request #3179 from cpennington/problem-check-metrics Calen Pennington 2014-04-02 15:34:00 -04:00
  • e81c12c7a4 switching more wiki icons to use the right format Frances Botsford 2014-04-02 15:09:42 -04:00
  • 3af90ef256 Add repsonse pagination to inline discussions Greg Price 2014-04-01 16:07:59 -04:00
  • 4874c45d31 remove double icons in the wiki sidebar Frances Botsford 2014-04-02 14:28:40 -04:00
  • 269cd19abe Merge pull request #3155 from edx/christina/tinymce-update-cdn2 Christina Roberts 2014-04-02 13:55:50 -04:00
  • 86cfda32b3 Add synchronization for rendering to studio xblock tests Jay Zoldak 2014-04-02 13:52:10 -04:00
  • cc275a9347 Check iframe src for the specific value TinyMCE uses. cahrens 2014-04-02 13:25:08 -04:00
  • 42a1f6e35b Merge pull request #3116 from edx/ahodges/documentation/launching Mark Hoeber 2014-04-02 13:47:18 -04:00
  • e79cc796fa Initial draft and images for LMS-2381 Alison Hodges 2014-03-25 18:10:08 -04:00
  • 092d620185 Merge pull request #3147 from mtyaka/password-reset-email-http David Baumgold 2014-04-02 13:46:45 -04:00
  • 638da490ad Remove a method call which depends on IPython. Valera Rozuvan 2014-04-02 11:37:36 +00:00
  • ca7ada624a Merge pull request #3176 from edx/hotfix/revert-openended-i18n Stephen Sanchez 2014-04-02 11:55:58 -04:00
  • 7e23e2655a Rename metrics so that we capture checks as well as scores and number of attempts Calen Pennington 2014-04-02 11:54:30 -04:00
  • beb1d74029 Paver should install requirements/private.txt Ned Batchelder 2014-04-02 11:52:46 -04:00
  • 7d38c493f7 Fixes potential 'too many open files error' when running all servers. Dave St.Germain 2014-04-02 11:45:00 -04:00
  • 3aecaba76f Merge pull request #3168 from cpennington/fix-lms-2489 Calen Pennington 2014-04-02 11:21:55 -04:00
  • e4de5d2eda Match our default code editor font size of 13. cahrens 2014-04-01 17:05:21 -04:00
  • 473ed4cc89 Studio: syncing up font-based styling between TinyMCE editing view and Studio HTML xmodule preview Brian Talbot 2014-04-01 16:54:19 -04:00
  • b04a0d9986 Update default font size to 14 for bulk e-mail editor (LMS). cahrens 2014-04-01 15:13:46 -04:00
  • cc15a267ae revising default (minified) TinyMCE content CSS to be scoped to .mce-content-body element Brian Talbot 2014-04-01 13:09:18 -04:00
  • 6443486dd0 scoping TinyMCE editing CSS to just tinyMCE context-based elements Brian Talbot 2014-04-01 08:17:25 -04:00
  • 9d9b2b8e18 Directions for creating codemirror-compressed.js cahrens 2014-03-31 15:55:50 -04:00
  • aaf842f83a Add dialog plugin code to compressed JS file and CSS file. cahrens 2014-03-31 13:05:09 -04:00
  • 786b416bad removing tinymce button border only on active to counteract fun LMS button styles Frances Botsford 2014-03-31 17:04:47 -04:00
  • f44a1b6c1c Tiny MCE version 4.0.20 Nimisha Asthagiri 2014-03-28 14:04:24 -04:00
  • 9c1a42b852 Use postMessage to communicate between the iframe and TinyMCE. cahrens 2014-03-27 13:03:28 -04:00
  • 8935166c7a Revert "Open ended panel headings not internationalized." Adam Palay 2014-04-02 11:00:51 -04:00
  • b7dc8d18e2 Merge pull request #3137 from edx/markhoeber/documentation/doc-97 Mark Hoeber 2014-04-02 11:06:36 -04:00
  • 1cb7628d8b Don't hardcode https protocol in password reset email. Matjaz Gregoric 2014-04-01 09:25:45 +02:00
  • a8b77b99dd Merge pull request #3171 from abdoosh00/unicode-fixes David Baumgold 2014-04-02 10:45:28 -04:00
  • fe847720ea Upgrade to TinyMCE 4.0.16. Abdallah 2014-02-13 17:49:25 +02:00
  • 1851c0501a Merge pull request #3174 from edx/zoldak/disable-acid Jay Zoldak 2014-04-02 10:22:12 -04:00
  • 186e3b8612 Temporarily disable studio acid block tests that are failing Jay Zoldak 2014-04-02 10:21:05 -04:00
  • c822abca9f Grading Documentation Update Mark Hoeber 2014-03-31 13:39:45 -04:00
  • d283eac0af Merge pull request #3044 from edx/sylviapearce/documentation/DOC-191 srpearce 2014-04-02 10:04:21 -04:00
  • 05ef8d892b Instructor- and student-facing documentation for ORA2 Sylvia Pearce 2014-03-24 15:10:23 -04:00
  • d44b117b4b Merge pull request #3148 from louyihua/localization-fix David Baumgold 2014-04-02 09:49:54 -04:00
  • f5c919841d Merge pull request #3162 from cpennington/problem-check-metrics Calen Pennington 2014-04-02 09:41:14 -04:00
  • 35be2e3032 line fix Abdallah 2014-04-02 16:40:55 +03:00
  • bb9f720fa6 unicode fixes Abdallah 2014-04-02 16:18:56 +03:00
  • bae60527fb Set big timeout for big subtitles. Alexander Kryklia 2014-04-02 15:28:53 +03:00
  • d194d0e02b Wait for big subtitles to render. Alexander Kryklia 2014-04-02 15:21:57 +03:00
  • 6199c8562d Fix acceptance tests. Alexander Kryklia 2014-04-02 12:32:53 +03:00
  • 90437fa5e0 Display transcript translations for student in their source language. Alexander Kryklia 2014-03-27 15:10:00 +02:00
  • 80e1270587 Make new-style chinese language codes works for translation louyihua 2014-04-02 12:45:59 +08:00
  • c54972e855 Fix bad interaction between pluggable InputTypes and Microsites Calen Pennington 2014-04-01 16:02:29 -04:00
  • 630a0b08ba Capture metrics for problem attempts and histograms of problem grades Calen Pennington 2014-04-01 13:39:32 -04:00
  • 1bd0bcb8c0 Merge pull request #3091 from cpennington/ora-metrics Calen Pennington 2014-04-01 16:09:11 -04:00
  • 4b1228be92 Merge pull request #3119 from louyihua/translation-fix Sarina Canelake 2014-04-01 15:43:10 -04:00
  • 2689967905 Merge pull request #3158 from cpennington/enrollment-metrics Calen Pennington 2014-04-01 14:05:10 -04:00
  • 0513e144b1 Actually push json parsing all the way down to the bottom of the GradingService get and post methods Calen Pennington 2014-03-28 15:26:19 -04:00
  • c9a5e9b88d Record metrics about the staff grading service Calen Pennington 2014-03-27 14:17:50 -04:00
  • f2b554db2a Record metrics about the peer grading service Calen Pennington 2014-03-27 14:17:39 -04:00
  • 6430e7e98c Make GradingServices always return dictionaries, rather than sometimes returning strings Calen Pennington 2014-03-27 14:09:58 -04:00