Commit Graph

15584 Commits

Author SHA1 Message Date
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
Vik Paruchuri
7b8b168f2e Move the mockquerydict 2013-05-08 19:21:12 -04:00
Vik Paruchuri
a2e5bd071b Add in tests for peer grading module 2013-05-08 19:17:14 -04:00
Vik Paruchuri
fd46ebd1fa Move some functions, make notification tests more robust 2013-05-08 19:04:07 -04:00
Vik Paruchuri
ff84545f31 Start to add peer grading tests, make dummy system a separate thing 2013-05-08 18:49:28 -04:00
Vik Paruchuri
4d759e9772 Test full flow, including reset 2013-05-08 18:15:57 -04:00
Vik Paruchuri
f26a258598 Add in test for grader reply 2013-05-08 18:07:17 -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
ca1aeb5bb8 Merge pull request #1988 from edx/devops/jbau/server_email_lms_setting
Set SERVER_EMAIL so that mail_admins works
2013-05-08 14:30:19 -07:00
Greg Price
4bba6c7d55 Merge pull request #1981 from edx/fix/gprice/drupal-mktg-links
Remove marketing URLs from common.py
2013-05-08 14:23:48 -07:00
Jason Bau
1354cd412a Set SERVER_EMAIL so that mail_admins works 2013-05-08 14:16:20 -07:00
Greg Price
f8539cc2d7 Redirect authenticated users from registration or login to dashboard 2013-05-08 17:10:54 -04:00
Greg Price
8e6a0914d4 Merge pull request #1984 from edx/feature/gprice/accept-zendesk-ssl-cert
Disable SSL cert validation for Zendesk API
2013-05-08 13:30:04 -07:00
Diana Huang
1e61bbd1c8 Jobs page updates. 2013-05-08 16:06:08 -04:00
Vik Paruchuri
c39a21d833 Remove old import 2013-05-08 16:03:11 -04:00
Vik Paruchuri
3801f574a4 Add in xqueue submission tests 2013-05-08 16:00:07 -04:00
Brian Talbot
b36a05b8cb Merge pull request #1982 from edx/fix/btalbot/studio-alerts
studio - alerts: synced up styles and sample markup
2013-05-08 12:51:45 -07:00