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

Commit Graph

  • e817fb4ca1 Merge pull request #637 from edx/vaxxxa/videoalpha_to_video Lyla Fischer 2013-08-12 10:56:12 -07:00
  • c727d43ce6 Merge pull request #617 from edx/rocha/change-console-stream-to-stderr Carlos Andrés Rocha 2013-08-12 10:55:29 -07:00
  • 0231e64f36 also define TECH_SUPPORT_EMAIL in cms.envs.common config file Chris Dodge 2013-08-12 13:41:05 -04:00
  • e6d44f5ae7 Merge pull request #626 from edx/feature/msteele/instrdash Miles Steele 2013-08-12 10:38:26 -07:00
  • 0da2fb842f Add new setting to cms project Chris Dodge 2013-08-12 13:29:15 -04:00
  • 43afb9a940 fix i18n Miles Steele 2013-08-12 13:21:39 -04:00
  • 05e1ffb190 remove unused code from xml_import.py Chris Dodge 2013-08-12 12:49:15 -04:00
  • 8fa4b4dbd1 Change course create form to synchronous validation. Peter Fogg 2013-08-06 16:59:15 -04:00
  • bfccfba9d4 Merge pull request #512 from edx/peterb/formula-preview Peter Baratta 2013-08-12 09:24:29 -07:00
  • 69fa1b069d Added user documentation Peter Baratta 2013-08-12 11:45:18 -04:00
  • 735e3b01a2 Create a new response type for Numerical/Formula Peter Baratta 2013-08-12 11:43:42 -04:00
  • a1162cbb34 Change calc module Peter Baratta 2013-08-12 11:40:20 -04:00
  • b2b574ffb6 instructor dash fixes Adam Palay 2013-08-12 11:01:19 -04:00
  • b1074ff1ac add i18n Miles Steele 2013-08-09 16:56:35 -04:00
  • d1e0005f30 Merge pull request #622 from edx/will/fix-js-tests-using-number-input Will Daly 2013-08-12 08:12:12 -07:00
  • 4f4f0e9a23 Merge pull request #619 from edx/rocha/fix-help-on-manage-dot-py Carlos Andrés Rocha 2013-08-12 07:32:40 -07:00
  • 6cf8643da5 Merge pull request #545 from edx/feature/msteele/fix-sql-index Miles Steele 2013-08-12 06:29:43 -07:00
  • d947b0ecc8 Coffee compile command now executes for just *.coffee items. This resolves an error that would sometimes occur on Mac OS X: "Error: EMFILE, too many open files" Will Daly 2013-08-12 09:26:22 -04:00
  • 4b738d4cc3 Refactored into helper method Will Daly 2013-08-12 08:55:30 -04:00
  • 86741d948e Merge pull request #613 from edx/blapenta/site-packages lapentab 2013-08-12 05:49:19 -07:00
  • a8646561fd Merge pull request #635 from edx/bugfix/ichuang/cms-user-view-if-bad-course chrisndodge 2013-08-12 05:35:06 -07:00
  • 74f3595d54 Add acceptance tests for checking rendering. Anton Stupak 2013-08-12 14:14:28 +03:00
  • e20acee4c4 Working on Videoalpha test fix. Peter Fogg 2013-08-09 15:10:07 -04:00
  • a6f6a50792 Disable js unit tests. Anton Stupak 2013-08-09 14:31:37 +03:00
  • d846462ce9 Migrate acceptance tests: old Video -> new Video. Anton Stupak 2013-08-09 10:53:01 +03:00
  • b33b5c7bd4 Python: videoalpha -> video. Vasyl Nakvasiuk 2013-08-08 18:43:25 +03:00
  • dad9f26a99 Make VideoAlpha out of Alpha. Anton Stupak 2013-08-08 18:38:34 +03:00
  • e381adbc3e Make js unit tests out of Alpha. Anton Stupak 2013-08-08 17:24:35 +03:00
  • 8ba94bb2a5 Remove js unit tests. Anton Stupak 2013-08-08 15:59:42 +03:00
  • 28b0ba5e10 Migrate video tests to videoalpha tests, remove video tests. Vasyl Nakvasiuk 2013-08-08 14:07:55 +03:00
  • 12ad9c8558 make CMS user view not show ErrorDescriptor courses ichuang 2013-08-11 15:25:24 +00:00
  • 4f321897df Merge pull request #620 from edx/feature/cdodge/convert-to-portable-links-on-import-and-clone chrisndodge 2013-08-11 06:20:11 -07:00
  • 8b2346fc51 Merge pull request #628 from edx/peter-fogg/fix-unit-delete-jump Peter Fogg 2013-08-10 06:48:51 -07:00
  • e23ec4f221 on the new envs configuration file, we need to squelch pylint errors on the from dev import * Chris Dodge 2013-08-10 00:29:17 -04:00
  • 20b957518c resolve last code violation Chris Dodge 2013-08-09 20:53:17 -04:00
  • f170d85547 fix wrapping, but mainly want to kick off another build due to Jenkins problem Chris Dodge 2013-08-09 16:13:00 -04:00
  • 1c2958e35d address PR feedback Chris Dodge 2013-08-09 14:21:03 -04:00
  • c6f277427c add a few debug messages to get localhost debug information. Also partition out the MongoDjangoToolbar configuration into a separate env config. This is because doing imports on large courses grinds localdev to a halt due to all the stack trace generation. Chris Dodge 2013-08-09 12:55:34 -04:00
  • b1b8f19c88 add another test. Seems like we never had an explicit test on an import into a new course-id. This fixes that Chris Dodge 2013-08-09 11:48:43 -04:00
  • 6b0e992d9e change regex names to better reflect what the actually match on Chris Dodge 2013-08-09 11:11:24 -04:00
  • d9d8d96e05 also support a link rewriting on course import and clone for the following format /courses/[org]/[course]/[run]/. We just need to substitute in the new course-id. Chris Dodge 2013-08-09 10:32:28 -04:00
  • 607573fbd9 add test files Chris Dodge 2013-08-09 01:03:44 -04:00
  • e2358af6a9 add ability to rewrite links on the old /courses/<org>/<course>/<run>/jump_to/i4x://<org>/<course> .. intracourseware linking to the new portable /jump_to_id/<id> format Chris Dodge 2013-08-09 01:03:16 -04:00
  • 25d6de243e add portable link rewriting on clone. Added tests. Chris Dodge 2013-08-09 00:09:37 -04:00
  • 36fda35040 do portable link rewriting on import and add test to confirm it Chris Dodge 2013-08-08 23:27:48 -04:00
  • 910523eee5 merge conflicts resolved marco 2013-08-09 18:45:54 -04:00
  • 68199da821 added oe-tools header areas to eventually consolitate all messaging marco 2013-08-09 18:44:15 -04:00
  • 29d9cfc54e Better handle edge cases Vik Paruchuri 2013-08-09 18:04:11 -04:00
  • 5b5c8151d0 Merge pull request #618 from edx/giulio/secure-embeds caesar2164 2013-08-09 14:19:21 -07:00
  • 464141c72a changing http:// to // on intro video urls to prevent browsers from blocking video embeds Giulio Gratta 2013-08-09 09:24:17 -07:00
  • c4a2f7dcdc Fix invalid state Vik Paruchuri 2013-08-09 17:01:07 -04:00
  • 6b16ef0adf Merge pull request #631 from edx/sarina/upgrade-diff-cover Sarina Canelake 2013-08-09 13:59:56 -07:00
  • 5c9538a9a1 Address review comments Vik Paruchuri 2013-08-09 16:46:25 -04:00
  • f4799f983e Merge pull request #630 from edx/jonahstanley/fix-courseteam-tests Jonah Stanley 2013-08-09 13:09:17 -07:00
  • d6e06e441f Upgrade diff-cover to newest version Sarina Canelake 2013-08-09 15:53:48 -04:00
  • 0595459c01 Revert back to old way of logging someone else in JonahStanley 2013-08-09 15:27:46 -04:00
  • cde8ee50d7 Fix jumping to the top of the page on unit delete. Peter Fogg 2013-08-09 15:18:08 -04:00
  • 6543343388 Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui Vik Paruchuri 2013-08-09 14:51:13 -04:00
  • 33da3ec1cf Fix self assessment template Vik Paruchuri 2013-08-09 14:50:57 -04:00
  • 835edbf32f Change locators to a restful interface. cahrens 2013-08-09 14:46:18 -04:00
  • 8cf82f2973 Fix self assessment test Vik Paruchuri 2013-08-09 14:38:30 -04:00
  • e9aca13636 enable beta dashboard Miles Steele 2013-08-08 10:09:47 -04:00
  • f6fc1aeed9 hide empty management list selector, add explanation text Miles Steele 2013-08-08 11:05:59 -04:00
  • 58c6b9bb61 add privilege copy Miles Steele 2013-08-08 10:09:03 -04:00
  • 53bda391ae Merge pull request #625 from edx/fix/msteele/instr-i18n Miles Steele 2013-08-09 11:05:32 -07:00
  • 8feaa0ffa4 Added in a wait upon logging in JonahStanley 2013-08-09 13:57:22 -04:00
  • 8f8d70aeae fix enroll multiple button, fix module_error report Miles Steele 2013-08-09 13:23:57 -04:00
  • 822f3a7865 Merge pull request #607 from edx/feanil/master_with_release Feanil Patel 2013-08-09 10:44:44 -07:00
  • abd17a2472 Merge pull request #623 from edx/adam/unicode-encode-error Adam 2013-08-09 10:35:32 -07:00
  • 25d45b8578 Merge pull request #574 from edx/feature/msteele/instrdash Miles Steele 2013-08-09 10:26:50 -07:00
  • 6e41c082b1 Fix tests Vik Paruchuri 2013-08-09 12:30:05 -04:00
  • 893f05976d make template string unicode Adam Palay 2013-08-09 12:25:14 -04:00
  • 9769f364e1 Updated tests to weaken "number" input field requirement, which isn't supported in Firefox. Will Daly 2013-08-09 12:10:53 -04:00
  • 166c4c6939 cleaned up merge issue in combined_open_ended.html marco 2013-08-09 11:31:33 -04:00
  • e1cba4b0b4 cleaned up html structure for various pages, style fixed for show/hide prompt item marco 2013-08-09 11:26:59 -04:00
  • 5d16bc9eb6 Remove ad-hoc patch for xblock issue Vik Paruchuri 2013-08-09 11:24:07 -04:00
  • 2612fc2bce Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui Vik Paruchuri 2013-08-09 11:23:52 -04:00
  • 0f9d7230c3 Merge pull request #614 from edx/sarina/update-xblock-version Sarina Canelake 2013-08-09 07:51:28 -07:00
  • 09a83dcd1e Merge pull request #589 from edx/fix/cdodge/better-export-error-messaging chrisndodge 2013-08-09 07:21:20 -07:00
  • 5b4c15a57d Studio: revises export prompt control copy Brian Talbot 2013-08-09 10:01:23 -04:00
  • f929b4930a Add in jasmine test for rubric, fix combinedopenended jasmine failures Vik Paruchuri 2013-08-09 08:42:02 -04:00
  • adbfdccee8 Prevent student from resetting problem unless they have completed required peer grading. Grant an exemption if there is no available peer grading. Vik Paruchuri 2013-08-09 08:18:23 -04:00
  • 0b58c22b97 Merge pull request #593 from edx/valera/captions_keyboard_access_2 Valera Rozuvan 2013-08-09 00:49:28 -07:00
  • 1efea116f6 Removed unnecessary leading and trailing spaces from heading in template. Valera Rozuvan 2013-08-09 10:26:18 +03:00
  • f301231051 Enabled tabbing to volume slider. Valera Rozuvan 2013-08-08 14:23:10 +03:00
  • 5380b5cfc3 Making it possible to tab through individual speeds. Valera Rozuvan 2013-08-08 13:36:13 +03:00
  • 8bbe1c39f6 Turned off all VideoAlpha Jasmine tests. Valera Rozuvan 2013-08-08 12:47:19 +03:00
  • 4c7250a000 Improved strings in template. Valera Rozuvan 2013-08-08 12:17:15 +03:00
  • 8a3ef33985 Fixing tests related to fetching YouTube metadata. Valera Rozuvan 2013-08-08 11:57:57 +03:00
  • 417bf6dd85 Removed some more comments. Valera Rozuvan 2013-08-08 10:32:35 +03:00
  • f9f9123ce4 Removed unnecessary commented out code from Jasmine tests. Valera Rozuvan 2013-08-08 10:30:13 +03:00
  • 4f207299db Changed back handling of Video by original Video code. Valera Rozuvan 2013-08-08 10:11:23 +03:00
  • 1f238b953b Fixed test for height of player when CC is disabled. Valera Rozuvan 2013-08-08 09:43:05 +03:00
  • 326d958727 Replaced Video with VideoAlpha. Valera Rozuvan 2013-08-07 17:11:55 +03:00
  • f08394ac2c Volume and speeds dialogs are fully extended. Valera Rozuvan 2013-08-07 15:28:30 +03:00
  • 740a343b76 Styling improvements. Valera Rozuvan 2013-08-07 14:40:56 +03:00
  • 6f431df910 Fixed bug dealing with empty subtitles Url string. Valera Rozuvan 2013-08-07 14:33:44 +03:00
  • fb0efd1b16 Made it so that keyboard also prolongs auto hiding of controls. Valera Rozuvan 2013-08-07 11:06:46 +03:00
  • 594ed6e0c3 Fixed failing test for VideoAlpha caption heiht. Valera Rozuvan 2013-08-06 19:17:46 +03:00
  • d46542cba8 Removing JavaScript qTip tooltips. Valera Rozuvan 2013-08-06 16:25:29 +03:00