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
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
Greg Price
0e525d69ff
Disable SSL cert validation for Zendesk API
...
They are currently using a CA that is not installed on our servers. Since it
isn't a top-tier CA and we aren't submitting anything particularly sensitive
anyway, we don't have to feel too bad about this.
2013-05-08 15:45:12 -04:00
Vik Paruchuri
1d53625673
Add in ability to mock a server, a lot more testing code for open ended
2013-05-08 15:37:25 -04:00
Steve Strassmann
165e7059c8
guard predicates are rake tasks, not functions
2013-05-08 15:34:35 -04:00
Brian Talbot
25dd2c7d67
studio - alerts: synced up example HTML to show advanced settings live notification, aria roles, and action classes; integrated typography mixins
2013-05-08 15:30:17 -04:00
Arthur Barrett
1eb05cfd4e
remove unnecessary count
2013-05-08 15:07:36 -04:00
Steve Strassmann
dfcbb73662
add guard code to ensure gnu gettext utilities are loaded before rake tests
2013-05-08 14:55:16 -04:00
Ned Batchelder
ce3e733d1f
Problems in 7.02x need lxml for their sandbox.
2013-05-08 14:49:02 -04:00
Ned Batchelder
6264d41f92
Very minor docstring tweak :)
2013-05-08 14:48:46 -04:00
Steve Strassmann
beb4b39b73
fix logging
2013-05-08 14:25:31 -04:00
Arthur Barrett
0f70b0aa8a
refactored api resource map and added total to search query
2013-05-08 14:09:29 -04:00
Steve Strassmann
dc473e6f7b
more verbose messages.po
2013-05-08 14:07:57 -04:00
Steve Strassmann
d05ba84f13
/usr/bin/env in shebang line
2013-05-08 13:49:42 -04:00
Steve Strassmann
0a62d5c76b
pull from master
2013-05-08 13:45:47 -04:00
Christina Roberts
0c6c7868ae
Merge pull request #1965 from edx/feature/christina/fields
...
Pass through the value (either default or inherited) that a metadata field WILL have if it is not explicitly set.
2013-05-08 10:32:55 -07: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
Vik Paruchuri
5c55595e8b
Start to add in some more open ended module tests
2013-05-08 12:10:49 -04:00
