Commits · 4f1e6c484e28ab218afe24467740d204c3df859d · edx / edx-platform · GitLab

30 May, 2013 8 commits
- 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 #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 14 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
- 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
- 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
- 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 18 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
- Merge pull request #2120 from edx/feature/will/capa-template-tests · 9f48c44f
```
Added tests for capa input templates (unescaped HTML)
```
  Will Daly committed May 28, 2013
  9f48c44f Browse Files
- make debug_request available only when DEBUG is enabled, so that production… · 54fb46ce
```
make debug_request available only when DEBUG is enabled, so that production doesn't have this security risk.
```
  Brian Wilson committed May 28, 2013
  54fb46ce Browse Files
- Merge pull request #2127 from edx/jtauber/mitxmako-readme · be70e016
```
updated mitxmako README to clarify license and origin
```
  James Tauber committed May 28, 2013
  be70e016 Browse Files
- Hopefully fixed registration flakey test · c3c4a0e9
  JonahStanley committed May 28, 2013
  
  c3c4a0e9 Browse Files
- updated mitxmako README to clarify license and origin · d38f2661
  James Tauber committed May 28, 2013
  
  d38f2661 Browse Files
- Merge pull request #2020 from edx/ux/marco/forums-icons · ab18953e
```
updated pinning icons
```
  marcotuts committed May 28, 2013
  ab18953e Browse Files
- Merge pull request #2125 from edx/giulio/fix-footer-layout · 3106ad02
```
fix footer and header spacing/margin issues
```
  caesar2164 committed May 28, 2013
  3106ad02 Browse Files
- Merge pull request #2115 from edx/bug/christina/preview_url · 0e4c0811
```
Bug/christina/preview url
```
  Christina Roberts committed May 28, 2013
  0e4c0811 Browse Files
- Merge pull request #2126 from edx/gprice/tweak-500-text · b668ab62
```
Reviewed by cale and brian (https://rbcommons.com/s/edx/r/3/)
```
  Greg Price committed May 28, 2013
  b668ab62 Browse Files
- fix user button/dropdown spacing/scrolling issue · 186da0d5
  Giulio Gratta committed May 28, 2013
  
  186da0d5 Browse Files
- lms/mktg - removes margins from social icons and reinstates flex-gutter margin… · 25305dc8
```
lms/mktg - removes margins from social icons and reinstates flex-gutter margin to colophon area of footer
```
  Brian Talbot committed May 28, 2013
  25305dc8 Browse Files
- lms/mktg - revises paragraph in colophon portion of footer to match footer's flex-grid value · ef6c365c
  Brian Talbot committed May 28, 2013
  
  ef6c365c Browse Files
- fix footer element spacing issues · 8d7b46b5
  Giulio Gratta committed May 28, 2013
  
  8d7b46b5 Browse Files
- Merge branch 'master' into bug/christina/preview_url · aca5cbb2
  cahrens committed May 28, 2013
  
  aca5cbb2 Browse Files
- Preview url is read in from environment file. · e0bb4ad4
  cahrens committed May 28, 2013
  
  e0bb4ad4 Browse Files