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

Commit Graph

  • f2c40a71fe Enable theming in base LMS template Nate Hardison 2013-05-31 15:17:45 -07:00
  • 0bf7c71ec2 Run all tests on jenkins Calen Pennington 2013-06-05 13:05:00 -04:00
  • fdf213f9b5 Compile all of the coffee and sass in the project, not just the files in */static Calen Pennington 2013-06-05 13:04:20 -04:00
  • 16fc7b37fb Make xmodule_assets incremental, rather than removing the entire generated asset tree Calen Pennington 2013-06-05 11:12:47 -04:00
  • d1be90bbc4 Merge branch 'master' of https://github.com/edx/edx-platform into slater/search Slater-Victoroff 2013-06-05 12:48:40 -04:00
  • 4391783248 add exporting of 'about' content as well as adding unit test checks Chris Dodge 2013-06-05 12:40:09 -04:00
  • 0fb1136559 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement dcadams 2013-06-05 09:25:49 -07:00
  • 468dfe3437 Merge pull request #71 from edx/feature/cdodge/allow-setting-of-session-cookie-name chrisndodge 2013-06-05 08:36:17 -07:00
  • 6fb97d52c0 fix typos Chris Dodge 2013-06-05 11:21:35 -04:00
  • ff7b851f95 Merge pull request #4 from edx/diana/fix-error-descriptor Diana Huang 2013-06-05 07:39:40 -07:00
  • 4bade8d286 allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox) Chris Dodge 2013-06-05 10:30:28 -04:00
  • 3c9bd1ddf8 allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox) Chris Dodge 2013-06-05 10:26:30 -04:00
  • 1ac6e12304 Pyes working, considering switch to raw requests, phonetic and fuzzy search both working Slater-Victoroff 2013-06-05 10:22:18 -04:00
  • b312944dcf Merge pull request #64 from edx/jonahstanley/fix-codemirror-tests Jonah Stanley 2013-06-05 06:30:58 -07:00
  • a8ec1ca9d5 Modified code such that non-logged in student activates correctly. dcadams 2013-06-04 17:08:34 -07:00
  • e1d3fb7301 Added warning message when no coverage information found. Added comments to tests.rake Will Daly 2013-06-04 18:46:45 -04:00
  • 99c185f06b Added diff coverage printout to rake coverage command Will Daly 2013-06-04 18:39:49 -04:00
  • a5fc721922 Merge branch 'master' into will/diff-cover-integration Will Daly 2013-06-04 18:19:07 -04:00
  • 5662ecfde9 Updated to current tag of diff-cover Will Daly 2013-06-04 18:13:42 -04:00
  • 9c506020d9 Fixed bug in tests.rake in which rm would be called with no args. Will Daly 2013-06-04 17:51:12 -04:00
  • 1ea6545556 Worked on reducing pep8 violations. dcadams 2013-06-04 14:13:13 -07:00
  • e092aadbf9 Merge pull request #48 from edx/jrbl/substitute-anonymous-user-id-in-html Joe Blaylock 2013-06-04 14:13:59 -07:00
  • 946c36e49a Merge pull request #56 from edx/fix/cale/coffee-assets-watch Calen Pennington 2013-06-04 13:59:19 -07:00
  • bbd34235b8 Made finding place to click a bit nicer JonahStanley 2013-06-04 16:40:18 -04:00
  • 7f2fa8ff3a Fixed issue with code mirror editing JonahStanley 2013-06-04 16:33:54 -04:00
  • 90a1a8cb72 Merge pull request #63 from edx/peter-fogg/single-click-video-creation Peter Fogg 2013-06-04 13:10:39 -07:00
  • b606d7ce56 Merge pull request #53 from edx/nate/fix-mako-templ-encoding Nate Hardison 2013-06-04 13:02:05 -07:00
  • 2b6a449b2a Unbreak acceptance tests in the cms. Peter Fogg 2013-06-04 15:48:20 -04:00
  • 5baee34896 Merge pull request #60 from edx/fix/btalbot/lms-header Brian Talbot 2013-06-04 12:26:13 -07:00
  • fda444220a Merge pull request #62 from edx/zoldak/turn-off-lettuce-screenshot-on-failure Jay Zoldak 2013-06-04 12:22:21 -07:00
  • f213113361 cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references marco 2013-06-04 15:15:12 -04:00
  • 59b26a791b Turn off automatic snapshot to tmp dir on lettuce failure Jay Zoldak 2013-06-04 15:09:44 -04:00
  • 7c4e20f9e5 lms - adds in alt text attribute to logo/edX home image for accessibility purposes Brian Talbot 2013-06-04 14:45:45 -04:00
  • f34b131678 lms - revises the physical height of the edX logo within the slim-sized header and vertically aligns all elements Brian Talbot 2013-06-04 14:44:57 -04:00
  • c790d6263f Merge pull request #59 from edx/nate/comment-atop-generated-asset-files Nate Hardison 2013-06-04 11:35:12 -07:00
  • 7bccce4e9c Add comment to dynamically-generated asset files Nate Hardison 2013-06-04 11:02:55 -07:00
  • 779f86c440 Merge pull request #46 from edx/peter-fogg/single-click-video-creation Peter Fogg 2013-06-04 11:08:40 -07:00
  • 30d5b8943f Merge pull request #14 from edx/feature/e0d/additional-sandbox-reqs e0d 2013-06-04 10:48:52 -07:00
  • 56f81fb104 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement dcadams 2013-06-04 10:29:04 -07:00
  • 39ee489460 adding sympy and networkx e0d 2013-05-31 10:56:47 -04:00
  • 70736c1da8 Remove tabs from unit.html for the third time. Peter Fogg 2013-06-04 13:23:09 -04:00
  • e982d7fcdc Refactor test_contenstore to remove code duplication. Peter Fogg 2013-06-04 13:22:08 -04:00
  • c62cc23bc2 Refactored Navigation Methods JonahStanley 2013-06-04 13:06:18 -04:00
  • ab5f71ea44 Merge branch 'master' into jonahstanley/add-navigation-tests JonahStanley 2013-06-04 13:05:36 -04:00
  • 2cfea12dfe Merge pull request #51 from edx/bug/christina/about_page_url Christina Roberts 2013-06-04 10:02:57 -07:00
  • 6b68f2c0fe Use coffee watch command to watch whole directories, so that it will pick up new coffee files as they are created Calen Pennington 2013-06-04 12:22:28 -04:00
  • 1b4eece295 Merge pull request #55 from edx/fix/btalbot/studio-advancedicon Brian Talbot 2013-06-04 08:54:58 -07:00
  • 862bb3f8bc Added the beginnings of the navigation tests JonahStanley 2013-06-04 11:34:52 -04:00
  • 3bcbc9f979 studio - replaces iconography for advanced component button within the unit view Brian Talbot 2013-06-04 11:26:16 -04:00
  • 714a3f1e40 added in vendor font references to lms for font-awesome marco 2013-06-04 11:21:07 -04:00
  • c8f1d49c6a Merge pull request #22 from edx/fix/btalbot/edx.org-accessibility Brian Talbot 2013-06-04 08:05:03 -07:00
  • 0936e614a5 addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown. marco 2013-06-04 11:04:06 -04:00
  • eca9eedecf edx.org - adds in I18n syntax for login and register view page titles Brian Talbot 2013-06-04 10:59:32 -04:00
  • e4cc0dfdba edx.org - revises login and register graphical banner images to include higher contrast between type and imagery Brian Talbot 2013-06-04 10:45:42 -04:00
  • d895c64f4a Use full descriptor when showing errors, not just the model data. Diana Huang 2013-06-04 10:43:06 -04:00
  • aa8f73ffb4 edx.org - revises base blue and color references to adhere to WCAG color contrast guidelines Brian Talbot 2013-05-29 18:14:01 -04:00
  • 8da62871a9 edx.org - revises registration h1 text to match the graphical banner texdt Brian Talbot 2013-05-29 17:35:34 -04:00
  • 64a85e19e7 Specify UTF-8 encoding when loading Mako template Nate Hardison 2013-06-03 17:19:33 -07:00
  • 57c513b104 basic shell for discussion home page with both profile information and email notification settings marco 2013-06-03 17:23:02 -04:00
  • f3b36b8bc9 Use from_descriptor instead of from_xml to make ErrorDescriptor Diana Huang 2013-05-31 15:28:54 -04:00
  • 266938a7b3 Finish the comment I forgot about... Peter Fogg 2013-06-03 16:55:28 -04:00
  • 90bbff8965 Add test to be sure that advanced components require multiple clicks. Peter Fogg 2013-06-03 16:53:14 -04:00
  • e06f0083e2 Adding myself to AUTHORS. Peter Fogg 2013-06-03 16:39:16 -04:00
  • bf88e5ce6a Be more explicit about template location. Peter Fogg 2013-06-03 15:48:07 -04:00
  • 8a67454f98 Prevent creation of unnecessary template divs, and rename .single_templates to .single-templates for convention. Peter Fogg 2013-06-03 15:36:55 -04:00
  • 38e3ff13ed pep8 cleanup. cahrens 2013-06-03 15:32:42 -04:00
  • 93be67d49a Fix bug STUD-103. The url base for about page links needs to be www.edx.org for Drupal site, vs. LMS_BASE which is used for Studio. Note that the complete URL is still not correct, but a redirect exists to take it to the new location. cahrens 2013-06-03 15:21:02 -04:00
  • d3ec1cb915 Add tests for single-click discussion creation. Peter Fogg 2013-06-03 14:57:34 -04:00
  • eff78bfd86 Add doc for click_component_from_menu and make sure css is present in any case. Peter Fogg 2013-06-03 14:38:56 -04:00
  • 6262274805 Expose site-wide anonymized ids to HTML module Joe Blaylock 2013-06-03 10:49:20 -07:00
  • c865641f13 Merge pull request #23 from edx/ned/move-loncapa-etc-into-sandbox Ned Batchelder 2013-06-03 11:27:16 -07:00
  • ff0c56b7fb Cleaning up code -- removed unnecessary lines, fixed indentation, renamed method. Peter Fogg 2013-06-03 14:21:50 -04:00
  • c0859cb042 Merge pull request #35 from antoviaque/install-update-templates James Tauber 2013-06-03 10:47:22 -07:00
  • afa6f485fd Added diff-cover as a requirement (installed from github) Will Daly 2013-06-03 13:26:01 -04:00
  • cdadcba9da Merge pull request #10 from edx/jonahstanley/add-more-tests Jonah Stanley 2013-06-03 10:25:53 -07:00
  • 8d7a2f316a Merge pull request #5 from edx/nate/asset-preprocessing-mgmt-cmd Nate Hardison 2013-06-03 10:15:33 -07:00
  • 4724a35f28 Merge pull request #9 from edx/fix/will/pip-version Will Daly 2013-06-03 10:02:38 -07:00
  • 03a9765b79 Change task.invoke to Rake::Task.invoke Nate Hardison 2013-06-03 10:00:50 -07:00
  • 1fd1f63075 Wrapper tasks for :assets-dependent Jasmine tasks Nate Hardison 2013-06-02 15:36:59 -07:00
  • 35fb5fa47e Add wrapper task to start LMS/CMS server Nate Hardison 2013-06-02 15:34:00 -07:00
  • 1001b315a3 Preprocess assets as Django management command Nate Hardison 2013-05-30 15:48:55 -07:00
  • 6af54ead39 Fixed scenario wording JonahStanley 2013-06-03 12:43:54 -04:00
  • 900dca9ef4 Merge branch 'master' into fix/will/pip-version Will Daly 2013-06-03 12:25:56 -04:00
  • 76ae980006 Clean the report directories before each test run, to ensure we don't get coverage results from a previous test run. Will Daly 2013-06-03 12:19:13 -04:00
  • 4bc27b930c Merge pull request #47 from edx/hotfix/jkarni/folditpartialcred jkarni 2013-06-03 09:19:10 -07:00
  • 198d63db86 Update docstring for get_score Julian Arni 2013-06-03 12:13:05 -04:00
  • 0d11eb16ba Fixed typo JonahStanley 2013-06-03 11:52:40 -04:00
  • 7ddb7a6784 Merge branch 'master' into feature/marco/discussionhome marco 2013-06-03 11:23:24 -04:00
  • c639bbc6f0 Add partial credit for foldit Julian Arni 2013-06-03 11:15:45 -04:00
  • 72d149caae Add docstrings and comments Peter Baratta 2013-05-29 13:25:48 -04:00
  • 01ef72f44d Merge pull request #37 from antoviaque/install-ubuntu-dependencies Slater-Victoroff 2013-06-03 07:45:02 -07:00
  • ed45c505a3 Simpler pyparsing Peter Baratta 2013-05-29 12:55:51 -04:00
  • 74866a38b0 Move parseActions and statics out of evaluator() Peter Baratta 2013-05-29 12:55:11 -04:00
  • 2871ce8dee Fix pep8 violations. Peter Fogg 2013-06-03 10:36:46 -04:00
  • 457bd30c68 Make sure advanced component creation shows even a single template. Peter Fogg 2013-06-03 10:26:52 -04:00
  • 55aaa1a8e9 Add lettuce tests for single-click video creation and fix previously failing tests. Peter Fogg 2013-06-03 10:20:29 -04:00
  • a17c487f16 Merged from Master JonahStanley 2013-06-03 09:46:19 -04:00
  • 8cc93cb5d8 Merge branch 'master' into jonahstanley/add-more-tests JonahStanley 2013-06-03 09:37:25 -04:00
  • cce65ce9ae Merge branch 'master' of github.com:edx/edx-platform into peter-fogg/single-click-video-creation Peter Fogg 2013-06-03 09:15:52 -04:00
  • babe46e6f2 Merge pull request #17 from edx/peter-fogg/no-autoplay-studio Peter Fogg 2013-06-03 06:07:03 -07:00