RobertMarks
46ae2f9c26
Added support for a new problem type: ChoicetextResponse
2013-07-18 10:12:56 -07:00
Vik Paruchuri
0ef6bc9043
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
2013-07-18 12:03:48 -04:00
Vik Paruchuri
915f815c63
Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-07-18 11:55:37 -04:00
Ned Batchelder
900e794c02
Only quiet the particular logger we think is too noisy.
2013-07-18 11:53:21 -04:00
Peter Fogg
58f147c161
Change delete asset prompt to Warning type for consistency.
2013-07-18 11:47:40 -04:00
Ned Batchelder
3d67c506a3
Use TransactionTestCase, to keep other tests from failing, even though it slows them down.
2013-07-18 11:16:46 -04:00
Ned Batchelder
10f062cf18
Records should be sorted by created,id so that timestamp ties will be broken by id.
2013-07-18 11:16:46 -04:00
Ned Batchelder
83cb3d1924
Add batch and sleep arguments so we can control the speed from the command line.
2013-07-18 11:16:46 -04:00
Ned Batchelder
3a49136f03
Quiet some debug output, get transactions right.
2013-07-18 11:16:46 -04:00
Ned Batchelder
07aad29684
The clean_history management command to remove excess courseware_studentmodulehistory records.
2013-07-18 11:16:46 -04:00
chrisndodge
8300bb5e67
Merge pull request #425 from edx/fix/cdodge/exporting-video-modules
...
Fix/cdodge/exporting video modules
2013-07-18 08:04:20 -07:00
Chris Dodge
99ff3719cc
remove the video from the toy course for now as the import-export-import isn't totally equivalence.
2013-07-18 10:35:50 -04:00
Lyla Fischer
ee01798599
Merge pull request #404 from edx/lyla/templates
...
Adding a template for drag-and-drop.
2013-07-18 07:03:09 -07:00
Chris Dodge
66287d0d99
fix test to use the new create_item method rather than clone_item, which has been deprecated, and thus breaking the test
2013-07-18 09:30:30 -04:00
James Tauber
ddb7c6e519
Merge pull request #431 from antoviaque/updatetemplate-notfound
...
Install: Fixes "Don't know how to build task 'cms:update_templates'"
2013-07-18 05:27:50 -07:00
Xavier Antoviaque
139b12f25b
Install: Fixes "Don't know how to build task 'cms:update_templates'"
...
Remove the `update_templates command from the installation script, this
command was removed by
3722685e1a
2013-07-18 09:14:09 -03:00
Jason Bau
c789642ebd
Merge pull request #396 from edx/jbau/fix/stanford-pwdreset-remove-vendor-js
...
put block around main_vendor js in main_django.html
2013-07-17 14:33:21 -07:00
Calen Pennington
96a9d74190
Merge pull request #422 from edx/release
...
Hotfix: 2013-07-17
2013-07-17 13:12:06 -07:00
Calen Pennington
ab482277be
Merge pull request #420 from edx/fix/cdodge/hotfix-export-crash
...
[HOTFIX] add a default XML serialization if the 'data' field is empty or None. So...
2013-07-17 12:14:06 -07:00
Calen Pennington
726a85c70f
Merge pull request #409 from edx/cale/make-jasmine-tests-quieter
...
Make jasmine tests quieter
2013-07-17 10:58:40 -07:00
Don Mitchell
6dda90f6f8
Merge pull request #419 from edx/dhm/template_acceptance
...
Missing comma on template -> category refactoring
2013-07-17 10:13:58 -07:00
Chris Dodge
8325e28a10
add a default XML serialization if the 'data' field is empty or None. Some XModules now - like video XModule - do not have XML set in the 'data' field
2013-07-17 12:31:33 -04:00
Adam
f0969fca4c
Merge pull request #374 from edx/fix/adam/mrev-check
...
notify students for NotFoundErrors from capa_module, improve tracking
2013-07-17 08:26:27 -07:00
Adam Palay
dfa435012b
notify students for NotFoundErrors from capa_module, improve error logging
2013-07-17 11:03:47 -04:00
ihoover
b42eacaa8f
moved MAX_AUTO_AUTH_USERS to ENV_TOKENS
2013-07-17 10:00:24 -04:00
frances botsford
033a36efb9
Merge pull request #371 from edx/fix/frances/lms-pdfviewer-cleanup
...
Quick LMS pdfviewer layout cleanup
2013-07-17 06:53:10 -07:00
Don Mitchell
5b367e8321
Missing comma on template -> category refactoring
...
And several pep8 changes
2013-07-17 09:22:34 -04:00
ihoover
ee4bc424ce
remove depracated feature flag GENERATE_RANDOM_USER_CREDENTIALS
2013-07-17 09:12:07 -04:00
Alexander Kryklia
813c22d138
Adds integration tests for word_cloud module
2013-07-17 14:57:32 +03:00
Lyla Fischer
3f8246f032
merge conflict
2013-07-16 18:25:01 -04:00
Lyla Fischer
a47daf26e4
removed uneeded defaults from imageresponse
2013-07-16 18:22:48 -04:00
ihoover
ceacc3b4b5
moved auto_auth view to students.view and fixed flag conflicts
2013-07-16 17:43:32 -04:00
Calen Pennington
d3993653cf
Merge pull request #270 from edx/dhm/non-persisted-studio-templates
...
Non-persisted studio templates
2013-07-16 14:42:57 -07:00
Chris Dodge
ecbf148688
add a new django-admin command to dump out a course structure document. This is response to an emergency request from Harvard researchers.
2013-07-16 16:53:01 -04:00
Lyla Fischer
a512337881
removed soon-to-be-universally-fixed defaults
2013-07-16 16:18:27 -04:00
Don Mitchell
be4fbc562e
Refactor tests to no longer use templates
...
Add boilerplate option to ItemFactory
Minor start date fix to not use microsecs
2013-07-16 16:00:28 -04:00
ihoover
e5f44165f8
Made activation flag and ENV_TOKEN
2013-07-16 15:29:38 -04:00
Renzo Lucioni
f2898f8cbf
Merge pull request #407 from edx/renzo/problem-check-event
...
Reinstate problem_check event as Problem Checked event
2013-07-16 12:20:30 -07:00
Calen Pennington
92391a22fc
Don't force field inheritance of default values
2013-07-16 14:33:59 -04:00
Calen Pennington
0a38e490e3
Fix pep8/pylint errors
2013-07-16 14:33:59 -04:00
Calen Pennington
f6b7b2678d
Set about page default content from overview.yml template
2013-07-16 14:33:59 -04:00
Calen Pennington
4b53478859
Require markdown to be explicitly set
2013-07-16 14:33:59 -04:00
Calen Pennington
8b5979641b
Change default rerandomize and showanswer
...
The defaults used to be rerandomize=always, showanswer=closed. This is
preserved for capa problems being imported from XML. However, for
courses, and for problems created in Studio, the default has been
changed to never/finished, to match the previous defaults used by
Studio.
2013-07-16 14:33:58 -04:00
Don Mitchell
3722685e1a
No longer persist XModule templates
...
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
2013-07-16 14:33:58 -04:00
Don Mitchell
8c904f31a9
Move defaults from yaml templates to field definitions.
...
This standardizes the XModule field default values to be the same as the
values that are presented by studio when a component is added to a
course.
2013-07-16 14:24:41 -04:00
James Tauber
d4f8ab3f09
Merge pull request #414 from edx/jtauber/switch-transifex-project
...
changed transifex project to edx-platform
2013-07-16 11:08:03 -07:00
ihoover
9eb1cce352
maximum number of random users
2013-07-16 14:05:41 -04:00
Julian Arni
2540be2442
Update rake docs to reflect change in folder structure
2013-07-16 13:45:22 -04:00
Julian Arni
5f9c395afe
Use source dir for data docs
2013-07-16 13:44:53 -04:00
James Tauber
3a095acced
changed transifex project to edx-platform
2013-07-16 13:38:34 -04:00
