Kevin Chugh
|
24095679a6
|
add back comment response flagging
|
2013-04-05 19:04:18 -04:00 |
|
Kevin Chugh
|
de7c511328
|
flagging working again
|
2013-04-05 16:39:22 -04:00 |
|
Kevin Chugh
|
0e8ef28347
|
flagging almost done
|
2013-04-05 13:23:09 -04:00 |
|
Kevin Chugh
|
daa0cd22d5
|
filter implemented for flagged
|
2013-04-01 23:16:22 -04:00 |
|
Kevin Chugh
|
2f4310713b
|
fix index
|
2013-04-01 13:22:56 -04:00 |
|
Kevin Chugh
|
5534d8bdce
|
fix mega merge conflicts
|
2013-03-29 07:33:52 -04:00 |
|
Victor Shnayder
|
a79a2907a9
|
Merge pull request #1755 from MITx/fix/brian/fix500v1
Fix/brian/fix500v1
|
2013-03-27 15:21:30 -07:00 |
|
Brian Wilson
|
c639799a07
|
fix missing import
|
2013-03-27 18:12:48 -04:00 |
|
Brian Wilson
|
bb7bc88847
|
merge out from master
|
2013-03-27 18:04:58 -04:00 |
|
Brian Wilson
|
99778b1b5b
|
add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8.
|
2013-03-27 17:59:56 -04:00 |
|
Don Mitchell
|
6d63d13fa8
|
Merge pull request #1753 from MITx/bug/christina/studio
Converter cleanup.
|
2013-03-27 12:46:01 -07:00 |
|
David Ormsbee
|
6e3d9608b4
|
Merge pull request #1754 from MITx/fix/cale/enrollment-integrity-error
An integrity error while creating an enrollment just means that our work...
|
2013-03-27 12:03:26 -07:00 |
|
Calen Pennington
|
122c8567c5
|
An integrity error while creating an enrollment just means that our work has already been done. Fixes https://www.pivotaltracker.com/story/show/46915947
|
2013-03-27 15:00:08 -04:00 |
|
cahrens
|
5c78218b13
|
Don't need to convert to milliseconds.
|
2013-03-27 14:52:27 -04:00 |
|
cahrens
|
22537ffd3b
|
Don't need to convert to milliseconds.
|
2013-03-27 14:51:39 -04:00 |
|
Victor Shnayder
|
b0356e32b2
|
Merge pull request #1589 from MITx/peter/symbolic
Added support for superscripts in variables
|
2013-03-27 10:40:50 -07:00 |
|
Victor Shnayder
|
eca18a1237
|
Merge pull request #1752 from MITx/fix/will/bug_294
Fix bug 294
|
2013-03-27 10:39:42 -07:00 |
|
Will Daly
|
cddc868656
|
Login URL resolves differently in LMS and CMS, which breaks login_test
when loaded by rake test_cms
I moved the test into lms/courseware/tests so they run correctly.
|
2013-03-27 13:01:10 -04:00 |
|
cahrens
|
227a5e8266
|
Delete converters, move unit tests to test_fields, add new additional test cases.
|
2013-03-27 12:56:06 -04:00 |
|
Will Daly
|
15ea32b095
|
Fixed bug 294, caused by unicode encoding error when creating logging
strings.
Added unit tests that verify the fix.
|
2013-03-27 12:53:58 -04:00 |
|
brianhw
|
a04881ceda
|
Merge pull request #1740 from MITx/fix/vik/peer-image-grading
Fix/vik/peer image grading
|
2013-03-27 09:06:54 -07:00 |
|
Vik Paruchuri
|
7101c76016
|
comment on rewrite links change
|
2013-03-27 12:02:32 -04:00 |
|
Victor Shnayder
|
8905343f80
|
Merge pull request #1744 from MITx/fix/diana/image-response-show-answer
Fix 500 errors for bug #289
|
2013-03-27 07:14:38 -07:00 |
|
Victor Shnayder
|
2cf815ae01
|
Merge pull request #1750 from MITx/fix/cale/anonymous-modx-dispatch
Return a 403 when an anonymous user attempts to hit modx_dispatch. Fixes...
|
2013-03-27 07:13:05 -07:00 |
|
Victor Shnayder
|
0e7cf8e782
|
Merge pull request #1751 from MITx/fix/cale/comment-client-non-json-errors
Make the django_comment_client return errors that can't be parsed as JSO...
|
2013-03-27 07:12:20 -07:00 |
|
Victor Shnayder
|
68902b8039
|
Merge pull request #1747 from MITx/fix/cdodge/should-return-404-on-bad-asset-request
if we parse an invalid location in the content store middleware, then re...
|
2013-03-27 07:09:38 -07:00 |
|
Christina Roberts
|
d4eca16f04
|
Merge pull request #1745 from MITx/feature/rocha/fix-advertised-start
Display advertised date correctly if it is an ISO date
|
2013-03-27 06:23:57 -07:00 |
|
Christina Roberts
|
093ac4a2a2
|
Merge pull request #1749 from MITx/fix/btalbot/studio-smoothscroll
studio - corrected JQ selector for smoothscrolling in-page links
|
2013-03-27 06:23:31 -07:00 |
|
Calen Pennington
|
521843876e
|
Make the django_comment_client return errors that can't be parsed as JSON just as simple strings when in an ajax context
|
2013-03-27 08:10:25 -04:00 |
|
Calen Pennington
|
2c0e5b82ff
|
Return a 403 when an anonymous user attempts to hit modx_dispatch. Fixes https://www.pivotaltracker.com/story/show/46916015 and https://www.pivotaltracker.com/story/show/46916029
|
2013-03-27 07:29:22 -04:00 |
|
Calen Pennington
|
772e805eb6
|
Merge pull request #1748 from MITx/fix/cdodge/limit-fields-in-metadata-cache-computation
optimize the result-set that gets returned from Mongo on metadata inheri...
|
2013-03-27 03:22:00 -07:00 |
|
Brian Talbot
|
2120481738
|
studio - corrected JQ selector for smoothscrolling in-page links
|
2013-03-27 01:34:25 -04:00 |
|
Chris Dodge
|
195fd2d1fe
|
optimize the result-set that gets returned from Mongo on metadata inheritence. We just need the fields which are actually inheritable, so no need to return anything else as it gets filtered out during the computation
|
2013-03-26 23:48:06 -04:00 |
|
Chris Dodge
|
b0e2c82ad3
|
actually.. return a 400 rather than a 404 because the request is malformed. Also add unit test.
|
2013-03-26 20:02:29 -04:00 |
|
chrisndodge
|
8abba39590
|
Merge pull request #1746 from MITx/feature/cale/metadata-inheritance-caching
Use get_many and set_many to cut down on the number of metadata trees to...
|
2013-03-26 16:28:58 -07:00 |
|
Chris Dodge
|
a44ecdfcd6
|
if we parse an invalid location in the content store middleware, then return a 404, not a 500
|
2013-03-26 16:45:47 -04:00 |
|
Calen Pennington
|
b975d4d90c
|
Fix tests
|
2013-03-26 16:43:58 -04:00 |
|
Calen Pennington
|
e0343342b0
|
Fix typo during pylint fixes
|
2013-03-26 16:36:58 -04:00 |
|
Calen Pennington
|
1f11508ac6
|
Pylint cleanup
|
2013-03-26 16:30:55 -04:00 |
|
Calen Pennington
|
90553a1b1d
|
Use get_many and set_many to cut down on the number of metadata trees to retrieve, and only retrieve them once per call to _load_items
|
2013-03-26 16:19:34 -04:00 |
|
Carlos Andrés Rocha
|
84f2cc8af6
|
Display advertised date correctly if it is an ISO date
|
2013-03-26 15:08:44 -04:00 |
|
Diana Huang
|
967cf7e6f3
|
Fix a problem where trying to show image response answers
was causing 500 errors. Add test to verify that this won't
happen again.
|
2013-03-26 14:43:41 -04:00 |
|
Carlos Andrés Rocha
|
f70511ebef
|
Merge pull request #1737 from MITx/diana/fix-login-dialog
Remove duplicate login dialog.
|
2013-03-26 10:28:26 -07:00 |
|
Christina Roberts
|
d24cc6f2c3
|
Merge pull request #1742 from MITx/feature/rocha/fix-advertised-start
Add tests to advertised_start for partially parsable dates
|
2013-03-26 10:19:04 -07:00 |
|
Carlos Andrés Rocha
|
0612b0eb94
|
Add tests to advertised_start for partially parsable dates
|
2013-03-26 13:13:55 -04:00 |
|
Don Mitchell
|
c370bb6a61
|
Merge pull request #1741 from MITx/feature/rocha/fix-advertised-start
Use advertised_start as a simple string
|
2013-03-26 09:48:12 -07:00 |
|
Carlos Andrés Rocha
|
586f566b42
|
Use advertised_start as a simple string
LMS Lighthouse [#297]
|
2013-03-26 11:54:32 -04:00 |
|
Vik Paruchuri
|
97cb4910a7
|
Add in default bucket, edit image url checks
|
2013-03-26 11:04:14 -04:00 |
|
Don Mitchell
|
a603f25466
|
Merge pull request #1739 from MITx/bug/christina/studio
Allow clearing of dates (except for course start date).
|
2013-03-26 07:44:42 -07:00 |
|
cahrens
|
f681d4300d
|
More cleanup in base.js.
|
2013-03-26 10:42:44 -04:00 |
|