Steve Strassmann
1f7bf1f00a
use global LOG instead of local log
2013-05-12 21:52:07 -04:00
Steve Strassmann
2b7d7bcd9a
pull from master
2013-05-12 21:31:21 -04:00
Jason Bau
348e982678
Merge pull request #2015 from edx/fix/jbau/parameterize-cms-email
...
Fix/jbau/parameterize cms email
2013-05-10 13:58:51 -07:00
Jason Bau
43779a92a0
Merge branch 'fix/jbau/parameterize-cms-email' of https://github.com/edx/mitx into fix/jbau/parameterize-cms-email
2013-05-10 13:43:26 -07:00
Jason Bau
408e26a0c1
parameterizes CMS email settings
2013-05-10 13:42:28 -07:00
Steve Strassmann
1c5815a844
per-file log objects
2013-05-10 15:11:10 -04:00
Steve Strassmann
a52cf85c08
rake task dependency for transifex
2013-05-10 14:50:49 -04:00
Steve Strassmann
f30f6207d5
clean up rakefile syntax for task dependencies
2013-05-10 14:47:47 -04:00
Steve Strassmann
35d72f30b9
update .gitignore; fix logger import in execute.py
2013-05-10 14:40:30 -04:00
Steve Strassmann
2d96664128
pull from master
2013-05-10 14:22: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
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
Calen Pennington
ea859bd6c7
Filter out the template course from the mongo modulestore get_courses function
2013-05-09 16:22:23 -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
Diana Huang
ec5f239d91
Add in new Coordinator position.
2013-05-09 09:12:07 -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
Jason Bau
1354cd412a
Set SERVER_EMAIL so that mail_admins works
2013-05-08 14:16:20 -07: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
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
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
Steve Strassmann
dfcbb73662
add guard code to ensure gnu gettext utilities are loaded before rake tests
2013-05-08 14:55:16 -04:00
Steve Strassmann
beb4b39b73
fix logging
2013-05-08 14:25:31 -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
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
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
Vik Paruchuri
2648a19cc2
Fix check for use for single location
2013-05-07 17:08:14 -04:00
Vik Paruchuri
e0d1eca6aa
Delete two lines. without this, the xblock fields are never created in cases where the module is "fresh" (ie has no existing data)
2013-05-07 16:56:08 -04:00
caesar2164
fe5fc448e6
Merge pull request #1948 from edx/feature/giulio/accessibility
...
Feature/giulio/accessibility
2013-05-07 13:41:04 -07:00
Diana Huang
c6f63140a2
Hide the API key during logging.
2013-05-07 16:38:38 -04:00
Giulio Gratta
91e2a39ec7
moving preventDefault() statements to the local script tag
2013-05-07 12:50:59 -07:00
Will Daly
aaa383b8ca
safe_key() now hashes the prefix/version as well, just in case
...
these are configured to be too long in the settings.
2013-05-07 15:48:51 -04:00
Vik Paruchuri
1398b55713
Comment touched modules
2013-05-07 15:48:19 -04:00
Vik Paruchuri
9e03280f50
Make peer grading fields stringy and fix js to avoid strange error
2013-05-07 15:33:15 -04:00
