David Ormsbee
|
aae3380aa9
|
Merge pull request #16 from edx/feature/e0d/remove-request-debugger
RFC: removing the request debugger entirely.
|
2013-05-31 08:36:16 -07:00 |
|
John Jarvis
|
23e98314f4
|
Merge pull request #19 from edx/jarv/django-upgrade
updating django minor release
|
2013-05-31 08:33:42 -07:00 |
|
e0d
|
2e84540af0
|
removing the request debugger entirely.
|
2013-05-31 11:15:28 -04:00 |
|
John Jarvis
|
800ec068bd
|
updating django minor release
|
2013-05-31 11:15:15 -04:00 |
|
marcotuts
|
46967a78dc
|
Merge pull request #6 from edx/release
Release 2013-05-29, with Hotfix 2013-05-30 back into master
|
2013-05-30 16:34:22 -07:00 |
|
marcotuts
|
3614a72a2c
|
Merge pull request #1 from edx/hotfix/advanced-settings
Put back in the blocks for Advanced Settings.
|
2013-05-30 15:41:09 -07:00 |
|
David Baumgold
|
bdc9570cd1
|
Removed Symbolset font files
|
2013-05-30 16:09:17 -04:00 |
|
Peter Baratta
|
e17f9f6c37
|
Merge pull request #2108 from edx/pbaratta/calc-tests
Add some testing to calc.py prior to changes
|
2013-05-30 12:54:52 -07:00 |
|
cahrens
|
62d2ad8986
|
Put back in the blocks for Advanced Settings.
|
2013-05-30 15:50:01 -04:00 |
|
Calen Pennington
|
6c7491a35a
|
Merge pull request #2153 from edx/fix/cale/remove-secrets
Remove secrets from master
|
2013-05-30 12:43:56 -07:00 |
|
David Baumgold
|
c12cb59b96
|
Merge pull request #2154 from edx/fix/db/advanced-settings-notifications
Put the advanced settings notifications back in
|
2013-05-30 12:27:19 -07:00 |
|
Calen Pennington
|
57c382d587
|
Remove secrets from master
|
2013-05-30 15:09:12 -04:00 |
|
David Baumgold
|
4f1e6c484e
|
Put the advanced settings notifications back in
|
2013-05-30 15:08:40 -04:00 |
|
Calen Pennington
|
858453fb83
|
Merge pull request #2152 from edx/fix/cale/remove-secrets
Remove secrets from master
|
2013-05-30 11:43:15 -07:00 |
|
Calen Pennington
|
0cdc58bf12
|
Remove secrets from master
|
2013-05-30 14:26:40 -04:00 |
|
chrisndodge
|
0728086336
|
Merge pull request #2151 from edx/fix/cdodge/hack-for-deploy
applying same hack from rc to master until real fix is ready
|
2013-05-30 09:54:41 -07:00 |
|
Chris Dodge
|
10761f102f
|
applying same hack from rc to master until real fix is ready
|
2013-05-30 12:53:30 -04:00 |
|
marcotuts
|
8a0c470259
|
Merge pull request #2131 from edx/rc/2013-05-29
Rc/2013 05 29, merging into release after adding release-2013-05-29 tag
|
2013-05-30 09:00:14 -07:00 |
|
Diana Huang
|
5118b06ef2
|
Merge pull request #2147 from edx/diana/fix-error-descriptor
Fix XML Error Module so that it no longer shows the data to non-staff.
|
2013-05-30 08:52:41 -07:00 |
|
chrisndodge
|
5eaa6aea23
|
Merge pull request #2140 from edx/fix/cdodge/add-randomize-to-list-of-collections
add the new category which can act as a category
|
2013-05-30 06:20:21 -07:00 |
|
chrisndodge
|
91c8570c37
|
Merge pull request #2142 from edx/fix/cdodge/repair-edge-login
update POST-back URL to the new one - post Drupal
|
2013-05-29 21:16:48 -07:00 |
|
David Baumgold
|
31ea1eba06
|
Merge pull request #2148 from edx/remove-symbolset
Removed Symbolset font files
|
2013-05-29 14:51:13 -07:00 |
|
David Baumgold
|
4720f41bc2
|
Removed Symbolset font files
|
2013-05-29 17:49:49 -04:00 |
|
Diana Huang
|
910324fb49
|
Fix XML Error Module so that it no longer shows the data to non-staff.
|
2013-05-29 16:31:11 -04:00 |
|
Ned Batchelder
|
9d13ac0dd7
|
One more tweak to CodeJail
|
2013-05-29 16:09:03 -04:00 |
|
Ned Batchelder
|
956998496a
|
Pass safe_exec a slug, the problem or response id; Use the latest CodeJail, with slug support.
|
2013-05-29 16:08:54 -04:00 |
|
Ned Batchelder
|
0714b97511
|
Give all response types an id attribute. CustomResponse had one, with a silly name. Use it for all ResponseTypes.
|
2013-05-29 16:08:37 -04:00 |
|
Ned Batchelder
|
c6dae2f17f
|
Merge pull request #2145 from edx/ned/codejail-slug
Ned/codejail slug
|
2013-05-29 12:58:07 -07:00 |
|
chrisndodge
|
42a55fafb2
|
Merge pull request #1714 from edx/feature/valera/videoalpha1_studio
Added videoalpha version 1 to the advanced components in studio.
|
2013-05-29 12:01:18 -07:00 |
|
Ned Batchelder
|
3a030df5a7
|
One more tweak to CodeJail
|
2013-05-29 14:38:37 -04:00 |
|
Ned Batchelder
|
34911f68a7
|
Pass safe_exec a slug, the problem or response id; Use the latest CodeJail, with slug support.
|
2013-05-29 14:25:24 -04:00 |
|
Ned Batchelder
|
1d5f32d065
|
Give all response types an id attribute. CustomResponse had one, with a silly name. Use it for all ResponseTypes.
|
2013-05-29 14:24:43 -04:00 |
|
Ned Batchelder
|
c1f72887fc
|
Use latest CodeJail to prevent bytecode writing.
|
2013-05-29 12:40:57 -04:00 |
|
Chris Dodge
|
879f7d1051
|
fix Edge login to use the updated POST-back URL /login -> /login_ajax
|
2013-05-29 12:11:25 -04:00 |
|
Chris Dodge
|
eb4dd76328
|
update POST-back URL to the new one - post Drupal
|
2013-05-29 12:02:41 -04:00 |
|
Chris Dodge
|
25dae57226
|
add the new category which can act as a category
|
2013-05-29 11:16:33 -04:00 |
|
Jonah Stanley
|
fa6bbfb9e2
|
Merge pull request #2129 from edx/fix/jonahstanley/fix-flakey-test
Fixed Flakey Acceptance Test
|
2013-05-29 07:48:46 -07:00 |
|
Ned Batchelder
|
18f28457b8
|
Merge pull request #2134 from edx/ned/latest-codejail
Use latest CodeJail to prevent bytecode writing.
|
2013-05-29 06:57:02 -07:00 |
|
Chris Dodge
|
4c97d16edc
|
add hack to assets.rake to unblock the release train
|
2013-05-28 23:40:16 -04:00 |
|
Ned Batchelder
|
ce9acf9fb2
|
Use latest CodeJail to prevent bytecode writing.
|
2013-05-28 21:45:46 -04:00 |
|
jinpa
|
7a388587b5
|
Merge pull request #2133 from edx/jinpa/public-username-off-master
Copy changes to make dup email or public-username messages more informat...
|
2013-05-28 17:11:02 -07:00 |
|
Jane Manning
|
c976fee2d9
|
Copy changes to make dup email or public-username messages more informative
|
2013-05-28 15:32:53 -07:00 |
|
brianhw
|
2efa160c56
|
Merge pull request #2128 from edx/bugfix/brian/remove-debug-request
make debug_request available only when DEBUG is enabled, so that product...
|
2013-05-28 14:11:20 -07:00 |
|
Greg Price
|
f0e688e8f8
|
Merge tag 'hotfix-2013-05-28'
Hotfix for 2013-05-28
Conflicts:
requirements/edx/github.txt
|
2013-05-28 17:01:15 -04:00 |
|
Will Daly
|
9f48c44fb6
|
Merge pull request #2120 from edx/feature/will/capa-template-tests
Added tests for capa input templates (unescaped HTML)
|
2013-05-28 13:55:05 -07:00 |
|
Brian Wilson
|
54fb46cee4
|
make debug_request available only when DEBUG is enabled, so that production doesn't have this security risk.
|
2013-05-28 15:30:25 -04:00 |
|
James Tauber
|
be70e016d4
|
Merge pull request #2127 from edx/jtauber/mitxmako-readme
updated mitxmako README to clarify license and origin
|
2013-05-28 12:24:58 -07:00 |
|
JonahStanley
|
c3c4a0e9ad
|
Hopefully fixed registration flakey test
|
2013-05-28 15:22:47 -04:00 |
|
James Tauber
|
d38f266153
|
updated mitxmako README to clarify license and origin
|
2013-05-28 15:14:47 -04:00 |
|
marcotuts
|
ab18953eec
|
Merge pull request #2020 from edx/ux/marco/forums-icons
updated pinning icons
|
2013-05-28 11:22:13 -07:00 |
|