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

6956 Commits

Author SHA1 Message Date
Jason Bau
606e8b1d97 Merge pull request #697 from edx/fix/jbau/openendmodule-round-score-up 
small change in aggregating peer eval grades (rounds up)
 2013-08-19 15:43:03 -07:00
Don Mitchell
20641bab61 indent even more 2013-08-19 16:57:59 -04:00
Don Mitchell
d3cbf212fe Add doc strings and fix spaces 2013-08-19 16:15:15 -04:00
cahrens
a4448ea50e Make sure to persist static tab name assignment. 
STUD-663

Pylint updates.
 2013-08-19 15:05:56 -04:00
Peter Baratta
e0f0ab090d Use calc's evaluator for staff answers in Numercial type 
Rather than just calling `complex(...)` on the staff answers, also call
`calc.evaluator`. This way, simple things like `1/3` can be entered, as well
as more complicated explicit equations (e.g. `sqrt((12^2 + 26^2)/2)` etc, etc)

Simplify and update the tests to work with this.
 2013-08-19 13:40:32 -04:00
Miles Steele
84322694cd add jasmine test for scroll to top 2013-08-19 13:37:41 -04:00
Don Mitchell
33737d3142 Merge pull request #661 from edx/dhm/location_mapper 
Location to/from locator mapping facilities
 2013-08-19 07:39:15 -07:00
ichuang
e9ef45076d pylint 2013-08-19 10:21:10 -04:00
ichuang
13bb3bf0a9 pylint 2013-08-19 10:18:04 -04:00
ichuang
39b646558a pep8 in inheritance.py 2013-08-19 10:15:26 -04:00
Will Daly
bd65cfa813 Removed outdated template logic in ModuleStoreTestCase 2013-08-19 09:39:30 -04:00
Will Daly
05b34098ab Refactored ModuleStoreTestCase to use modulestore interface 
for clearing _MODULESTORES
 2013-08-19 09:27:36 -04:00
Will Daly
06977c198e Created new test configuration for MixedModuleStore 2013-08-19 08:47:53 -04:00
ichuang
220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py
 2013-08-19 08:24:35 -04:00
Chris Dodge
033f922ec0 add a try catch around the staticstorage lookup, which can throw an exception 2013-08-17 10:33:59 -04:00
chrisndodge
594a73d437 Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore 
Feature/cdodge/add a mixed modulestore
 2013-08-17 07:32:51 -07:00
Vik Paruchuri
f17987c13a Fix flagging, select rubric labels in peer grading 2013-08-16 17:37:53 -04:00
Don Mitchell
998a25e7b3 Use a sort of name to choose if > 1 map 
and some minor comment changes.
 2013-08-16 16:07:26 -04:00
Don Mitchell
8f530d12c7 Raise ItemNotFoundError rather than return None if no map found 2013-08-16 16:07:26 -04:00
Don Mitchell
bd8a7906f5 Clarify doc/comments on default v explicit mappings 2013-08-16 16:07:26 -04:00
Don Mitchell
2ad515d15a Move singleton accessor w/ django dependencies to same place as modulestore() singleton accessor 2013-08-16 16:07:26 -04:00
Don Mitchell
2702d8a636 Implement location mapper as stand-alone helper class 
with own db connection.
 2013-08-16 16:06:56 -04:00
Don Mitchell
47a2122a65 Require edx:// for urls 
But don't use this parser for urls embedded in a browser url request.
 2013-08-16 16:06:11 -04:00
Don Mitchell
1b63ecab48 Enable test via naming it correctly 2013-08-16 16:06:11 -04:00
Don Mitchell
37602edfec Translate locations <-> locators 
unit tests and fixes they implied
 2013-08-16 16:06:11 -04:00
Don Mitchell
3ee6b3c095 pep8 violation fix (shadowed identifier) 2013-08-16 16:04:58 -04:00
Don Mitchell
1abae6f093 Location to Locator mapping utilities 
partial impl
 2013-08-16 16:04:58 -04:00
