Steve Strassmann
beb4b39b73
fix logging
2013-05-08 14:25:31 -04:00
Steve Strassmann
dc473e6f7b
more verbose messages.po
2013-05-08 14:07:57 -04:00
Steve Strassmann
d05ba84f13
/usr/bin/env in shebang line
2013-05-08 13:49:42 -04:00
Steve Strassmann
0a62d5c76b
pull from master
2013-05-08 13:45:47 -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
Steve Strassmann
15938dd8e4
pull from master
2013-05-08 09:48:47 -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
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
Steve Strassmann
129c02f0b2
forgot to remove stale comment
2013-05-07 14:12:58 -04:00
Steve Strassmann
cf8d6b8965
factor logging out of library calls
2013-05-07 14:10:59 -04: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
Steve Strassmann
0ba0bb5b7a
merge from master
2013-05-07 13:24:52 -04:00
Steve Strassmann
4620f50fb1
addressed Cale's comments; switched to path.py paths
2013-05-07 13:24:38 -04: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
Steve Strassmann
87fbfdce3f
merge with master
2013-05-07 10:48:51 -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
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
Steve Strassmann
0b0a4a7564
pull from master
2013-05-06 16:57:32 -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
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
Steve Strassmann
8e735b4deb
Merge branch 'master' of https://github.com/edx/mitx into feature/straz/transifex
2013-05-06 14:06:12 -04:00
Steve Strassmann
bec2ca4086
cleanup headers of files pulled from transifex.
2013-05-06 14:05:05 -04:00
Greg Price
ec3c8458e7
Merge pull request #1911 from edx/feature/gprice/feedback-button
2013-05-06 11:03:41 -07:00
Greg Price
203a958e68
Outline textareas in red on a form submission error
...
This was previously done for input but not textarea.
2013-05-06 13:35:52 -04:00
Greg Price
00729a8c13
Add an omnipresent help tab to the LMS
...
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
2013-05-06 13:35:52 -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
cahrens
84ff2a0941
Merge branch 'master' into feature/christina/fields
2013-05-06 12:42:18 -04:00
Christina Roberts
66185423a2
Merge pull request #1945 from edx/feature/christina/computed_default
...
Get rid of _computed_default.
2013-05-06 09:28:37 -07:00
David Baumgold
8d7eb03577
Merge pull request #1930 from edx/fix-readme
...
MOAR README
2013-05-06 09:26:49 -07:00
Victor Shnayder
fe12c64523
Merge pull request #1951 from edx/victor/epfl-desc
...
update EPFL profile. LH # 374
2013-05-06 08:34:48 -07:00
