Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,363 Commits 1 Branch 0 Tags
e8f067de8f2be4c7864ad1bdf4e0794de175e0dc
Commit Graph

3005 Commits

Author SHA1 Message Date
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.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
 2013-05-16 10:29:33 -04:00
Kevin Chugh
c410da91de fix coffeescript error 2013-05-16 10:29:32 -04:00
dcadams
67356cdcc8 Merge of master to get Jenkins running. 2013-05-15 09:54:53 -07:00
dcadams
6225950356 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-05-15 09:48:14 -07: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
dcadams
5e75e91322 Takes care of Victor's comments on the PR. 
Note, the students_lc list is used in _do_enroll_students when overload
= True so it needs to be left in.
 2013-05-13 13:20:37 -07:00
dcadams
3890701cbb Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-05-13 13:10:16 -07:00
Chris Dodge
cbe205328a Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2013-05-13 15:47:33 -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
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
5619306c6b add comment that the models.py file has been moved 2013-05-10 13:43:15 -04:00
Chris Dodge
d39d44ba49 keep migrations in djangoapp_comment_client 2013-05-10 12:58:00 -04:00
Greg Price
7dd2973eca Return 404 for course about pages if the marketing site is enabled 
It would be better to redirect to the marketing site course about pages, but
the URLs for those are not easily computed, and we do not have time to set up
a full mapping in the LMS config.
 2013-05-10 11:03:16 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new 
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
 2013-05-10 10:30:10 -04:00
Chris Dodge
1b0eff52ed create test cases to simulate error exporting/importing textbooks 2013-05-10 10:01:10 -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
Chris Dodge
11244107fd add an empty models.py file to django_comment_client 2013-05-09 16:16:11 -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
244261f1cf added more unit tests 2013-05-09 14:31:38 -04:00
Arthur Barrett
f1f65c563e fix failing unit test in lms.envs.test env 2013-05-09 11:51:24 -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
dcadams
2ef3bcc92d Commit just to get Jenkins to rerun. 2013-05-08 14:52:18 -07:00
dcadams
dcabac8edf Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement 2013-05-08 14:48:29 -07:00
Arthur Barrett
1eb05cfd4e remove unnecessary count 2013-05-08 15:07:36 -04:00
Arthur Barrett
0f70b0aa8a refactored api resource map and added total to search query 2013-05-08 14:09:29 -04:00