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
Steve Strassmann
4620f50fb1
addressed Cale's comments; switched to path.py paths
2013-05-07 13:24:38 -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
Greg Price
93cbb2e422
Redirect from LMS courses page to marketing courses page
...
(Only if marketing site is enabled)
2013-05-07 13:06:38 -04:00
Vik Paruchuri
258aebed20
Fix anonymoususer 500 error
2013-05-07 12:58:49 -04:00
Greg Price
ef27b8f787
Make register button for marketing site break out of iframe
...
Use window.top.location.href instead of location.href for redirection.
2013-05-07 12:41:33 -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
Greg Price
6361280075
Merge pull request #1959 from edx/feature/gprice/drupal-register-button-fix
2013-05-07 08:57:12 -07:00
Chris Dodge
3c747f0e6e
consolidate the list of permissions
2013-05-07 11:53:02 -04:00
Greg Price
2c67352606
Fix new view containing only register button to properly enroll
2013-05-07 11:34:41 -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
Greg Price
3fd8b6ff59
Merge pull request #1960 from edx/feature/gprice/drupal-reset-buttons
2013-05-07 08:17:44 -07:00
Brian Talbot
7aa9a6cfa5
Merge pull request #1962 from edx/fix/btalbot/lms-mktgiframe
...
edx.org - resolved iframe button styles in IE + added in coming soon state
2013-05-07 08:04:45 -07:00
Brian Talbot
9a01bb5e52
edx.org - adding back js-dependent register class to register button
2013-05-07 11:02:02 -04:00
Brian Talbot
126c9f9f37
edx.org - further revision to iframe register button states: coming soon styling
2013-05-07 11:00:21 -04:00
Steve Strassmann
87fbfdce3f
merge with master
2013-05-07 10:48:51 -04:00
Brian Talbot
3b84d77131
edx.org - resolved (in a dirty way) iframed buttons picking up style in IE and added in coming soon style treatment
2013-05-07 10:25:41 -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
marco
d28c0b5f91
cleaned up styling, synced up partially to existing standards for forms, fonts, colors, etc; currently open select box issue on chrome
2013-05-07 08:59:28 -04: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
Ned Batchelder
91db1eed4c
The new settings will only be read from .json files if aws.py handles them.
2013-05-06 18:06:08 -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
