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
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
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
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
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
aca5cbb215
Merge branch 'master' into bug/christina/preview_url
2013-05-28 12:13:19 -04:00
cahrens
e0bb4ad4dd
Preview url is read in from environment file.
2013-05-28 12:04:48 -04:00
Greg Price
e755bdfdfd
Tweak text on 500 error page
2013-05-28 10:59:19 -04:00
Will Daly
dcb95291a9
Merge branch 'master' into feature/will/capa-template-tests
2013-05-28 08:07:54 -04:00
Greg Price
7d3d34c69e
Remove tags for comment client request time histogram in Datadog
...
According to someone from Datadog, this was generating tags like "knowledgeable_
people_who_put_this_course_together._this_is_harvard._you_can_t_tell_us_there_s_
a_shortage_of_editorial_talent." They say that they can handle tens or hundreds
of unique tags but not thousands. Given that we have a unique URL for each
thread, we can't even use that as a tag. Thus, all tags are removed for now
until we can determine whether there is a useful set of tags with small enough
cardinality. In light of this, I did not investigate why the long tag mentioned
above was being generated.
2013-05-27 22:01:51 -04:00
VikParuchuri
256a367748
Merge pull request #2085 from edx/feature/vik/oe-editor
...
Feature/vik/oe editor
2013-05-24 13:56:26 -07:00
Vik Paruchuri
b1b93e71d7
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
2013-05-24 16:52:14 -04:00
Vik Paruchuri
e17276ade8
Fix some pep8 stuff
2013-05-24 16:43:29 -04:00
Vik Paruchuri
cef401f246
Swap icon to icon-table
2013-05-24 16:20:59 -04:00
Will Daly
519ddc02f9
Merge pull request #2117 from edx/fix/will/testing-docs
...
Updated testing documentation to reflect changes to how requirements are
2013-05-24 13:02:59 -07:00
Vik Paruchuri
9cbb4e090d
Swap icons for font awesome
2013-05-24 14:40:33 -04:00
Vik Paruchuri
5050eab74a
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
2013-05-24 14:26:33 -04:00
Will Daly
a64476f39a
Removed obsolete troubleshooting tip.
2013-05-24 11:08:52 -04:00
frances botsford
d2880586a3
Merge pull request #2118 from edx/fix/frances/studio-iconcleanup
...
Removed old icon references and files
2013-05-24 07:31:15 -07:00
