Ned Batchelder
45815e2d03
Remove obsolete file comment_client/legacy.py
2013-06-21 17:33:23 -04:00
Ned Batchelder
df4b512b6f
Change wildcard imports into specific imports
2013-06-21 17:33:06 -04:00
Ned Batchelder
3eec09b87a
Merge pull request #216 from edx/ned/remove-unused-imports
...
Ned/remove unused imports
2013-06-20 14:15:31 -07:00
Calen Pennington
308fe26b65
Clean up pep8 E128 issues
2013-06-20 09:08:25 -04:00
Ned Batchelder
61b53713d2
Remove unused imports from lms, as detected by pylint.
2013-06-19 16:56:34 -04:00
Ned Batchelder
98673f8e6a
Somehow, when I moved symmath, I left behind its test files!?
2013-05-31 14:39:23 -04:00
Ned Batchelder
9314154ec1
Move loncapa grading helpers into the sandbox-packages directory.
2013-05-31 12:01:33 -04:00
Greg Price
787366fe02
Remove tags for comment client request time histogram in Datadog
...
According to someone from Datadog, this was generating tags like "knowledgeable_
people_who_put_this_course_together._this_is_harvard._you_can_t_tell_us_there_s_
a_shortage_of_editorial_talent." They say that they can handle tens or hundreds
of unique tags but not thousands. Given that we have a unique URL for each
thread, we can't even use that as a tag. Thus, all tags are removed for now
until we can determine whether there is a useful set of tags with small enough
cardinality. In light of this, I did not investigate why the long tag mentioned
above was being generated.
2013-05-22 14:12:25 -04:00
Nate Hardison
cc7b2942ee
Handle Heroku's 503 maintenance mode response
...
The LMS comment client previously would try to parse the response
as JSON, choke, and return a 500 to the client. Now, the LMS client
displays a message indicating that the forums are down for
maintenance.
2013-05-21 10:03:51 -07:00
Kevin Chugh
ef3204da69
Merge pull request #2059 from edx/feature/zoldak/forum-testing
...
Feature/zoldak/forum testing
2013-05-17 10:10:55 -07:00
Ned Batchelder
e947218285
Merge master to here.
2013-05-16 14:21:51 -04:00
Jay Zoldak
3b8a8a13b0
Revert "Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs""
...
This reverts commit 5560a4add4
2013-05-16 10:29:33 -04:00
Jay Zoldak
ed5ad46192
Revert "Revert "fix merge conflict""
...
This reverts commit 2df3fe9344
2013-05-16 10:29:33 -04:00
Greg Price
87cc4fab5a
Add tags to comment service request Datadog timer
2013-05-14 14:49:56 -04:00
Greg Price
c8970cafee
Add comment service request time logging to Datadog
2013-05-14 11:32:40 -04:00
Diana Huang
c6f63140a2
Hide the API key during logging.
2013-05-07 16:38:38 -04:00
Ned Batchelder
7c498be606
Move packages around so we can install packages into the sandbox.
2013-05-06 10:55:05 -04:00
Diana Huang
2df3fe9344
Revert "fix merge conflict"
...
This reverts commit acfd0d9fd6e4194c99d8
2013-04-26 12:40:35 -04:00
Diana Huang
5560a4add4
Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs"
...
This reverts commit 57427f9ac537621c26cd
2013-04-26 12:40:02 -04:00
Your Name
67f57a7145
use new API verbs
2013-04-23 13:28:23 -04:00
Your Name
7994e1b344
pep8 fixes
2013-04-22 12:53:30 -04:00
Kevin Chugh
93978da87c
fixes cleanup
2013-04-09 14:57:43 -04:00
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
5534d8bdce
fix mega merge conflicts
2013-03-29 07:33:52 -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
Calen Pennington
6b64b4214f
Make relative imports explicitly relative
2013-03-15 11:23:22 -04:00
Calen Pennington
029d8c8085
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
2013-03-15 09:46:47 -04:00
Peter Baratta
bac9f1f571
Merge branch 'master' into peter/symbolic
2013-03-14 06:31:17 -06:00
Peter Baratta
75b561267c
Script feature fix
2013-03-14 06:29:51 -06:00
Your Name
7450128064
update coffeescript
2013-03-13 12:52:07 -04:00
Kevin Chugh
07534a7231
fix thread/thread id issue
2013-03-13 09:02:57 -04:00
Your Name
8280c55992
pinning .1
2013-03-12 17:40:26 -04:00
Peter Baratta
c6545eb092
Begin to document symmath as we go
2013-03-06 06:21:08 -07:00
Peter Baratta
b82212ed0c
Merge branch 'master' into peter/symbolic
2013-03-06 05:16:34 -07:00
Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
Peter Baratta
66657db0be
Added support for superscripts in variables and fixed bug with normal subscripted variables raised to powers
2013-03-04 09:49:41 -07:00
Ned Batchelder
7c8a90229e
Use 'is None' and 'is not None'
2013-03-04 10:57:25 -05:00
Will Daly
e65a017c74
Added additional unit tests for symmath library that verify
...
symmath_check for simple symbolic input strings.
2013-02-27 10:19:02 -05:00
Will Daly
850d9846f8
Fixed an error in symmath_check that occurred when
...
the expected result = 0. symmath_check() was dividing
a quantity by the expected result, leading to a NaN value
that caused the answer to be marked incorrect.
Added test_symmath_check.py with basic tests for
the symmath_check() function.
2013-02-25 18:34:35 -05:00
David Ormsbee
f519c4f571
Merge pull request #1474 from MITx/feature/victor/revert-revert-of-forums-ui
...
Feature/victor/revert revert of forums ui
2013-02-25 09:03:33 -08:00
Will Daly
862ce67bfc
Fixed a bug in symmath_check(): one of the if statements
...
evaluated bool(ans), which is False when ans=0.
This led to an error message "[symmath_check] failed to get MathML for
input; dynamath=[None]" when the function reached a later condition.
The check that evaluated bool(ans) was redundant, so I removed it.
2013-02-25 10:59:33 -05:00
Your Name
ff68853990
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-21 13:30:24 -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
Ned Batchelder
857edaf6f3
Remove dogfood and quickedit.
2013-02-13 12:23:08 -05:00
Your Name
7a1aed8945
Merge remote-tracking branch 'origin/master' into feature/victor/revert-revert-of-forums-ui
2013-02-11 13:55:47 -05: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
Victor Shnayder
6d9a9ec46f
Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge"
...
This reverts commit e4819a1b55b6ec41cae0
2013-02-08 15:00:25 -05:00
