Arthur Barrett
f1f65c563e
fix failing unit test in lms.envs.test env
2013-05-09 11:51:24 -04:00
Diana Huang
ec5f239d91
Add in new Coordinator position.
2013-05-09 09:12:07 -04:00
Vik Paruchuri
fd46ebd1fa
Move some functions, make notification tests more robust
2013-05-08 19:04:07 -04:00
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
dcadams
2ef3bcc92d
Commit just to get Jenkins to rerun.
2013-05-08 14:52:18 -07:00
dcadams
dcabac8edf
Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement
2013-05-08 14:48:29 -07:00
Jason Bau
1354cd412a
Set SERVER_EMAIL so that mail_admins works
2013-05-08 14:16:20 -07:00
Diana Huang
1e61bbd1c8
Jobs page updates.
2013-05-08 16:06:08 -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
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
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
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
Arthur Barrett
eca155f99a
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-07 17:27:40 -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
Greg Price
23eacdbea2
Fix registration button text
2013-05-07 16:45:33 -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
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
Vik Paruchuri
1398b55713
Comment touched modules
2013-05-07 15:48:19 -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
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
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
Arthur Barrett
cd4bec8750
merged master branch into feature/abarrett/lms-notes-app
2013-05-07 12:32:22 -04:00
Greg Price
2c67352606
Fix new view containing only register button to properly enroll
2013-05-07 11:34:41 -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
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
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
Diana Huang
a081ba4bbb
Merge pull request #1934 from edx/diana/drupal/fix-lms-links
...
Fix links between marketing site and courseware.
2013-05-06 14:14:29 -07:00