Don Mitchell
0833f87fef Remove 'edu' from examples 
per our agreement not to use the domain
 2013-08-16 16:03:34 -04:00
chrisndodge
8ba3214cd4 Merge pull request #496 from edx/feature/cdodge/add-a-mixed-modulestore 
Add a 'MixedModuleStore' which aggregates between XML and Mongo Modulestores
 2013-08-16 13:02:31 -07:00
Vik Paruchuri
59336ee03c Fix prompt hiding issue in peer grading 2013-08-16 15:24:38 -04:00
Don Mitchell
7f126f13e9 Merge pull request #624 from edx/dhm/flatten_kvs 
xblock fields persist w/o breaking by scope
 2013-08-16 12:18:02 -07:00
Vik Paruchuri
48b0e570bc Disable submit buttons until rubric totally filled out 2013-08-16 15:10:55 -04:00
Vik Paruchuri
8248c33138 Grab the correct location to report data for 2013-08-16 14:48:11 -04:00
Valera Rozuvan
a5a6d2d54a Added test for Flash video player. 
Fix for video and captions sync. Test for this fix.
 2013-08-16 14:45:10 -04:00
Vik Paruchuri
bc8244b709 Rename reset to try again, hide and disable submit buttons 2013-08-16 14:43:37 -04:00
James Tauber
6bc8d3273d Merge pull request #716 from edx/jtauber/fix-encoding 
fixed encoding declaration
 2013-08-16 11:38:54 -07:00
Jay Zoldak
e91205aff3 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/video_module.py
 2013-08-16 14:25:03 -04:00
Vik Paruchuri
4f3ec68fb7 Scroll to top in peer and staff grading, preserve line breaks in submissions 2013-08-16 14:12:37 -04:00
Don Mitchell
4c28684014 pass xblock fields as top-level keywords on factories 2013-08-16 14:01:16 -04:00
James Tauber
b985722255 fixed encoding 
xgettext seems to only like `utf-8` not `utf8` so string extraction
was failing without this
 2013-08-16 13:52:07 -04:00
Vik Paruchuri
be3291eeb0 Proper scoping, show status to staff, fix line break issues, multiple self assessments on one page work 2013-08-16 13:22:34 -04:00
Chris Dodge
d1ce55f65c have the test teardown explicitly call destroy_db 2013-08-16 12:02:58 -04:00
Peter Baratta
01c743f244 Merge pull request #664 from edx/peterb/fix/math-initial-display 
Fix initial loading bug on `<formulaequationinput />`
 2013-08-16 08:17:03 -07:00
Don Mitchell
69a0683322 Remove obsolete attrs. 2013-08-16 10:42:53 -04:00
Don Mitchell
5029659327 Better explain behavior and todo's 2013-08-16 10:42:53 -04:00
Don Mitchell
438bbffb93 Add field iterator which includes namespaced fields 
And fix get_explicitly_set to use it and to get the json not native
field values.
 2013-08-16 10:42:53 -04:00
Don Mitchell
929597ce84 Move load_from_json to the test file only 
It's a reasonable demo of in memory xblock creation, but doesn't fit
the xblock pattern. Moving temporarily to keep the dag persistence test.
 2013-08-16 10:42:53 -04:00
Don Mitchell
857431f793 Clarify comments re behavior 2013-08-16 10:42:53 -04:00
Don Mitchell
a507ebc1b6 Clarify function name 
and fix some comments ref'g old names
 2013-08-16 10:42:53 -04:00
Don Mitchell
e4a69373d0 xblock fields persist w/o breaking by scope 
Letting xblocks handle scope rather than separating fields into
different attrs. Although, split still shunts content fields to a
different collection than setting and children fields.

The big difference is that content fields will always be a dict and not
sometimes just a string and there's no special casing of 'data' attr.

The other mind change is no more 'metadata' dict.
 2013-08-16 10:42:52 -04:00