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

4005 Commits

Author SHA1 Message Date
cahrens
fae8fd3841 Merge branch 'master' into feature/christina/unify-fields 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt
 2013-06-13 10:55:13 -04:00
cahrens
0f8d7c744c Test cleanup. 2013-06-13 10:42:23 -04:00
Peter Fogg
d52329be23 Merge pull request #128 from edx/peter-fogg/fix-video-captions-setting 
Make video captions respect course author's setting.
 2013-06-13 06:32:33 -07:00
cahrens
6e92ddf3dd Cannot set String field to a dict anymore! 2013-06-12 17:07:41 -04:00
JonahStanley
3c43dbb26f Changed the other % to format 2013-06-12 13:36:46 -04:00
cahrens
86d952bf91 Change to putting serialize/de-serialize directly in xml_module. 2013-06-12 13:34:38 -04:00
JonahStanley
6d686dd9f6 Changed the way the file path was obtained 2013-06-12 13:32:46 -04:00
JonahStanley
1b5050c9ac Changed the following: 
% to format
css_find().click() to its actual function
A few name changes as well as step changes
Removal of drag testing
A refactoring of login and create user.  Login will no longer create the specified user
 2013-06-12 13:25:33 -04:00
Brian Talbot
832da3ad48 syncs styling rules for buttons/inputs to ensure consistency 2013-06-12 11:43:59 -04:00
Peter Fogg
52bf82ac17 Set Youtube ID defaults to the empty string. 2013-06-12 11:29:14 -04:00
Peter Fogg
008c769ffb Update and fix acceptance to show captions when correct. 2013-06-12 10:27:05 -04:00
JonahStanley
eb14a07814 Added tests for course updates and handouts 2013-06-11 16:15:49 -04:00
chrisndodge
e685ff7125 Merge pull request #129 from edx/fix/cdodge/cancel-asset-upload-crash 
[STUD-256] Seems like on chrome when cancel is hit in the file chooser, the 'change...
 2013-06-11 12:52:56 -07:00
Peter Fogg
3159c949d3 Update acceptance tests for captions to use metadata settings editor. 2013-06-11 15:29:16 -04:00
Peter Fogg
dbb127599f Merge peter-fogg/fix-video-captions-setting. 2013-06-11 15:11:14 -04:00
Peter Fogg
45527bf921 Reword acceptance test. 2013-06-11 15:07:01 -04:00
Chris Dodge
be6fbf913e make local variable 2013-06-11 14:36:04 -04:00
JonahStanley
81b06d5c70 Added tests for static pages 
Also added in drag and drop helper.  Please be careful using this method as it is truly a hack to obtain the visual effects.  As of this commit, selenium does not support drag and drop for jQuery sortable items
 2013-06-11 14:34:18 -04:00
