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
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
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
Steve Strassmann
15938dd8e4
pull from master
2013-05-08 09:48:47 -04:00
David Baumgold
7f69e45b9e
whitespace changes
2013-05-08 09:29:20 -04:00
David Baumgold
ec79ebd4a7
Updated Backbone.js and Underscore.js
...
Backbone 1.0.0, Underscore 1.4.4
2013-05-08 09:29:15 -04:00
Will Daly
b19c80ccb5
Merge pull request #1957 from edx/fix/will/bug_392
...
Added unit tests for safe_key() to resolve bug 392.
2013-05-08 06:23:49 -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
Vik Paruchuri
5cd9641f24
Update peer grading comment
2013-05-07 17:35:00 -04:00
Vik Paruchuri
530ac51c1c
Add .error callback back in
2013-05-07 17:33:34 -04:00
Arthur Barrett
eca155f99a
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-07 17:27:40 -04:00
Arthur Barrett
0ed07779c8
kludged in the note tab panel so it can be turned on and off using the policy editor by adding "notes" to "advanced_modules."
2013-05-07 17:27:06 -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
