Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,365 Commits 1 Branch 0 Tags
c07917d918e5dde6ca815ffca37f0019816db256
Commit Graph

9365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
c07917d918 Merge pull request #1354 from MITx/feature/ichuang/fix-flashing-background-in-video 
fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes
 2013-01-25 13:55:16 -08:00
David Ormsbee
ca28796a86 Merge pull request #1345 from MITx/feature/apenney/pearson-merge 
Pearson export/import code. (No merging before 25th Jan)
 2013-01-25 13:54:55 -08:00
ichuang
c56982e6f0 fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes 2013-01-25 16:45:16 -05:00
chrisndodge
72c9d9f70c Merge pull request #1352 from MITx/feature/dhm/drag 
min height on droppable areas and add padding to top/bottom on hover.
 2013-01-25 12:57:06 -08:00
Brian Talbot
8a6dc040a9 studio - styled first children in an overview's subsection list for drag and drop work 2013-01-25 15:26:25 -05:00
Don Mitchell
0009430b59 min height on droppable areas and add padding to top/bottom on hover. 2013-01-25 14:30:51 -05:00
chrisndodge
c9a877b77c Merge pull request #1336 from MITx/feature/dhm/drag 
unit/subsection/section drag and drop on overview page
 2013-01-25 10:51:57 -08:00
Victor Shnayder
faaf290e10 Merge pull request #1351 from MITx/content/rocha/most-important-change-ever 
Added one more year!
 2013-01-25 10:37:54 -08:00
Carlos Andrés Rocha
f35d4a16c3 Added one more year! 2013-01-25 13:31:23 -05:00
Don Mitchell
e58193f87f Updated comment 2013-01-25 13:03:54 -05:00
Don Mitchell
45393ac6f8 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-25 12:46:09 -05:00
Don Mitchell
5ef3f3ee66 Update jquery ui. Overrode draggable w/ an in place fix for scroll 
racing condition.
 2013-01-25 12:44:58 -05:00
Ashley Penney
a54778551e This needs to be a list of strings. 2013-01-25 10:49:20 -05:00
Victor Shnayder
0e78d9eb61 Merge pull request #1349 from MITx/fix/cdodge/position-jumping-fix 
put back the 'position' argument to get_module() which got accidentially...
 2013-01-24 18:49:25 -08:00
Chris Dodge
1787157e00 put back the 'position' argument to get_module() which got accidentially - or so I think - dropped in a previous commit 2013-01-24 21:38:02 -05:00
David Ormsbee
d31229360f Merge pull request #1348 from MITx/fix/zoldak/ie-keyword 
Fix broken IE due to using the word function
 2013-01-24 14:07:59 -08:00
Jay Zoldak
896933a3c4 Fix broken IE 2013-01-24 17:02:18 -05:00
Brian Wilson
368e3d5c97 Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge 2013-01-24 16:38:07 -05:00
Brian Wilson
872f4b6c13 fix handling of rejected accommodations 2013-01-24 16:37:02 -05:00
David Ormsbee
acfafa6516 Merge pull request #1347 from MITx/fix/cdodge/remove-duplicate-assign-default-role 
fix merge problem. assign_default_role() ended up being defined twice as...
 2013-01-24 13:00:40 -08:00
Chris Dodge
dfbe7dd4f9 fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict 2013-01-24 15:54:02 -05:00
Ashley Penney
135369a3d7 Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge 2013-01-24 15:20:49 -05:00
Ashley Penney
b02ebc4618 Add these two options in as well. 2013-01-24 15:20:27 -05:00
Brian Wilson
4f37ea9149 add --create_dummy_exam option to pearson_make_tc_registration 2013-01-24 14:45:31 -05:00
Brian Wilson
cb2d8db57c store files in S3 bucket in separate directories by mode 2013-01-24 12:46:00 -05:00
Brian Wilson
20db3841cb Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge 2013-01-24 12:42:01 -05:00
David Ormsbee
e074c629fc Merge pull request #1344 from MITx/bugfix/brian/pearson-reg-end-date 
add UTC time to registration end date
 2013-01-24 09:27:11 -08:00
Ashley Penney
126ff55cd5 Not sure why this was set to use SSH. 2013-01-24 10:06:09 -05:00
Ashley Penney
645cfbce21 Move this into the github requirements where it belongs. 2013-01-24 10:00:13 -05:00
Brian Wilson
1199b1ecfa debug pearson import and update unit tests 2013-01-24 09:42:25 -05:00
Brian Wilson
d395c4448d add more pearson tests, and update commands in response 2013-01-24 09:42:25 -05:00
Brian Wilson
740d0403e9 change name of function back to get_testcenter_registration, and disable its use as a test 2013-01-24 09:42:25 -05:00
Brian Wilson
f4703b40cb add test-with-settings 2013-01-24 09:42:25 -05:00
Brian Wilson
553528cd1c change get_testcenter_registration to get_tc_registration, so it's not treated as a test. 2013-01-24 09:42:25 -05:00
Brian Wilson
d30974b560 Get pearson export working in a unit test 2013-01-24 09:42:24 -05:00
Brian Wilson
7bcfc44b71 add first test shell 2013-01-24 09:42:24 -05:00
Ashley Penney
c5979f8efa Stray % 2013-01-24 09:42:24 -05:00
Ashley Penney
60ae54b2e1 Actually, lets use Cale's fixes. 2013-01-24 09:42:24 -05:00
Ashley Penney
491dd408aa Add dogapi for datadog. 2013-01-24 09:42:24 -05:00
Ashley Penney
d0ecae30d7 Fix datadog logging to use .name on the file objects and add an additional logging line. 2013-01-24 09:42:24 -05:00
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