e0d
2e84540af0
removing the request debugger entirely.
2013-05-31 11:15:28 -04:00
Ned Batchelder
e947218285
Merge master to here.
2013-05-16 14:21:51 -04:00
Greg Price
a5bb31792b
Add a prefix string to Zendesk errors to be more searchable in Splunk
2013-05-13 16:38:52 -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
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
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
Greg Price
87072a9a58
Add an endpoint for submission of Zendesk tickets by end users
...
This functionality requires the Zendesk URL, user, and API key to be specified
in django.conf.settings. Also, add a flag to MITX_FEATURES (enabled by default)
to control the endpoint and the front-end feature (yet to be added).
2013-05-06 13:35:51 -04:00
Ned Batchelder
7c498be606
Move packages around so we can install packages into the sandbox.
2013-05-06 10:55:05 -04:00
cahrens
227a5e8266
Delete converters, move unit tests to test_fields, add new additional test cases.
2013-03-27 12:56:06 -04:00
Don Mitchell
056b7d3427
More unit tests which found another timezone assumption :-)
2013-03-22 16:45:21 -04:00
Don Mitchell
8370124e2b
Make to and from json for dates use iso format esp for timezone.
2013-03-22 16:16:32 -04:00
Ned Batchelder
78d3d20069
When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons.
...
Conflicts:
common/djangoapps/util/converters.py
2013-02-12 11:25:14 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Don Mitchell
edda80d485
New style base python classes and basestring type.
2013-01-22 11:30:24 -05:00
Chris Dodge
e70db062b2
Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
...
Conflicts:
requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
Don Mitchell
ff490599fa
Debugging unit tests
2012-12-26 10:29:35 -05:00
Don Mitchell
0a91a98dd0
Merge remote-tracking branch 'origin/feature/cale/cms-master' into
...
feature/dhm/cms-settings
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/course_info.js
cms/static/js/template_loader.js
cms/static/js/views/course_info_edit.js
cms/templates/base.html
cms/templates/course_info.html
cms/urls.py
2012-12-11 10:55:10 -05:00
Don Mitchell
39024a7fee
Grading mostly working
2012-12-10 16:32:33 -05:00
Chris Dodge
79e48dde97
move the underscore tempaltes to /static/client-templates and update the references
2012-12-10 10:01:08 -05:00
Don Mitchell
50d7e6160e
Move models from common to cms.
...
Add unit tests.
2012-12-03 12:20:15 -05:00
Don Mitchell
5331ae055f
Got time change hooked up but gained a spurious call to change on date
...
change.
2012-11-27 15:15:28 -05:00
Don Mitchell
2238019539
Details tab works except for file references
2012-11-27 11:32:03 -05:00
Calen Pennington
71f39bc4c0
Merge pull request #751 from MITx/cdodge/meta-data-cms-editing
...
Cdodge/meta data cms editing
2012-09-25 06:16:51 -07:00
Victor Shnayder
450a20228d
more info
2012-09-21 17:49:10 -04:00
Victor Shnayder
8d0cc1007a
add a debug_request view that prints the request.
2012-09-21 16:51:49 -04:00
Chris Dodge
0a7dfca0e4
Fix JSON postback error where the content-type header line can contain more info than just the application/json descriptor. Now we just to a compare on the start of the header value.
2012-09-21 14:25:48 -04:00
Victor Shnayder
ce0bc1f782
Separate caches per-domain-name
2012-08-22 13:18:33 -04:00
Calen Pennington
6abc2d733f
Merge pull request #370 from MITx/feature/bridger/django1.4
...
Feature/bridger/django1.4
2012-08-08 12:52:33 -07:00
Bridger Maxwell
14a35b9605
Upgrading to django 1.4.
2012-08-08 11:57:15 -04:00
Calen Pennington
80b8529f2f
Merge branch 'hotfix/1.0.4'
...
Conflicts:
common/djangoapps/util/middleware.py
2012-08-08 11:05:26 -04:00
Victor Shnayder
b4e400ba56
Make tests pass again again
...
* Move lazyproperty decorator into xmodule so it's accessible during tests
* add default xqueue to test system
2012-08-07 11:08:56 -04:00
Bridger Maxwell
ba42c0225d
Moved the generation of the 'grading context' to a lazy property in course descriptor.
2012-08-06 13:57:41 -04:00
Calen Pennington
8059008bde
Switch from exception logging middleware to a django signal handler, so that we no longer swallow Http404 exceptions and turn them into 500 errors
2012-08-06 10:13:12 -04:00
Calen Pennington
1d1a9173a4
Cleaning up pep8 violations
2012-07-23 14:44:40 -04:00
Bridger Maxwell
6caee537a1
Accidentally disabled cache_if_anonymous earlier. Re-enabling.
2012-07-22 17:40:27 -04:00
Bridger Maxwell
2f4aba8042
If a user is anonymous when they click the enroll button, they will automatically be enrolled in the course if they immediately log in our create an account.
2012-07-21 17:52:28 -04:00
Bridger Maxwell
960c8619e5
Added a cache_if_anonymous decorator.
2012-07-16 13:40:17 -04:00
Prem Sichanugrist
0f60459709
Add @expect_json to help with parsing JSON request
2012-07-05 09:38:51 -04:00
Calen Pennington
5404345b1f
Make tests pass when running on cms
2012-06-18 13:21:06 -04:00
