Steve Strassmann
2d96664128
pull from master
2013-05-10 14:22:37 -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
Steve Strassmann
01d4fbeb7c
reorder imports
2013-05-10 14:14:36 -04: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
Steve Strassmann
8c8377f1df
Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views
...
pull master
2013-05-10 13:59:07 -04:00
Steve Strassmann
9350a2c067
refactoring views
2013-05-10 13:56:30 -04:00
Chris Dodge
5619306c6b
add comment that the models.py file has been moved
2013-05-10 13:43:15 -04:00
Mark L. Chang
4003f8633d
more copy tweaks
2013-05-10 13:39:46 -04:00
Mark L. Chang
f7655576cd
copy change
2013-05-10 13:21:09 -04:00
marco
04bb7335e7
removed extra section heading in settings DOM, placed settings after editor
2013-05-10 13:18:43 -04: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
ec53e3ca90
Merge pull request #1994 from edx/fix/gprice/remove-dashboard-news
...
Remove edX news from dashboard if marketing site is enabled
2013-05-10 08:55:59 -07:00
Greg Price
d04e8492a8
Merge pull request #1996 from edx/fix/gprice/drupal-course-about-404
...
Return 404 for course about pages if the marketing site is enabled
2013-05-10 08:52:45 -07:00
Greg Price
7d544d449f
Remove edX news from dashboard if marketing site is enabled
2013-05-10 11:03:49 -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
Will Daly
4324453827
Added option to run acceptance tests without collectstatic
2013-05-10 10:43:46 -04:00
Will Daly
881b72a6d1
Added option to run a specific feature
2013-05-10 10:35:51 -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
John Jarvis
a1e6c194c6
removing LINK_PATH
2013-05-10 10:24:32 -04:00
Will Daly
2546d6227f
Added test_acceptance command to rake file that runs
...
all acceptance tests.
2013-05-10 10:03:44 -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
Will Daly
c730d43dbf
Resolved import conflict involving django-staticfiles
...
(lettuce assumes we are using django.contrib.staticfiles).
This allows us to run the django-admin.py harvest test server,
instead of launching the server ourselves.
2013-05-10 09:18:37 -04:00
Calen Pennington
ee52726853
Merge pull request #2000 from edx/fix/cale/dont-show-template-course
...
Filter out the template course from the mongo modulestore get_courses function
2013-05-10 04:06:33 -07:00
ichuang
2bb180a353
Merge pull request #1935 from edx/fix/formularesponse_needs_samples
...
formularesponse requires the "samples" attribute
2013-05-09 19:02:57 -07:00
Jason Bau
5a73a06885
parameterizes CMS email settings
2013-05-09 16:21:55 -07:00
John Jarvis
3352ae7f75
repo rename to edx-platform
2013-05-09 18:29:45 -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
Steve Strassmann
0bea50ede1
start refactoring views.py
2013-05-09 16:24:21 -04:00
Calen Pennington
ea859bd6c7
Filter out the template course from the mongo modulestore get_courses function
2013-05-09 16:22:23 -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
marco
004018c1eb
Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui
2013-05-09 14:59:01 -04:00
marco
6dbfa7499b
removed metadata-edit styling
2013-05-09 14:58:54 -04:00
cahrens
b314b5ce59
Renaming of some files.
2013-05-09 14:51:16 -04:00
cahrens
4a7f7d6537
Update the other templates that include metadata-edit.html.
2013-05-09 14:34:52 -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
marco
cad8ae1b9b
merged in new data requirements for html
2013-05-09 14:19:31 -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
