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

Commit Graph

  • 5cb456ba85 Fix merge conflict. Peter Fogg 2013-06-17 16:49:22 -04:00
  • 15facf8fc0 Changed change_text to implement new type_in_codemirror function JonahStanley 2013-06-17 16:48:37 -04:00
  • 56015e4b94 Update CHANGELOG.rst; move acceptance test methods into more appropriate files; docstring cleaning. Peter Fogg 2013-06-17 16:47:15 -04:00
  • 46da897610 Merge branch 'master' into jonahstanley/add-courseteam-tests JonahStanley 2013-06-17 16:43:56 -04:00
  • c05a06a885 Merge pull request #182 from edx/renzo/segment-io-auth-backport Renzo Lucioni 2013-06-17 13:40:24 -07:00
  • 080c5e4bc1 Merge pull request #186 from edx/christina/latex_and_click Christina Roberts 2013-06-17 13:36:49 -07:00
  • 267241a0c2 Merge pull request #192 from edx/ned/backdated-changelog-entries Ned Batchelder 2013-06-17 13:30:39 -07:00
  • c3105df9fc Merge pull request #190 from edx/feature/cdodge/soft-delete-assets chrisndodge 2013-06-17 13:23:56 -07:00
  • f528f61ec1 Add new Jasmine test to ensure Segment.io is called when appropriate Renzo Lucioni 2013-06-17 16:18:07 -04:00
  • d7e03890d7 CHANGELOG entry for the whitelistable sandboxing change. Ned Batchelder 2013-06-17 16:11:03 -04:00
  • 53f18f27b9 need to comment out another thumbnail check due to build test environment not having libjpeg installed Chris Dodge 2013-06-17 15:59:14 -04:00
  • 25fe8e8070 Now using context files and os.path JonahStanley 2013-06-17 15:54:10 -04:00
  • e78eb9aa66 Merge pull request #187 from edx/ned/remove-obsolete-changelogs Ned Batchelder 2013-06-17 12:46:32 -07:00
  • 73ba1e547e Change code to use css_click in hopes that will make the test pass on Don's mac. cahrens 2013-06-17 15:46:10 -04:00
  • 97f4291b2a Add comment clarifying which Segment.io key is in use Renzo Lucioni 2013-06-17 15:35:04 -04:00
  • 71a6da6485 Merge pull request #188 from edx/feature/cdodge/soft-delete-assets chrisndodge 2013-06-17 12:20:00 -07:00
  • a52f62a923 disable assertions on thumbnail generation as it puts a system requirement on libjpeg which may not be installed on the test machines Chris Dodge 2013-06-17 14:59:48 -04:00
  • 085a590bdd timezone conversion: more unit tests Don Mitchell 2013-06-17 14:48:18 -04:00
  • 92fc452b34 Change the wording of problem steps to follow Given, When, Then... convention. cahrens 2013-06-17 14:30:37 -04:00
  • ef1f523c55 Removed _MODULESTORE reference that was doing nothing JonahStanley 2013-06-17 14:12:42 -04:00
  • 77a9073655 These CHANGELOGS were never used, and are now obsolete. Ned Batchelder 2013-06-17 14:11:42 -04:00
  • 9d464701f9 timezone conversion tests Don Mitchell 2013-06-17 14:04:12 -04:00
  • 3fdc02dbc4 Merge pull request #148 from edx/feature/cale/xblock-init Calen Pennington 2013-06-17 11:03:44 -07:00
  • 298417c732 Remove waits by adding code in click that will try the operation multiple times (thanks to Jonah). cahrens 2013-06-17 13:55:15 -04:00
  • c30d2d2f52 Incorporate Segment.io into Logger.log with whitelist Renzo Lucioni 2013-06-17 13:48:50 -04:00
  • 8159e86141 Many changes to finish up PR. To wit: Peter Fogg 2013-06-17 11:53:27 -04:00
  • 82606a062c Make XModuleDescriptor use __init__ from XBlock Calen Pennington 2013-06-12 16:48:49 -04:00
  • 438ac3b1a4 Move video xmodule tests to xmodule directory Calen Pennington 2013-06-12 11:56:12 -04:00
  • 4c8a92e968 Merge branch 'dhm/timeconv/bug0' of github.com:edx/edx-platform into dhm/timeconv/bug0 Don Mitchell 2013-06-17 13:30:35 -04:00
  • cb40e9ff88 Fix a few remaining tz naive dates Don Mitchell 2013-06-17 09:37:43 -04:00
  • 319eb0bad7 Merge pull request #170 from edx/feature/cdodge/soft-delete-assets chrisndodge 2013-06-17 09:56:17 -07:00
  • 07486a4dbc Refactoring the code in tests.py to remove unnecessary dependencies on the XML Modulestore. Jean Manuel Nater 2013-06-17 11:54:16 -04:00
  • b2bc39fa09 Updated diff-cover to version 0.1.2, which fixes a bug in which missing lines were over-reported Will Daly 2013-06-17 11:17:58 -04:00
  • 0d6f213997 I think we need to add the new assets.js into the PIPELIE Chris Dodge 2013-06-17 11:03:28 -04:00
  • 16e476e8e4 refactored asset page related JS into it's own page Chris Dodge 2013-06-17 10:34:09 -04:00
  • 7cebb873df allow for an optional throw_on_not_found on contentstore().find() so we can clean up caller logic in the tests Chris Dodge 2013-06-14 16:35:21 -04:00
  • dc94ea1041 add unit test for emptying the trashcan Chris Dodge 2013-06-14 16:19:17 -04:00
  • 7e46447cd5 there is no default for empty_asset_trashcan, caller must provide a list Chris Dodge 2013-06-14 16:08:19 -04:00
  • 7f1768f8f8 put back the verbose switch in xml_importer.py Chris Dodge 2013-06-14 15:37:14 -04:00
  • ab94b8618c forgot to internationalize one string Chris Dodge 2013-06-14 15:32:02 -04:00
  • b443629ee8 remove invalid comments Chris Dodge 2013-06-14 15:26:37 -04:00
  • cd0087ca53 use the new notification tools for the confirmation dialog Chris Dodge 2013-06-14 12:39:34 -04:00
  • 70ee4b8060 add unit tests for asset delete/restore Chris Dodge 2013-06-14 10:47:32 -04:00
  • 274d8997a2 update warning message Chris Dodge 2013-06-13 16:15:48 -04:00
  • 443d6a382f add CHANGELOG entry for work Chris Dodge 2013-06-13 16:06:09 -04:00
  • 85b904f176 fix sizing of the delete column Chris Dodge 2013-06-13 16:01:06 -04:00
  • 9b749c4201 add ajax callback entry point to remove the asset Chris Dodge 2013-06-13 11:59:19 -04:00
  • 3fa6e77dff add new collection configuration to support a 'trashcan' for assets. Update class factory to allow callers to specify if they want the default set of assets or the trashcan Chris Dodge 2013-06-13 11:14:56 -04:00
  • 48ee275799 Fix a few remaining tz naive dates Don Mitchell 2013-06-17 09:37:43 -04:00
  • 1e3efadc28 switch to using environment variables to get key for Segment.io Renzo Lucioni 2013-06-17 10:58:37 -04:00
  • 7518f32f5e Instrument sequentials with segment-io so we know when people switch tabs manually or using the arrows to navigate Renzo Lucioni 2013-06-17 10:30:17 -04:00
  • 67bcbe228b Merge pull request #178 from edx/valera/adding_changeleog_info Valera Rozuvan 2013-06-17 06:44:45 -07:00
  • 3ea9f79132 Merge pull request #179 from edx/valera/additional_comments_on_youtube_api_bug Valera Rozuvan 2013-06-17 06:44:23 -07:00
  • d1ebfbc9b5 Merge pull request #180 from edx/jarv/fix-segment-io John Jarvis 2013-06-17 06:09:01 -07:00
  • ffeabae069 moving settings into the auth tokens section John Jarvis 2013-06-17 09:07:02 -04:00
  • 770b9f1f87 fixing segment io settings bug John Jarvis 2013-06-17 09:01:20 -04:00
  • 184c0a5c40 Added comment regarding the fact that the temporary bug fix should be eventually removed. Valera Rozuvan 2013-06-17 09:17:48 +03:00
  • bb70907e20 Added info to changelog for recent pull requests. Valera Rozuvan 2013-06-17 08:48:55 +03:00
  • da2fda1045 Fix for broken forums due to forum entry with no start_date Jason Bau 2013-06-14 21:13:11 -07:00
  • d8f307a50b Merge branch 'master' into peter-fogg/remove-video-xml Peter Fogg 2013-06-14 15:33:51 -04:00
  • 1ef29053ba Merge pull request #167 from edx/feanil/segment_io_lms Feanil Patel 2013-06-14 12:12:57 -07:00
  • 2cf71b7ff3 Add helper method for typing in CodeMirror, make it robust to Mac and Unix. cahrens 2013-06-14 15:12:25 -04:00
  • 163610d557 updated pinning icons and removed images marco 2013-06-14 15:10:17 -04:00
  • d5105b7a4b updated flag icons to be font-awesome based marco 2013-06-14 15:04:39 -04:00
  • b9d97e468c removed new post icon and added font-awesome replacement marco 2013-06-14 14:42:16 -04:00
  • e0045499f3 Update acceptance test. Peter Fogg 2013-06-14 14:41:33 -04:00
  • e5c20e051c Update to look for segment io key in auth data. Feanil Patel 2013-06-14 14:28:38 -04:00
  • 21dc4d863e Put back in some older code to save source_code property. cahrens 2013-06-14 14:10:40 -04:00
  • 6035d0a23a Addresses latest comments on pull request #132. In particular: Peter Fogg 2013-06-14 14:08:28 -04:00
  • 5b388f52c1 Merge pull request #125 from edx/pbaratta/calc-add-trig Peter Baratta 2013-06-14 10:08:09 -07:00
  • 5b793bb6ad Merge pull request #141 from edx/feanil/sass_unicode Feanil Patel 2013-06-14 10:06:23 -07:00
  • b6c4cc4a63 new post button using font-awesome marco 2013-06-14 11:44:48 -04:00
  • 224d0074fd Merge pull request #96 from edx/nate/fix-missing-faq-route Nate Hardison 2013-06-14 08:09:42 -07:00
  • 206f582503 Fix merge conflict in common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml. Peter Fogg 2013-06-14 10:44:05 -04:00
  • ce70b00f98 Merge pull request #145 from edx/feature/db/rake-coffee-clobber David Baumgold 2013-06-14 06:50:36 -07:00
  • 0f6e259439 Merge pull request #127 from edx/anton/fix_event_tracking Valera Rozuvan 2013-06-14 01:38:40 -07:00
  • 74426bdcc6 Add tracking of additional events Anton Stupak 2013-06-11 17:55:16 +03:00
  • 89da47a134 Merge pull request #138 from edx/valera/bugfix_firefox_videoalpha_speed_1 Valera Rozuvan 2013-06-14 01:28:59 -07:00
  • 2568a9b881 Merge pull request #123 from edx/valera/no_autoplay_videoalpha_studio Valera Rozuvan 2013-06-14 01:14:08 -07:00
  • 72d7c9ca97 Moved the definition of autoplay attribute to videoalpha_module.py file. Changed double negative if statement for autoplay check to simple if. Valera Rozuvan 2013-06-12 11:57:54 +03:00
  • 9f4dcbcd1b disables pylint warning for lettuce tests syntax Alexander Kryklia 2013-06-11 14:24:29 +03:00
  • 4c544d6f49 Added lettuce tests for autoplay in videoalpha. Valera Rozuvan 2013-06-11 13:48:43 +03:00
  • 66e106a9e2 Copied autoplay attribute from video xmoudle to videoalpha. Now students will have the video autoplaying, and in Studio it will be pause by default. Valera Rozuvan 2013-06-07 17:35:57 +03:00
  • 754be2caa1 If Video Alpha is playing a YouTube video in Firefox in HTML5 mode, then when switching to speed 1.0 it will simply reload the iframe, instead of using the built-in method to change the speed. The fixes the bug temporarily, while the YouTube team fixes the bug internally in the API. Commented additions to fix YouTube firefox speed 1.0 switch bug. Valera Rozuvan 2013-06-12 11:14:45 +03:00
  • a6bcb797b0 remove compiled coffeescript files before recompiling with rake David Baumgold 2013-06-12 15:54:23 -04:00
  • 9e0997d3c8 Merge pull request #111 from edx/feature/christina/unify-fields Christina Roberts 2013-06-13 13:49:14 -07:00
  • 10f29dfc16 Merge pull request #158 from edx/feature/db/rake-jasmine-watch David Baumgold 2013-06-13 13:48:57 -07:00
  • ab700e6352 Add CHANGELOG message Peter Baratta 2013-06-13 16:46:17 -04:00
  • bd1f912125 Merge branch 'master' into pbaratta/calc-add-trig Peter Baratta 2013-06-13 16:43:27 -04:00
  • 46686d8f7d Quick fixes in calc.py Peter Baratta 2013-06-13 16:38:43 -04:00
  • daf5ef146e Fixed weird issue of needed to sometimes first find then click instead of css_click JonahStanley 2013-06-13 16:33:39 -04:00
  • 0667150f4e Merge pull request #157 from edx/feature/cale/remove-stores-state Calen Pennington 2013-06-13 13:26:09 -07:00
  • c5fd4044f2 Update for ModelType ("Stringy" version) change. cahrens 2013-06-13 16:21:32 -04:00
  • d42736708c Merge branch 'master' into feature/christina/unify-fields cahrens 2013-06-13 16:19:13 -04:00
  • cd49e1bb68 Check to see if a location is valid before displaying it for instructor grading Vik Paruchuri 2013-06-13 16:00:28 -04:00
  • b946a10c0c cleaned up topic header to allow for multiple line titles still being visible marco 2013-06-13 15:50:21 -04:00
  • c2e5c60713 Remove correct/incorrect message, and auto-add in needed markdown for studio Vik Paruchuri 2013-06-13 15:34:00 -04:00
  • bea83c533f Update failing metadata settings acceptance test. Peter Fogg 2013-06-13 15:31:28 -04:00
  • 03f02bcf24 Added rake jasmine:cms:browser:watch command David Baumgold 2013-06-13 14:57:54 -04:00
  • fa84abc3eb Add unit tests for creating VideoDescriptor from old XML. Brings test coverage for video_module.py to 91%. Peter Fogg 2013-06-13 14:40:12 -04:00