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
David Baumgold
d09e93142f
Merge pull request #1980 from edx/backbone-1.0.0
...
Upgrade to Backbone 1.0.0
2013-05-09 09:34:35 -07:00
Arthur Barrett
f1f65c563e
fix failing unit test in lms.envs.test env
2013-05-09 11:51:24 -04:00
cahrens
60f41eb108
Cleanup.
2013-05-09 11:49:09 -04:00
cahrens
cf491b1184
Remove component.html changes.
2013-05-09 11:46:47 -04:00
Vik Paruchuri
682d06bcff
Fix a lot of pep8 violations
2013-05-09 11:27:44 -04:00
cahrens
7e42512bfa
Merge branch 'ux/marco/studio-componentsettings' into feature/christina/metadata-ui
2013-05-09 11:20:04 -04:00
cahrens
bfdbcc2f32
Beginnings of Backbone views/models.
2013-05-09 11:16:12 -04:00
marco
3ebd5de744
added rest of settings list
2013-05-09 10:54:10 -04:00
Greg Price
623c55222f
Merge pull request #1987 from edx/feature/gprice/redirect-if-logged-in
...
Redirect authenticated users from registration or login to dashboard
2013-05-09 07:50:49 -07:00
Vik Paruchuri
f72659fa2e
Add in asserts
2013-05-09 10:15:07 -04:00
Vik Paruchuri
f9e97cb935
Add test for proper saving
2013-05-09 10:05:48 -04:00
Vik Paruchuri
7a1ef62ee3
Do some code reformatting
2013-05-09 09:56:02 -04:00
Vik Paruchuri
8c12eb78c9
Fix some exceptions
2013-05-09 09:54:57 -04:00
Vik Paruchuri
09d34a02cc
Add in some comments
2013-05-09 09:50:32 -04:00
Vik Paruchuri
8323cc7c60
Refactor tests
2013-05-09 09:44:16 -04:00
marco
3284247905
restyling of the input fields, partway through adding in examples of all settings
2013-05-09 09:35:31 -04:00
Diana Huang
ec5f239d91
Add in new Coordinator position.
2013-05-09 09:12:07 -04:00
