Commits · 57f8bbf69dddd55e7168fb6ccb65ea3567163e0d · edx / edx-platform · GitLab

31 May, 2013 3 commits
- Updates to Selenium test based on feedback. · 57f8bbf6
  cahrens committed May 31, 2013
  
  57f8bbf6 Browse Files
- Pylint cleanup. · ab5834fb
  cahrens committed May 31, 2013
  
  ab5834fb Browse Files
- Merge branch 'master' into feature/christina/metadata-ui · e6dfa8e8
  cahrens committed May 31, 2013
  
  e6dfa8e8 Browse Files
30 May, 2013 29 commits
- Merge pull request #6 from edx/release · 46967a78
```
Release 2013-05-29, with Hotfix 2013-05-30 back into master
```
  marcotuts committed May 30, 2013
  46967a78 Browse Files
- Merge pull request #1 from edx/hotfix/advanced-settings · 3614a72a
```
Put back in the blocks for Advanced Settings.
```
  marcotuts committed May 30, 2013
  3614a72a Browse Files
- Removed Symbolset font files · bdc9570c
  David Baumgold committed May 30, 2013
  
  bdc9570c Browse Files
- Merge pull request #2108 from edx/pbaratta/calc-tests · e17f9f6c
```
Add some testing to calc.py prior to changes
```
  Peter Baratta committed May 30, 2013
  e17f9f6c Browse Files
- Put back in the blocks for Advanced Settings. · 62d2ad89
  cahrens committed May 30, 2013
  
  62d2ad89 Browse Files
- Merge pull request #2153 from edx/fix/cale/remove-secrets · 6c7491a3
```
Remove secrets from master
```
  Calen Pennington committed May 30, 2013
  6c7491a3 Browse Files
- Merge pull request #2154 from edx/fix/db/advanced-settings-notifications · c12cb59b
```
Put the advanced settings notifications back in
```
  David Baumgold committed May 30, 2013
  c12cb59b Browse Files
- Remove secrets from master · 57c382d5
  Calen Pennington committed May 30, 2013
  
  57c382d5 Browse Files
- Put the advanced settings notifications back in · 4f1e6c48
  David Baumgold committed May 30, 2013
  
  4f1e6c48 Browse Files
- Merge pull request #2152 from edx/fix/cale/remove-secrets · 858453fb
```
Remove secrets from master
```
  Calen Pennington committed May 30, 2013
  858453fb Browse Files
- Prepare for Peter's change. · 6c06599d
  cahrens committed May 30, 2013
  
  6c06599d Browse Files
- Remove secrets from master · 0cdc58bf
  Calen Pennington committed May 30, 2013
  
  0cdc58bf Browse Files
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · 46cf5e33
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  cahrens committed May 30, 2013
  46cf5e33 Browse Files
- Review feedback. · 8fd15ce4
  cahrens committed May 30, 2013
  
  8fd15ce4 Browse Files
- Refactor user factory usage for lettuce tests. Fix merge conflict. · 86afe727
  Jay Zoldak committed May 30, 2013
  
  86afe727 Browse Files
- Merge branch 'master' into feature/christina/metadata-ui · 1c209789
  cahrens committed May 30, 2013
  
  1c209789 Browse Files
- Go back to setFixtures. · c0c5e920
  cahrens committed May 30, 2013
  
  c0c5e920 Browse Files
- Merge pull request #2151 from edx/fix/cdodge/hack-for-deploy · 07280863
```
applying same hack from rc to master until real fix is ready
```
  chrisndodge committed May 30, 2013
  07280863 Browse Files
- applying same hack from rc to master until real fix is ready · 10761f10
  Chris Dodge committed May 30, 2013
  
  10761f10 Browse Files
- fix merge conflict · 2f504ec4
  Jay Zoldak committed May 30, 2013
  
  2f504ec4 Browse Files
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · a1b62912
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  Jay Zoldak committed May 30, 2013
  a1b62912 Browse Files
- Merge in from origin/feature/christina/metadata-ui · 4a64c0c9
  Jay Zoldak committed May 30, 2013
  
  4a64c0c9 Browse Files
- Merge branch 'master' into feature/christina/metadata-ui · 14eb9c9a
  cahrens committed May 30, 2013
  
  14eb9c9a Browse Files
- Tidy up the new lettuce tests for metadata editing a bit. · 6627ca56
  Jay Zoldak committed May 30, 2013
  
  6627ca56 Browse Files
- Updates from code review. · 5d41e2a9
  cahrens committed May 30, 2013
  
  5d41e2a9 Browse Files
- Merge pull request #2131 from edx/rc/2013-05-29 · 8a0c4702
```
Rc/2013 05 29, merging into release after adding release-2013-05-29 tag
```
  marcotuts committed May 30, 2013
  8a0c4702 Browse Files
- Merge pull request #2147 from edx/diana/fix-error-descriptor · 5118b06e
```
Fix XML Error Module so that it no longer shows the data to non-staff.
```
  Diana Huang committed May 30, 2013
  5118b06e Browse Files
- Merge pull request #2140 from edx/fix/cdodge/add-randomize-to-list-of-collections · 5eaa6aea
```
add the new category which can act as a category
```
  chrisndodge committed May 30, 2013
  5eaa6aea Browse Files
- Merge pull request #2142 from edx/fix/cdodge/repair-edge-login · 91c8570c
```
update POST-back URL to the new one - post Drupal
```
  chrisndodge committed May 29, 2013
  91c8570c Browse Files
29 May, 2013 8 commits
- Merge pull request #2148 from edx/remove-symbolset · 31ea1eba
```
Removed Symbolset font files
```
  David Baumgold committed May 29, 2013
  31ea1eba Browse Files
- Removed Symbolset font files · 4720f41b
  David Baumgold committed May 29, 2013
  
  4720f41b Browse Files
- Update documentation (per Toddi). · b2fe7f5c
  cahrens committed May 29, 2013
  
  b2fe7f5c Browse Files
- Cleanup. · f0260757
  cahrens committed May 29, 2013
  
  f0260757 Browse Files
- Fix XML Error Module so that it no longer shows the data to non-staff. · 910324fb
  Diana Huang committed May 29, 2013
  
  910324fb Browse Files
- Update display name. · d7a1dda9
  cahrens committed May 29, 2013
  
  d7a1dda9 Browse Files
- One more tweak to CodeJail · 9d13ac0d
  Ned Batchelder committed May 29, 2013
  
  9d13ac0d Browse Files
- Pass safe_exec a slug, the problem or response id; Use the latest CodeJail, with slug support. · 95699849
  Ned Batchelder committed May 29, 2013
  
  95699849 Browse Files