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

30 May, 2013 13 commits
- 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 #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 23 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
- Merge pull request #2145 from edx/ned/codejail-slug · c6dae2f1
```
Ned/codejail slug
```
  Ned Batchelder committed May 29, 2013
  c6dae2f1 Browse Files
- Remove unnecessary fields. · b77919a8
  cahrens committed May 29, 2013
  
  b77919a8 Browse Files
- pep8 and documentation cleanup. · 551a1c15
  cahrens committed May 29, 2013
  
  551a1c15 Browse Files
- i18n · 4920f08d
  cahrens committed May 29, 2013
  
  4920f08d 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
- Update for metadata changes. · e3bc5e6b
  cahrens committed May 29, 2013
  
  e3bc5e6b 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
- Don't call setFixtures. Can stomp on other tests. · 7d07309f
  cahrens committed May 29, 2013
  
  7d07309f Browse Files
- Jasmine test for views. · 24707f8f
  cahrens committed May 29, 2013
  
  24707f8f 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 4 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