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

Commit Graph

  • 3669ea5c97 Merge pull request #1375 from MITx/diana/fix-requirejs-jasmine-xmodule Jay Zoldak 2013-01-29 13:26:36 -08:00
  • cb66ac7192 Merge pull request #1376 from MITx/fix/zoldak/cms-requirejs Calen Pennington 2013-01-29 13:26:02 -08:00
  • c3eba0d2da Add RequireJS.js to files.json so that the cms jasmine tests will run without erroring when importing RequireJS. Jay Zoldak 2013-01-29 16:22:37 -05:00
  • 877f757f94 Merge pull request #1369 from MITx/feature/jarv/certificate-restriction jarv 2013-01-29 13:14:41 -08:00
  • cb77209d3c Add missing requirejs for xmodule jasmine tests Diana Huang 2013-01-29 16:09:27 -05:00
  • 585f1c41d6 New jasmine tests for combined open ended problems. Diana Huang 2013-01-29 16:04:43 -05:00
  • 3858362157 more tests Deena Wang 2013-01-29 15:53:20 -05:00
  • 424cfd3cd7 Merge pull request #1372 from MITx/feature/dhm/drag Christina Roberts 2013-01-29 12:10:38 -08:00
  • 15a2890795 Merge branch 'master' into feature/marco/group Your Name 2013-01-29 15:05:38 -05:00
  • 574d6e8e28 Simple zIndex rather than fancy stack works best. Don Mitchell 2013-01-29 15:00:49 -05:00
  • 1a398980d0 Add tests for diango-comment-client middleware Jay Zoldak 2013-01-29 14:47:05 -05:00
  • 053547453e Add tests for django-comment-client models Jay Zoldak 2013-01-29 14:45:35 -05:00
  • d81da9df4d Add tests for django comment client mustache helpers Jay Zoldak 2013-01-29 14:44:37 -05:00
  • 593b038780 Add tests for django-comment-client helpers Jay Zoldak 2013-01-29 14:43:28 -05:00
  • efc572c24d Fix navigation jasmine tests Diana Huang 2013-01-29 14:36:27 -05:00
  • 1f049410ae Add tests for django comment client utils Jay Zoldak 2013-01-29 14:31:27 -05:00
  • 4f58e9c177 Merge branch 'master' into feature/deena/testing to get factory files Deena Wang 2013-01-29 14:33:54 -05:00
  • 63d269acf1 draggable is not the collapsed item :-( but ui.helper seems to be. Don Mitchell 2013-01-29 14:31:14 -05:00
  • e745087455 Fix permissions bug and add test cases for django comment client permissions. Jay Zoldak 2013-01-29 14:30:15 -05:00
  • d9fdccb567 testing testing tests Deena Wang 2013-01-29 14:23:55 -05:00
  • 855c8bb7e7 add unit test for tab reordering Chris Dodge 2013-01-29 13:44:42 -05:00
  • 87d8598abe subsection drag Don Mitchell 2013-01-29 13:43:58 -05:00
  • 3f740976bc Adding dashboard text for certificate restriction John Jarvis 2013-01-29 13:24:17 -05:00
  • b3d7dc779d Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag Don Mitchell 2013-01-29 13:17:15 -05:00
  • 5fcb6bfcd4 Remove debug code Don Mitchell 2013-01-29 13:16:21 -05:00
  • ba95cf2385 Auto expand on hover of drag&drop unit Don Mitchell 2013-01-29 13:10:23 -05:00
  • 3f4c45468f Fix courseware jasmine tests Diana Huang 2013-01-29 11:36:10 -05:00
  • a98c924d47 Merge pull request #1371 from MITx/victor/cohorts-tweaks David Ormsbee 2013-01-29 08:35:07 -08:00
  • 39a9c47512 make links look like links Victor Shnayder 2013-01-29 11:33:26 -05:00
  • a9ee71fffc Adding section on eligibility John Jarvis 2013-01-29 11:26:55 -05:00
  • 0a1f5bc154 Merge pull request #1368 from MITx/feature/brian/pearson-status David Ormsbee 2013-01-29 08:19:41 -08:00
  • 15a11e9cb7 add validation of accommodation codes Brian Wilson 2013-01-29 11:16:23 -05:00
  • 5a389551b0 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/static-tab-reordering Chris Dodge 2013-01-29 11:14:55 -05:00
  • 3a6d45e716 Grade a student even if they are on the restricted list John Jarvis 2013-01-29 11:13:30 -05:00
  • 37b82a66eb Merge pull request #1363 from MITx/marketing/victor Victor Shnayder 2013-01-29 08:12:33 -08:00
  • 85c412fc2e changed cms/env/tests, added test_views.py Deena Wang 2013-01-29 11:06:32 -05:00
  • 69ff879e95 add more validation for countries Brian Wilson 2013-01-29 10:41:41 -05:00
  • 17930e4186 Merge pull request #1370 from MITx/feature/cdodge/add-course-about-video-to-xlint Don Mitchell 2013-01-29 07:37:14 -08:00
  • 0f39e04697 Adding certificate restriction lookup John Jarvis 2013-01-29 10:27:53 -05:00
  • 4b0999939b Adding docstring to CertificateWhitelist model John Jarvis 2013-01-29 10:26:21 -05:00
  • 415ebec879 renaming whitelist to is_whitelisted John Jarvis 2013-01-29 10:24:29 -05:00
  • dbc0f353c5 cert_status temporary assignment removed John Jarvis 2013-01-29 10:22:58 -05:00
  • 09ab52bc94 fix log message in pearson import Brian Wilson 2013-01-29 10:21:41 -05:00
  • 74839663ff added cms/djangoapps/contentstore/test/tests.py Deena Wang 2013-01-29 10:12:39 -05:00
  • 5a4c0fb907 imports should have a marketing video. Treat it as a warning as every course might not have one. Chris Dodge 2013-01-29 09:38:59 -05:00
  • 289301e0ea adding more to help string John Jarvis 2013-01-28 19:38:51 -05:00
  • 0c43e69c00 command for certificate restriction (embargoed countries) John Jarvis 2013-01-28 19:30:40 -05:00
  • e9722b259b Removing whitespace John Jarvis 2013-01-28 19:29:53 -05:00
  • e81394c2b0 Adding new model for certificate whitelist John Jarvis 2013-01-28 19:29:13 -05:00
  • 666828f71a Command for certificate whitelist John Jarvis 2013-01-28 19:28:47 -05:00
  • 7e033d0265 django command for certificate restriction John Jarvis 2013-01-28 19:28:24 -05:00
  • bae2162fa0 add pearson_dump command. Modify rule for determining authorization transaction type. Brian Wilson 2013-01-28 18:29:34 -05:00
  • 28a2dd9a18 support reordering of static tabs in studio Chris Dodge 2013-01-28 16:33:28 -05:00
  • 7918c35414 fixing up tests Deena Wang 2013-01-28 15:29:55 -05:00
  • a0ccba6bf8 Merge pull request #1366 from MITx/bugfix/victor/fix-cohorts-test-in-cms Jay Zoldak 2013-01-28 12:13:53 -08:00
  • fba88db5fa Adding django-admin command for certificate_restriction John Jarvis 2013-01-28 15:10:35 -05:00
  • 734a8bd6e5 make tests pass with cms config as well as lms Victor Shnayder 2013-01-28 15:07:44 -05:00
  • 14d9633fa6 Merge branch 'diana/open-ended-ui-updates' into tests/diana/update-oe-unit-tests Diana Huang 2013-01-28 14:58:50 -05:00
  • 7d82b6cb0e Merge branch 'master' into tests/diana/update-oe-unit-tests Diana Huang 2013-01-28 13:49:37 -05:00
  • 2e19de2d77 Merge pull request #1364 from MITx/bug/btalbot/lms-coursewaremenu chrisndodge 2013-01-28 10:32:41 -08:00
  • 64a4dea429 Merge pull request #1365 from MITx/bugfix/brian/pearson-unittest Jay Zoldak 2013-01-28 10:27:14 -08:00
  • 5d5642673c Add new field to disable certificate download John Jarvis 2013-01-28 12:58:02 -05:00
  • 9cf0f0900b Fix Pearson unit tests. Brian Wilson 2013-01-28 12:56:26 -05:00
  • d1e5632880 Remove the specific version of ruby here because it's breaking the dev scripts amongst other things. Ashley Penney 2013-01-28 12:51:05 -05:00
  • ffbda8a0be Update test Diana Huang 2013-01-28 11:52:15 -05:00
  • ef3a124281 LMS - added in additional JQUI accordion parameter needed to display full height of active element in courseware sidebar Brian Talbot 2013-01-28 11:13:21 -05:00
  • 1d4b674c79 Address code review feedback Diana Huang 2013-01-28 10:57:06 -05:00
  • fe4dc7622e Updates to combined open ended tests Diana Huang 2013-01-28 10:18:01 -05:00
  • 8d64bfdbdb Update tests to handle rubric scores Diana Huang 2013-01-28 08:41:39 -05:00
  • 0852af3f35 Merge branch 'master' into tests/diana/update-oe-unit-tests Diana Huang 2013-01-28 08:28:39 -05:00
  • 163400e268 Merge pull request #1362 from MITx/feature/edz/revert-explicit-charset chrisndodge 2013-01-27 15:29:54 -08:00
  • 1f6331161c Update FAQ (LH #125) Victor Shnayder 2013-01-27 18:10:14 -05:00
  • 37a9dccbe7 Update media kit download (LH #168) Victor Shnayder 2013-01-27 17:50:53 -05:00
  • d697c6b94c Add associate legal counsel job description (LH #166) Victor Shnayder 2013-01-27 17:46:27 -05:00
  • aee8c863cd Make 'Students' link on FAQ page point to /help (LH #164) Victor Shnayder 2013-01-27 17:38:56 -05:00
  • c8e6bedc1a add e0d 2013-01-27 17:19:12 -05:00
  • 6a7997f9ba add e0d 2013-01-27 17:19:00 -05:00
  • 313eab90c3 add e0d 2013-01-27 17:18:55 -05:00
  • fd8df0122e Merge pull request #1361 from MITx/feature/victor/cohorts David Ormsbee 2013-01-27 07:20:59 -08:00
  • c1f7b109d8 Fix missing import Victor Shnayder 2013-01-27 10:19:36 -05:00
  • 2b824c844a Merge pull request #1360 from MITx/edz/feature/explicit-css-charset chrisndodge 2013-01-26 18:44:16 -08:00
  • d5e9c0db8f Merge pull request #1359 from MITx/feature/edz/explicit-csrf-domain chrisndodge 2013-01-26 18:43:43 -08:00
  • d747f54fc8 adding explicit charset declaration to additional css e0d 2013-01-26 21:29:05 -05:00
  • 956ccb06e9 explicitly set the domain for the csrf cookie to match the session domain. e0d 2013-01-26 21:10:14 -05:00
  • a725fa1f17 Merge pull request #1358 from MITx/bugfix/dave/force_sass_utf8 David Ormsbee 2013-01-26 11:47:08 -08:00
  • eff5093cbf Force charset for application.sass to be UTF-8 David Ormsbee 2013-01-26 14:38:49 -05:00
  • d3a7be3484 Merge pull request #1357 from MITx/feature/victor/cohorts David Ormsbee 2013-01-26 11:06:44 -08:00
  • 46570b01ef refactor tests, add test for is_commentable_cohorted, fix a bug Victor Shnayder 2013-01-26 13:49:12 -05:00
  • 4afa31550b Merge pull request #1350 from MITx/feature/victor/cohorts David Ormsbee 2013-01-26 10:07:07 -08:00
  • 439acf2df7 Fix docstring and test for get_cohort Victor Shnayder 2013-01-26 13:06:09 -05:00
  • 6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts Victor Shnayder 2013-01-26 12:37:26 -05:00
  • d237e68af2 Merge pull request #1356 from MITx/feature/cale/fix-gemfile Calen Pennington 2013-01-25 21:45:10 -08:00
  • ad2dc8a322 Add a .ruby-version file for use w/ rbenv Calen Pennington 2013-01-26 00:10:20 -05:00
  • 109689fe9a Fix versions in gemfile Calen Pennington 2013-01-26 00:01:47 -05:00
  • c07917d918 Merge pull request #1354 from MITx/feature/ichuang/fix-flashing-background-in-video David Ormsbee 2013-01-25 13:55:16 -08:00
  • ca28796a86 Merge pull request #1345 from MITx/feature/apenney/pearson-merge David Ormsbee 2013-01-25 13:54:55 -08:00
  • c56982e6f0 fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes ichuang 2013-01-25 16:45:16 -05:00
  • 8d6d9285f5 Merge branch 'master' into tests/diana/update-oe-unit-tests Diana Huang 2013-01-25 16:38:09 -05:00
  • ca0cb5b703 Merge branch 'master' into tests/diana/update-oe-unit-tests Diana Huang 2013-01-25 16:37:41 -05:00
  • 9f6afcb606 Add some more tests Diana Huang 2013-01-25 16:33:45 -05:00