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

Commit Graph

  • d9ad4b5724 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged Valera Rozuvan 2013-02-25 12:13:52 +02:00
  • 268e5b4bf7 Front end stuff clean up. Valera Rozuvan 2013-02-25 12:13:44 +02:00
  • 82a74abd65 return ok on poll_reset Alexander Kryklia 2013-02-25 12:12:28 +02:00
  • 9cdd271ee4 added icon class Alexander Kryklia 2013-02-25 12:04:18 +02:00
  • 3dae4d29bd reset part-1 Alexander Kryklia 2013-02-25 11:21:47 +02:00
  • fa00ea442e add first pass at multi-chapter support. Brian Wilson 2013-02-25 01:26:34 -05:00
  • db06efae75 Prevent scroll-to-top on clicks in cohorts views Victor Shnayder 2013-02-24 19:44:41 -05:00
  • 01a38c29be Add auto-cohorting functionality. Victor Shnayder 2013-02-24 18:48:01 -05:00
  • 8e93e0770f Merge pull request #1509 from MITx/feature/victor/capa-finished Victor Shnayder 2013-02-24 13:24:34 -08:00
  • cfc8a37aae Fully functional Genex jmclaus 2013-02-24 12:02:06 -05:00
  • 4f33f7ffbc turn on tracking (helps with debugging) ichuang 2013-01-03 00:49:57 +00:00
  • b6cf206fc7 fix latex high-level-source editor ichuang 2013-02-24 01:54:29 +00:00
  • c3f55845c0 factoring out discussion logic (for now, anyway) Arthur Barrett 2013-02-22 18:22:32 -05:00
  • 66ddfa295d more refactoring and work on annotationinput (should be working now). Arthur Barrett 2013-02-22 16:33:28 -05:00
  • 3a6f43f320 Create additional BDD spec tests for Course Advanced Settings editor Jay Zoldak 2013-02-22 16:27:05 -05:00
  • b1f5d67a96 studio - alerts: initial pass at alert styling and markup complete Brian Talbot 2013-02-22 14:39:49 -05:00
  • 60f803f369 studio - alerts: initial pass at alert styling and markup complete Brian Talbot 2013-02-22 14:29:19 -05:00
  • bb24a079a1 studio - alerts: initial pass at alert styling and markup complete Brian Talbot 2013-02-22 14:28:13 -05:00
  • 85b75badd7 Refactor lettuce commands for navigation to the advanced settings page Jay Zoldak 2013-02-22 14:06:27 -05:00
  • d7bbfbc707 studio - alerts: basic layout and general alert styling WIP Brian Talbot 2013-02-22 13:52:24 -05:00
  • 840f7839fa added save and render functionality to annotationinput Arthur Barrett 2013-02-22 12:48:22 -05:00
  • af2690fcaf Update lettuce test framework to use a course factory instead of the studio UI for creating courses Jay Zoldak 2013-02-22 12:36:27 -05:00
  • de2b05bf66 Merge branch 'master' into feature/btalbot/studio-alerts Brian Talbot 2013-02-22 12:01:50 -05:00
  • e5294591dc Foldit leaderboard w/o tests Julian Arni 2013-02-22 11:12:26 -05:00
  • c11d627c88 Chrome/Safari don't use keypress for backspace and delete. Don Mitchell 2013-02-22 11:00:27 -05:00
  • ff35d3e6d9 Merge in a cherry-picked commit Ned Batchelder 2013-02-22 10:54:01 -05:00
  • 2e21c71fc4 A script to run just one test, based on the test failure description. Ned Batchelder 2013-01-24 13:56:46 -05:00
  • ed955df230 Merge pull request #1529 from MITx/feature/vik/oe-messages Diana Huang 2013-02-22 07:31:06 -08:00
  • d5865e70b8 Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages Vik Paruchuri 2013-02-22 10:21:34 -05:00
  • f9667849b8 Fix some minor bugs in event handling and add enter key support Diana Huang 2013-02-20 17:31:56 -05:00
  • 3ecafa9b42 Add hot keys to rubrics Diana Huang 2013-02-19 16:31:14 -05:00
  • 4713c5f095 re-enable discussion service Alexander Kryklia 2013-02-22 10:40:09 +02:00
  • 78bf8d5876 update annotationinput jsonv alue on tag selection or comment change Arthur Barrett 2013-02-22 00:42:12 -05:00
  • 3970ea33e1 return from capa problem Arthur Barrett 2013-02-21 22:54:50 -05:00
  • f1c8301e4f added question marks Mark L. Chang 2013-02-21 22:47:48 -05:00
  • 215f6aeb27 Merge pull request #1505 from MITx/feature/brian/pdf_js David Ormsbee 2013-02-21 17:28:16 -08:00
  • e337292b5f Fix existing advanced settings lettuce tests. Jay Zoldak 2013-02-21 18:20:42 -05:00
  • d42a12da59 Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js Brian Wilson 2013-02-21 17:50:08 -05:00
  • 8076c5b731 remove unneeded files (that break collectstatic) Brian Wilson 2013-02-21 17:38:00 -05:00
  • 0e2c46a718 Clicking "reply to annotation" scrolls to the problem (specified in xml by problem=index). Arthur Barrett 2013-02-21 17:01:43 -05:00
  • 7e107119b7 Merge pull request #1535 from MITx/fix/cdodge/make-jump-to-handle-lost-slash chrisndodge 2013-02-21 12:43:15 -08:00
  • 103508b45d remove empty attempts and weights from simple test course Chris Dodge 2013-02-21 15:41:59 -05:00
  • 6d174ef029 remove dead code Brian Wilson 2013-02-21 15:41:28 -05:00
  • d503fe3d79 Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js Brian Wilson 2013-02-21 15:38:28 -05:00
  • d5e34b0a44 fix initialization of scale dropdown, and check for valid values of page number Brian Wilson 2013-02-21 15:35:03 -05:00
  • 8d76556729 Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings Victor Shnayder 2013-02-21 12:12:44 -08:00
  • c10dc838b2 Fix tip on JSON key value pairs Jay Zoldak 2013-02-21 15:01:12 -05:00
  • 22639adc63 studio - alerts WIP Brian Talbot 2013-02-21 14:31:24 -05:00
  • 76c4007449 Merge pull request #1522 from MITx/diana/click-tracking Diana Huang 2013-02-21 11:10:35 -08:00
  • 3580deaec0 Merge pull request #1534 from MITx/fix/zoldak/test-modulestore-naming Ned Batchelder 2013-02-21 11:01:58 -08:00
  • a8178de497 Added styling to the annotationinput capa problem. Arthur Barrett 2013-02-21 13:52:22 -05:00
  • e5efcf65d3 remove console.log Don Mitchell 2013-02-21 13:34:11 -05:00
  • 851a99cb13 remove commented out code Don Mitchell 2013-02-21 13:32:29 -05:00
  • ff68853990 Merge branch 'master' into feature/victor/revert-revert-of-forums-ui Your Name 2013-02-21 13:30:24 -05:00
  • 697bd5c97b also this one Don Mitchell 2013-02-21 13:28:43 -05:00
  • 116c74c075 Highlighting of field labels and smarter decision as to when to show the save cancel bar. Don Mitchell 2013-02-21 13:27:36 -05:00
  • 9eb2766943 Change test modulestore naming differentiation scheme to uuid Jay Zoldak 2013-02-21 13:07:14 -05:00
  • bc1ee3dbfa Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings Chris Dodge 2013-02-21 12:56:20 -05:00
  • 041d28f0e9 use better variable names to assert that the expected item was indeed loaded Chris Dodge 2013-02-21 12:56:17 -05:00
  • 49cab68aee Merge pull request #1533 from MITx/fix/cdodge/template-got-renamed Don Mitchell 2013-02-21 09:27:23 -08:00
  • fa3402a977 template name got changed. Need to reflect that on test. Chris Dodge 2013-02-21 12:25:10 -05:00
  • bb75a23101 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings Chris Dodge 2013-02-21 11:58:52 -05:00
  • 3494d58450 Merge pull request #1532 from MITx/feature/ned/clean_up_tests David Ormsbee 2013-02-21 08:52:09 -08:00
  • c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. Ned Batchelder 2013-02-21 11:38:45 -05:00
  • ba7959fc4d Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling Don Mitchell 2013-02-21 08:29:54 -08:00
  • a7f6545cbc add unit test Chris Dodge 2013-02-21 11:22:20 -05:00
  • 68a8587ed2 don't serialize weight out as an int - use a string. The code in capa-module.py expects a string and tries to convert to a float. So this impedence mismatch is causing a crash on import when importing empty strings for 'weight' or 'attempts' Chris Dodge 2013-02-21 11:02:47 -05:00
  • 9aac915c9f Remove unnecessary assignment Diana Huang 2013-02-21 10:33:48 -05:00
  • 00e31c0116 fix toolbarViewer styling Brian Wilson 2013-02-21 10:30:20 -05:00
  • 3a8b7156a0 Merge branch 'master' into diana/click-tracking Diana Huang 2013-02-21 10:19:35 -05:00
  • 18a56005b0 Address code review feedback Diana Huang 2013-02-21 10:17:08 -05:00
  • 8b1579e490 Merge pull request #1527 from MITx/feature/vik/check-if-submission-allowed Jay Zoldak 2013-02-21 06:37:50 -08:00
  • 6f2e6116f9 LMS - adding back in a Sass mixin that seems to still have dependencies Brian Talbot 2013-02-21 09:16:06 -05:00
  • 3d36736cf3 Limit remembered logins to 7 days, so that old cookies will eventually expire Calen Pennington 2013-02-21 09:05:19 -05:00
  • 731f4abd8a fix bug with nav to a page, and add pdfviewer.css. Brian Wilson 2013-02-21 03:15:08 -05:00
  • cc7f791078 parse xml for annotationinput Arthur Barrett 2013-02-20 19:19:17 -05:00
  • 342220f0f4 js syntax John Jarvis 2013-02-20 18:50:16 -05:00
  • 1850528a99 add contents of pdfjs to common/static/js/vendor, after fixing CR/LF issues in localization files Brian Wilson 2013-02-20 18:49:59 -05:00
  • 50cae69945 define pdfviewer.js, and use from static_pdfbook.html Brian Wilson 2013-02-20 18:37:17 -05:00
  • 4b93ef491b errors for login and reg John Jarvis 2013-02-20 18:23:41 -05:00
  • 9d5a08fc6d Fix location string Vik Paruchuri 2013-02-20 18:07:24 -05:00
  • 9bc8dbd7ca Fix location strings, re-order checkboxes Vik Paruchuri 2013-02-20 18:04:25 -05:00
  • 7b604aa026 Fix an import statement Vik Paruchuri 2013-02-20 17:57:09 -05:00
  • 3fe6a74e76 Merge pull request #1528 from MITx/press/international-press-release Diana Huang 2013-02-20 14:55:58 -08:00
  • 84eaec3666 add press release: edX expands internationally Victor Shnayder 2013-02-20 17:50:23 -05:00
  • 051b7fd21d Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages Vik Paruchuri 2013-02-20 17:50:09 -05:00
  • 43158de9bb Merge branch 'feature/vik/check-if-submission-allowed' into feature/vik/oe-messages Vik Paruchuri 2013-02-20 17:50:00 -05:00
  • 07f64abb11 Refactored init method. Arthur Barrett 2013-02-20 17:38:47 -05:00
  • c55f997086 Fix self assessment tests Vik Paruchuri 2013-02-20 17:34:51 -05:00
  • a982ebbb03 Refactored rendered method and added span ids. Arthur Barrett 2013-02-20 17:33:11 -05:00
  • 912800cabf Fix location string object problems Vik Paruchuri 2013-02-20 17:27:37 -05:00
  • a8fadb0ecc Remove render to string import Vik Paruchuri 2013-02-20 17:16:38 -05:00
  • bf454382d0 Merge pull request #1525 from MITx/press/international Victor Shnayder 2013-02-20 14:14:11 -08:00
  • 19a80c6268 Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages Vik Paruchuri 2013-02-20 17:12:53 -05:00
  • cc63f9c2db Unique IDs, other cleanup. cahrens 2013-02-20 17:11:34 -05:00
  • cf7a34ae74 Merge pull request #1524 from MITx/feature/vik/check-if-submission-allowed Diana Huang 2013-02-20 14:03:39 -08:00
  • 4d643d36cc Merge branch 'press/international' of github.com:MITx/mitx into press/international Victor Shnayder 2013-02-20 16:53:39 -05:00
  • d5ba5457dc Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed Vik Paruchuri 2013-02-20 16:49:59 -05:00
  • 1f0c84ed05 Merge pull request #1523 from MITx/style/btalbot/studio-newsection Christina Roberts 2013-02-20 13:44:49 -08:00
  • 8b5f088eb9 studio - fixed alignment of new section field and controls Brian Talbot 2013-02-20 16:43:13 -05:00