Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,355 Commits 1 Branch 0 Tags
20d87061d428fb554bfbd3e904b1dcd052d6f934
Commit Graph

19226 Commits

Author SHA1 Message Date
Ashley Penney
274cb8d865 Actually call the appropriate file. 2013-01-24 09:42:24 -05:00
Ashley Penney
3aacba1f63 Run over each file and run the import. We could probably do this as a try/except and not delete if the output of the import failed but it may be simply easier to refetch those files from the S3 backup and try again. 2013-01-24 09:42:24 -05:00
Ashley Penney
05b36bdd09 Add tags to the datadog event which will be set to the appropriate filename so we can see the cause of failures. 2013-01-24 09:42:24 -05:00
Ashley Penney
3a4091b798 Tweaks to enable datadog error events as well as some pep8 tidyup vim was shouting at me about. 2013-01-24 09:42:24 -05:00
Ashley Penney
333f2e5167 Fix ccd->cdd, I typed ccd so many times while working on this code. I am bad at typing! 2013-01-24 09:42:24 -05:00
Brian Wilson
5e76c9d033 add pearson_import_conf_zip command 2013-01-24 09:42:24 -05:00
Ashley Penney
46e9a8f6ac Add help string. 2013-01-24 09:42:23 -05:00
Ashley Penney
482cefd246 Bunch of fixes to pep8 formatting, missing imports, change of kwargs to 
options, quoting variables and a few other fixups.
 2013-01-24 09:42:23 -05:00
Ashley Penney
5431332cec Fix up help. 2013-01-24 09:42:23 -05:00
Ashley Penney
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.
 2013-01-24 09:42:23 -05:00
Ashley Penney
0555ebc434 Bunch of fixes to how I do if/else checks, fix a typo in Command and 
repair the for filename part of sftp.
 2013-01-24 09:42:23 -05:00
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
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
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
9af7c6cc5d adding login views 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
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
Chris Dodge
9d5ac308b1 remove flag to hide progress tab 2013-01-23 15:11:41 -05:00
Calen Pennington
27b57bb48b Don't update settings based on data from content for discussion modules during init 2013-01-23 14:51:07 -05:00
Calen Pennington
993c24b72b WIP: Model data caching work 2013-01-23 14:51:07 -05:00
Calen Pennington
c44898b1de Remove random printing during XModuleDescriptor equality check 2013-01-23 14:47:05 -05:00
Calen Pennington
2eca8bd0e9 Set default video position to 0, but don't overwrite it during __init__ 2013-01-23 14:47:05 -05:00
Calen Pennington
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 2013-01-23 14:47:05 -05:00
Calen Pennington
ce76b64bae Handle problem resets in such a way that the LoncapaProblem generates the new random seed, and the CapaModule saves that seed 2013-01-23 14:47:05 -05:00
Calen Pennington
9d66169d06 Don't set a seed to None that's already None 2013-01-23 14:47:05 -05:00
Calen Pennington
8e5373f993 Make Randomization return un-adjusted values as a passthrough 2013-01-23 14:47:05 -05:00
Christina Roberts
cd78b27b50 Merge pull request #1334 from MITx/bug/btalbot/cms-problemmenu 
studio - resolved bug with .header CSS inheritance and problem editor
 2013-01-23 11:40:24 -08:00
Brian Talbot
5fee7eeaec studio - further resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:58:20 -05:00
Brian Talbot
2ca267dc52 studio - resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:50:10 -05:00
cahrens
a1eeb56839 Import requireJS. 2013-01-23 12:30:06 -05:00
Don Mitchell
b0bbb34644 Merge pull request #1331 from MITx/feature/christina/tiny-mce 
Feature/christina/tiny mce
 2013-01-23 09:14:42 -08:00
jmvt
549a5e9fe9 Merge remote-tracking branch 'origin/master' into jmpm-analytics 2013-01-23 12:02:48 -05:00
Ned Batchelder
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. 2013-01-23 11:34:24 -05:00
cahrens
2609ba4093 Delete unused icon, reorder dropdown. 2013-01-23 11:02:16 -05:00
Don Mitchell
966db4fbaf Merge pull request #1329 from MITx/fix/cdodge/draft-store-get-items 
add optional course_id parameter to DraftMongoStore.get_items()
 2013-01-23 07:39:36 -08:00
Diana Huang
5ca1586e0c Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 2013-01-23 08:57:47 -05:00