Commits · 6bb6f1c7432cf56c38ae6bf3d1962a0e159db29a · edx / edx-platform · GitLab

13 May, 2013 3 commits
- add comment to explain json dump logic · 6bb6f1c7
  Arthur Barrett committed May 13, 2013
  
  6bb6f1c7 Browse Files
- make user id check more idiomatic · e2e32e31
  Arthur Barrett committed May 13, 2013
  
  e2e32e31 Browse Files
- replace bare except with except DoesNotExist · 6f7f9245
  Arthur Barrett committed May 13, 2013
  
  6f7f9245 Browse Files
11 May, 2013 3 commits
- Merge branch 'master' into feature/abarrett/lms-notes-app · beabdf14
  Arthur Barrett committed May 11, 2013
  
  beabdf14 Browse Files
- replacing lists with namedtuples to improve readability · 11a48dc9
  Arthur Barrett committed May 11, 2013
  
  11a48dc9 Browse Files
- log the course_id when notes are disabled · ee1ee26c
  Arthur Barrett committed May 11, 2013
  
  ee1ee26c Browse Files
10 May, 2013 5 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
- 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 16 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
- trying to fix pylint errors · a6ad65cb
  Arthur Barrett committed May 09, 2013
  
  a6ad65cb Browse Files
- add model unit tests · a407c84b
  Arthur Barrett committed May 09, 2013
  
  a407c84b Browse Files
- Filter out the template course from the mongo modulestore get_courses function · ea859bd6
  Calen Pennington committed May 09, 2013
  
  ea859bd6 Browse Files
- add search test · 9aed148d
  Arthur Barrett committed May 09, 2013
  
  9aed148d Browse Files
- add more tests for update and delete actions · aad5096c
  Arthur Barrett committed May 09, 2013
  
  aad5096c Browse Files
- fix pep8 violations · 2838dba1
  Arthur Barrett committed May 09, 2013
  
  2838dba1 Browse Files
- Merge branch 'master' into feature/abarrett/lms-notes-app · dd583ce4
  Arthur Barrett committed May 09, 2013
  
  dd583ce4 Browse Files
- added more unit tests · 244261f1
  Arthur Barrett committed May 09, 2013
  
  244261f1 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
- fix failing unit test in lms.envs.test env · f1f65c56
  Arthur Barrett committed May 09, 2013
  
  f1f65c56 Browse Files
- Add in new Coordinator position. · ec5f239d
  Diana Huang committed May 09, 2013
  
  ec5f239d Browse Files
08 May, 2013 13 commits
- Merge branch 'master' into feature/abarrett/lms-notes-app · c7197cd5
  Arthur Barrett committed May 08, 2013
  
  c7197cd5 Browse Files
- adding some tests · bf21211b
  Arthur Barrett committed May 08, 2013
  
  bf21211b Browse Files
- 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
- 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
- remove unnecessary count · 1eb05cfd
  Arthur Barrett committed May 08, 2013
  
  1eb05cfd Browse Files
- refactored api resource map and added total to search query · 0f70b0aa
  Arthur Barrett committed May 08, 2013
  
  0f70b0aa 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