Commit Graph

  • 46e9a8f6ac Add help string. Ashley Penney 2013-01-17 10:09:11 -05:00
  • 482cefd246 Bunch of fixes to pep8 formatting, missing imports, change of kwargs to options, quoting variables and a few other fixups. Ashley Penney 2013-01-16 13:37:33 -05:00
  • 5431332cec Fix up help. Ashley Penney 2013-01-16 12:14:43 -05:00
  • 3d5599c829 Further fixes to close the ssh connection explictly, make both the default option if nothing is provided, and not bother passing true when calling the subcommands. Ashley Penney 2013-01-16 12:12:22 -05:00
  • 0555ebc434 Bunch of fixes to how I do if/else checks, fix a typo in Command and repair the for filename part of sftp. Ashley Penney 2013-01-16 12:04:53 -05:00
  • 378b1ff0c3 Various changes thanks to feedback from Brian to make the existing export commands handle --dest-from-settings and --destination and fail unless one is provided as well as rename pearson.py to pearson_transfer and allow is to call the import/export commands directly. Ashley Penney 2013-01-16 11:26:39 -05:00
  • ced29a25ec Add paramiko to requirements. Ashley Penney 2013-01-16 10:17:30 -05:00
  • 61ea2d7b5d Couple of fixes to the settings data. Ashley Penney 2013-01-16 10:02:10 -05:00
  • 1acf2dbba3 Use a dictionary for all the pearson stuff to keep the auth/env stuff clean. Ashley Penney 2013-01-16 09:52:04 -05:00
  • 1d13b1a9bd Make various changes to handle the s3/sftp part of the pearson process. Ashley Penney 2013-01-16 09:45:22 -05:00
  • 210cdf870e Updates to the mock peer grading service and new tests. Diana Huang 2013-01-24 09:41:24 -05:00
  • dc3dd41aa7 Update tests to cover the peer grading service Diana Huang 2013-01-24 08:58:24 -05:00
  • f2b43ec459 Merge pull request #1343 from MITx/feature/christina/tiny-mce Don Mitchell 2013-01-24 05:34:36 -08:00
  • 0cb5f101ae add UTC time to registration end date Brian Wilson 2013-01-24 01:18:10 -05:00
  • 711cc9a041 Tell tinyMCE to not change image paths. #143 cahrens 2013-01-23 20:18:28 -05:00
  • 4af2e1118a Changing login and register to login_user and register_user John Jarvis 2013-01-23 18:44:26 -05:00
  • d2e130ab33 Removing extra parens John Jarvis 2013-01-23 18:42:35 -05:00
  • 64f0855055 Adding removed code from master rebase John Jarvis 2013-01-23 18:41:17 -05:00
  • 8a0cc6e610 Revert "Fixing namespace issue for "login"" John Jarvis 2013-01-23 18:34:53 -05:00
  • dcc53c2bcd Fixing namespace issue for "login" John Jarvis 2013-01-23 17:53:23 -05:00
  • 80bcf060a0 javascript to redirect the user to the dashboard after reg John Jarvis 2013-01-23 17:52:15 -05:00
  • 8374534802 drupal integration - revised copy, layout, and styles per marketing feedback Brian Talbot 2013-01-22 23:05:14 -05:00
  • cbe35eeab3 drupal integration - further color sync, copy edits, and removing courseware button when on login page Brian Talbot 2013-01-22 14:38:31 -05:00
  • e1fae8e885 drupal integration - color syncing with marketing site standards Brian Talbot 2013-01-22 14:31:08 -05:00
  • bb66f8963f drupal integration - revised general page background for shorter content pages, small visual tweaks to footer Brian Talbot 2013-01-22 14:09:32 -05:00
  • a15bf74f7c drupal integration - styled and revised markup/copy for password reset modal Brian Talbot 2013-01-22 14:02:03 -05:00
  • 633126234e drupal integration - adding back in modal assets for password recovery - wip Brian Talbot 2013-01-22 11:58:04 -05:00
  • c500896913 drupal integration - adding back in modal assets for passwor recovery - wip Brian Talbot 2013-01-22 11:40:58 -05:00
  • de4f35df77 drupal integration - plumbing in password reset UI updates - wip Brian Talbot 2013-01-22 11:33:33 -05:00
  • 2019af4170 drupal integration - revised/proofed header and footer styles to match spacing of marketing site and renamed social icons Brian Talbot 2013-01-22 09:31:40 -05:00
  • 42d4b4d69b drupal integration - revised padding between content and footer globally, removed secondary form actions for time being Brian Talbot 2013-01-21 21:13:12 -05:00
  • 2f6255378f drupal integration - revised UI of global footer to matched marketing site footer content and feel Brian Talbot 2013-01-21 21:08:33 -05:00
  • eda371a1f7 drupal integration - revised UI of course slim header to coincide with marketing site theme Brian Talbot 2013-01-21 19:45:32 -05:00
  • d6354fd8b1 drupal integration - revised general header HTML and Sass to coincide with marketing site nav and theme Brian Talbot 2013-01-21 19:38:11 -05:00
  • eaeae03315 drupal integration - further sass refinment and hiding example error states Brian Talbot 2013-01-21 18:48:54 -05:00
  • 009ac06d4d drupal integration - added unified account-centric Sass, which holds registration/login styling Brian Talbot 2013-01-21 15:51:11 -05:00
  • 7c7d0da5b4 drupal integration - styled page layout, form fields and states, added in status message areas/standards and revised Sass Brian Talbot 2013-01-21 15:50:16 -05:00
  • 6bff41708d cleaning up LMS Sass variables a bit Brian Talbot 2013-01-21 12:53:27 -05:00
  • 1db87e0533 drupal integration - added sass files to architecture and plumbed HTML for login and register views Brian Talbot 2013-01-20 15:08:50 -05:00
  • 2c604bc473 changing url name to signin Brian Talbot 2013-01-17 16:13:02 -05:00
  • 9af7c6cc5d adding login views John Jarvis 2013-01-17 11:52:58 -05:00
  • ed39ca2303 initial branch creation for reg/login revisions with drupal Brian Talbot 2013-01-17 09:59:17 -05:00
  • 037fe5f722 When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons. Ned Batchelder 2013-01-23 17:11:02 -05:00
  • cc67017d4c Merge branch 'master' into diana/open-ended-ui-updates Diana Huang 2013-01-23 16:45:40 -05:00
  • 4a79643fde Make code inline instead of block. cahrens 2013-01-23 16:43:49 -05:00
  • abcc5c0204 Merge pull request #1342 from MITx/feature/cdodge/add-standard-problem-metadata Victor Shnayder 2013-01-23 13:40:46 -08:00
  • 2856971b45 update templates to include attemps and weight values. Also update capa_module.py to accept empty strings ('') to mean 'default value' Chris Dodge 2013-01-23 16:36:16 -05:00
  • 1bd9366e40 Merge remote-tracking branch 'origin/master' into feature/kevin/groups Kevin Chugh 2013-01-23 16:26:06 -05:00
  • 59b3dc61a2 lms producing grouped content Kevin Chugh 2013-01-23 16:25:26 -05:00
  • fe8e25e72d Merge pull request #1341 from MITx/feature/christina/tiny-mce chrisndodge 2013-01-23 13:25:01 -08:00
  • 2969a9e48d Toggling of code should mark editor as dirty. cahrens 2013-01-23 16:19:17 -05:00
  • 548f3de508 Merge pull request #1340 from MITx/fix/zoldak/fix_jenkins chrisndodge 2013-01-23 13:05:50 -08:00
  • 29c4e6c066 Do not run the lms jasmine tests on jenkins for now, until we fix them. Jay Zoldak 2013-01-23 16:03:25 -05:00
  • 2ed5fdf76b Merge pull request #1338 from MITx/fix/cdodge/remove-hide-progress-tab Christina Roberts 2013-01-23 12:20:54 -08:00
  • 247199d699 Merge pull request #1337 from MITx/feature/cale/fix-staff-debug-link chrisndodge 2013-01-23 12:17:17 -08:00
  • 9c3e727889 add unit test to assert that the flag is not set on course metadata Chris Dodge 2013-01-23 15:14:36 -05:00
  • 9d5ac308b1 remove flag to hide progress tab Chris Dodge 2013-01-23 15:11:41 -05:00
  • 27b57bb48b Don't update settings based on data from content for discussion modules during init Calen Pennington 2013-01-15 08:47:08 -05:00
  • 993c24b72b WIP: Model data caching work Calen Pennington 2013-01-08 16:24:28 -05:00
  • 507d2021cd Remove unused reference to StudentModuleCache Calen Pennington 2013-01-08 12:11:37 -05:00
  • abb21ab111 staff_problem_info.html only renders for staff, so don't check for staff access Calen Pennington 2013-01-08 12:10:52 -05:00
  • 4779043a5f Add message during 404 for debugging Calen Pennington 2013-01-08 11:54:12 -05:00
  • c44898b1de Remove random printing during XModuleDescriptor equality check Calen Pennington 2013-01-08 11:52:32 -05:00
  • 2eca8bd0e9 Set default video position to 0, but don't overwrite it during __init__ Calen Pennington 2013-01-08 11:51:51 -05:00
  • e5a6509bb0 Add a first_time_user attribute to CourseModule so that we can check for that explicitly, rather than looking for an implicitly created StudentModule Calen Pennington 2013-01-08 11:51:20 -05:00
  • ce76b64bae Handle problem resets in such a way that the LoncapaProblem generates the new random seed, and the CapaModule saves that seed Calen Pennington 2013-01-08 11:44:58 -05:00
  • 9d66169d06 Don't set a seed to None that's already None Calen Pennington 2013-01-08 11:44:31 -05:00
  • 8e5373f993 Make Randomization return un-adjusted values as a passthrough Calen Pennington 2013-01-08 11:44:20 -05:00
  • 6e7afb968d Move xqueue handler to new module format, and continue to distinguish grades set by xqueue from those set by ajax in stats Calen Pennington 2013-01-05 12:20:38 -05:00
  • cd78b27b50 Merge pull request #1334 from MITx/bug/btalbot/cms-problemmenu Christina Roberts 2013-01-23 11:40:24 -08:00
  • ae2a8e0c58 Whitespace cleanup Calen Pennington 2013-01-23 14:37:42 -05:00
  • 6c181470c6 staff_problem_info.html is only put on the page for staff, so we don't need to check staff_access inside it Calen Pennington 2013-01-23 14:37:36 -05:00
  • 4bdabb38e4 Oops, double edit backed out. Don Mitchell 2013-01-23 14:17:23 -05:00
  • 3e048d7072 Removed old function Don Mitchell 2013-01-23 14:15:09 -05:00
  • 2db0401273 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag Don Mitchell 2013-01-23 14:13:17 -05:00
  • 25df02fedd studio - syncing cheatsheet language with new class name for heading 1 again Brian Talbot 2013-01-23 13:04:16 -05:00
  • 0e061ca726 studio - syncing cheatsheet language with new class name for heading 1 Brian Talbot 2013-01-23 13:02:33 -05:00
  • 7cca46e691 Requirejs doesn't belong here Don Mitchell 2013-01-23 12:39:40 -05:00
  • 5fee7eeaec studio - further resolved bug with .header CSS inheritance and problem editor menu UI Brian Talbot 2013-01-23 12:58:20 -05:00
  • 2ca267dc52 studio - resolved bug with .header CSS inheritance and problem editor menu UI Brian Talbot 2013-01-23 12:50:10 -05:00
  • 6a4c6ad4d8 Merge pull request #1333 from MITx/feature/christina/misc Don Mitchell 2013-01-23 09:35:50 -08:00
  • a1eeb56839 Import requireJS. cahrens 2013-01-23 12:30:06 -05:00
  • b0bbb34644 Merge pull request #1331 from MITx/feature/christina/tiny-mce Don Mitchell 2013-01-23 09:14:42 -08:00
  • 4d0d46462c Fixed the y axis drop problem by requiring it to be within the x bounds. Don Mitchell 2013-01-23 12:12:40 -05:00
  • 549a5e9fe9 Merge remote-tracking branch 'origin/master' into jmpm-analytics jmvt 2013-01-23 12:02:48 -05:00
  • 6f322bcd81 Simplify the construction of the ErrorDescriptor Ned Batchelder 2013-01-23 11:34:42 -05:00
  • 376575dedd Make system.xblock_model_data more explicit to fix the problem where error descriptors can't get any data because the schema and the data don't match. Ned Batchelder 2013-01-23 11:34:24 -05:00
  • 54ee1607b8 add unit test to test DraftModuleStore.get_items() fix Chris Dodge 2013-01-23 11:22:37 -05:00
  • ad5f00f270 Drag and drop for sections, subsections, and units works with following caveats: - it drops wherever the y of the cursor is no matter the x for the cursor. I've constrained the draggables to never change x; so, the drop doesn't care where the x of the cursor is only the y. - if you force auto scroll, the visual thing you'll dragging gets out of sync w/ the mouse cursor; however, the mouse cursor is the "true" location; so, the drop's posit is the mouse cursor y not the visual clone's y. Don Mitchell 2013-01-23 11:16:04 -05:00
  • 2609ba4093 Delete unused icon, reorder dropdown. cahrens 2013-01-23 11:02:16 -05:00
  • ca185c034f Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing Deena Wang 2013-01-23 10:50:37 -05:00
  • 3fd69bcae4 more tests in test_views.py Deena Wang 2013-01-23 10:41:12 -05:00
  • c7d9eb23f1 Merge pull request #1328 from MITx/fix/cdodge/subsection-crash-no-display-name Don Mitchell 2013-01-23 07:40:52 -08:00
  • 966db4fbaf Merge pull request #1329 from MITx/fix/cdodge/draft-store-get-items Don Mitchell 2013-01-23 07:39:36 -08:00
  • 4f005044d6 Added time of query display. jmvt 2013-01-23 10:17:17 -05:00
  • eab9511466 Merge pull request #1295 from MITx/feature/jarv/certificate-force-update David Ormsbee 2013-01-23 06:32:41 -08:00
  • 0042131588 use property rather than referencing the metadata dictionary. This is better because if there is no 'display_name' defined, then we get back a string of the location name Chris Dodge 2013-01-23 09:12:24 -05:00
  • 5ca1586e0c Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates Diana Huang 2013-01-23 08:57:47 -05:00
  • 71e4541c69 Merge branch 'master' into feature/diana/rubric-input Diana Huang 2013-01-23 08:56:55 -05:00
  • 07785e3c07 Merge pull request #1327 from MITx/bugfix/brian/openid_provider_post Victor Shnayder 2013-01-23 05:53:54 -08:00