Commit Graph

  • 8c5f9e6e41 Fix merge conflict. Peter Fogg 2013-06-03 08:49:52 -04:00
  • 1d8e46f01c Merge pull request #13 from edx/victor/help-button-text Victor Shnayder 2013-06-02 20:47:45 -07:00
  • 4c6e482d39 Merge pull request #24 from edx/ned/remove-test-ike Ned Batchelder 2013-06-02 18:45:05 -07:00
  • de743a4812 Merge pull request #39 from edx/fix/marco/studio-latex-compiler Christina Roberts 2013-06-02 13:19:32 -07:00
  • 7735e37585 Merge pull request #8 from edx/valera/fix_videoalpha_studio_integration chrisndodge 2013-06-02 13:04:33 -07:00
  • 6fb520f21e add peer grading to the advanced components check Chris Dodge 2013-06-02 14:39:36 -04:00
  • cd0f4b8194 Merge pull request #18 from edx/fix/cdodge/bad-link-in-activation-email chrisndodge 2013-06-02 11:36:31 -07:00
  • 67a29ea94a hides latex compiler in settings tab by making previously specific css sibling selector general enough to find and hide the appropriate div marco 2013-06-02 12:48:54 -04:00
  • 91d3f4ddff add simple content check for the activation page when the user is not logged in Chris Dodge 2013-06-02 00:43:17 -04:00
  • c0899463e3 remove unused import reference Chris Dodge 2013-06-02 00:18:35 -04:00
  • ba9a5b3824 add simple check on whether the expected advanced modules appear in the edit unit page when turned on Chris Dodge 2013-06-02 00:15:34 -04:00
  • d2bb831781 Merge pull request #34 from antoviaque/install-requirements-pre James Tauber 2013-06-01 19:56:26 -07:00
  • d606e7fa7d Install steps - Use edx-platform gemset when fetching ruby deps Xavier Antoviaque 2013-06-01 19:28:15 -03:00
  • 52b76c87f4 Merge pull request #11 from edx/feature/christina/metadata-ui Christina Roberts 2013-06-01 16:01:53 -07:00
  • 750b1d51ba Install steps - Fixes syntax of update_templates django command Xavier Antoviaque 2013-06-01 11:39:57 -03:00
  • 4d311f44cd Code review feedback. cahrens 2013-06-01 18:46:09 -04:00
  • 2a8105145f Install steps - Fixed typo for installation of rvm on Linux Xavier Antoviaque 2013-06-01 19:18:29 -03:00
  • 906b70cc41 Install steps - Use "Linux" instead of distribution name to detect OS Xavier Antoviaque 2013-06-01 17:46:16 -03:00
  • a06e34e2f9 Install steps - Fixes mysql package name dependency for Debian/Ubuntu Xavier Antoviaque 2013-06-01 14:44:23 -03:00
  • 388e6b856f Install steps - Add numpy requirement in manual installation steps Xavier Antoviaque 2013-06-01 12:54:45 -03:00
  • f27f664d46 Merge pull request #26 from edx/jtauber/fix-overview James Tauber 2013-06-01 06:07:46 -07:00
  • dbcef7d743 create-dev-env.sh: if run from repo, set $BASE appropriately yarko 2013-05-31 23:18:38 -05:00
  • e503da47b9 Merge pull request #31 from edx/nate/edx-platform-ruby-gemset James Tauber 2013-05-31 19:52:01 -07:00
  • 1f1a43a424 Change Ruby gemset to edx-platform Nate Hardison 2013-05-31 17:46:24 -07:00
  • 223c3b238c updated README with boilerplate James Tauber 2013-05-31 18:28:39 -04:00
  • 04842087fc Merge pull request #25 from edx/slater/new_mac_dev_script Slater-Victoroff 2013-05-31 15:14:53 -07:00
  • 57e43770d5 cleaning up, some syntax fixed and edge cases considered Slater-Victoroff 2013-05-31 17:51:03 -04:00
  • a267f5ec86 Pull request comments addressed, if else condition cleaned up Slater-Victoroff 2013-05-31 17:28:47 -04:00
  • c5b95e393f merge conflict resolved, whitespace changes Slater-Victoroff 2013-05-31 16:54:16 -04:00
  • 3fc7bb6e42 Last requirement that was needed on Jonah's machine. Now working on the fresh Ubuntu install there Slater-Victoroff 2013-05-31 16:49:03 -04:00
  • 68fa1984fa Last requirement that was needed on Jonah's machine. Now working on the fresh Ubuntu install there Slater-Victoroff 2013-05-31 16:49:03 -04:00
  • 9e140dcc32 pull request notes attended to Slater-Victoroff 2013-05-31 16:31:00 -04:00
  • f0abdce65a small tweaks to overview doc James Tauber 2013-05-31 16:22:59 -04:00
  • 68581610a4 Allow single-click creation of course components that only have one template. Peter Fogg 2013-05-31 16:22:51 -04:00
  • 0b0b36028c Added ubuntu requirements for better mysql support Slater-Victoroff 2013-05-31 16:10:11 -04:00
  • 486d085d1e Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui cahrens 2013-05-31 16:00:09 -04:00
  • a82daf0710 Change to Backbone collection. cahrens 2013-05-31 15:59:53 -04:00
  • 5434f2750e Cleaning up code to fix pylint/pep8 errors. Peter Fogg 2013-05-31 15:58:12 -04:00
  • ae2a507ec8 Remove test_ike.py, Ike says we don't need it, and it looks like a test. Ned Batchelder 2013-05-31 15:40:51 -04:00
  • d7ba5db81a Added note about the current state of support for debian based systems to accurately reflect state of development Slater-Victoroff 2013-05-31 15:37:30 -04:00
  • 286fcece4a Fixed issue of searching for text JonahStanley 2013-05-31 15:33:56 -04:00
  • c87e46969a files cleaned up and debugging nearing the final steps Slater-Victoroff 2013-05-31 15:32:40 -04:00
  • 88d3f253b6 Move symmath to be its own directory, and install it into the sandbox. Ned Batchelder 2013-05-31 15:22:16 -04:00
  • cb9da2cd03 Potentially fixed all flakey tests JonahStanley 2013-05-31 15:16:45 -04:00
  • 4a997842c7 Merge pull request #2 from edx/fix/vik/single-step-oe VikParuchuri 2013-05-31 12:10:45 -07:00
  • cd82bd054d Merge pull request #20 from edx/zoldak/distribute-version Jay Zoldak 2013-05-31 12:09:17 -07:00
  • 56433729c6 Realized an issue requiring us to remove raring support, fixed a couple more bugs Slater-Victoroff 2013-05-31 15:09:13 -04:00
  • 3b3b5d97e9 Removed npm requirement due to node version conflicts Slater-Victoroff 2013-05-31 14:58:40 -04:00
  • e01991eca5 Tweak copy Victor Shnayder 2013-05-31 14:56:37 -04:00
  • 3308bb4be7 Fixed pull request comments and refactored the duplicate code JonahStanley 2013-05-31 14:53:29 -04:00
  • 98673f8e6a Somehow, when I moved symmath, I left behind its test files!? Ned Batchelder 2013-05-31 14:39:23 -04:00
  • 92e159ea37 text and style adjustments to help button modal Frances Botsford 2013-05-31 14:31:16 -04:00
  • 6272e89014 Down to node errors on Ubuntu Slater-Victoroff 2013-05-31 14:30:56 -04:00
  • 1c0bcf476a Merge pull request #3 from edx/fix/vik/speed-up-oe-test VikParuchuri 2013-05-31 11:05:35 -07:00
  • 343d9019e0 Merge pull request #15 from edx/pbaratta/fix/trailing-period Peter Baratta 2013-05-31 10:20:46 -07:00
  • badd3a8d13 Properly stub out the controller_qs variable in the tested module. Test times out without this. Vik Paruchuri 2013-05-23 17:08:06 -04:00
  • 9281a80089 Fix js that prevented single step OE problems (ie only self assessment) from working Vik Paruchuri 2013-05-30 17:34:03 -04:00
  • 2277c82efd Fix pep8 whitespace violation. Peter Fogg 2013-05-31 12:54:09 -04:00
  • 56ed47b37f Allow single-click video creation. Peter Fogg 2013-05-31 12:52:53 -04:00
  • 6f1f0e115c changed ubuntu strategy for numpy and scipy Slater-Victoroff 2013-05-31 12:46:44 -04:00
  • 0ce2ff22f6 testing numpy change on ubuntu Slater-Victoroff 2013-05-31 12:45:36 -04:00
  • 290d049c29 Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui marco 2013-05-31 12:41:13 -04:00
  • a76adc2871 Added useful requirements and removed problematic scipy Slater-Victoroff 2013-05-31 12:40:43 -04:00
  • 72e1fab1c4 SASS variable and naming standards sync-up based on @talbs feedback completed marco 2013-05-31 12:40:40 -04:00
  • ff3997e72e Add test to verify a single period is not accepted as input Peter Baratta 2013-05-31 12:37:14 -04:00
  • 1bedc2e4bd Change the file paths to be less specific. Ned Batchelder 2013-05-31 12:23:58 -04:00
  • 35a1dc123a Wrap the lines so I can read the text. Ned Batchelder 2013-05-31 12:23:16 -04:00
  • ab2a919c92 more tests run, some requirements added for graphviz on ubuntu Slater-Victoroff 2013-05-31 12:22:45 -04:00
  • a503a753cd Remove unnecessary pylint warning disable. Peter Fogg 2013-05-31 12:16:25 -04:00
  • 453bf42133 Revert changes to how video_alpha is stubbed out for testing. Peter Fogg 2013-05-31 12:12:14 -04:00
  • 9314154ec1 Move loncapa grading helpers into the sandbox-packages directory. Ned Batchelder 2013-05-31 12:01:33 -04:00
  • 7a16938ad2 Remove unnecessary suppression. Peter Fogg 2013-05-31 11:58:05 -04:00
  • 87daba69ea Merge branch 'master' of github.com:edx/edx-platform into fix/cdodge/bad-link-in-activation-email Chris Dodge 2013-05-31 11:53:49 -04:00
  • aae3380aa9 Merge pull request #16 from edx/feature/e0d/remove-request-debugger David Ormsbee 2013-05-31 08:36:16 -07:00
  • 23e98314f4 Merge pull request #19 from edx/jarv/django-upgrade John Jarvis 2013-05-31 08:33:42 -07:00
  • 57f8bbf69d Updates to Selenium test based on feedback. cahrens 2013-05-31 11:26:31 -04:00
  • ab5834fb41 Pylint cleanup. cahrens 2013-05-31 11:26:19 -04:00
  • 7efcd98135 fix up styles in header for this particular use case Chris Dodge 2013-05-31 11:25:28 -04:00
  • a5ee903ef5 Pin capa to require distribute greater than 28 because an old branch had it at 30 Jay Zoldak 2013-05-31 11:24:49 -04:00
  • 1699d24c9a Successful on mac, almost there on ubuntu Slater-Victoroff 2013-05-31 11:24:07 -04:00
  • 782cb05410 Add passing Lettuce testing for video autoplay in LMS. Peter Fogg 2013-05-31 11:22:45 -04:00
  • 2e84540af0 removing the request debugger entirely. e0d 2013-05-31 11:15:28 -04:00
  • 800ec068bd updating django minor release John Jarvis 2013-05-31 11:15:15 -04:00
  • 62bacea371 use the right link to the login page in a particular use case: clicking activation email when not logged in Chris Dodge 2013-05-31 11:10:14 -04:00
  • 087834337a Pep8 newline Peter Baratta 2013-05-31 11:05:21 -04:00
  • 821621cd52 small edits mostly taken care of Slater-Victoroff 2013-05-31 11:05:20 -04:00
  • 86f62d5419 Pin distribute version to greater than 28 because old branches of capa required 30 Jay Zoldak 2013-05-31 11:04:59 -04:00
  • 75f127d76b Change help button text, fixing LMS-319 Victor Shnayder 2013-05-31 09:34:32 -04:00
  • b489a5d773 distribute fix Slater-Victoroff 2013-05-31 10:41:59 -04:00
  • 80a27f9391 Add test and functionality for trailing period Peter Baratta 2013-05-31 10:41:08 -04:00
  • 660dbd80b9 small fix Slater-Victoroff 2013-05-31 10:38:18 -04:00
  • 433043b146 Removed starting courseware clone Slater-Victoroff 2013-05-31 10:37:18 -04:00
  • 49ed93a4e6 Fixed first stage bugs Slater-Victoroff 2013-05-31 10:35:26 -04:00
  • b2cd6915e4 Draft 1 of cross-platform bash script is complete, but more testing needs to be done Slater-Victoroff 2013-05-31 10:14:28 -04:00
  • e6dfa8e81c Merge branch 'master' into feature/christina/metadata-ui cahrens 2013-05-31 09:46:17 -04:00
  • a49acc73ee Removed the save_html line JonahStanley 2013-05-31 09:16:14 -04:00
  • 1c48279563 Added requirement for pip>=1.3 Will Daly 2013-05-29 16:47:17 -04:00
  • 37cffd0835 Added videoalpha to advanced components in component.py file. Valera Rozuvan 2013-05-31 13:48:17 +03:00
  • 46967a78dc Merge pull request #6 from edx/release marcotuts 2013-05-30 16:34:22 -07:00
  • 3614a72a2c Merge pull request #1 from edx/hotfix/advanced-settings marcotuts 2013-05-30 15:41:09 -07:00