Jay Zoldak
|
2f504ec4bf
|
fix merge conflict
|
2013-05-30 12:42:50 -04:00 |
|
Jay Zoldak
|
a1b62912f3
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-30 12:33:15 -04:00 |
|
Jay Zoldak
|
4a64c0c9b6
|
Merge in from origin/feature/christina/metadata-ui
|
2013-05-30 12:33:02 -04:00 |
|
cahrens
|
14eb9c9a3b
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-30 12:27:03 -04:00 |
|
Jay Zoldak
|
6627ca5635
|
Tidy up the new lettuce tests for metadata editing a bit.
|
2013-05-30 12:26:18 -04:00 |
|
cahrens
|
5d41e2a952
|
Updates from code review.
|
2013-05-30 12:26:01 -04: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 |
|
cahrens
|
b2fe7f5c01
|
Update documentation (per Toddi).
|
2013-05-29 17:19:33 -04:00 |
|
cahrens
|
f0260757c5
|
Cleanup.
|
2013-05-29 16:50:22 -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 |
|
cahrens
|
d7a1dda937
|
Update display name.
|
2013-05-29 16:23:31 -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 |
|
cahrens
|
b77919a849
|
Remove unnecessary fields.
|
2013-05-29 15:53:30 -04:00 |
|
cahrens
|
551a1c1516
|
pep8 and documentation cleanup.
|
2013-05-29 15:47:46 -04:00 |
|
cahrens
|
4920f08d2a
|
i18n
|
2013-05-29 15:15:31 -04: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 |
|
cahrens
|
e3bc5e6bef
|
Update for metadata changes.
|
2013-05-29 14:43:31 -04: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 |
|
cahrens
|
7d07309f9d
|
Don't call setFixtures. Can stomp on other tests.
|
2013-05-29 14:03:16 -04:00 |
|
cahrens
|
24707f8f85
|
Jasmine test for views.
|
2013-05-29 12:09:42 -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 |
|
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 |
|
caesar2164
|
3106ad027d
|
Merge pull request #2125 from edx/giulio/fix-footer-layout
fix footer and header spacing/margin issues
|
2013-05-28 11:12:49 -07:00 |
|
Christina Roberts
|
0e4c08112f
|
Merge pull request #2115 from edx/bug/christina/preview_url
Bug/christina/preview url
|
2013-05-28 11:08:22 -07:00 |
|
Greg Price
|
b668ab62f3
|
Merge pull request #2126 from edx/gprice/tweak-500-text
Reviewed by cale and brian (https://rbcommons.com/s/edx/r/3/)
|
2013-05-28 11:08:07 -07:00 |
|
cahrens
|
625c6b518c
|
Cleanup, change how we load templates.
|
2013-05-28 14:07:35 -04:00 |
|
Giulio Gratta
|
186da0d5fe
|
fix user button/dropdown spacing/scrolling issue
|
2013-05-28 10:49:58 -07:00 |
|
Brian Talbot
|
25305dc8f7
|
lms/mktg - removes margins from social icons and reinstates flex-gutter margin to colophon area of footer
|
2013-05-28 13:44:16 -04:00 |
|
Brian Talbot
|
ef6c365ca0
|
lms/mktg - revises paragraph in colophon portion of footer to match footer's flex-grid value
|
2013-05-28 13:36:47 -04:00 |
|
Giulio Gratta
|
8d7b46b51b
|
fix footer element spacing issues
|
2013-05-28 10:15:39 -07:00 |
|
cahrens
|
f3d4381fde
|
Minor cleanup.
|
2013-05-28 12:53:00 -04:00 |
|