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

Commit Graph

  • 78987cc400 resolving merge conflicts John Jarvis 2013-03-19 16:16:32 -04:00
  • e7f8c7c676 pep8 fixes Will Daly 2013-03-19 16:00:43 -04:00
  • 39aa25c2d6 Removed file that was added accidentally. Will Daly 2013-03-19 15:57:24 -04:00
  • 66434d7d05 Moved XQueue mock from terrain into LMS, so that the server is not created for cms tests. Will Daly 2013-03-19 15:51:20 -04:00
  • 20ccf5937b Implemented CodeResponse lettuce tests Will Daly 2013-03-19 15:37:53 -04:00
  • 2087b81573 Created MockXQueueServer which listens on a local port and simulates an XQueue. Will Daly 2013-03-19 09:16:54 -04:00
  • a03f6c3bf1 More Selenium test, code cleanup. cahrens 2013-03-19 14:02:07 -04:00
  • a455c6b1e4 edx.org - added in error state revisions and modal window tweaks Brian Talbot 2013-03-19 13:57:14 -04:00
  • 0710bbd70c Merge branch 'master' into feature/abarrett/lms-notes-app Arthur Barrett 2013-03-19 13:43:45 -04:00
  • 0884051b32 Fixed bug where in firefox a marked poll button was not highlighted in blue. Valera Rozuvan 2013-03-19 19:29:09 +02:00
  • 39d451d92a Merge pull request #1687 from MITx/hotfix/edz/pinning e0d 2013-03-19 09:31:14 -07:00
  • 57b43d7a6c Genex now saves its state jmclaus 2013-03-19 16:36:55 +01:00
  • 3c645de43f extend xmodule.ConditionalModule docstrings Vasyl Nakvasiuk 2013-03-19 17:29:28 +02:00
  • a245cae4ef Merge pull request #1691 from MITx/feature/cale/fix-metadata-inheritance chrisndodge 2013-03-19 07:56:21 -07:00
  • 8fda5af4e4 Comment cleanup Calen Pennington 2013-03-19 10:54:46 -04:00
  • 0209c883bb Remove trailing whitespace Calen Pennington 2013-03-19 10:41:38 -04:00
  • 94d3ccf674 Always compute the metadata inheritance tree, even on a course module, so that when walking down the tree, we always get the right data Calen Pennington 2013-03-19 10:41:12 -04:00
  • dc60d107e9 edx.org - added in new login and registration visual banners per marketing request Brian Talbot 2013-03-19 09:53:52 -04:00
  • 07b3db97a2 remove test rake task Vasyl Nakvasiuk 2013-03-19 14:15:52 +02:00
  • 9e7258d887 fix rakefile, fix docs Vasyl Nakvasiuk 2013-03-19 12:38:08 +02:00
  • dc89a4b3d5 Beginning of Selenium test, updates to work with master. cahrens 2013-03-18 21:25:44 -04:00
  • c901cecdea studio - tender widget: added compromise of style given iframe and clunky DOM elements that tender is using. meh. Brian Talbot 2013-03-18 16:23:30 -04:00
  • 1b08071fdc merged from master and resolved conflict with annotatable module. Arthur Barrett 2013-03-18 15:51:27 -04:00
  • 7507f91d22 Added TODO and explanation for the top-level scss variables. Arthur Barrett 2013-03-18 15:43:43 -04:00
  • 49ee903eda Merge branch 'master' into feature/btalbot/studio-checklists cahrens 2013-03-18 15:30:19 -04:00
  • a70a23a48e Merge pull request #1680 from MITx/feature/will/courseware_lettuce_tests Jay Zoldak 2013-03-18 12:24:19 -07:00
  • c50bf5678e Merge pull request #1688 from MITx/fix/cdodge/add-500-404-templates-to-Studio Don Mitchell 2013-03-18 12:11:39 -07:00
  • 3e28ffa4f7 remove import and shortened line length Chris Dodge 2013-03-18 15:10:17 -04:00
  • dc78a08ce5 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio Chris Dodge 2013-03-18 15:05:37 -04:00
  • f6fb64f130 Saving checkbox state, client template for individual checklist. cahrens 2013-03-18 15:03:54 -04:00
  • e59b650fab add an array of courses to not refresh the metadata cache on writes. This is needed for imports where we are doing bulk updates otherwise, the DB gets thrashed and the import takes too long, timing out the browser Chris Dodge 2013-03-18 15:02:49 -04:00
  • 9a59336b5e Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite VikParuchuri 2013-03-18 11:58:38 -07:00
  • b6e82afb0e Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests Jay Zoldak 2013-03-18 11:53:22 -07:00
  • 568f557dfc Pep8 fixes Changed constant to uppercase Will Daly 2013-03-18 13:50:25 -04:00
  • eff6f1d182 Merge pull request #1690 from MITx/feature/cale/no-student-state-instructor-dash chrisndodge 2013-03-18 10:21:37 -07:00
  • 16f9f6ef4f studio - tender widget: added initial reference and behavior Brian Talbot 2013-03-18 13:15:01 -04:00
  • 2b14960519 Merge pull request #1689 from MITx/fix/cale/pylint-cleanup Jay Zoldak 2013-03-18 10:14:49 -07:00
  • 3fbde821dd Skip over fields that are scoped to students when looping through the CourseModule fields in the instructor dashboard Calen Pennington 2013-03-18 13:09:10 -04:00
  • 651465f1ad add HTML templates for 404/500 errors Chris Dodge 2013-03-18 12:56:17 -04:00
  • a4f10bfdaf Small pylint cleanup Calen Pennington 2013-03-18 12:45:46 -04:00
  • cdcdfd49e0 studio - alerts: resolving local master merge conflcits Brian Talbot 2013-03-18 10:58:16 -04:00
  • be27dfd500 poll_module.rst done Vasyl Nakvasiuk 2013-03-18 16:30:29 +02:00
  • 63ecc64d82 conditional_module.rst done Vasyl Nakvasiuk 2013-03-18 16:13:44 +02:00
  • 8580e9825e Merge branch 'master' into fix/btalbot/studio-sasscleanup Brian Talbot 2013-03-18 09:57:53 -04:00
  • 911c384527 remove old xml docs, add rake buildpubdocs, showpubdocs, pubdoc Vasyl Nakvasiuk 2013-03-18 15:53:07 +02:00
  • 2b677544a5 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio Chris Dodge 2013-03-18 09:39:47 -04:00
  • f172405c9a remove xml documentation from docs/source/ Vasyl Nakvasiuk 2013-03-18 15:37:29 +02:00
  • 9a18685c1c add a discussion module write through cache to speed up Forum rendering Chris Dodge 2013-03-18 09:01:54 -04:00
  • 27be7e159a Merge pull request #1685 from MITx/feature/cale/string_days_early chrisndodge 2013-03-16 17:48:43 -07:00
  • 9dda977ece Handle days_early_for_beta possibly being a string Calen Pennington 2013-03-16 20:38:32 -04:00
  • 1b619ac1c6 Merge pull request #1684 from MITx/content/rocha/xblock-announcement-2 Carlos Andrés Rocha 2013-03-16 14:47:50 -07:00
  • a4451bdcd2 XBlock SDK announcement Carlos Andrés Rocha 2013-03-15 10:29:30 -07:00
  • a1ba97376a studio - sass cleanup: further revisions and box-sizing all elements for consistency Brian Talbot 2013-03-16 12:18:35 -04:00
  • 8be15d8625 Merge pull request #1683 from MITx/feature/kevin/pinning_patch David Ormsbee 2013-03-15 22:22:28 -07:00
  • 3e65a68828 auto generate the discussion id on create. Also add 'discussion_id' to the list of 'system-metadata' so that end users cannot edit it Chris Dodge 2013-03-15 23:01:03 -04:00
  • b54ebb3460 make discussion module use MetadataOnlyEditingDescriptor which will not present a code edit region and only display the metadata editor Chris Dodge 2013-03-15 22:43:20 -04:00
  • d91008b73a Prevent random.Random() from running at import time. Victor Shnayder 2013-03-15 19:36:14 -07:00
  • b5cf9b326e Merge pull request #1679 from MITx/content/rocha/xblocks-announcement brianhw 2013-03-15 14:27:01 -07:00
  • 03caf94c98 remove redundent XML attribtues which are in metadata Chris Dodge 2013-03-15 16:26:39 -04:00
  • e4efda9a47 Reformat code Vik Paruchuri 2013-03-15 16:21:36 -04:00
  • 5fd1e7426d Lettuce tests now import one_time_startup.py to ensure that mongo caches are initialized for the test database. This avoids a warning from the mongo modulestore. Will Daly 2013-03-15 16:17:45 -04:00
  • cd3e88fdd5 Fix version tuples to be a dictionary Vik Paruchuri 2013-03-15 16:05:38 -04:00
  • 500c4ab86e Convert versions to tuples Vik Paruchuri 2013-03-15 15:40:04 -04:00
  • 06b118ae33 studio - sass cleanup: resolved static pages display issue after local merge master Brian Talbot 2013-03-15 15:23:03 -04:00
  • 01b1974f50 Address review comment Vik Paruchuri 2013-03-15 15:15:23 -04:00
  • 3a13cd7b34 Merged changes in factories.py with version in master Will Daly 2013-03-15 15:09:39 -04:00
  • b609ab0e6a Convert to using versioninteger class Vik Paruchuri 2013-03-15 15:05:47 -04:00
  • 405ea8d675 Remove copy.copy Vik Paruchuri 2013-03-15 14:57:48 -04:00
  • 97839d9de5 Fix default version string integer issues Vik Paruchuri 2013-03-15 14:52:55 -04:00
  • 64e1eb9903 Fix randomness bug in cohort placement Victor Shnayder 2013-03-15 11:35:27 -07:00
  • c34666af80 Fix version handling Vik Paruchuri 2013-03-15 14:20:55 -04:00
  • e41bb8462c Added lettuce tests for script (customresponse) problems. Increased wait time for login screen to reduce false positives. Will Daly 2013-03-15 12:13:07 -04:00
  • 8423816076 LMS contentstore lettuce tests now dynamically create courses in mongo using terrain.factories.py and capa.tests.response_xml_factory Will Daly 2013-03-15 11:33:04 -04:00
  • a20a3a02bb Refactored lettuce problem test assertion that a problem is correct/incorrect/unanswered Will Daly 2013-03-14 09:15:24 -04:00
  • 3d8625da9c Refactored problem lettuce test implementation Will Daly 2013-03-14 08:42:35 -04:00
  • 5a2a4055f8 Added lettuce test for formula problem Will Daly 2013-03-13 17:18:02 -04:00
  • 4d5a8e757c Added lettuce tests for numerical problem Will Daly 2013-03-13 17:01:34 -04:00
  • b3946828c0 Added lettuce tests for string problems Will Daly 2013-03-13 16:18:27 -04:00
  • e6466fdddc Changed user creation so that it creates the user only if it doesn't already exist Will Daly 2013-03-13 14:44:27 -04:00
  • 56a6363d7a CSS selectors in lettuce tests for problems now include the element tag. Will Daly 2013-03-13 14:40:37 -04:00
  • 90213d483c Wrote lettuce tests for drop-down, multiple choice, and checkbox problems. Will Daly 2013-03-13 14:25:36 -04:00
  • 93a59f244d XBlock SDK announcement Carlos Andrés Rocha 2013-03-15 10:29:30 -07:00
  • 53257a3c47 i need more sleep: Your Name 2013-03-15 12:47:28 -04:00
  • 68cb63daa8 accidentally deleted models file Your Name 2013-03-15 12:42:59 -04:00
  • 84a5475d5a studio - sass cleanup: resolving conflicts with local master merge Brian Talbot 2013-03-15 12:42:33 -04:00
  • 20767d5cc7 create notes djangoapp for annotator.js Arthur Barrett 2013-03-13 17:34:58 -04:00
  • 6ed279ce38 Pin versions of testing tools Calen Pennington 2013-03-15 12:40:27 -04:00
  • a761e2e829 make pinning backward compatible Your Name 2013-03-15 12:38:28 -04:00
  • 7697a43cf4 Fix typo in signup forms Carlos Andrés Rocha 2013-03-15 09:38:06 -07:00
  • 3b0aed5d42 Merge pull request #1572 from MITx/feature/alex/poll-merged Calen Pennington 2013-03-15 09:04:42 -07:00
  • 0f5a05c8a2 Merge pull request #1673 from MITx/jmpm-analytics Calen Pennington 2013-03-15 09:04:15 -07:00
  • f1d4096bcd Mark snippets as raw strings to avoid having to escape backslashes Calen Pennington 2013-03-15 11:52:50 -04:00
  • 0a53ec3ee6 updates Your Name 2013-03-15 11:37:58 -04:00
  • 10de617dea Squelch a few more pylint exceptions Calen Pennington 2013-03-15 11:28:46 -04:00
  • 9f99c9004b Fix up capa tests Calen Pennington 2013-03-15 11:28:33 -04:00
  • 6b64b4214f Make relative imports explicitly relative Calen Pennington 2013-03-15 11:23:22 -04:00
  • f1c66e9178 Make common/djangoapps not a python module either Calen Pennington 2013-03-15 11:16:15 -04:00
  • 67a0cccba9 Addressing some pep8/pylint concerns David Ormsbee 2013-03-15 11:08:09 -04:00
  • 470e402723 patch for backward compatibility Your Name 2013-03-15 10:51:34 -04:00
  • fd3ba7db2a Don't make cms.djangoapps a python module Calen Pennington 2013-03-15 10:50:46 -04:00