Adam Palay
dfa435012b
notify students for NotFoundErrors from capa_module, improve error logging
2013-07-17 11:03:47 -04: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
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
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
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
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
Don Mitchell
ef8618f7ad
Make DraftModuleStore mongo only
...
DraftModuleStore was originally designed as a mixin, but never used that
way, and with the upcoming changes to use the versioned module store,
never will be. This changes removes a circular dependency between
mongo.py and draft.py.
2013-07-16 08:55:26 -04:00
Renzo Lucioni
92ae50d415
Remove unused code and include problem ID of data we send
2013-07-15 15:18:01 -04:00
Renzo Lucioni
c770458e6a
Reinstate problem_check event as Problem Checked event
2013-07-15 13:31:56 -04:00
Lyla Fischer
2262ffe4e5
updated imageresponse example to a more universal example (baby animals)
2013-07-15 12:17:43 -04:00
Lyla Fischer
d83d49cac4
drag_and_drop template added
2013-07-15 11:26:03 -04:00
David Baumgold
7f5aedb215
Merge pull request #380 from edx/db/studio-i18n
...
Studio internationalization
2013-07-13 05:45:50 -07:00
David Baumgold
a6f349dab9
Studio i18n
2013-07-12 16:25:39 -04:00
Chris Dodge
ac4e20b4f3
change serialize_field to check for type. If value is a string, simply return that, otherwise do a json.dumps
2013-07-12 15:27:36 -04:00
Vik Paruchuri
ffad965536
fix some combinedopenended ui and data routing
2013-07-12 15:06:11 -04:00
Vik Paruchuri
0cadc8af36
Change status bar UI
2013-07-12 14:13:53 -04:00
Chris Dodge
958ecdb053
raise a more appropriate Exception
2013-07-12 12:47:51 -04:00
Chris Dodge
547f4633d5
use better syntax for asserting that exception is thrown
2013-07-12 12:47:23 -04:00
Chris Dodge
5aae3c6971
add new tests for the string literal serialization
2013-07-12 11:14:35 -04:00
Chris Dodge
50bea28d75
Add a 'string literal' serialization method and use it in the lambda function mapping table when the value to xml serialize is of basestring type. Also a couple of drive-by pep8 fixes.
2013-07-12 11:13:59 -04:00
Vik Paruchuri
d710d8e43a
Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe
2013-07-11 10:52:50 -04:00
JonahStanley
67326cfae8
Fixed xmodule tests to not rely on full
...
Also fixed things in the toy course where needed
2013-07-11 10:12:09 -04:00
David Baumgold
cb62797306
Merge pull request #347 from edx/update-sass
...
Update SASS and Bourbon, add Neat
2013-07-10 11:09:11 -07:00
Chris Dodge
1b377260cc
change log levels on the delete course utility. Otherwise they get filtered out in production environments (min set to WARN level)
2013-07-10 12:34:39 -04:00
Frances Botsford
a0962cc3b9
updated sass transitions to use newer bourbon syntax
2013-07-10 09:18:00 -04:00
Brian Talbot
d046fdf743
resolves local Sass warnings/errors around missing mixins referenced in xmodule styling
2013-07-10 09:17:59 -04:00
Frances Botsford
4187090dac
removed non-existent sass extends from LMS: .table-wrapper, .dullify, .trans, .problem-set
2013-07-10 09:17:59 -04:00
David Baumgold
27796219c7
Changed @include background-size() to background-size
...
Bourbon's background-size mixin has been deprecated, and they recommend to use the
official spec.
2013-07-10 09:17:58 -04:00
David Baumgold
5bd79a8669
Changed @include box-shadow() to box-shadow
...
Bourbon's box-shadow mixin has been deprecated, and they recommend to use the
official spec.
2013-07-10 09:17:58 -04:00
David Baumgold
41374838cb
Changed @include border-radius() to border-radius
...
The official border-radius mixins were deprecated and removed in Bourbon 3.0.
https://github.com/thoughtbot/bourbon/pull/95
2013-07-10 09:17:58 -04:00
Calen Pennington
dcaed88cb2
Merge pull request #313 from edx/cale/use-super-for-calling-parent-__init__-methods
...
Use super for calling parent __init__ methods
2013-07-10 06:17:41 -07:00
David Baumgold
e1ed5c3d2d
docstrings
2013-07-09 19:16:10 -04:00
David Baumgold
090d0d4464
Fix up unit tests
2013-07-09 19:16:08 -04:00
Chris Dodge
6642cdddae
support uploading and referencing assets as streams rather than having to read everything into memory first
2013-07-09 19:15:58 -04:00
Chris Dodge
7d7eee7d0d
inital work to use streams/chunks when handling uploaded assets
2013-07-09 19:15:58 -04:00
Felix Sun
bc315c1149
Merge pull request #328 from edx/felix/hinter2
...
Felix/hinter2
2013-07-09 15:29:14 -07:00
Felix Sun
6c55726134
Fixed naming error in crowdsource_hinter. (Introduced in git merge.)
2013-07-09 14:34:21 -04:00
Felix Sun
596e1ead29
Merge branch 'felix/hinter2' of https://github.com/edx/edx-platform into felix/hinter2
...
Conflicts:
common/lib/xmodule/xmodule/crowdsource_hinter.py
2013-07-09 13:28:27 -04:00
Felix Sun
3418feba52
Added error logging for unparsable answers.
2013-07-09 13:26:02 -04:00
jkarni
ab4dfc248f
Merge pull request #217 from edx/feature/jkarni/jsinput
...
Feature/jkarni/jsinput
2013-07-08 12:51:04 -07:00
Julian Arni
fd6abc88e2
Incorporate review comments
2013-07-08 14:32:02 -04:00
chrisndodge
57d82dea10
Merge pull request #330 from edx/fix/cdodge/delete-course-delete-drafts
...
[STUD-380] Fix/cdodge/delete course delete drafts
2013-07-08 07:24:24 -07:00
Carlos Andrés Rocha
dd8f1f5385
Rename get to data in crowdsourced hinter module
2013-07-08 09:55:06 -04:00
Felix Sun
bc1dea3de1
Fixed bug: When student submits empty string, hinter returns a 500 error.
...
Added tests to catch said bug.
Fixed some pylint violations.
2013-07-08 09:55:06 -04:00
