Ashley Penney
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.
I've set it to die in pearson_transfer.py if the django PEARSON settings
aren't available. I don't want to try and provide defaults, these must
exist or it simply fails.
2013-01-24 09:42:23 -05:00
Ashley Penney
ced29a25ec
Add paramiko to requirements.
2013-01-24 09:42:23 -05:00
Ashley Penney
61ea2d7b5d
Couple of fixes to the settings data.
2013-01-24 09:42:03 -05:00
Ashley Penney
1acf2dbba3
Use a dictionary for all the pearson stuff to keep the auth/env stuff
...
clean.
2013-01-24 09:42:03 -05:00
Ashley Penney
1d13b1a9bd
Make various changes to handle the s3/sftp part of the pearson process.
2013-01-24 09:42:03 -05:00
Diana Huang
210cdf870e
Updates to the mock peer grading service and new tests.
2013-01-24 09:41:24 -05:00
Diana Huang
dc3dd41aa7
Update tests to cover the peer grading service
2013-01-24 08:58:24 -05:00
Don Mitchell
f2b43ec459
Merge pull request #1343 from MITx/feature/christina/tiny-mce
...
Make code inline instead of block.
2013-01-24 05:34:36 -08:00
Brian Wilson
0cb5f101ae
add UTC time to registration end date
2013-01-24 01:18:10 -05:00
cahrens
711cc9a041
Tell tinyMCE to not change image paths.
...
#143
2013-01-23 20:18:28 -05:00
John Jarvis
4af2e1118a
Changing login and register to login_user and register_user
2013-01-23 18:44:26 -05:00
John Jarvis
d2e130ab33
Removing extra parens
2013-01-23 18:42:35 -05:00
John Jarvis
64f0855055
Adding removed code from master rebase
2013-01-23 18:41:17 -05:00
John Jarvis
8a0cc6e610
Revert "Fixing namespace issue for "login""
...
This reverts commit dcc53c2bcd
2013-01-23 18:34:53 -05:00
John Jarvis
dcc53c2bcd
Fixing namespace issue for "login"
...
* renaming login to login_user
* renaming register to register_user
2013-01-23 18:22:14 -05:00
John Jarvis
80bcf060a0
javascript to redirect the user to the dashboard after reg
2013-01-23 18:22:14 -05:00
Brian Talbot
8374534802
drupal integration - revised copy, layout, and styles per marketing feedback
2013-01-23 18:22:13 -05:00
Brian Talbot
cbe35eeab3
drupal integration - further color sync, copy edits, and removing courseware button when on login page
2013-01-23 18:22:13 -05:00
Brian Talbot
e1fae8e885
drupal integration - color syncing with marketing site standards
2013-01-23 18:22:13 -05:00
Brian Talbot
bb66f8963f
drupal integration - revised general page background for shorter content pages, small visual tweaks to footer
2013-01-23 18:22:13 -05:00
Brian Talbot
a15bf74f7c
drupal integration - styled and revised markup/copy for password reset modal
2013-01-23 18:22:13 -05:00
Brian Talbot
633126234e
drupal integration - adding back in modal assets for password recovery - wip
2013-01-23 18:22:13 -05:00
Brian Talbot
c500896913
drupal integration - adding back in modal assets for passwor recovery - wip
2013-01-23 18:22:13 -05:00
Brian Talbot
de4f35df77
drupal integration - plumbing in password reset UI updates - wip
2013-01-23 18:22:13 -05:00
Brian Talbot
2019af4170
drupal integration - revised/proofed header and footer styles to match spacing of marketing site and renamed social icons
2013-01-23 18:22:13 -05:00
Brian Talbot
42d4b4d69b
drupal integration - revised padding between content and footer globally, removed secondary form actions for time being
2013-01-23 18:22:13 -05:00
Brian Talbot
2f6255378f
drupal integration - revised UI of global footer to matched marketing site footer content and feel
2013-01-23 18:22:13 -05:00
Brian Talbot
eda371a1f7
drupal integration - revised UI of course slim header to coincide with marketing site theme
2013-01-23 18:22:12 -05:00
Brian Talbot
d6354fd8b1
drupal integration - revised general header HTML and Sass to coincide with marketing site nav and theme
2013-01-23 18:22:12 -05:00
Brian Talbot
eaeae03315
drupal integration - further sass refinment and hiding example error states
2013-01-23 18:22:12 -05:00
Brian Talbot
009ac06d4d
drupal integration - added unified account-centric Sass, which holds registration/login styling
2013-01-23 18:22:12 -05:00
Brian Talbot
7c7d0da5b4
drupal integration - styled page layout, form fields and states, added in status message areas/standards and revised Sass
2013-01-23 18:22:12 -05:00
Brian Talbot
6bff41708d
cleaning up LMS Sass variables a bit
2013-01-23 18:22:12 -05:00
Brian Talbot
1db87e0533
drupal integration - added sass files to architecture and plumbed HTML for login and register views
2013-01-23 18:22:12 -05:00
Brian Talbot
2c604bc473
changing url name to signin
2013-01-23 18:22:12 -05:00
John Jarvis
9af7c6cc5d
adding login views
2013-01-23 18:22:12 -05:00
Brian Talbot
ed39ca2303
initial branch creation for reg/login revisions with drupal
2013-01-23 18:22:12 -05:00
Ned Batchelder
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.
2013-01-23 17:11:02 -05:00
Diana Huang
cc67017d4c
Merge branch 'master' into diana/open-ended-ui-updates
2013-01-23 16:45:40 -05:00
cahrens
4a79643fde
Make code inline instead of block.
2013-01-23 16:43:49 -05:00
Victor Shnayder
abcc5c0204
Merge pull request #1342 from MITx/feature/cdodge/add-standard-problem-metadata
...
update templates to include attemps and weight values. Also update capa_...
2013-01-23 13:40:46 -08:00
Chris Dodge
2856971b45
update templates to include attemps and weight values. Also update capa_module.py to accept empty strings ('') to mean 'default value'
2013-01-23 16:36:16 -05:00
Kevin Chugh
1bd9366e40
Merge remote-tracking branch 'origin/master' into feature/kevin/groups
2013-01-23 16:26:06 -05:00
Kevin Chugh
59b3dc61a2
lms producing grouped content
2013-01-23 16:25:26 -05:00
chrisndodge
fe8e25e72d
Merge pull request #1341 from MITx/feature/christina/tiny-mce
...
Toggling of code should mark editor as dirty.
2013-01-23 13:25:01 -08:00
cahrens
2969a9e48d
Toggling of code should mark editor as dirty.
2013-01-23 16:19:17 -05:00
chrisndodge
548f3de508
Merge pull request #1340 from MITx/fix/zoldak/fix_jenkins
...
Do not run the lms jasmine tests on jenkins for now, until we fix them.
2013-01-23 13:05:50 -08:00
Jay Zoldak
29c4e6c066
Do not run the lms jasmine tests on jenkins for now, until we fix them.
2013-01-23 16:03:25 -05:00
Christina Roberts
2ed5fdf76b
Merge pull request #1338 from MITx/fix/cdodge/remove-hide-progress-tab
...
Fix/cdodge/remove hide progress tab
2013-01-23 12:20:54 -08:00
chrisndodge
247199d699
Merge pull request #1337 from MITx/feature/cale/fix-staff-debug-link
...
Feature/cale/fix staff debug link
2013-01-23 12:17:17 -08:00
