Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,922 Commits 1 Branch 0 Tags
4443afecaf2450f16fb36d7c79d99cd5e91c19d3
Commit Graph

651 Commits

Author SHA1 Message Date
cahrens
5c78218b13 Don't need to convert to milliseconds. 2013-03-27 14:52:27 -04:00
cahrens
22537ffd3b Don't need to convert to milliseconds. 2013-03-27 14:51:39 -04:00
cahrens
227a5e8266 Delete converters, move unit tests to test_fields, add new additional test cases. 2013-03-27 12:56:06 -04:00
Victor Shnayder
68902b8039 Merge pull request #1747 from MITx/fix/cdodge/should-return-404-on-bad-asset-request 
if we parse an invalid location in the content store middleware, then re...
 2013-03-27 07:09:38 -07:00
Chris Dodge
b0e2c82ad3 actually.. return a 400 rather than a 404 because the request is malformed. Also add unit test. 2013-03-26 20:02:29 -04:00
Calen Pennington
b975d4d90c Fix tests 2013-03-26 16:43:58 -04:00
cahrens
83eda6ac93 Merge branch 'master' into bug/christina/studio 2013-03-26 10:34:37 -04:00
Chris Dodge
269152c4f2 add a test scenario to count RT to database when prefetching children. This uses a shim function on pymongo's collection.find to do the counting 2013-03-25 23:15:35 -04:00
Chris Dodge
d8f1c2b41a add unit test for proper depth build out 2013-03-25 22:49:39 -04:00
cahrens
ce884c44ee Newline cleanup. 2013-03-25 17:26:59 -04:00
cahrens
fa63bcce94 Allow clearing of dates (except for course start date). 
https://edx.lighthouseapp.com/projects/102637/tickets/231
 2013-03-25 17:25:49 -04:00
Don Mitchell
884019b14c Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse 
Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py
 2013-03-22 16:56:31 -04:00
Don Mitchell
056b7d3427 More unit tests which found another timezone assumption :-) 2013-03-22 16:45:21 -04:00
Don Mitchell
8370124e2b Make to and from json for dates use iso format esp for timezone. 2013-03-22 16:16:32 -04:00
Don Mitchell
2dcfd1eba1 Merge pull request #1719 from MITx/feature/btalbot/studio-checklists 
Add course checklists to Studio
 2013-03-22 12:49:30 -07:00
cahrens
505a382421 Re-enable all the tests! 2013-03-22 14:00:20 -04:00
Christina Roberts
14e0387b20 Merge pull request #1716 from MITx/bug/orphan 
Bug/orphan
 2013-03-22 07:33:52 -07:00
cahrens
d631509afa Re-enable all the tests! 2013-03-22 10:28:36 -04:00
cahrens
a2a1478d92 Fix caching bug on back button. 2013-03-22 09:51:45 -04:00
cahrens
be4045cb86 Reduce pep8 warnings, move Checklistst to top of menu. 2013-03-21 22:17:46 -04:00
cahrens
8385db8518 Clean up comments. 2013-03-21 21:40:38 -04:00
cahrens
016fe196ae Add Python unit tests, don't convert URLs every time. 2013-03-21 21:21:24 -04:00
cahrens
6b3b7fe277 Some cleanup. 2013-03-21 15:19:45 -04:00
Jay Zoldak
25ceea175c Merge pull request #1710 from MITx/feature/will/speed_up_lettuce_tests 
Feature/will/speed up lettuce tests
 2013-03-21 12:17:07 -07:00
cahrens
1ae9e9bde3 Tests for opening action links. 2013-03-21 13:56:11 -04:00
Don Mitchell
e7727fcc6e Pylint muting via docstrings and line wraps 2013-03-21 12:30:33 -04:00
cahrens
8ca6e324af Merge branch 'master' into feature/btalbot/studio-checklists 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/sass/base-style.scss
	cms/urls.py
 2013-03-21 12:23:13 -04:00
Don Mitchell
11c9028f52 Merge pull request #1712 from MITx/fix/cdodge/get-import-to-work-with-conditionals 
import needs to enumerate through the fields for all content scopes. Als...
 2013-03-21 08:44:16 -07:00
Don Mitchell
bc8c0b6db2 Added unit test for what broke the system, but won't catch such a 
regression in future b/c the problem was persisting under one parser and
reading under another.
 2013-03-21 11:09:55 -04:00
Don Mitchell
ae55cd7533 One more unit test for json not containing expected fields. 2013-03-21 09:40:57 -04:00
Chris Dodge
9cd38d115e import needs to enumerate through the fields for all content scopes. Also add unit test 2013-03-20 21:37:09 -04:00
Don Mitchell
bd2dd9408d Unit tests and minor fixes to course_info_updates. Main fix was 
returning the content in same form as it was saved rather than parroting
it back.
 2013-03-20 17:49:03 -04:00
cahrens
6d6e144c35 Urls working. 2013-03-20 16:37:08 -04:00
Jay Zoldak
3576a3154b Repoint factory references in lettuce tests to world. 2013-03-20 09:38:52 -04:00
Jay Zoldak
74653ff8ad Factory refactor working for lms lettuce tests. 2013-03-20 09:38:52 -04:00
cahrens
a03f6c3bf1 More Selenium test, code cleanup. 2013-03-19 14:02:07 -04:00
cahrens
dc89a4b3d5 Beginning of Selenium test, updates to work with master. 2013-03-18 21:25:44 -04:00
cahrens
49ee903eda Merge branch 'master' into feature/btalbot/studio-checklists 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/template_loader.js
 2013-03-18 15:30:19 -04:00
Chris Dodge
3e28ffa4f7 remove import and shortened line length 2013-03-18 15:10:17 -04:00
cahrens
f6fb64f130 Saving checkbox state, client template for individual checklist. 2013-03-18 15:03:54 -04:00
Chris Dodge
2b677544a5 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio 2013-03-18 09:39:47 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
fd3ba7db2a Don't make cms.djangoapps a python module 2013-03-15 10:50:46 -04:00
cahrens
ac25b02ce6 Minor updates. 2013-03-14 13:48:17 -04:00
cahrens
564374048e A little cleanup. 2013-03-14 09:35:26 -04:00
cahrens
e0207432ca Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists 2013-03-14 09:23:05 -04:00
cahrens
54156b7ac1 Saving work. 2013-03-14 09:22:58 -04:00
Brian Talbot
1fce77d8b2 Merge branch 'master' into feature/btalbot/studio-checklists 2013-03-13 19:19:38 -04:00
Calen Pennington
531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-13 12:18:04 -04:00
Brian Talbot
1b5f040021 studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI 2013-03-12 21:57:40 -04:00