Victor Shnayder
|
e352226df5
|
Merge remote-tracking branch 'origin/master' into 700x-sandbox
|
2013-02-14 09:19:25 -05:00 |
|
Victor Shnayder
|
f80181be9a
|
Merge pull request #1499 from MITx/feature/ichuang/codeinput-rows-fix
allow "rows" attrib of coderesponse textbox to set box height
|
2013-02-14 06:16:29 -08:00 |
|
ichuang
|
e413d16bff
|
allow "rows" attrib of coderesponse textbox to set box height
|
2013-02-13 21:25:31 -05:00 |
|
John Hess
|
d48efa8592
|
Merge pull request #1498 from MITx/jth/protex
Jth/protex
|
2013-02-13 12:18:21 -08:00 |
|
John Hess
|
259bd8817f
|
Moved onclick to 'fold' button instead of to courseware's button
|
2013-02-13 15:10:32 -05:00 |
|
Calen Pennington
|
9b6cbd6d11
|
Merge pull request #1495 from MITx/feature/ned/remove-dogfood
Remove dogfood and quickedit.
|
2013-02-13 10:27:52 -08:00 |
|
Ned Batchelder
|
857edaf6f3
|
Remove dogfood and quickedit.
|
2013-02-13 12:23:08 -05:00 |
|
Christina Roberts
|
0b91c1c346
|
Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates
clean up templates that were removed from disk - we need to remove from ...
|
2013-02-13 06:29:35 -08:00 |
|
Chris Dodge
|
fbe3d29f19
|
added tests
|
2013-02-13 09:25:09 -05:00 |
|
jmclaus
|
9dbe911907
|
Back to last version of Protex
|
2013-02-13 09:45:44 +01: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 |
|
Julian Arni
|
9785bc9e70
|
Adding multiple-choice loncapa integration.
|
2013-02-12 17:21:34 -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 |
|
Chris Dodge
|
93d186511f
|
clean up templates that were removed from disk - we need to remove from DB as well
|
2013-02-12 10:23:32 -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
|
75898bfe1a
|
tell collectstatic not to mess with protex--it relies on the filename
|
2013-02-11 17:54:54 -05:00 |
|
Victor Shnayder
|
aadb885211
|
Merge branch 'feature/victor/raw-static-files' into 700x-sandbox
|
2013-02-11 17:51:36 -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 |
|
Don Mitchell
|
565f5f0adc
|
Stop simple clicks from paging to top w/o disrupting dnd
|
2013-02-11 16:28:22 -05:00 |
|
Christina Roberts
|
14234c8106
|
Merge pull request #1481 from MITx/bug/dhm/misc
Bug 180
|
2013-02-11 13:23:08 -08: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 |
|
Don Mitchell
|
ae4a854e18
|
Bug 180
|
2013-02-11 15:46:58 -05:00 |
|
David Ormsbee
|
75ff2bd6cb
|
Merge pull request #1456 from MITx/fix/cdodge/dangling-discussion-modules
Fix/cdodge/dangling discussion modules
|
2013-02-11 11:40:00 -08:00 |
|
Chris Dodge
|
33009eba7d
|
add exporting of grading_policy.json
|
2013-02-11 14:30:26 -05:00 |
|
Victor Shnayder
|
0014b28925
|
Merge remote-tracking branch 'origin/master' into 700x-sandbox
|
2013-02-11 14:12:29 -05:00 |
|
David Ormsbee
|
754493597d
|
Merge pull request #1469 from MITx/feature/ichuang/fix-verbose-staff-debug
Fix "staff debug" so it only appears where useful, instead of everywhere
|
2013-02-10 22:10:53 -08:00 |
|
chrisndodge
|
de060a6085
|
Merge pull request #1477 from MITx/bugfix/dave/mmlans_check
Make type check for self.code a little more robust,
|
2013-02-10 16:12:32 -08: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
|
f94df6e3f5
|
Merge pull request #1476 from MITx/fix/cdodge/mitx-feature-disallow-new-courses
quick hack to give some protection from unauthorized users from making n...
|
2013-02-10 13:53:00 -08:00 |
|