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
ca1aeb5bb8
Merge pull request #1988 from edx/devops/jbau/server_email_lms_setting
...
Set SERVER_EMAIL so that mail_admins works
2013-05-08 14:30:19 -07:00
Jason Bau
1354cd412a
Set SERVER_EMAIL so that mail_admins works
2013-05-08 14:16:20 -07:00
Greg Price
8e6a0914d4
Merge pull request #1984 from edx/feature/gprice/accept-zendesk-ssl-cert
...
Disable SSL cert validation for Zendesk API
2013-05-08 13:30:04 -07:00
Brian Talbot
b36a05b8cb
Merge pull request #1982 from edx/fix/btalbot/studio-alerts
...
studio - alerts: synced up styles and sample markup
2013-05-08 12:51:45 -07: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
Brian Talbot
25dd2c7d67
studio - alerts: synced up example HTML to show advanced settings live notification, aria roles, and action classes; integrated typography mixins
2013-05-08 15:30:17 -04: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
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
Diana Huang
d522b53f6d
Merge pull request #1974 from edx/diana/hide-api-key
...
Hide the Comments Service API key during logging.
2013-05-08 07:50:31 -07: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
Arthur Barrett
894cfd1f48
update doc strings in api
2013-05-07 18:45:40 -04: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
Arthur Barrett
0ed07779c8
kludged in the note tab panel so it can be turned on and off using the policy editor by adding "notes" to "advanced_modules."
2013-05-07 17:27:06 -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
caesar2164
fe5fc448e6
Merge pull request #1948 from edx/feature/giulio/accessibility
...
Feature/giulio/accessibility
2013-05-07 13:41:04 -07:00
Diana Huang
c6f63140a2
Hide the API key during logging.
2013-05-07 16:38:38 -04:00
Giulio Gratta
91e2a39ec7
moving preventDefault() statements to the local script tag
2013-05-07 12:50:59 -07: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
Giulio Gratta
87362aa887
Merge branch 'master' of github.com:edx/mitx into feature/giulio/accessibility
2013-05-07 11:21:44 -07:00
Giulio Gratta
f7719a60c7
changed offending javascript:void() hrefs on anchors to preventDefault()
2013-05-07 11:20:47 -07:00
Giulio Gratta
953af59b0d
fixing some more LMS accessibility issues
2013-05-07 10:25:16 -07:00
Giulio Gratta
a266330b2d
made signup form labels and close modal button accessible friendly and tweaked login form to match signup form
2013-05-07 10:25:08 -07:00
Giulio Gratta
3eac9376dd
made forgot password form close modal button accessible friendly
2013-05-07 10:25:08 -07:00
Giulio Gratta
2dde742f38
made login form labels and close modal button accessible friendly
2013-05-07 10:25:08 -07:00
Vik Paruchuri
258aebed20
Fix anonymoususer 500 error
2013-05-07 12:58:49 -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
Jay Zoldak
29a5d3b42e
Merge pull request #1955 from edx/fix/zoldak/add-gitignores-xmodule-js
...
Ignore the js files that are compiled from coffeescript when running the...
2013-05-07 06:09:54 -07:00
Arthur Barrett
ade6d4085d
turn off notes js debugging
2013-05-06 19:35:41 -04:00
Arthur Barrett
4070e019e4
modified the html static book to only enable annotator.js when notes are enabled for the course
2013-05-06 19:29:44 -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
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
Arthur Barrett
45cca10fb9
remove debugging from default notes view
2013-05-06 17:01:35 -04:00
Arthur Barrett
0e1b3999e8
add limit and offset params to search endpoint
2013-05-06 17:01:17 -04:00
Jay Zoldak
2ffaea7ade
Merge pull request #1949 from edx/fix/zoldak/modulestore-tests
...
Fix tests that intermittently fail when run in concurrent jobs on jenkins.
2013-05-06 13:32:27 -07:00
cahrens
594d28a653
Pass default value through.
2013-05-06 16:03:41 -04:00
Arthur Barrett
ceefdf0161
user must be authenticated to view notes tab
2013-05-06 15:52:32 -04:00
Arthur Barrett
c5728fb036
fix undefined variable name error in mako template
2013-05-06 14:48:51 -04:00
Jay Zoldak
522751e425
Ignore the js files that are compiled from coffeescript when running the xmodule jasmine tests
2013-05-06 14:28:05 -04:00
Greg Price
ec3c8458e7
Merge pull request #1911 from edx/feature/gprice/feedback-button
2013-05-06 11:03:41 -07:00
