David Baumgold
d09e93142f
Merge pull request #1980 from edx/backbone-1.0.0
...
Upgrade to Backbone 1.0.0
2013-05-09 09:34:35 -07:00
Vik Paruchuri
682d06bcff
Fix a lot of pep8 violations
2013-05-09 11:27:44 -04:00
cahrens
bfdbcc2f32
Beginnings of Backbone views/models.
2013-05-09 11:16:12 -04:00
Vik Paruchuri
f72659fa2e
Add in asserts
2013-05-09 10:15:07 -04:00
Vik Paruchuri
f9e97cb935
Add test for proper saving
2013-05-09 10:05:48 -04:00
Vik Paruchuri
7a1ef62ee3
Do some code reformatting
2013-05-09 09:56:02 -04:00
Vik Paruchuri
8c12eb78c9
Fix some exceptions
2013-05-09 09:54:57 -04:00
Vik Paruchuri
09d34a02cc
Add in some comments
2013-05-09 09:50:32 -04:00
Vik Paruchuri
8323cc7c60
Refactor tests
2013-05-09 09:44:16 -04:00
Vik Paruchuri
7b8b168f2e
Move the mockquerydict
2013-05-08 19:21:12 -04:00
Vik Paruchuri
a2e5bd071b
Add in tests for peer grading module
2013-05-08 19:17:14 -04:00
Vik Paruchuri
fd46ebd1fa
Move some functions, make notification tests more robust
2013-05-08 19:04:07 -04:00
Vik Paruchuri
ff84545f31
Start to add peer grading tests, make dummy system a separate thing
2013-05-08 18:49:28 -04:00
Vik Paruchuri
4d759e9772
Test full flow, including reset
2013-05-08 18:15:57 -04:00
Vik Paruchuri
f26a258598
Add in test for grader reply
2013-05-08 18:07:17 -04:00
Arthur Barrett
c7197cd567
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-08 18:04:24 -04:00
Greg Price
f8539cc2d7
Redirect authenticated users from registration or login to dashboard
2013-05-08 17:10:54 -04:00
Vik Paruchuri
c39a21d833
Remove old import
2013-05-08 16:03:11 -04:00
Vik Paruchuri
3801f574a4
Add in xqueue submission tests
2013-05-08 16:00:07 -04:00
Greg Price
0e525d69ff
Disable SSL cert validation for Zendesk API
...
They are currently using a CA that is not installed on our servers. Since it
isn't a top-tier CA and we aren't submitting anything particularly sensitive
anyway, we don't have to feel too bad about this.
2013-05-08 15:45:12 -04:00
Vik Paruchuri
1d53625673
Add in ability to mock a server, a lot more testing code for open ended
2013-05-08 15:37:25 -04:00
Ned Batchelder
6264d41f92
Very minor docstring tweak :)
2013-05-08 14:48:46 -04:00
Christina Roberts
0c6c7868ae
Merge pull request #1965 from edx/feature/christina/fields
...
Pass through the value (either default or inherited) that a metadata field WILL have if it is not explicitly set.
2013-05-08 10:32:55 -07:00
Chris Dodge
d8d4111a99
Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master
2013-05-08 12:15:26 -04:00
Vik Paruchuri
5c55595e8b
Start to add in some more open ended module tests
2013-05-08 12:10:49 -04:00
David Baumgold
ec79ebd4a7
Updated Backbone.js and Underscore.js
...
Backbone 1.0.0, Underscore 1.4.4
2013-05-08 09:29:15 -04:00
Will Daly
b19c80ccb5
Merge pull request #1957 from edx/fix/will/bug_392
...
Added unit tests for safe_key() to resolve bug 392.
2013-05-08 06:23:49 -07:00
VikParuchuri
fb4685fe9a
Merge pull request #1976 from edx/vik/fix/oe-bugs
...
Vik/fix/oe bugs
2013-05-07 14:54:17 -07:00
Vik Paruchuri
5cd9641f24
Update peer grading comment
2013-05-07 17:35:00 -04:00
Vik Paruchuri
530ac51c1c
Add .error callback back in
2013-05-07 17:33:34 -04:00
Arthur Barrett
eca155f99a
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-07 17:27:40 -04:00
Vik Paruchuri
2648a19cc2
Fix check for use for single location
2013-05-07 17:08:14 -04:00
Vik Paruchuri
e0d1eca6aa
Delete two lines. without this, the xblock fields are never created in cases where the module is "fresh" (ie has no existing data)
2013-05-07 16:56:08 -04:00
Will Daly
aaa383b8ca
safe_key() now hashes the prefix/version as well, just in case
...
these are configured to be too long in the settings.
2013-05-07 15:48:51 -04:00
Vik Paruchuri
1398b55713
Comment touched modules
2013-05-07 15:48:19 -04:00
Vik Paruchuri
9e03280f50
Make peer grading fields stringy and fix js to avoid strange error
2013-05-07 15:33:15 -04:00
Diana Huang
2947ce246f
Better error handling for when marketing urls are missing from the settings.
2013-05-07 13:17:30 -04:00
cahrens
9e1c935b60
Merge branch 'master' into feature/christina/fields
2013-05-07 12:39:45 -04:00
Christina Roberts
729ca900e6
Merge pull request #1920 from edx/feature/christina/fields
...
Pass additional field information from editable_metadata_fields, remove system_metadata_fields variable.
2013-05-07 09:38:34 -07:00
Arthur Barrett
cd4bec8750
merged master branch into feature/abarrett/lms-notes-app
2013-05-07 12:32:22 -04:00
Chris Dodge
3c747f0e6e
consolidate the list of permissions
2013-05-07 11:53:02 -04:00
Chris Dodge
81ecf0c5df
add unit test to verify forum seeding occurs when creating new courses
2013-05-07 11:18:15 -04:00
Will Daly
1b0b365fa6
Added unit tests for safe_key() to resolve bug 392.
...
Updated safe_key() so that it: (a) avoids creating keys that
are too long for memcache, and (b) handles unicode in keys, prefixes,
and versions
Added __init__.py, which should have been in the last commit
Pep8/Pylint fixes
2013-05-06 17:26:18 -04:00
Diana Huang
a081ba4bbb
Merge pull request #1934 from edx/diana/drupal/fix-lms-links
...
Fix links between marketing site and courseware.
2013-05-06 14:14:29 -07:00
Jay Zoldak
c2cd75469b
Change the methodology to ignore .js files by default. Any .js files that are coded can be handled individually.
2013-05-06 17:05:47 -04:00
Chris Dodge
ae9d13b53a
update comment models.py to not have the dependency on get_course_by_id (which is in LMS). Also explicitly set the db_table name because django auto generates table prefixes according to the djangoapp name
2013-05-06 16:04:25 -04:00
cahrens
594d28a653
Pass default value through.
2013-05-06 16:03:41 -04:00
Chris Dodge
57eca325d2
move some files from lms/djangoapps/django_comment_client to common/djangoapps/django_comment_common
2013-05-06 15:59:35 -04:00
Will Daly
4f33b8e0c0
Fixed a UnicodeEncodeError that occurred when generating cache keys
...
from non-ASCII unicode code submissions.
2013-05-06 15:04:20 -04:00
Diana Huang
6110b54ca8
Address code review feedback
...
* Fix indentation/line break issues
* Handle marketing root URL as a separate case in marketing_link
* Move link map to its own setting.
2013-05-06 14:56:06 -04:00
