Ned Batchelder
6264d41f92
Very minor docstring tweak :)
2013-05-08 14:48:46 -04:00
Steve Strassmann
beb4b39b73
fix logging
2013-05-08 14:25:31 -04:00
Arthur Barrett
0f70b0aa8a
refactored api resource map and added total to search query
2013-05-08 14:09:29 -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
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
Greg Price
e190dc00d6
Remove marketing URLs from common.py
...
The MKTG_URLS dictionary is overwritten completely in aws.py anyway, and we
shouldn't be trying to keep both the production config and LMS code in sync
with changes to the marketing site.
2013-05-08 11:06:02 -04: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
David Baumgold
7f69e45b9e
whitespace changes
2013-05-08 09:29:20 -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
Arthur Barrett
894cfd1f48
update doc strings in api
2013-05-07 18:45:40 -04:00
Greg Price
c82b28aac3
Merge pull request #1977 from edx/fix/gprice/drupal-registration-links
...
Fix links to honor code, ToS, and privacy policy for marketing site
2013-05-07 14:58:26 -07:00
Greg Price
7143749d7b
Fix links to honor code, ToS, and privacy policy for marketing site
2013-05-07 17:54:32 -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
Greg Price
50d8321bc5
Merge pull request #1975 from edx/fix/gprice/drupal-registration-button-text
...
Fix registration button text
2013-05-07 14:21:48 -07:00
Vik Paruchuri
2648a19cc2
Fix check for use for single location
2013-05-07 17:08:14 -04:00
Greg Price
ab7795aaf6
Merge pull request #1972 from edx/fix/gprice/drupal-fix-course-link
...
Fix courses link in LMS header when not logged in
2013-05-07 13:59:23 -07: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
Greg Price
23eacdbea2
Fix registration button text
2013-05-07 16:45:33 -04:00
caesar2164
fe5fc448e6
Merge pull request #1948 from edx/feature/giulio/accessibility
...
Feature/giulio/accessibility
2013-05-07 13:41:04 -07:00
marco
977d0d76c2
cleaning up styles to use list-input, field, group, label, input, tip, etc standards. also opted to try out initial pass at hierarchy splitting of css classes on items that repeat (li, for example)
2013-05-07 16:40:21 -04:00
Diana Huang
c6f63140a2
Hide the API key during logging.
2013-05-07 16:38:38 -04:00
Greg Price
dadb0b6931
Fix courses link in LMS header when not logged in
2013-05-07 16:35:08 -04:00
jarv
621f4c65fe
Merge pull request #1971 from edx/jarv/new-mktg-url
...
be more forgiving about the iframe url
2013-05-07 13:19:10 -07:00
John Jarvis
0b7af27b4b
be more forgiving about the iframe url
...
If anything after mktg/ does not parse as a course-id return "coming soon"
This will prevent 404 errors when urls are incorrect on the marketing
site.
2013-05-07 16:00:00 -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
Greg Price
f7f791ab69
Merge pull request #1963 from edx/feature/gprice/drupal-iframe-breakout
...
Make register button for marketing site break out of iframe
2013-05-07 11:21:54 -07: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
Diana Huang
30e1dd6e8e
Merge pull request #1966 from edx/diana/drupal/fix-lms-links
...
Better error handling for when marketing urls are missing
2013-05-07 10:56:06 -07:00
Greg Price
0ff4d1ca9f
Merge pull request #1968 from edx/feature/gprice/drupal-course-redirects
...
Redirect from LMS courses page to marketing courses page
2013-05-07 10:34:35 -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
Steve Strassmann
0ba0bb5b7a
merge from master
2013-05-07 13:24:52 -04:00