Chris Dodge
1602f592b4 use better API 2013-06-11 14:32:33 -04:00
Peter Fogg
0149766710 Add acceptance test to ensure that show_captions has the right effect. 2013-06-11 14:07:40 -04:00
Chris Dodge
fa8ae228bf Seems like on chrome when cancel is hit in the file chooser, the 'changed' event is fired and startUpload() was being called. We need to check to see if the upload file is blank and - if so - just return immediately out of the function 2013-06-11 13:38:01 -04:00
JonahStanley
29275c48d1 Added in the drag and drop support 2013-06-11 11:29:54 -04:00
JonahStanley
c74d76a36b Removed test breakpoint 2013-06-11 10:07:13 -04:00
JonahStanley
d471bcb723 Added tests for uploading files 
TODO: When deleting is available, test deleting uploaded files`
 2013-06-11 10:00:52 -04:00
Peter Fogg
f9b825fe8b Fix failing acceptance tests and allow videos to be imported from XML. 2013-06-11 09:27:02 -04:00
JonahStanley
b7674679d9 Tests now use their own contentstore database 
test.py was changed such that the database being used is test_xcontent
course_helpers.clear_courses now calls contentstore().fs_files.drop() such that all content is removed and the databse is started afresh in the same manner as the modulestore
 2013-06-11 09:18:16 -04:00
Don Mitchell
44061f9c04 Revert bad merge 2013-06-10 17:16:35 -04:00
Don Mitchell
e4757452f0 Partial implementation of means to get xmodule from descriptor and 
attempt to test xmodule_modified (see fixme)
Removed obsolete else clause from before conversion
Ensure factories use datetime not struct_time for start date
Added more unit tests for settings encoder
 2013-06-10 17:16:35 -04:00
Don Mitchell
e7c4e5f4d3 Fixed use_tz not being effective in cms 2013-06-10 17:16:35 -04:00
Don Mitchell
168cb306d3 Move tz_aware into connection config rather than settings. 
Make django use_tz
 2013-06-10 17:16:35 -04:00
Don Mitchell
909fe134f9 Added date_util tests back in and handle null time obj. 2013-06-10 17:16:34 -04:00
Don Mitchell
28f8910db4 Make pymongo tz_aware 2013-06-10 17:16:34 -04:00
Don Mitchell
855433341d Minor code review fixes (removing commented code). 2013-06-10 17:16:34 -04:00
Don Mitchell
e47f8b1765 Coding consistency changes for code review. 2013-06-10 17:16:34 -04:00
Don Mitchell
b7cfbe0ce6 Add safety check for start dates unbound 2013-06-10 17:16:34 -04:00
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
Don Mitchell
976280e693 Merge pull request #110 from edx/bug/dhm/baddrafts 
Have the draft module store actively prevent non-leaf nodes from being
 2013-06-10 12:01:49 -07:00
JonahStanley
271de4fbc9 Added in testing for course team 
Also modified the create_course method in common to allow for the possibility to access the course name and etc. from other files.
 2013-06-10 14:38:52 -04:00
chrisndodge
1c348a94d4 Merge pull request #116 from edx/fix/cdodge/make-sure-imported-files-are-location-clean 
partial fix for STUD-145, catch invalid location errors and return a HTT...
 2013-06-10 09:48:56 -07:00
Chris Dodge
0c6991822b move test so it doesn't split the tests from a helper method 2013-06-10 12:46:03 -04:00
cahrens
b0b3062a20 Allow a value of 0 for max attempts. STUD-264. 2013-06-10 11:51:25 -04:00
Chris Dodge
d9ce3162e0 partial fix for STUD-145, catch invalid location errors and return a HTTP 400 error to client 2013-06-10 11:47:37 -04:00
JonahStanley
2ad934f1c2 Added testing for grading settings 
Please note that 2 tests will not reliably work:
Deleting a grade- Was able to circumvent this with javascript
Moving the grade slider- Could not circumvent, is skipped but the framework is in place
 2013-06-10 11:41:17 -04:00
cahrens
0baec0a164 Move string fields, get rid of hard-coded list of booleans. 2013-06-07 15:45:34 -04:00
Don Mitchell
2266028921 Have the draft module store actively prevent non-leaf nodes from being 
saved as draft.
 2013-06-07 15:40:30 -04:00
Jonah Stanley
a3a7d1d548 Merge pull request #77 from edx/jonahstanley/fix-alert-tests 
Jonahstanley/fix alert tests
 2013-06-06 12:59:07 -07:00
Christina Roberts
743384502e Merge pull request #89 from edx/bug/christina/mktg-urls 
Bug/christina/mktg urls
 2013-06-06 08:26:23 -07:00
cahrens
c715edf57a Strip off https:// 2013-06-06 10:55:41 -04:00
Peter Fogg
4415fb4c42 Started removing XML from video editor. 
TODO: This breaks the 1.5x and .75x speeds. I'm still looking into
why.

TODO: VideoDescriptor inherits from RawDescriptor in order to
use the from_xml and export_to_xml methods. This seems really ugly,
though; I'd rather find a better way to do this.
 2013-06-06 10:29:24 -04:00
cahrens
39397c5c2f Bullet-proofing for MKTG_URLS. 2013-06-06 10:29:10 -04:00