Chris Dodge
|
7229a9cdaf
|
perform a new merge from master, resolve conflicts
|
2013-01-03 10:43:03 -05:00 |
|
Brian Wilson
|
c76f37050a
|
introduce form to template
|
2013-01-03 03:22:37 -05:00 |
|
valera-rozuvan
|
62271fe5c6
|
Added namespaced RequireJS.
|
2013-01-03 10:14:06 +02:00 |
|
Brian Wilson
|
4abd9cd3d4
|
get closer to working again
|
2013-01-02 18:56:25 -05:00 |
|
Calen Pennington
|
465c85b04b
|
Make model classes inherit their parents fields attribute
|
2013-01-02 15:08:49 -05:00 |
|
Calen Pennington
|
0bed19648e
|
Remove filename and giturl references
|
2013-01-02 15:08:27 -05:00 |
|
Calen Pennington
|
8e0d218c7d
|
Stop using .definition and .metadata directly
|
2013-01-02 15:06:43 -05:00 |
|
Calen Pennington
|
60fa8619cb
|
Fixing tests
|
2013-01-02 10:37:49 -05:00 |
|
David Ormsbee
|
8bf393fbba
|
Merge pull request #1182 from MITx/bridger/feature/ungraded_course
Visual changes for ungraded courses
|
2013-01-02 07:19:34 -08:00 |
|
Calen Pennington
|
6427dd6742
|
WIP: Get the cms running. Component previews work
|
2013-01-02 09:07:02 -05:00 |
|
Calen Pennington
|
85e109da57
|
Allow field scope of None
|
2013-01-02 09:05:49 -05:00 |
|
Calen Pennington
|
344cb133aa
|
Make import/export tests pass
|
2013-01-02 09:05:49 -05:00 |
|
Calen Pennington
|
6a612a6e02
|
Trim down list of equality attributes for descriptors
|
2013-01-02 09:05:49 -05:00 |
|
Calen Pennington
|
265a2e7630
|
Give children the None scope
|
2013-01-02 09:05:48 -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
|
6ece7fd541
|
Fieldify the video module
|
2012-12-28 14:56:43 -05:00 |
|
Calen Pennington
|
84cb0ce99b
|
Move inheritance logic out into a separate file in the modulestore
|
2012-12-28 14:56:42 -05:00 |
|
Calen Pennington
|
48a1e09133
|
Pass in state to LCP on reset
|
2012-12-28 14:55:32 -05:00 |
|
Calen Pennington
|
c7069be2a4
|
Centralize logic for standardizing rerandomize values
|
2012-12-28 14:55:32 -05:00 |
|
Calen Pennington
|
e4c06fab4a
|
Cleaning up ABTest properties
|
2012-12-28 14:55:32 -05:00 |
|
Calen Pennington
|
4b6ec85dcb
|
Minor cleanups
|
2012-12-28 14:55:32 -05:00 |
|
Calen Pennington
|
db55001bf6
|
Use named scope for student_preferences in abtests
|
2012-12-28 14:55:32 -05:00 |
|
Calen Pennington
|
6e933ae756
|
Fix typo
|
2012-12-28 14:55:32 -05:00 |
|
Calen Pennington
|
7cb95aad47
|
WIP: Add grade publishing functionality
|
2012-12-28 14:55:32 -05:00 |
|
Calen Pennington
|
e1ca413b6f
|
Fix import of metadata
|
2012-12-28 14:55:32 -05:00 |
|
Calen Pennington
|
9d822fc359
|
Make sequences record whether they have been visited or not (done somewhat implicitly now, would be nice to be more explicit)
|
2012-12-28 14:55:32 -05:00 |
|
Calen Pennington
|
f3032ba7cf
|
Make course textbooks and wiki slugs work
|
2012-12-28 14:55:32 -05:00 |
|
Calen Pennington
|
7679fda172
|
Remove debugging print statements
|
2012-12-28 14:54:13 -05:00 |
|
Calen Pennington
|
81e065bdb6
|
Fix more errors in tests
|
2012-12-28 14:54:13 -05:00 |
|
Calen Pennington
|
d61c91c139
|
Fix errors around error descriptors and custom tag modules
|
2012-12-28 14:53:30 -05:00 |
|
Calen Pennington
|
8693d288c8
|
Fix errors from running unit tests (some tests still fail)
|
2012-12-28 14:51:50 -05:00 |
|
Calen Pennington
|
5cb31c0e32
|
Make load_from_json on descriptors pass the right sort of arguments
|
2012-12-28 14:51:50 -05:00 |
|
Calen Pennington
|
8c42e0f52e
|
Import course objects first, so that later updates that try and edit the course object don't fail
|
2012-12-28 14:51:50 -05:00 |
|
Calen Pennington
|
040abfcc68
|
Don't call update_metadata anymore when updating course tabs, because the updates are implicit
|
2012-12-28 14:51:50 -05:00 |
|
Calen Pennington
|
d11a9b1d21
|
Convert ABTest module to new property based format. Doesn't account for definition_to_xml needing redefinition
|
2012-12-28 14:51:50 -05:00 |
|
Calen Pennington
|
8991cdd3b5
|
Stop raising BaseExceptions
|
2012-12-28 14:51:50 -05:00 |
|
Calen Pennington
|
7977491ddf
|
WIP: LMS Courseware appears to be working
|
2012-12-28 14:51:50 -05:00 |
|
Calen Pennington
|
b1c9b2ca0e
|
Add more tests of DbModel
|
2012-12-28 14:48:47 -05:00 |
|
Calen Pennington
|
eb1ab3ea7d
|
Add tests of xmodule.model and xmodule.runtime, and fix some exposed bugs
|
2012-12-28 14:48:47 -05:00 |
|
Calen Pennington
|
01411ae66e
|
WIP: Trying to get tests working
|
2012-12-28 14:48:47 -05:00 |
|
Calen Pennington
|
7e224f5847
|
Convert a bunch more references from metadata to fields
|
2012-12-28 14:45:46 -05:00 |
|
Calen Pennington
|
57b3ceba27
|
Add a field type that treats a string as an int
|
2012-12-28 14:45:46 -05:00 |
|
Calen Pennington
|
45544396a8
|
Make computed defaults work, even in namespaces
|
2012-12-28 14:45:46 -05:00 |
|
Calen Pennington
|
25754b50ff
|
WIP. Trying to fix inheritance
|
2012-12-28 14:45:46 -05:00 |
|
Calen Pennington
|
c5e3380b71
|
WIP: Save student state via StudentModule. Inheritance doesn't work
|
2012-12-28 14:45:46 -05:00 |
|
Calen Pennington
|
cbfc7b201a
|
WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms
|
2012-12-28 14:44:31 -05:00 |
|
Calen Pennington
|
8ba4163557
|
WIP. Data loads, but not all of it
|
2012-12-28 14:39:13 -05:00 |
|
Chris Dodge
|
725805f1cf
|
add forgotten new file
|
2012-12-28 13:52:49 -05:00 |
|
Chris Dodge
|
c0f12e69f7
|
fixes on the export. There's some attributes not being handled correctly
|
2012-12-27 16:15:52 -05:00 |
|
Chris Dodge
|
625237601f
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export
Conflicts:
common/lib/xmodule/xmodule/contentstore/content.py
common/lib/xmodule/xmodule/contentstore/mongo.py
|
2012-12-27 14:16:40 -05:00 |
|