Arthur Barrett
|
6b5bf319c3
|
Style and behavior changes. Added return links to discussions.
|
2013-02-12 19:08:23 -05:00 |
|
Arthur Barrett
|
0c70d201f8
|
Auto-expand the discussion thread after it is scrolled to by simulating a click on the show/hide button. Note: the jQuery highlight effect doesnt work here due to a CSS !important setting on .discussion-module background color.
|
2013-02-12 13:57:28 -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 |
|
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 |
|
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 |
|
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 |
|
Arthur Barrett
|
a144896154
|
Style and behavior changes to the header and tooltips.
|
2013-02-11 16:17:34 -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 |
|
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 |
|
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 |
|
Arthur Barrett
|
3a81ed0651
|
Updated styling and markup.
|
2013-02-10 19:40:18 -05: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 |
|
Chris Dodge
|
4f67c6c052
|
quick hack to give some protection from unauthorized users from making new courses. Make it so only is_staff people see the 'Create New Course' button.
|
2013-02-10 16:17:08 -05:00 |
|
Arthur Barrett
|
b7158e9f8a
|
Switched to $.scrollTo instead of custom animation and refactored toggle method.
|
2013-02-09 14:38:04 -05:00 |
|
David Ormsbee
|
9b6f8a3673
|
Merge pull request #1475 from MITx/feature/brian/pearson-exam
change missingExamSeriesCode to missingPartnerID
|
2013-02-09 08:08:37 -08:00 |
|
Brian Wilson
|
2a1c89bec5
|
change missingExamSeriesCode to missingPartnerID
|
2013-02-09 02:24:51 -05:00 |
|
Arthur Barrett
|
5fc7f1a892
|
Constrain comments to viewport.
|
2013-02-08 21:27:35 -05:00 |
|
Arthur Barrett
|
a9773eb888
|
Updated markup, styling, and tooltip behavior for displaying instructor comments. Added drag/drop to the comments so the user can organize them as they wish after clicking on the span. When the user hides the annotations, their positions on the screen are remembered so they can be restored later. Also modified the markup so that block content can be displayed.
|
2013-02-08 20:38:24 -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 |
|
David Ormsbee
|
1e197df3c1
|
Merge pull request #1471 from MITx/victor/jobs-page
Posting lots of new jobs
|
2013-02-08 10:53:27 -08:00 |
|
chrisndodge
|
891e350a83
|
Merge pull request #1464 from MITx/bug/bug161
On first request for handouts, create the db record. (bug 160)
|
2013-02-08 10:49:01 -08:00 |
|
Brian Wilson
|
f51876da6a
|
cosmetic changes
|
2013-02-08 13:42:54 -05:00 |
|
Don Mitchell
|
2cdfed9efe
|
Merge pull request #1472 from MITx/feature/christina/misc2
A couple minor bug fixes.
|
2013-02-08 10:15:11 -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 |
|
Victor Shnayder
|
a68094515c
|
fix capitalization and spacing
|
2013-02-08 12:33:19 -05:00 |
|
Victor Shnayder
|
83a4f40ac6
|
fix typo; fix phrasing for software engineer job
|
2013-02-08 12:24:07 -05:00 |
|
Victor Shnayder
|
61f5991885
|
Posting lots of new jobs
|
2013-02-08 12:15:09 -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 |
|
chrisndodge
|
7244425996
|
Merge pull request #1467 from MITx/feature/cale/cms-no-collect-course-static
Make it so that cms doesn't try to run collectstatic on course content
|
2013-02-08 08:05:56 -08:00 |
|