Commits · 1f7bf1f00a43ccf142b1f4b1517cbeb2acbcafd3 · edx / edx-platform · GitLab

13 May, 2013 2 commits
- use global LOG instead of local log · 1f7bf1f0
  Steve Strassmann committed May 12, 2013
  
  1f7bf1f0 Browse Files
- pull from master · 2b7d7bcd
  Steve Strassmann committed May 12, 2013
  
  2b7d7bcd Browse Files
10 May, 2013 10 commits
- Merge pull request #2015 from edx/fix/jbau/parameterize-cms-email · 348e9826
```
Fix/jbau/parameterize cms email
```
  Jason Bau committed May 10, 2013
  348e9826 Browse Files
- Merge branch 'fix/jbau/parameterize-cms-email' of https://github.com/edx/mitx… · 43779a92
```
Merge branch 'fix/jbau/parameterize-cms-email' of https://github.com/edx/mitx into fix/jbau/parameterize-cms-email
```
  Jason Bau committed May 10, 2013
  43779a92 Browse Files
- parameterizes CMS email settings · 408e26a0
  Jason Bau committed May 10, 2013
  
  408e26a0 Browse Files
- per-file log objects · 1c5815a8
  Steve Strassmann committed May 10, 2013
  
  1c5815a8 Browse Files
- rake task dependency for transifex · a52cf85c
  Steve Strassmann committed May 10, 2013
  
  a52cf85c Browse Files
- clean up rakefile syntax for task dependencies · f30f6207
  Steve Strassmann committed May 10, 2013
  
  f30f6207 Browse Files
- update .gitignore; fix logger import in execute.py · 35d72f30
  Steve Strassmann committed May 10, 2013
  
  35d72f30 Browse Files
- pull from master · 2d966641
  Steve Strassmann committed May 10, 2013
  
  2d966641 Browse Files
- Merge pull request #2000 from edx/fix/cale/dont-show-template-course · ee527268
```
Filter out the template course from the mongo modulestore get_courses function
```
  Calen Pennington committed May 10, 2013
  ee527268 Browse Files
- Merge pull request #1935 from edx/fix/formularesponse_needs_samples · 2bb180a3
```
formularesponse requires the "samples" attribute
```
  ichuang committed May 09, 2013
  2bb180a3 Browse Files
09 May, 2013 8 commits
- parameterizes CMS email settings · 5a73a068
  Jason Bau committed May 09, 2013
  
  5a73a068 Browse Files
- Merge pull request #1986 from edx/feature/gprice/fix-help-modal-text · c765906f
```
Update "thank you" text in help modal
```
  Greg Price committed May 09, 2013
  c765906f Browse Files
- Update "thank you" text in help modal · 89d0dc19
```
As per request from Mary.
```
  Greg Price committed May 09, 2013
  89d0dc19 Browse Files
- Filter out the template course from the mongo modulestore get_courses function · ea859bd6
  Calen Pennington committed May 09, 2013
  
  ea859bd6 Browse Files
- Merge pull request #1983 from edx/diana/jobs-page-update · f9023fd1
```
Jobs page updates.
```
  Diana Huang committed May 09, 2013
  f9023fd1 Browse Files
- Put Front End Developer back in. · e5b18a56
  Diana Huang committed May 09, 2013
  
  e5b18a56 Browse Files
- Merge pull request #1980 from edx/backbone-1.0.0 · d09e9314
```
Upgrade to Backbone 1.0.0
```
  David Baumgold committed May 09, 2013
  d09e9314 Browse Files
- Add in new Coordinator position. · ec5f239d
  Diana Huang committed May 09, 2013
  
  ec5f239d Browse Files
08 May, 2013 19 commits
- Merge pull request #1988 from edx/devops/jbau/server_email_lms_setting · ca1aeb5b
```
Set SERVER_EMAIL so that mail_admins works
```
  Jason Bau committed May 08, 2013
  ca1aeb5b Browse Files
- Set SERVER_EMAIL so that mail_admins works · 1354cd41
  Jason Bau committed May 08, 2013
  
  1354cd41 Browse Files
- Merge pull request #1984 from edx/feature/gprice/accept-zendesk-ssl-cert · 8e6a0914
```
Disable SSL cert validation for Zendesk API
```
  Greg Price committed May 08, 2013
  8e6a0914 Browse Files
- Jobs page updates. · 1e61bbd1
  Diana Huang committed May 08, 2013
  
  1e61bbd1 Browse Files
- Merge pull request #1982 from edx/fix/btalbot/studio-alerts · b36a05b8
```
studio - alerts: synced up styles and sample markup
```
  Brian Talbot committed May 08, 2013
  b36a05b8 Browse Files
- Disable SSL cert validation for Zendesk API · 0e525d69
```
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.
```
  Greg Price committed May 08, 2013
  0e525d69 Browse Files
- guard predicates are rake tasks, not functions · 165e7059
  Steve Strassmann committed May 08, 2013
  
  165e7059 Browse Files
- studio - alerts: synced up example HTML to show advanced settings live… · 25dd2c7d
```
studio - alerts: synced up example HTML to show advanced settings live notification, aria roles, and action classes; integrated typography mixins
```
  Brian Talbot committed May 08, 2013
  25dd2c7d Browse Files
- add guard code to ensure gnu gettext utilities are loaded before rake tests · dfcbb736
  Steve Strassmann committed May 08, 2013
  
  dfcbb736 Browse Files
- fix logging · beb4b39b
  Steve Strassmann committed May 08, 2013
  
  beb4b39b Browse Files
- more verbose messages.po · dc473e6f
  Steve Strassmann committed May 08, 2013
  
  dc473e6f Browse Files
- /usr/bin/env in shebang line · d05ba84f
  Steve Strassmann committed May 08, 2013
  
  d05ba84f Browse Files
- pull from master · 0a62d5c7
  Steve Strassmann committed May 08, 2013
  
  0a62d5c7 Browse Files
- Merge pull request #1965 from edx/feature/christina/fields · 0c6c7868
```
Pass through the value (either default or inherited) that a metadata field WILL have if it is not explicitly set.
```
  Christina Roberts committed May 08, 2013
  0c6c7868 Browse Files
- Merge pull request #1974 from edx/diana/hide-api-key · d522b53f
```
Hide the Comments Service API key during logging.
```
  Diana Huang committed May 08, 2013
  d522b53f Browse Files
- pull from master · 15938dd8
  Steve Strassmann committed May 08, 2013
  
  15938dd8 Browse Files
- whitespace changes · 7f69e45b
  David Baumgold committed May 08, 2013
  
  7f69e45b Browse Files
- Updated Backbone.js and Underscore.js · ec79ebd4
```
Backbone 1.0.0, Underscore 1.4.4
```
  David Baumgold committed May 08, 2013
  ec79ebd4 Browse Files
- Merge pull request #1957 from edx/fix/will/bug_392 · b19c80cc
```
Added unit tests for safe_key() to resolve bug 392.
```
  Will Daly committed May 08, 2013
  b19c80cc Browse Files
07 May, 2013 1 commit
- Merge pull request #1976 from edx/vik/fix/oe-bugs · fb4685fe
```
Vik/fix/oe bugs
```
  VikParuchuri committed May 07, 2013
  fb4685fe Browse Files