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

40 Commits

Author SHA1 Message Date
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -05:00
Calen Pennington
52beec8878 Switch inheritance in split-mongo over to using InheritingFieldData. 2014-09-29 22:35:40 -04:00
Calen Pennington
234c18053d Inherit from JSONField rather than Field for json-based fields 2014-09-29 11:56:40 -04:00
Calen Pennington
8acef4c637 Allow Timedelta and RelativeTime fields to handle from_json being passed timedelta objects 2014-09-29 10:32:15 -04:00
Filippo Valsorda
a9930bf34a Make enforce_type an optional flag, to avoid conflicts 2014-08-08 09:14:10 -07:00
Filippo Valsorda
0482038756 Enforce type of the XBlocks Fields when set 
This updates the XBlock dependency to edX/XBlock@***
and add the newly introduced enforce_type methods
 2014-08-08 09:14:10 -07:00
polesye
102d1cb253 Persist student progress in video. 
Student logins to edx, plays video, selects position, closes
browser, opens video, position is restored.

BLD-385
 2014-02-11 13:53:24 +00:00
Alexander Kryklia
c351c3dae7 Fix typos. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
e902ff6548 Fix error printing: use repr. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
32f0f555e9 Use more clean expression. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
3c4f71bbe5 Update variable names and fix typo. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
0188207819 Fix to_json of RelativeTime to support Isotime format. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
040b4da124 Change str of RelativeTime. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
2c90fd18f4 Rename IsoTime to RelativeTime. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
f46433e764 Add tests fro IsoTime methods. 2013-10-23 13:03:55 +03:00
Alexander Kryklia
0da81e2a56 Update IsoTIme to be timedelta and update tests. 2013-10-23 13:03:55 +03:00
polesye
7cbdac7322 Add new python field. 2013-10-23 13:00:36 +03:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Sarina Canelake
f438922a88 Fix error seen in combinedopenended modules 2013-08-14 16:36:33 -04:00
Adam Palay
b2b3a50400 convert datetime.now() to datetime.now(UTC) for xqueue 2013-07-22 17:39:11 -04:00
Don Mitchell
025a95885a Generate TypeError if from or to_json fail. 2013-07-18 16:47:15 -04:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04:00
Don Mitchell
cf2675d701 Update fields.py 
When changing variable names for code review critique, accidental cut/paste prevented intended behavior.
 2013-06-18 12:32:26 -04:00
Don Mitchell
a1f181e7bb Make the variable and method names clearer 2013-06-18 11:45:16 -04:00
Don Mitchell
085a590bdd timezone conversion: more unit tests 
and code reorganization
 2013-06-17 14:48:18 -04:00
Don Mitchell
cb40e9ff88 Fix a few remaining tz naive dates 
And remove redundant but != date parsing methods. In process make
the general parsing function less lenient (don't default date nor
month)
 2013-06-17 13:26:45 -04:00
cahrens
9d0867ea11 Merge cleanup. 2013-06-13 11:31:10 -04:00
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
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
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
cahrens
0baec0a164 Move string fields, get rid of hard-coded list of booleans. 2013-06-07 15:45:34 -04:00
cahrens
cc2d06975e Remove duplicated StringyX definitions. 2013-04-24 14:59:32 -04:00
Chris Dodge
8ece663284 more drive by violation fixes 2013-04-12 15:45:27 -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
Carlos Andrés Rocha
586f566b42 Use advertised_start as a simple string 
LMS Lighthouse [#297]
 2013-03-26 11:54:32 -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
Calen Pennington
789ac3fc87 Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api 2013-01-04 16:19:58 -05:00
Calen Pennington
fa75245e8a WIP: Start cleaning up CMS to work with new field format 2013-01-02 09:05:48 -05:00
Calen Pennington
01411ae66e WIP: Trying to get tests working 2012-12-28 14:48:47 -05:00