Commits · 46967a78dc505b4dc9b232bd07647c1b6edd8d87 · edx / edx-platform · GitLab

30 May, 2013 17 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
- Remove secrets from master · 0cdc58bf
  Calen Pennington committed May 30, 2013
  
  0cdc58bf 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
- 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 20 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
- 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
- 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
- Give all response types an id attribute. CustomResponse had one, with a silly… · 0714b975
```
Give all response types an id attribute.  CustomResponse had one, with a silly name.  Use it for all ResponseTypes.
```
  Ned Batchelder committed May 29, 2013
  0714b975 Browse Files
- Merge pull request #2145 from edx/ned/codejail-slug · c6dae2f1
```
Ned/codejail slug
```
  Ned Batchelder committed May 29, 2013
  c6dae2f1 Browse Files
- Merge pull request #1714 from edx/feature/valera/videoalpha1_studio · 42a55faf
```
Added videoalpha version 1 to the advanced components in studio.
```
  chrisndodge committed May 29, 2013
  42a55faf Browse Files
- One more tweak to CodeJail · 3a030df5
  Ned Batchelder committed May 29, 2013
  
  3a030df5 Browse Files
- Pass safe_exec a slug, the problem or response id; Use the latest CodeJail, with slug support. · 34911f68
  Ned Batchelder committed May 29, 2013
  
  34911f68 Browse Files
- Give all response types an id attribute. CustomResponse had one, with a silly… · 1d5f32d0
```
Give all response types an id attribute.  CustomResponse had one, with a silly name.  Use it for all ResponseTypes.
```
  Ned Batchelder committed May 29, 2013
  1d5f32d0 Browse Files
- Use latest CodeJail to prevent bytecode writing. · c1f72887
  Ned Batchelder committed May 29, 2013
  
  c1f72887 Browse Files
- fix Edge login to use the updated POST-back URL /login -> /login_ajax · 879f7d10
  Chris Dodge committed May 29, 2013
  
  879f7d10 Browse Files
- update POST-back URL to the new one - post Drupal · eb4dd763
  Chris Dodge committed May 29, 2013
  
  eb4dd763 Browse Files
- add the new category which can act as a category · 25dae572
  Chris Dodge committed May 29, 2013
  
  25dae572 Browse Files
- Merge pull request #2129 from edx/fix/jonahstanley/fix-flakey-test · fa6bbfb9
```
Fixed Flakey Acceptance Test
```
  Jonah Stanley committed May 29, 2013
  fa6bbfb9 Browse Files
- Merge pull request #2134 from edx/ned/latest-codejail · 18f28457
```
Use latest CodeJail to prevent bytecode writing.
```
  Ned Batchelder committed May 29, 2013
  18f28457 Browse Files
- add hack to assets.rake to unblock the release train · 4c97d16e
  Chris Dodge committed May 28, 2013
  
  4c97d16e Browse Files
- Use latest CodeJail to prevent bytecode writing. · ce9acf9f
  Ned Batchelder committed May 28, 2013
  
  ce9acf9f Browse Files
- Merge pull request #2133 from edx/jinpa/public-username-off-master · 7a388587
```
Copy changes to make dup email or public-username messages more informat...
```
  jinpa committed May 28, 2013
  7a388587 Browse Files
28 May, 2013 3 commits
- Copy changes to make dup email or public-username messages more informative · c976fee2
  Jane Manning committed May 28, 2013
  
  c976fee2 Browse Files
- Merge pull request #2128 from edx/bugfix/brian/remove-debug-request · 2efa160c
```
make debug_request available only when DEBUG is enabled, so that product...
```
  brianhw committed May 28, 2013
  2efa160c Browse Files
- Merge tag 'hotfix-2013-05-28' · f0e688e8
```
Hotfix for 2013-05-28

Conflicts:
	requirements/edx/github.txt
```
  Greg Price committed May 28, 2013
  f0e688e8 Browse Files