Commit Graph

4624 Commits

Author SHA1 Message Date
Arthur Barrett
0dd8dabf13 validation errors should return 400 status code instead of 500. 2013-05-16 13:18:36 -04:00
Arthur Barrett
3a178bab1f Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-15 11:12:42 -04:00
Greg Price
87cc4fab5a Add tags to comment service request Datadog timer 2013-05-14 14:49:56 -04:00
Arthur
c8bdc1ab66 update readme 2013-05-14 12:42:26 -03:00
Greg Price
c8970cafee Add comment service request time logging to Datadog 2013-05-14 11:32:40 -04:00
Arthur Barrett
149f2ff897 add readme 2013-05-14 11:26:15 -04:00
Arthur Barrett
5e39971fcc merge master. resolved conflicts in component.py and course.py. 2013-05-14 10:54:21 -04:00
David Baumgold
d376cb52ca Forgot to update phantom-jasmine location for LMS 2013-05-13 17:31:57 -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
e0d
eb843172ff Enable Delft and Georgetown to be handled by the dynamic path 2013-05-13 14:02:41 -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
Arthur Barrett
6f7f924510 replace bare except with except DoesNotExist 2013-05-13 11:51:21 -04:00
Chris Dodge
d32e7a5b61 Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-13 11:06:49 -04:00
Vasyl Nakvasiuk
f1d1a3f606 refactoring after Python code review 2013-05-13 14:44:07 +03:00
Valera Rozuvan
13bed39dde Refactoring after peer review. 2013-05-13 14:44:07 +03:00
Valera Rozuvan
f4b247d2bb Refactoring, documenting, moving all HTML generation to template. 2013-05-13 14:44:07 +03:00
Vasyl Nakvasiuk
6deeb60278 update template for word_cloud, refactor empty json answer 2013-05-13 14:44:04 +03:00
Vasyl Nakvasiuk
dac9b5c038 Word Cloud: add full cycle Python + HTML + JS 2013-05-13 14:44:01 +03:00
Vasyl Nakvasiuk
dd5a7e7ba8 initialize JS for word_cloud 2013-05-13 14:44:01 +03:00
Alexander Kryklia
bb9bc42171 adds initial word_cloud_module files 2013-05-13 14:44:00 +03:00
Arthur Barrett
beabdf1434 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-11 14:52:39 -04:00
Arthur Barrett
11a48dc962 replacing lists with namedtuples to improve readability 2013-05-11 14:50:35 -04:00
Arthur Barrett
ee1ee26c49 log the course_id when notes are disabled 2013-05-11 13:57:07 -04:00
Chris Dodge
1db66957af Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-10 15:44:55 -04:00
Chris Dodge
1b0eff52ed create test cases to simulate error exporting/importing textbooks 2013-05-10 10:01:10 -04:00
Greg Price
c765906fc5 Merge pull request #1986 from edx/feature/gprice/fix-help-modal-text
Update "thank you" text in help modal
2013-05-09 14:37:13 -07:00
Greg Price
89d0dc1963 Update "thank you" text in help modal
As per request from Mary.
2013-05-09 17:16:43 -04:00
Arthur Barrett
a6ad65cb98 trying to fix pylint errors 2013-05-09 16:57:19 -04:00
Arthur Barrett
a407c84bdf add model unit tests 2013-05-09 16:34:02 -04:00
Arthur Barrett
9aed148dc1 add search test 2013-05-09 16:08:29 -04:00
Arthur Barrett
aad5096ca1 add more tests for update and delete actions 2013-05-09 15:43:34 -04:00
Arthur Barrett
2838dba199 fix pep8 violations 2013-05-09 15:12:22 -04:00
Arthur Barrett
dd583ce4f9 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-09 14:32:05 -04:00
Arthur Barrett
244261f1cf added more unit tests 2013-05-09 14:31:38 -04:00
Diana Huang
f9023fd112 Merge pull request #1983 from edx/diana/jobs-page-update
Jobs page updates.
2013-05-09 11:04:14 -07:00
Diana Huang
e5b18a5688 Put Front End Developer back in. 2013-05-09 13:58:25 -04:00
Arthur Barrett
f1f65c563e fix failing unit test in lms.envs.test env 2013-05-09 11:51:24 -04:00
Diana Huang
ec5f239d91 Add in new Coordinator position. 2013-05-09 09:12:07 -04:00
Vik Paruchuri
fd46ebd1fa Move some functions, make notification tests more robust 2013-05-08 19:04:07 -04:00
Arthur Barrett
c7197cd567 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-08 18:04:24 -04:00
Arthur Barrett
bf21211b25 adding some tests 2013-05-08 18:03:41 -04:00
Jason Bau
1354cd412a Set SERVER_EMAIL so that mail_admins works 2013-05-08 14:16:20 -07:00
Diana Huang
1e61bbd1c8 Jobs page updates. 2013-05-08 16:06:08 -04:00