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

Commit Graph

  • e791e84ea7 Remove the stores_state field from XModule Calen Pennington 2013-06-13 14:38:59 -04:00
  • 7516fb5652 Added to author file Bethany LaPenta 2013-06-13 14:35:29 -04:00
  • 85f1386918 Fixed test_system looking like a test to nosetests, also fixed a class in test_error_module.py that had one class inheriting from another Bethany LaPenta 2013-06-13 14:30:07 -04:00
  • 75cbc4dbbb Merge pull request #154 from edx/ned/adding-changelog Ned Batchelder 2013-06-13 11:16:11 -07:00
  • a7df1a1d9d Starting the CHANGELOG process. Ned Batchelder 2013-06-13 11:49:39 -04:00
  • c01041938c Upgrade xblock version to get strict ModelTypes. cahrens 2013-06-13 13:33:30 -04:00
  • 71054b24b0 Merge pull request #151 from edx/bug/dhm/timeconv Don Mitchell 2013-06-13 09:07:42 -07:00
  • 5c94acaaf9 Merge pull request #149 from edx/renzo/segment-io-fix Renzo Lucioni 2013-06-13 08:58:31 -07:00
  • b57abec48e added my name and email to AUTHORS Renzo Lucioni 2013-06-13 11:57:26 -04:00
  • a83199014d Merge branch 'peter-fogg/remove-video-xml' of github.com:edx/edx-platform into peter-fogg/remove-video-xml Peter Fogg 2013-06-13 11:51:48 -04:00
  • 5cee351896 Update XML in old video tests. This change tags like <video youtube="1.0:abcdefg"> to <video youtube_id_1_0="abcdefg". Peter Fogg 2013-06-13 11:43:51 -04:00
  • ef56c49056 Update XML in old video tests. This change tags like <video youtube="1.0:abcdefg"> to <video youtube_id_1_0="abcdefg". Peter Fogg 2013-06-13 11:43:51 -04:00
  • 662c577951 Undo change to jenkins/test.sh in anticipation of merge Peter Baratta 2013-06-13 11:35:06 -04:00
  • d136fdac9a added comment to make clear that leaving the variable analytics outside of the feature flag block is intentional Renzo Lucioni 2013-06-13 10:39:05 -04:00
  • 8508e3f647 dummy object creation without conditionals Renzo Lucioni 2013-06-12 17:45:31 -04:00
  • dac174e448 Merge cleanup. cahrens 2013-06-13 11:31:18 -04:00
  • 9d0867ea11 Merge cleanup. cahrens 2013-06-13 11:31:10 -04:00
  • c7e37887b3 Merge updates. cahrens 2013-06-13 11:22:34 -04:00
  • 5735ccaad5 Address Sarina's comments from the PR Peter Baratta 2013-06-13 11:09:22 -04:00
  • 40bf2514ab Added tests for downloading files JonahStanley 2013-06-13 11:00:45 -04:00
  • 6af4402abd Squash 3 more naive datetime warnings. I think the only ones left are in migrations. Don Mitchell 2013-06-13 10:56:48 -04:00
  • fae8fd3841 Merge branch 'master' into feature/christina/unify-fields cahrens 2013-06-13 10:55:13 -04:00
  • 0f8d7c744c Test cleanup. cahrens 2013-06-13 10:42:23 -04:00
  • d4d92135ca Merge pull request #119 from kern3020/master James Tauber 2013-06-13 07:40:26 -07:00
  • 86cdc06d82 Merge branch 'release' Ned Batchelder 2013-06-13 10:35:56 -04:00
  • 7fb9bfd685 fix test string comparison Miles Steele 2013-06-13 10:25:36 -04:00
  • 2fab945340 Cherry pick change to url matching regular expression. Fixes LMS-37 Calen Pennington 2013-06-13 10:20:43 -04:00
  • 66ab6597ca Remove outdated unit test for VideoModule constructor. Peter Fogg 2013-06-13 09:46:42 -04:00
  • d52329be23 Merge pull request #128 from edx/peter-fogg/fix-video-captions-setting Peter Fogg 2013-06-13 06:32:33 -07:00
  • 6e92ddf3dd Cannot set String field to a dict anymore! cahrens 2013-06-12 17:07:41 -04:00
  • 1af4d90a1a removed icon stack from email area of helpgrid marco 2013-06-12 16:02:17 -04:00
  • e5158578f4 icon color changes and profile link style to match profile page marco 2013-06-12 15:14:14 -04:00
  • 89d0003603 Be strict about ModelType expected types, rename Object as Dict. cahrens 2013-06-12 14:59:17 -04:00
  • 48f47696c4 sass build cleanup for baseline fixes marco 2013-06-12 14:39:10 -04:00
  • 73e122755a cleaned up margin and padding to use baseline variable marco 2013-06-12 14:37:52 -04:00
  • 25aec96e86 Merge pull request #124 from edx/fix/cale/test-ruby-install Calen Pennington 2013-06-12 11:30:10 -07:00
  • 8da102c732 Update failing Jasmine tests for video. Peter Fogg 2013-06-12 13:50:33 -04:00
  • 03d514524b removed border to the right of discussion list marco 2013-06-12 13:49:46 -04:00
  • c63fb7c14d basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss marco 2013-06-12 13:47:39 -04:00
  • 5b8163dc9c Merge pull request #92 from edx/fix/cale/url-tests Calen Pennington 2013-06-12 10:47:13 -07:00
  • 3c43dbb26f Changed the other % to format JonahStanley 2013-06-12 13:36:46 -04:00
  • 86d952bf91 Change to putting serialize/de-serialize directly in xml_module. cahrens 2013-06-12 13:34:38 -04:00
  • 6d686dd9f6 Changed the way the file path was obtained JonahStanley 2013-06-12 13:32:46 -04:00
  • 1b5050c9ac Changed the following: % to format css_find().click() to its actual function A few name changes as well as step changes Removal of drag testing A refactoring of login and create user. Login will no longer create the specified user JonahStanley 2013-06-12 13:25:33 -04:00
  • 0825319cc7 fix gradebook tests Miles Steele 2013-06-12 11:49:35 -04:00
  • 4e2c4f02d6 Fix times not being parse from HH:MM:SS format into floats and update video module logic tests. Peter Fogg 2013-06-12 12:37:06 -04:00
  • 45c1109c72 syncs up font-weight across problem button/input actions (cherry picked from commit 14100ba14c) Brian Talbot 2013-06-12 11:04:12 -04:00
  • 10fd401157 syncs styling rules for buttons/inputs to ensure consistency (cherry picked from commit 832da3ad48) Brian Talbot 2013-06-12 11:00:15 -04:00
  • cb46cc6ac6 abstracts height rule to apply to the capa check, show, save actions (cherry picked from commit 050846af71) Brian Talbot 2013-06-12 10:12:20 -04:00
  • a684c6f679 removes HTML elemements from problem action Sass selectors (cherry picked from commit 664efb9887) Brian Talbot 2013-06-11 17:10:38 -04:00
  • 04bfa01644 resolves height issue when display the check and show answer actions alongside problems (cherry picked from commit a17bf5e2ce) Brian Talbot 2013-06-11 17:07:59 -04:00
  • 9acab2de70 added pylint ignores, fixed missing import (cherry picked from commit 273df4e113) e0d 2013-06-12 11:24:28 -04:00
  • bcc92ef8ef Adding comments. (cherry picked from commit c96511a278) e0d 2013-06-11 16:37:37 -04:00
  • 3ae11e860c Better error handling. (cherry picked from commit 1511ec841a) e0d 2013-06-11 15:00:39 -04:00
  • d380c76df6 Adding a new env to handle escalating privileges to run db migrations. (cherry picked from commit d2554909d8) e0d 2013-06-11 14:42:39 -04:00
  • e641d2c6b5 Merge pull request #136 from edx/fix/btalbot/xmodule-showanswer Brian Talbot 2013-06-12 08:56:08 -07:00
  • 14100ba14c syncs up font-weight across problem button/input actions Brian Talbot 2013-06-12 11:04:12 -04:00
  • 832da3ad48 syncs styling rules for buttons/inputs to ensure consistency Brian Talbot 2013-06-12 11:00:15 -04:00
  • 050846af71 abstracts height rule to apply to the capa check, show, save actions Brian Talbot 2013-06-12 10:12:20 -04:00
  • 664efb9887 removes HTML elemements from problem action Sass selectors Brian Talbot 2013-06-11 17:10:38 -04:00
  • a17bf5e2ce resolves height issue when display the check and show answer actions alongside problems Brian Talbot 2013-06-11 17:07:59 -04:00
  • 681e96b702 Update display names and help text for video metadata. Peter Fogg 2013-06-12 11:42:36 -04:00
  • b11e748341 Merge pull request #142 from edx/e0d/pylint-and-import e0d 2013-06-12 08:38:32 -07:00
  • 52bf82ac17 Set Youtube ID defaults to the empty string. Peter Fogg 2013-06-12 11:29:14 -04:00
  • 273df4e113 added pylint ignores, fixed missing import e0d 2013-06-12 11:24:28 -04:00
  • d715c61d69 Merge pull request #118 from edx/fix/cale/xmodule-assets-deletion-error Calen Pennington 2013-06-12 08:10:36 -07:00
  • 20df6dec00 Default to unicode for sass compilation. Feanil Patel 2013-06-12 10:57:31 -04:00
  • 63e376daf8 Fix failing test bug. Peter Fogg 2013-06-12 10:48:04 -04:00
  • a25a0d71ac refactored tests in courseware to draw course info from mongo instead of xmlmodulestore Jean Manuel Nater 2013-06-12 10:42:52 -04:00
  • 008c769ffb Update and fix acceptance to show captions when correct. Peter Fogg 2013-06-12 10:15:23 -04:00
  • eccf800f47 Ignore files that don't exist when we try and delete them while compiling xmodule assets Calen Pennington 2013-06-10 12:59:21 -04:00
  • fd4d816816 Merge pull request #133 from edx/e0d/migrate-as-other-user e0d 2013-06-12 05:10:28 -07:00
  • 58d561ac8e Merge pull request #126 from edx/diana/fix-display-text Diana Huang 2013-06-11 14:36:06 -07:00
  • e843f80e1f Fixed naming issue and hopefully clicking issue JonahStanley 2013-06-11 17:09:39 -04:00
  • 413202e7d6 Merged ned/whitelistable-sandbox Ned Batchelder 2013-06-11 16:49:45 -04:00
  • f79d1e215a Fix some typos and unclear descriptions. Diana Huang 2013-06-11 11:43:13 -04:00
  • c96511a278 Adding comments. e0d 2013-06-11 16:37:37 -04:00
  • 7b7a3427d9 Fix broken lettuce tests Jay Zoldak 2013-06-11 15:16:12 -04:00
  • eb14a07814 Added tests for course updates and handouts JonahStanley 2013-06-11 16:15:49 -04:00
  • 1ff72e0bae Convert show_captions to StringyBoolean. Peter Fogg 2013-06-11 16:14:52 -04:00
  • 94ac7fba31 Prevent showing video speeds that aren't set by course author. Peter Fogg 2013-06-11 16:12:58 -04:00
  • 872bf71c37 Remove data attribute from templates/video/default.yaml. Peter Fogg 2013-06-11 15:51:28 -04:00
  • e685ff7125 Merge pull request #129 from edx/fix/cdodge/cancel-asset-upload-crash chrisndodge 2013-06-11 12:52:56 -07:00
  • 716da9c6bc Convert Floats to StringyFloats. Peter Fogg 2013-06-11 15:38:02 -04:00
  • d4a5af850d Merge pull request #135 from edx/zoldak/fix-lettuce-tests Jay Zoldak 2013-06-11 12:34:01 -07:00
  • 3159c949d3 Update acceptance tests for captions to use metadata settings editor. Peter Fogg 2013-06-11 15:29:16 -04:00
  • 32562b7055 Fix broken lettuce tests Jay Zoldak 2013-06-11 15:16:12 -04:00
  • dbb127599f Merge peter-fogg/fix-video-captions-setting. Peter Fogg 2013-06-11 15:11:14 -04:00
  • 45527bf921 Reword acceptance test. Peter Fogg 2013-06-11 15:07:01 -04:00
  • 1511ec841a Better error handling. e0d 2013-06-11 15:00:39 -04:00
  • d2554909d8 Adding a new env to handle escalating privileges to run db migrations. e0d 2013-06-11 14:42:39 -04:00
  • be6fbf913e make local variable Chris Dodge 2013-06-11 14:36:04 -04:00
  • 81b06d5c70 Added tests for static pages JonahStanley 2013-06-11 14:34:18 -04:00
  • fc6f0606c2 0;95;cRemove unnecessary boolean conversion. Peter Fogg 2013-06-11 14:33:24 -04:00
  • 1602f592b4 use better API Chris Dodge 2013-06-11 14:32:33 -04:00
  • 64b909c5f0 Merge pull request #12 from edx/feature/dhm/timeconv Don Mitchell 2013-06-11 11:11:05 -07:00
  • 0149766710 Add acceptance test to ensure that show_captions has the right effect. Peter Fogg 2013-06-11 14:07:40 -04:00
  • 3d89b697fd Merge pull request #130 from edx/zoldak/fix-broken-lettuce Jay Zoldak 2013-06-11 10:56:11 -07:00
  • 37d7bc2365 Update lettuce test for problems with new css for show and hide answers. Jay Zoldak 2013-06-11 13:52:35 -04:00
  • 8543043f86 Make video captions respect course author's setting. Peter Fogg 2013-06-11 13:39:15 -04:00