Diana Huang
|
482d97d321
|
Better error messages for when a linked problem cannot be found
|
2013-02-12 13:41:26 -05:00 |
|
Vik Paruchuri
|
9ead4ebb35
|
Wire through ability to skip basic checks
|
2013-02-12 13:30:56 -05:00 |
|
Arthur Barrett
|
7e7911a08d
|
Changed the markup and js for associating spans with discussion threads. Uses the discussion id now.
|
2013-02-12 13:24:50 -05:00 |
|
Brian Talbot
|
e5c0bdf7a1
|
studio - added in manual policy editor CodeMirror styles and removed unused classes on CodeMirror instance in other settings tabs
|
2013-02-12 13:13:37 -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 |
|
Don Mitchell
|
c9c026be62
|
Fixed urls
|
2013-02-12 12:15:07 -05:00 |
|
Arthur Barrett
|
45a27f303f
|
Merge branch 'master' into feature/abarrett/annotatable_xmodule
|
2013-02-12 12:09:21 -05:00 |
|
Arthur Barrett
|
cfa16feab5
|
Trying to setup jasmine specs...
|
2013-02-12 12:00:54 -05:00 |
|
Brian Talbot
|
7ca267fd78
|
studio - debugging grading settings JS errors WIP
|
2013-02-12 11:56:54 -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 |
|
Brian Talbot
|
22b959d657
|
studio - link wiring and spot styling changes for new nav/soft landing/settings work
|
2013-02-12 11:16:37 -05:00 |
|
Diana Huang
|
7658cd7a50
|
Make the text on the peer grading closed page clearer
|
2013-02-12 11:10:59 -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 |
|
Diana Huang
|
d45c539c6d
|
Make the peer grading due date a property of the problem
metadata, not the peer grading module metadata.
|
2013-02-12 10:49:06 -05: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 |
|
cahrens
|
75ceed7f69
|
Show "successful save" message when a new edit is made.
|
2013-02-12 10:29:47 -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 |
|
Brian Talbot
|
8976818c78
|
studio - header UI: in progress markup changes WIP
|
2013-02-12 09:16:24 -05:00 |
|
Kevin Chugh
|
d57c78f9d9
|
fix showing less than and greater than in code
|
2013-02-11 20:01:09 -05:00 |
|
Vik Paruchuri
|
65cb53b8a6
|
Revert logsettings
|
2013-02-11 19:21:22 -05:00 |
|
Vik Paruchuri
|
e1b2481c38
|
Fix remaining path issues
|
2013-02-11 19:08:53 -05:00 |
|
Vik Paruchuri
|
bdc5910cbb
|
Fix import paths to point to xmodule, remove old JS resource strings
|
2013-02-11 19:03:18 -05:00 |
|
Vik Paruchuri
|
b5bac1e3c1
|
Fix some path issues in import statements
|
2013-02-11 18:47:01 -05:00 |
|
Vik Paruchuri
|
b9bf96520e
|
Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports
|
2013-02-11 18:43:47 -05:00 |
|
Vik Paruchuri
|
c2b32b7038
|
Fix location that is queried on
|
2013-02-11 18:23:01 -05:00 |
|
Vik Paruchuri
|
ba650202b4
|
Add in logic to pass settings to peer grading xmodule
|
2013-02-11 18:09:57 -05:00 |
|
Vik Paruchuri
|
323caeb744
|
Properly pass around S3 interface
|
2013-02-11 17:58:19 -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 |
|
Vik Paruchuri
|
01e8fe8d08
|
Pass S3 interface in module_render
|
2013-02-11 17:54:37 -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 |
|
Vik Paruchuri
|
120c0e139e
|
Remove url element from parent class to avoid annoying errors
|
2013-02-11 17:38:25 -05:00 |
|
Vik Paruchuri
|
0f71f5b92e
|
Finish settings refactor
|
2013-02-11 17:36:33 -05:00 |
|
Vik Paruchuri
|
aca5e2300b
|
Fix dev settings
|
2013-02-11 17:33:16 -05:00 |
|
Vik Paruchuri
|
9bca4ebf21
|
Start to refactor grading settings
|
2013-02-11 17:32:11 -05:00 |
|
Diana Huang
|
285e575895
|
Update copy to be clearer about the workflow.
|
2013-02-11 17:29:45 -05:00 |
|
cahrens
|
e9bb5eb1d0
|
Minor updates.
|
2013-02-11 17:27:39 -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 |
|