Greg Price
d724223a4c
Merge pull request #2053 from edx/fix/gprice/modulestore-500-errors
...
Handle ItemNotFoundError from the modulestore to avoid 500 errors
2013-05-22 10:58:06 -07:00
Vik Paruchuri
e9f05640f8
Update comments
2013-05-22 12:16:23 -04:00
Vik Paruchuri
96f145b8f6
Update error message
2013-05-22 12:00:36 -04:00
Vik Paruchuri
3bd04290f5
Add tests, address review comments
2013-05-22 11:58:03 -04:00
Vik Paruchuri
a44eacd474
Make fields stringy, remove false dict
2013-05-22 10:54:52 -04:00
Vik Paruchuri
21f7e222f7
Fix exception clause
2013-05-22 10:51:11 -04:00
Vik Paruchuri
c5f9d94cc4
Add in comments, fix behavior
2013-05-21 14:46:22 -04:00
Vik Paruchuri
c91fa2f45a
Add in some comments
2013-05-21 14:23:24 -04:00
Vik Paruchuri
956669de21
If location cannot be found, move on
2013-05-21 14:21:46 -04:00
Vik Paruchuri
0887383ca7
Don't show peer grading button unless there is a peer grading element in the course
2013-05-21 14:18:00 -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
e0d
a7b02e0029
actually needs to be 255 given unicode requirements
2013-05-20 14:40:05 -04:00
e0d
0e37564490
pep8 fixes
2013-05-20 12:01:25 -04:00
e0d
a54ecb98c6
resizing uri column
2013-05-20 11:59:56 -04:00
Greg Price
de5b4d7d27
Merge branch 'master' into drupal-new
2013-05-17 16:10:56 -04:00
Greg Price
db3189d5ad
Disable marketing registration button for courses that user cannot enroll in
2013-05-17 14:10:04 -04: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
Diana Huang
dadcdd0599
Fix lettuce signup feature to match Drupal site.
2013-05-17 10:51:38 -04:00
Diana Huang
acfcd0f8a4
Fix the login lettuce feature for the new Drupal site.
2013-05-17 10:51:38 -04:00
Ned Batchelder
f856b69ab5
Merge branch 'feature/ned/sandboxed-python'
2013-05-17 10:28:06 -04:00
Your Name
867d69ed12
update views.py to add docstrings and change exception name to address pylint errors
2013-05-16 18:13:59 -04:00
Greg Price
37ec01dd8d
Handle ItemNotFoundError from the modulestore to avoid 500 errors
2013-05-16 16:50:03 -04:00
Diana Huang
b6c0081064
Look for the existence of the links, not for
...
the actual urls
2013-05-16 16:30:29 -04:00
Diana Huang
22cf0dfa97
Fix bug in lettuce tests where the unregister dialog wasn't
...
getting closed fast enough.
2013-05-16 16:30:29 -04:00
Diana Huang
1c2175304e
Merge branch 'master' into drupal-new
2013-05-16 16:27:36 -04:00
Jay Zoldak
71626f4ff6
Pep8 fixes of django_comment_client code
2013-05-16 15:57:34 -04:00
Ned Batchelder
e947218285
Merge master to here.
2013-05-16 14:21:51 -04:00
Arthur Barrett
e89cd7a397
fix test to check for 400 status code instead of 500.
2013-05-16 13:38:14 -04:00
Arthur Barrett
1fbe43a650
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-16 13:23:12 -04:00
Arthur Barrett
0dd8dabf13
validation errors should return 400 status code instead of 500.
2013-05-16 13:18:36 -04:00
Your Name
a9db41d8d0
flag and unflag tests for comments and threads
2013-05-16 10:59:23 -04:00
Your Name
c7e0b576d0
fix missing paren
2013-05-16 10:59:23 -04:00
Kevin Chugh
03725de34a
flag abuse failing
2013-05-16 10:59:23 -04:00
Kevin Chugh
fa269d3c96
add flag thread django test
2013-05-16 10:59:23 -04:00
Jay Zoldak
e1481d93a8
Work on view test for comment client code.
2013-05-16 10:56:58 -04:00
Jay Zoldak
7e63611478
Start adding view tests for discussion client. Note that these will not work unless you change your test.py to enable discussion forums.
2013-05-16 10:56:57 -04:00
Jay Zoldak
ed5ad46192
Revert "Revert "fix merge conflict""
...
This reverts commit 2df3fe9344
2013-05-16 10:29:33 -04:00
Kevin Chugh
c410da91de
fix coffeescript error
2013-05-16 10:29:32 -04:00
Chris Dodge
6cec66979a
fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test
2013-05-15 11:16:47 -04:00
Arthur
c8bdc1ab66
update readme
2013-05-14 12:42:26 -03:00
Arthur Barrett
149f2ff897
add readme
2013-05-14 11:26:15 -04:00
Arthur Barrett
026773b508
fix pep8 warnings and add empty message to notes tab
2013-05-13 16:54:32 -04:00
Arthur Barrett
bea943d537
merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules.
2013-05-13 16:26:28 -04:00
VikParuchuri
e122efc5a3
Merge pull request #1991 from edx/feature/vik/oe-tests
...
Feature/vik/oe tests
2013-05-13 10:49:33 -07:00
Arthur Barrett
66d3ccff17
sanitize note text and other input in the model as well as escape template output to close potential security hole
2013-05-13 13:40:19 -04:00
Arthur Barrett
be98b5fa3e
merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list)
2013-05-13 13:26:55 -04:00
Vik Paruchuri
6dfc490fc7
Json updates
2013-05-13 12:49:01 -04:00
Arthur Barrett
f6b554b10d
added initial schema migration for notes model
2013-05-13 12:26:33 -04:00
Arthur Barrett
6bb6f1c743
add comment to explain json dump logic
2013-05-13 12:05:33 -04:00
Arthur Barrett
e2e32e31d9
make user id check more idiomatic
2013-05-13 11:55:42 -04:00
