Chris Dodge
1db66957af
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
2013-05-10 15:44:55 -04:00
Greg Price
ea4a8cf2ad
Merge pull request #1992 from edx/fix/gprice/login-button-link
...
Make login link button in header work with course enrollment flow
2013-05-10 11:14:39 -07:00
Greg Price
d50608e9c2
Merge pull request #2002 from edx/fix/gprice/drupal-activation-login-link
...
Make activation complete page use non-modal login link
2013-05-10 11:10:10 -07:00
Chris Dodge
5619306c6b
add comment that the models.py file has been moved
2013-05-10 13:43:15 -04:00
dcadams
a05006a415
Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement
2013-05-10 10:39:00 -07:00
Greg Price
64d18c0ec4
Merge pull request #2010 from edx/fix/gprice/course-num-case
...
Make course number in registration button not transformed to lowercase
2013-05-10 10:08:06 -07:00
Chris Dodge
d39d44ba49
keep migrations in djangoapp_comment_client
2013-05-10 12:58:00 -04:00
Greg Price
6f06a3d92a
Make login link button in header work with course enrollment flow
...
When an unauthenticated user clicks the registration button for a course, they
are redirected to the registration page with query params that are ultimately
included in the form that gets submitted so they can be enrolled in the course
upon successful registration. The header login button is fixed to pass the same
query parameters to the login page so the user can be enrolled in the course
upon successful login.
2013-05-10 11:03:38 -04:00
Greg Price
7dd2973eca
Return 404 for course about pages if the marketing site is enabled
...
It would be better to redirect to the marketing site course about pages, but
the URLs for those are not easily computed, and we do not have time to set up
a full mapping in the LMS config.
2013-05-10 11:03:16 -04:00
Greg Price
0a8d426706
Make activation complete page use non-modal login link
2013-05-10 11:02:39 -04:00
Greg Price
c00b903757
Make course number in registration button not transformed to lowercase
2013-05-10 10:58:12 -04:00
Greg Price
a0fb4d6c85
Merge branch 'master' into drupal-new
...
Conflicts:
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/base/_base.scss
lms/templates/forgot_password_modal.html
2013-05-10 10:30:10 -04:00
Chris Dodge
51809965fe
Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master
2013-05-10 10:01:53 -04:00
Chris Dodge
1b0eff52ed
create test cases to simulate error exporting/importing textbooks
2013-05-10 10:01:10 -04:00
Greg Price
c765906fc5
Merge pull request #1986 from edx/feature/gprice/fix-help-modal-text
...
Update "thank you" text in help modal
2013-05-09 14:37:13 -07:00
Greg Price
89d0dc1963
Update "thank you" text in help modal
...
As per request from Mary.
2013-05-09 17:16:43 -04:00
Arthur Barrett
a6ad65cb98
trying to fix pylint errors
2013-05-09 16:57:19 -04:00
Arthur Barrett
a407c84bdf
add model unit tests
2013-05-09 16:34:02 -04:00
Chris Dodge
11244107fd
add an empty models.py file to django_comment_client
2013-05-09 16:16:11 -04:00
Arthur Barrett
9aed148dc1
add search test
2013-05-09 16:08:29 -04:00
Arthur Barrett
aad5096ca1
add more tests for update and delete actions
2013-05-09 15:43:34 -04:00
Arthur Barrett
2838dba199
fix pep8 violations
2013-05-09 15:12:22 -04:00
Arthur Barrett
dd583ce4f9
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-09 14:32:05 -04:00
Arthur Barrett
244261f1cf
added more unit tests
2013-05-09 14:31:38 -04:00
Diana Huang
f9023fd112
Merge pull request #1983 from edx/diana/jobs-page-update
...
Jobs page updates.
2013-05-09 11:04:14 -07:00
Diana Huang
e5b18a5688
Put Front End Developer back in.
2013-05-09 13:58:25 -04:00
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
