Valera Rozuvan
|
1ca397c5eb
|
Testing errors.
|
2013-02-25 13:28:19 +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
|
4713c5f095
|
re-enable discussion service
|
2013-02-22 10:40:09 +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 |
|
Alexander Kryklia
|
059b9f66e3
|
poll and conditional finished
|
2013-02-15 18:48:39 +02:00 |
|
Calen Pennington
|
50af0be13d
|
Fix course short description display (now that they're xmodules)
|
2013-02-13 16:17:12 -05:00 |
|
Calen Pennington
|
927da34477
|
Fix data_dirs for /static link replacement
|
2013-02-13 16:15:22 -05:00 |
|
Calen Pennington
|
f0f7e0dc1c
|
Fix more tests
|
2013-02-13 14:22:08 -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 |
|
Carlos Andrés Rocha
|
dff0c10b7a
|
Merge pull request #1493 from MITx/bug/dhm/misc
Fix broken test and don't pass time units as strings but as ints.
|
2013-02-12 15:14:37 -08:00 |
|
Don Mitchell
|
c904174bb7
|
Fix broken test and don't pass time units as strings but as ints.
|
2013-02-12 17:30:57 -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 |
|
chrisndodge
|
af364166fe
|
Merge pull request #1491 from MITx/bug/dhm/misc
lms required grace period fields to be in specific order
|
2013-02-12 12:42:53 -08:00 |
|
Don Mitchell
|
76d675ba16
|
fix npe for time (bug 185)
|
2013-02-12 15:20:02 -05:00 |
|
Don Mitchell
|
8e213fb0d7
|
lms required grace period fields to be in specific order
|
2013-02-12 13:48:54 -05: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 |
|
David Ormsbee
|
537d6dd18e
|
Merge pull request #1490 from MITx/bugfix/brian/pearson-timer
change timer to calculate relative duration in javascript
|
2013-02-12 09:26:53 -08:00 |
|
Brian Wilson
|
b5378b04b3
|
change timer to calculate relative duration in javascript
|
2013-02-12 12:25:11 -05:00 |
|
Ned Batchelder
|
baee9f96dc
|
Merge branch 'master' of github.com:MITx/mitx
|
2013-02-12 11:28:51 -05:00 |
|
Ned Batchelder
|
78d3d20069
|
When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons.
Conflicts:
common/djangoapps/util/converters.py
|
2013-02-12 11:25:14 -05:00 |
|
David Ormsbee
|
e07b667c02
|
Merge pull request #1488 from MITx/bug/btalbot/pearson-ie
Resolving an LMS sidebar accordion issue in IE7
|
2013-02-12 08:01:59 -08:00 |
|
Victor Shnayder
|
7d65c64148
|
Merge pull request #1485 from MITx/fix/kevin/code_show_lt_and_gt
fix showing less than and greater than in code
|
2013-02-12 07:38:16 -08:00 |
|
Brian Talbot
|
f33f7134fb
|
lms - pearson: trying to resolve JQUI accordion width bug in IE7 - enforcing width to chapters
|
2013-02-12 10:34:21 -05:00 |
|
Calen Pennington
|
23bb87e0bb
|
Merge pull request #1486 from MITx/feature/ned/clean_up_tests
We no longer need override_settings, Django has a better one.
|
2013-02-12 07:22:27 -08:00 |
|
Calen Pennington
|
de5b3a2a39
|
Merge pull request #1483 from MITx/feature/victor/raw-static-files
Feature/victor/raw static files
|
2013-02-12 07:21:01 -08:00 |
|
Brian Talbot
|
83e4dfaacb
|
lms - pearson: trying to resolve JQUI accordion width bug in IE7
|
2013-02-12 09:58:16 -05:00 |
|
Kevin Chugh
|
21f4616080
|
spread less than and greater than fix to responses and comments, and profile view
|
2013-02-12 09:18:46 -05:00 |
|
Kevin Chugh
|
d57c78f9d9
|
fix showing less than and greater than in code
|
2013-02-11 20:01:09 -05:00 |
|
Victor Shnayder
|
3ccb33c8b3
|
Simplify, make it actually work.
- regexp was too complicated, didn't work
|
2013-02-11 17:50:13 -05:00 |
|
Victor Shnayder
|
2dcdeff4b6
|
Make replace_static_urls leave alone urls that have '?raw' at the end
- needed for GWT'ed modules that rely on the filename to find dependencies
|
2013-02-11 17:07:15 -05:00 |
|
Ned Batchelder
|
aa2d0ecaf2
|
We no longer need override_settings, Django has a better one.
|
2013-02-11 17:06:35 -05:00 |
|
Christina Roberts
|
f18618e35b
|
Merge pull request #1482 from MITx/bug/dhm/misc
bug 155
|
2013-02-11 13:46:20 -08:00 |
|
Don Mitchell
|
8bc9564d92
|
clean up note to self
|
2013-02-11 16:45:36 -05:00 |
|
Don Mitchell
|
777e0ef9c5
|
The other one was too inclusive
|
2013-02-11 16:36:34 -05:00 |
|