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

Commit Graph

  • 0726294c35 Use get_child_descriptors for grades.py Calen Pennington 2013-01-10 09:03:12 -05:00
  • 89a0b82e5c Decrease the number of queries needed for LMS courseware Calen Pennington 2013-01-10 08:40:19 -05:00
  • 993d59b230 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-10 13:50:57 -05:00
  • 58837066b0 A couple renames. cahrens 2013-01-10 13:50:21 -05:00
  • 70e5344949 Merge pull request #1256 from MITx/fix/cdodge/import-ordering-error Don Mitchell 2013-01-10 10:40:30 -08:00
  • a7887721af Merge pull request #1255 from MITx/bug/btalbot/unit-editing Christina Roberts 2013-01-10 10:35:31 -08:00
  • 76059b52e7 make sure we commit the course module first when importing. There's a sneaky little ordering dependency where we can't save a static tabe until the course module has been saved. This is because - when saving a static tab - we have to scribble on the course module's metadata to point to it. Chris Dodge 2013-01-10 13:24:40 -05:00
  • 4128f37a1f studio - moving a component's static view visually below modal while editing Brian Talbot 2013-01-10 13:18:26 -05:00
  • 19bc657487 Use correct version of the grader id. Diana Huang 2013-01-10 12:44:54 -05:00
  • e5d73107bd Merge pull request #1254 from MITx/bug/dhm/jan13 Christina Roberts 2013-01-10 09:25:38 -08:00
  • b3af587ba0 Merge pull request #1247 from MITx/feature/btalbot/cms-sectiontoggling Christina Roberts 2013-01-10 09:04:26 -08:00
  • bcafc5fdfb Bug fix for modal cover not going way when click outside of edit (#106). cahrens 2013-01-10 11:07:11 -05:00
  • 04582f4e7c Update timepicker b/c it wasn't handling minutes from 01-09 and they'd fixed it Don Mitchell 2013-01-10 11:05:14 -05:00
  • ee9b9d0422 Merge pull request #1249 from MITx/feature/cas/speed-editor chrisndodge 2013-01-09 17:52:46 -08:00
  • 171d4c34b0 Merge pull request #1250 from MITx/bug/dhm/jan13 chrisndodge 2013-01-09 17:39:02 -08:00
  • 9a221dfd29 Merge branch 'feature/brian/pearson-reg' of github.com:MITx/mitx into feature/brian/pearson-upload Brian Wilson 2013-01-09 18:08:32 -05:00
  • 468d703b57 Update CDD export to output only changed records. Brian Wilson 2013-01-09 18:08:05 -05:00
  • 96a7db62cd Fixed time picker race condition for grace period. Still quirky in that in rounds down times from :01-:09 to :00 (and perhaps others). I think that's a bug or setting in timepicker. Don Mitchell 2013-01-09 17:55:02 -05:00
  • d1c888b119 Put init code in a document ready event handler. Don Mitchell 2013-01-09 16:37:45 -05:00
  • 7f836e77a7 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor Don Mitchell 2013-01-09 16:28:36 -05:00
  • 35e353e06b Oops, xxp was going to (x) xp :-( now ( ) xxp :-) Don Mitchell 2013-01-09 16:28:25 -05:00
  • 2caa5a518f Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-09 16:20:51 -05:00
  • b3d168b6f2 Make editor names consistent. cahrens 2013-01-09 16:20:38 -05:00
  • 700ae5bf53 Merge pull request #1248 from MITx/fix/cdodge/discussion-boards Christina Roberts 2013-01-09 13:19:00 -08:00
  • 603c6ce296 Get rid of extra space at beginning of markdown for templates Don Mitchell 2013-01-09 16:17:58 -05:00
  • a388263298 pearson registration - giving registration call to actions on dashboard a bit more room Brian Talbot 2013-01-09 16:06:10 -05:00
  • d4f30b378e remove commented out line and add a new comment. also remove debugging trace output Chris Dodge 2013-01-09 16:05:09 -05:00
  • d0e06e1a35 With improved unit tests to test machavellian (sic) patterns Don Mitchell 2013-01-09 16:03:09 -05:00
  • e11706ef07 change over the 'get all discussion models' to use get_items() which is better supported in Mongo-backed stores Chris Dodge 2013-01-09 15:53:22 -05:00
  • 6bebb1b7a5 Merge branch 'master' into feature/diana/rubric-input Diana Huang 2013-01-09 15:45:22 -05:00
  • 393ee3533c Merge branch 'master' into diana/peer-grading-improvements Diana Huang 2013-01-09 15:45:02 -05:00
  • 373c8eb2a7 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor Don Mitchell 2013-01-09 15:36:28 -05:00
  • 8245ebac83 On menu based markdown conversion, be picky about x as marker for correct requiring it to be first non-whitespace char on line, followed by whitespace, followed eventually but another non-whitespace char strip trailing newline from selection. Don Mitchell 2013-01-09 15:36:16 -05:00
  • 71ee11bfb0 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-09 15:10:56 -05:00
  • 914132f802 remove tiny mce link CSS cahrens 2013-01-09 15:10:41 -05:00
  • e725087122 studio - removing unused scrollTo plugin reference from base template Brian Talbot 2013-01-09 15:05:07 -05:00
  • 7921b32b63 studio - set viewport to scroll to bottom of component type list in component editor Brian Talbot 2013-01-09 15:04:20 -05:00
  • 13c692c29b Show back button when we see an error. Diana Huang 2013-01-09 14:59:59 -05:00
  • 54d91e7875 Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements Diana Huang 2013-01-09 14:44:08 -05:00
  • c4d1b2e643 Use correct user id and make the reload button a back button Diana Huang 2013-01-09 14:41:23 -05:00
  • 1252181fe1 Code review cleanup. cahrens 2013-01-09 14:11:13 -05:00
  • cc8e8ba6c6 Pearson reg: relax validation of phone country codes. Brian Wilson 2013-01-09 13:31:04 -05:00
  • 19fa439326 studio - firming up section-wide collapsing/expanding functionality Brian Talbot 2013-01-09 12:31:32 -05:00
  • 21fe582788 No longer need this extra file. Brian Wilson 2013-01-09 11:51:55 -05:00
  • 144c6bca8b Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor Don Mitchell 2013-01-09 11:38:23 -05:00
  • fff9afdeb8 Minor cleanups Don Mitchell 2013-01-09 11:38:01 -05:00
  • 8ad9bc5949 Move Pearson URL to settings. Fix Register button. Other small changes. Brian Wilson 2013-01-09 11:26:54 -05:00
  • 31f9084b61 Tom cruft to be deleted. cahrens 2013-01-09 11:12:52 -05:00
  • 64387a4f0c Tom cruft to be deleted, problem editor CSS moved to correct location. cahrens 2013-01-09 11:06:18 -05:00
  • cc4482b4c9 Merge pull request #1245 from MITx/feature/cdodge/cache-toc Don Mitchell 2013-01-09 08:01:38 -08:00
  • 67b72a92bc Merge remote-tracking branch 'origin/feature/cas/speed-editor' into feature/cas/speed-editor cahrens 2013-01-09 10:50:16 -05:00
  • 5daa6e7b73 Tom cruft to be deleted. cahrens 2013-01-09 10:49:59 -05:00
  • b8f530e865 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor Don Mitchell 2013-01-09 10:49:20 -05:00
  • 9b72d11473 add some comments to the change Chris Dodge 2013-01-09 10:47:29 -05:00
  • 2d8ddb0dcb Ever slightly more rigorous test. actually look for the markdown field in the model as well as the ancillary info Don Mitchell 2013-01-09 10:47:03 -05:00
  • 8760e7669e Merge pull request #1244 from MITx/bug/dhm/jan13 chrisndodge 2013-01-09 07:42:20 -08:00
  • fd600e5be2 add some simple in-mem caching for course TOC. This is a problem when running against Mongo since courses are created/disposed very frequently Chris Dodge 2013-01-09 10:38:32 -05:00
  • 950d398387 Updates to the CSS Diana Huang 2013-01-09 10:19:42 -05:00
  • 6342564f82 Merge branch 'master' into feature/brian/pearson-reg Brian Wilson 2013-01-09 09:59:49 -05:00
  • 62a70170cf Updated unit test for the create operation related to bug 107 Don Mitchell 2013-01-09 09:55:50 -05:00
  • 2019c9d037 Bug 107 Don Mitchell 2013-01-09 09:47:43 -05:00
  • d53669fcb9 Merge branch 'feature/cale/cms-master' into feature/cas/speed-editor cahrens 2013-01-09 09:41:35 -05:00
  • b704645f99 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-09 09:40:34 -05:00
  • b97955965a Warn user when going to XML Editor. Cleanup and comments. cahrens 2013-01-09 09:39:46 -05:00
  • 21f5c2d89a Merge pull request #1240 from MITx/feature/zoldak/cms-bdd-testing Don Mitchell 2013-01-09 06:30:03 -08:00
  • 2b87940828 Merge pull request #1241 from MITx/bug/dhm/jan13 chrisndodge 2013-01-09 06:14:27 -08:00
  • 21fc7340d6 Merge pull request #1243 from MITx/fix/cdodge/missing-setting-for-cms chrisndodge 2013-01-09 06:12:50 -08:00
  • b8074b8bb4 add required video setting Chris Dodge 2013-01-09 09:11:43 -05:00
  • 941d55cee3 Merge pull request #1229 from MITx/feature/ichuang/update-symmath-server Calen Pennington 2013-01-09 06:10:32 -08:00
  • 5a95dd28b1 Merge pull request #1227 from MITx/feature/ichuang/fix-capa-contextualize-text-for-option-response-and-mc Calen Pennington 2013-01-09 06:08:45 -08:00
  • 2a1e102fca studio - resolving merge conflict with cms/templates/unit.html Brian Talbot 2013-01-09 08:56:58 -05:00
  • f60a9d8d35 studio - problem speed editor: tweaking presentation of problem sub menu further Brian Talbot 2013-01-09 08:54:40 -05:00
  • a5cce4769e add accommodation listing, and revise error messages Brian Wilson 2013-01-09 02:14:02 -05:00
  • 25f08374ca hook up more registration status boxes Brian Wilson 2013-01-08 17:42:15 -05:00
  • 83b7997d12 Added unit tests and generalized a catch Don Mitchell 2013-01-08 16:43:42 -05:00
  • ecb3dd6134 Merge pull request #1239 from MITx/bugfix/dave/forum_missing_vertical David Ormsbee 2013-01-08 13:38:23 -08:00
  • 1122cdb286 Added more comments in response to code review. David Ormsbee 2013-01-08 16:37:31 -05:00
  • f0f25296b2 Update documentation Diana Huang 2013-01-08 15:54:49 -05:00
  • 75447eb80d studio - problem speed editor: revised html and DOM for problem sub menu Brian Talbot 2013-01-08 15:43:02 -05:00
  • c7feee5b67 Delete speed-editor.js and cruft from unit.html. cahrens 2013-01-08 15:39:45 -05:00
  • 1708dc4080 Use html rather than xml parsing for course updates Don Mitchell 2013-01-08 15:13:37 -05:00
  • 4ac15daf44 Fix formatting. cahrens 2013-01-08 15:04:48 -05:00
  • 94696786c0 Merge in Don's change. cahrens 2013-01-08 14:57:15 -05:00
  • f616aecd81 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor cahrens 2013-01-08 14:56:59 -05:00
  • f056f0624d Set up the framework for running lettuce tests against studio Jay Zoldak 2013-01-07 16:34:15 -05:00
  • 051339afb0 Tiny cleanup. David Ormsbee 2013-01-08 13:54:44 -05:00
  • 8952eda98d XML loaded courses should no longer be able to throw NoPathToItem. David Ormsbee 2013-01-08 13:34:22 -05:00
  • bc10d080df Save work cahrens 2013-01-08 13:39:16 -05:00
  • fc0a7614bf Load courses in dir name order, keep separate ParentTracker per course. David Ormsbee 2013-01-08 11:21:22 -05:00
  • ae4e7815a9 CapaDescriptor new unit tests Don Mitchell 2013-01-08 13:16:38 -05:00
  • 329982a665 pearson registration - fixed layout issue with submission errors Brian Talbot 2013-01-08 11:48:07 -05:00
  • bbe0120d5c pearson registration - changed accepted classes, content, and styling to use the term process instead Brian Talbot 2013-01-08 11:41:01 -05:00
  • 352f284624 pearson registration - revised UI states for reg form, simplified markup for form fields, synched button styles/text b/t registration form and dashboard Brian Talbot 2013-01-08 11:37:26 -05:00
  • 7377f4bda3 Merge pull request #1238 from MITx/fix/cdodge/turn-of-module-wrappers chrisndodge 2013-01-08 08:25:53 -08:00
  • 6e2b4a07d8 Added is_empty to model presented to unit.html Don Mitchell 2013-01-08 11:18:57 -05:00
  • 99750a6812 make sure we turn off module wrappers for the 'ancillary' course content Chris Dodge 2013-01-08 11:18:41 -05:00
  • 76f2ef6f7c Empty template now recognized as allowing markdown editing Save saves markdown and updates the xml Don Mitchell 2013-01-08 10:53:45 -05:00
  • 19401f29d9 Minor javascript updates Diana Huang 2013-01-08 10:22:07 -05:00
  • b41f68c801 pearson registration - changing registration status states to progress-based states UI - wip Brian Talbot 2013-01-07 17:14:11 -05:00
  • ca32a8b0c0 Merge pull request #1237 from MITx/fix/cdodge/return-bad-request Don Mitchell 2013-01-07 13:49:11 -08:00