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

Commit Graph

  • a1a33eb5e5 Fix path to phantom jasmine now that we install via node Jay Zoldak 2013-05-17 10:53:14 -04:00
  • dadcdd0599 Fix lettuce signup feature to match Drupal site. Diana Huang 2013-05-16 18:18:04 -04:00
  • acfcd0f8a4 Fix the login lettuce feature for the new Drupal site. Diana Huang 2013-05-16 17:59:59 -04:00
  • 2b80b358ed Add in a test for the marketing_link function in mitxmako Diana Huang 2013-05-16 16:15:51 -04:00
  • 163a50c697 Merge pull request #2055 from edx/fix/btalbot/studio-tooltips Brian Talbot 2013-05-17 07:47:30 -07:00
  • 85f2be44b5 studio - resolves line-height issue that core typography settings creates with tooltip rendering Brian Talbot 2013-05-16 13:38:56 -04:00
  • 1f43fa163a internationalization stripped out marco 2013-05-17 10:29:24 -04:00
  • f856b69ab5 Merge branch 'feature/ned/sandboxed-python' Ned Batchelder 2013-05-17 10:28:06 -04:00
  • 6fb8adaa50 add flagging and unflagging tests to response show view Your Name 2013-05-17 09:52:02 -04:00
  • ad5b71deae format content view test for readability Your Name 2013-05-17 09:34:41 -04:00
  • 296a878169 add flagging tests to DiscussionContentView Your Name 2013-05-17 09:31:12 -04:00
  • ce2308b5bb add flagging tests to DiscussionContentView Your Name 2013-05-17 09:28:12 -04:00
  • 867d69ed12 update views.py to add docstrings and change exception name to address pylint errors Your Name 2013-05-16 18:13:59 -04:00
  • 362736c4d1 Merge pull request #2060 from edx/fix/gprice/marketing-links Greg Price 2013-05-16 14:24:13 -07:00
  • 29b7778461 initial i18n changes to unit.html, component.html, and the individual setting type template files marco 2013-05-16 17:17:43 -04:00
  • 944d2d61f1 Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore). #324 cahrens 2013-05-16 17:15:53 -04:00
  • d0c4afb32f More info in the capa/safe_exec/README Ned Batchelder 2013-05-16 17:02:45 -04:00
  • 4e95aa053f Fix marketing links in password reset pages Greg Price 2013-05-16 15:57:35 -04:00
  • 37ec01dd8d Handle ItemNotFoundError from the modulestore to avoid 500 errors Greg Price 2013-05-16 10:05:13 -04:00
  • 9fba56c0e2 Include running jasmine tests for discussion forums on jenkins Jay Zoldak 2013-05-16 16:49:25 -04:00
  • b6c0081064 Look for the existence of the links, not for the actual urls Diana Huang 2013-05-16 14:42:35 -04:00
  • 22cf0dfa97 Fix bug in lettuce tests where the unregister dialog wasn't getting closed fast enough. Diana Huang 2013-05-14 17:16:24 -04:00
  • 1c2175304e Merge branch 'master' into drupal-new Diana Huang 2013-05-16 16:27:36 -04:00
  • f30b9d91e9 Merge pull request #2057 from edx/fix/gprice/disable-courseware-links Greg Price 2013-05-16 13:23:19 -07:00
  • 71626f4ff6 Pep8 fixes of django_comment_client code Jay Zoldak 2013-05-16 15:57:34 -04:00
  • f58deb4c3c removed latex compiler buttom from settings tab marco 2013-05-16 15:42:29 -04:00
  • ce56fa3066 Merge pull request #1990 from edx/feature/abarrett/lms-notes-app chrisndodge 2013-05-16 12:38:56 -07:00
  • 2fd0b1b972 Merge pull request #2054 from edx/jarv/move-edx-requirements John Jarvis 2013-05-16 12:13:44 -07:00
  • b8d2276de7 Remove dashboard links for unstarted courses Greg Price 2013-05-16 13:57:34 -04:00
  • ff2ba68d79 Tweak behavior of registration button for marketing site Greg Price 2013-05-16 13:37:48 -04:00
  • d8fed59314 Use the latest CodeJail. Ned Batchelder 2013-05-16 14:54:13 -04:00
  • adcd1dd886 update annotator.min.css with change to fix adder button and serve the minified one. Arthur Barrett 2013-05-16 14:48:06 -04:00
  • 522c2a12d2 private-requirements.txt moved, ignore it in the new place. Ned Batchelder 2013-05-16 14:37:55 -04:00
  • b8acb39ce1 moving sandbox requirements John Jarvis 2013-05-16 14:32:27 -04:00
  • 653dd4240c moving requirements files to a directory that corresponds with the virtualenv name John Jarvis 2013-05-16 12:06:31 -04:00
  • e1120d5624 new location for requirement files John Jarvis 2013-05-16 12:13:40 -04:00
  • 9138302108 rakefile updates John Jarvis 2013-05-16 12:16:21 -04:00
  • 52e5fe223c update annotator.js library and fix the annotator-adder button hover state in courseware. Arthur Barrett 2013-05-16 14:27:21 -04:00
  • e947218285 Merge master to here. Ned Batchelder 2013-05-16 14:21:51 -04:00
  • bbd1d8d09e From code review: the hash was shallow, so nested objects could have hashed differently when they didn't need to. Ned Batchelder 2013-05-16 13:58:05 -04:00
  • e89cd7a397 fix test to check for 400 status code instead of 500. Arthur Barrett 2013-05-16 13:38:14 -04:00
  • a6c5e699ea Update combined open ended and peer grading per conversation with Vik. cahrens 2013-05-16 13:28:48 -04:00
  • 1fbe43a650 Merge branch 'master' into feature/abarrett/lms-notes-app Arthur Barrett 2013-05-16 13:23:12 -04:00
  • 430e009b5d added TODO for open ended and notes tab advanced policy settings. Arthur Barrett 2013-05-16 13:22:40 -04:00
  • 0dd8dabf13 validation errors should return 400 status code instead of 500. Arthur Barrett 2013-05-16 13:18:36 -04:00
  • fca63f065f Merge pull request #2023 from edx/feature/will/ci-lettuce-tests Will Daly 2013-05-16 10:18:00 -07:00
  • f05b25d17a Added more to the safe_exec docstring. Ned Batchelder 2013-05-16 13:15:28 -04:00
  • b97772a9c6 Gitignore jasmine_test_runner.html in the appropriate place. Jay Zoldak 2013-05-16 12:39:48 -04:00
  • 01ff8396e3 Fix CodeMirror initialization problem. cahrens 2013-05-16 12:34:39 -04:00
  • a30e31213b rakefile updates John Jarvis 2013-05-16 12:16:21 -04:00
  • 50160592f7 new location for requirement files John Jarvis 2013-05-16 12:13:40 -04:00
  • caf64d5dd0 moving requirements files to a directory that corresponds with the virtualenv name John Jarvis 2013-05-16 12:06:31 -04:00
  • d1fee427fe Updated Jenkins script to reflect new requirements installation process Will Daly 2013-05-16 11:39:44 -04:00
  • 1e1e6450df Pep8 fixes Will Daly 2013-05-16 11:33:50 -04:00
  • 342b3bb0e9 Merge branch 'master' into feature/will/ci-lettuce-tests Will Daly 2013-05-16 11:21:59 -04:00
  • a9db41d8d0 flag and unflag tests for comments and threads Your Name 2013-05-15 17:05:47 -04:00
  • c7e0b576d0 fix missing paren Your Name 2013-05-15 14:38:48 -04:00
  • 03725de34a flag abuse failing Kevin Chugh 2013-05-15 13:02:23 -04:00
  • fa269d3c96 add flag thread django test Kevin Chugh 2013-05-14 19:37:21 -04:00
  • 82d2b78b96 update jasmine tests Your Name 2013-05-14 18:23:02 -04:00
  • 71be3debc4 updated flagging icons to not use other libraries marco 2013-05-13 15:16:21 -04:00
  • e1481d93a8 Work on view test for comment client code. Jay Zoldak 2013-05-10 14:51:37 -04:00
  • 7e63611478 Start adding view tests for discussion client. Note that these will not work unless you change your test.py to enable discussion forums. Jay Zoldak 2013-05-09 17:19:10 -04:00
  • 90892450b7 failed jasmine tests still failing Your Name 2013-05-09 16:39:57 -04:00
  • cc2cc469fe more work on jasmine tests for forums Jay Zoldak 2013-05-08 14:10:42 -04:00
  • cbdf93473b start to get the jasmine tests working for comment service Jay Zoldak 2013-05-07 16:21:37 -04:00
  • ed3df10638 Set up rake task for jasmine tests for discussion forums code. Jay Zoldak 2013-05-07 12:20:38 -04:00
  • 235ecff28b In progress. cahrens 2013-05-16 10:40:48 -04:00
  • 33e8621af6 cursor state for discussions (not inline) span text needed to be set to pointer marco 2013-05-03 12:37:59 -07:00
  • 18759b21d6 capitalization on tooltips marco 2013-05-03 12:03:19 -07:00
  • 495cd305d4 adjusted cursor for span label on pins to be default marco 2013-05-03 11:55:14 -07:00
  • e2d3aee768 styling inline flaggin Your Name 2013-05-03 14:25:39 -04:00
  • 65dbd3cf73 padding around icons for flags and pins marco 2013-05-03 08:05:59 -07:00
  • 0a43c0ff59 minor css tweaks to flag and pin icons marco 2013-05-02 13:59:13 -04:00
  • 90e7a84570 show inline pinning and flagging Your Name 2013-04-29 17:10:47 -04:00
  • 78097c7ee1 update css for better cursor on pinning and flagging Your Name 2013-04-29 16:08:49 -04:00
  • 121f678f1b restore flagging to inline thread Your Name 2013-04-29 16:01:14 -04:00
  • 3b8a8a13b0 Revert "Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs"" Jay Zoldak 2013-04-29 13:17:27 -04:00
  • ed5ad46192 Revert "Revert "fix merge conflict"" Jay Zoldak 2013-04-29 13:17:16 -04:00
  • 4b806768ec more server trial and error Your Name 2013-04-25 15:28:01 -04:00
  • 8568ce7ad0 server django version generating 1 instead of True so test for both Your Name 2013-04-25 15:00:26 -04:00
  • ab08fa94e4 coffeescript fixes Kevin Chugh 2013-04-25 11:36:12 -04:00
  • c410da91de fix coffeescript error Kevin Chugh 2013-04-25 07:02:57 -04:00
  • ef14155306 cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill marco 2013-05-16 09:50:16 -04:00
  • 1c36564f45 Use newer CodeJail. Ned Batchelder 2013-05-16 07:47:16 -04:00
  • e78436db18 Merge branch 'feature/will/ci-lettuce-tests' of https://github.com/edx/edx-platform into feature/will/ci-lettuce-tests Will Daly 2013-05-15 17:07:24 -04:00
  • 3a981cfa05 Removed COURSES_ROOT and DATA_DIR from cms/envs/acceptance.py Will Daly 2013-05-15 17:06:44 -04:00
  • 8f3c1db1ef Add some notes for the future maintainer. Ned Batchelder 2013-05-15 17:00:39 -04:00
  • 281662a43e Merge pull request #2048 from edx/fix/cale/prereqs-before-django Calen Pennington 2013-05-15 13:49:05 -07:00
  • bbb6a3c60d resolved metadata-edit conflict, adding in latex item into settings marco 2013-05-15 16:27:04 -04:00
  • 12dae84a07 commented out firefox polyfill ad well as xmodule css editor changes marco 2013-05-15 16:07:45 -04:00
  • 6dcf7be05d Merge pull request #2047 from edx/fix/btalbot/studio-typographyvariables Brian Talbot 2013-05-15 13:03:50 -07:00
  • 6a618cbe5e Merge branch 'master' into fix/btalbot/studio-typographyvariables Brian Talbot 2013-05-15 16:02:44 -04:00
  • 0df9f714b8 Install python prereqs before trying to run django or install requirements/local.txt Calen Pennington 2013-05-15 15:49:51 -04:00
  • 4e118a080e Updated docs to add a note about Chrome / ChromeDriver revisions. Will Daly 2013-05-15 15:48:03 -04:00
  • 59f68c2179 Added comments for skipped tests Will Daly 2013-05-15 15:45:12 -04:00
  • d1c629882c studio - fixes Sass variable defintion to ensure the older -serif references the proper new -sans-serif variable Brian Talbot 2013-05-15 15:42:59 -04:00
  • ec7c47828f Merge pull request #1961 from edx/feature/cale/maintain-dev-environment Calen Pennington 2013-05-15 12:36:36 -07:00
  • c85cc5a3a7 Fix bad merge. cahrens 2013-05-15 15:35:18 -04:00
  • d72b6b05bf Merge branch 'master' into feature/christina/metadata-ui cahrens 2013-05-15 15:29:27 -04:00