Calen Pennington
|
f4032caeaf
|
Merge branch 'feature/cale/xmodule-storage-model' into feature/alex/poll-merged
Conflicts:
common/lib/xmodule/xmodule/conditional_module.py
|
2013-03-01 14:13:58 -05:00 |
|
Vasyl Nakvasiuk
|
e9dacfae09
|
remove self.contents from ConditionalModule
|
2013-02-28 20:07:59 +02:00 |
|
Vasyl Nakvasiuk
|
9186e61702
|
use shortcut get_display_items
|
2013-02-27 18:52:17 +02:00 |
|
Vasyl Nakvasiuk
|
81bfa46f2e
|
fix caching problem in conditional_module
|
2013-02-27 18:34:09 +02:00 |
|
Vasyl Nakvasiuk
|
076926c43a
|
call system.error_tracker together with logging
|
2013-02-26 10:51:19 +02:00 |
|
Vasyl Nakvasiuk
|
2348ed3db1
|
fix empty display_name problem
|
2013-02-25 18:38:47 +02:00 |
|
Vasyl Nakvasiuk
|
aa34c9d335
|
remove 'passed' feature
|
2013-02-25 16:56:34 +02:00 |
|
Vasyl Nakvasiuk
|
a70cb2e154
|
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
|
2013-02-25 16:20:01 +02:00 |
|
Vasyl Nakvasiuk
|
0448ef5e03
|
add docstring
|
2013-02-25 16:15:33 +02:00 |
|
Valera Rozuvan
|
65bbfab566
|
Changed text on reset button.
|
2013-02-25 16:02:26 +02:00 |
|
Alexander Kryklia
|
fbc8d0e9d7
|
renamed
|
2013-02-25 14:11:26 +02:00 |
|
Alexander Kryklia
|
ebc37f1d2d
|
reset updates
|
2013-02-25 13:35:58 +02:00 |
|
Valera Rozuvan
|
767f0bd4b3
|
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
|
2013-02-25 13:28:27 +02:00 |
|
Valera Rozuvan
|
1ca397c5eb
|
Testing errors.
|
2013-02-25 13:28:19 +02:00 |
|
Alexander Kryklia
|
4600155f97
|
add icon class support
|
2013-02-25 13:13:00 +02:00 |
|
Valera Rozuvan
|
df2335c90c
|
Bug fixing.
|
2013-02-25 13:08:37 +02:00 |
|
Valera Rozuvan
|
6f16455e70
|
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
|
2013-02-25 12:57:31 +02:00 |
|
Alexander Kryklia
|
0f7db9e54d
|
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
|
2013-02-25 12:55:58 +02:00 |
|
Valera Rozuvan
|
5a62eae726
|
Fixing bugs.
|
2013-02-25 12:55:29 +02:00 |
|
Alexander Kryklia
|
f5dc0afa07
|
fixed reset json
|
2013-02-25 12:54:56 +02:00 |
|
Valera Rozuvan
|
653154f11e
|
UI changes.
|
2013-02-25 12:33:49 +02:00 |
|
Valera Rozuvan
|
d9ad4b5724
|
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
|
2013-02-25 12:13:52 +02:00 |
|
Valera Rozuvan
|
268e5b4bf7
|
Front end stuff clean up.
|
2013-02-25 12:13:44 +02:00 |
|
Alexander Kryklia
|
82a74abd65
|
return ok on poll_reset
|
2013-02-25 12:12:28 +02:00 |
|
Alexander Kryklia
|
9cdd271ee4
|
added icon class
|
2013-02-25 12:04:18 +02:00 |
|
Alexander Kryklia
|
3dae4d29bd
|
reset part-1
|
2013-02-25 11:21:47 +02:00 |
|
Alexander Kryklia
|
6940cb334a
|
small refactor
|
2013-02-19 13:33:55 +02:00 |
|
Alexander Kryklia
|
e2470842f7
|
get_module get descr insted of loc
|
2013-02-19 13:31:28 +02:00 |
|
Alexander Kryklia
|
841cfd28cc
|
fix typo
|
2013-02-19 13:06:14 +02:00 |
|
Alexander Kryklia
|
72f6578395
|
fix typo
|
2013-02-18 11:46:07 +02:00 |
|
Alexander Kryklia
|
0a80f835c0
|
Revert "fix typo"
This reverts commit 24d2c11c3e.
|
2013-02-18 11:45:21 +02:00 |
|
Alexander Kryklia
|
24d2c11c3e
|
fix typo
|
2013-02-18 11:45:03 +02:00 |
|
Calen Pennington
|
2bc3000156
|
Fix tests
|
2013-02-15 15:44:11 -05:00 |
|
Alexander Kryklia
|
059b9f66e3
|
poll and conditional finished
|
2013-02-15 18:48:39 +02:00 |
|
Calen Pennington
|
04d7146944
|
Fixing xmodule tests
|
2013-02-13 16:31:38 -05:00 |
|
Calen Pennington
|
2443aa79a7
|
Indentation fix
|
2013-02-13 16:27:29 -05:00 |
|
Calen Pennington
|
927da34477
|
Fix data_dirs for /static link replacement
|
2013-02-13 16:15:22 -05:00 |
|
Calen Pennington
|
bd822b9d2f
|
Fix tests post-merge
|
2013-02-13 14:13:22 -05:00 |
|
Calen Pennington
|
793bbfd351
|
Set up dev environment for testing xml vs mongo vs split_mongo modulestores
|
2013-02-13 14:04:21 -05:00 |
|
jkarni
|
2197bd987f
|
Merge pull request #1461 from MITx/feature/julian/multiple-choice-tweaks
Feature/julian/multiple choice tweaks
|
2013-02-12 13:32:15 -08:00 |
|
Ned Batchelder
|
27e8d699be
|
On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't.
|
2013-02-12 13:43:03 -05:00 |
|
Brian Wilson
|
b5378b04b3
|
change timer to calculate relative duration in javascript
|
2013-02-12 12:25:11 -05:00 |
|
Don Mitchell
|
46a7f7427a
|
Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy
add exporting of grading_policy.json
|
2013-02-11 12:53:36 -08:00 |
|
Chris Dodge
|
33009eba7d
|
add exporting of grading_policy.json
|
2013-02-11 14:30:26 -05:00 |
|
David Ormsbee
|
fb1e7f3dc1
|
Make type check for self.code a little more robust, give default val for mmlans so it's never undefined
|
2013-02-10 19:03:25 -05:00 |
|
David Ormsbee
|
80843c1561
|
Merge pull request #1463 from MITx/feature/brian/pearson-exam
Feature/brian/pearson exam
|
2013-02-08 11:07:15 -08:00 |
|
cahrens
|
98026e4325
|
A couple minor bug fixes.
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
|
2013-02-08 12:46:32 -05:00 |
|
Jay Zoldak
|
0d0049ec76
|
Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional
fix test_conditional
|
2013-02-08 08:13:01 -08:00 |
|
Calen Pennington
|
dd4db0601f
|
Remove generated files
|
2013-02-08 10:45:59 -05:00 |
|
Calen Pennington
|
bda46c423d
|
Fix some issues that were prevent lms start
|
2013-02-08 10:41:02 -05:00 |
|