Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,828 Commits 1 Branch 0 Tags
62d2ad8986ecffa58bbabb1b61472e2dbece95af
Commit Graph

13828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Calen Pennington
57c382d587 Remove secrets from master 2013-05-30 15:09:12 -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
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
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
4c97d16edc add hack to assets.rake to unblock the release train 2013-05-28 23:40:16 -04: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
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
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
chrisndodge
27c6816bac Merge pull request #2113 from edx/fix/cdodge/few-xml-serialize-fixes 
randomize_module.py was missing 'import lxml' to support definition_to_x...
 2013-05-24 06:26:23 -07:00
Frances Botsford
dfb623a29f removed old icon css and js files and references that are no longer needed 2013-05-24 09:01:15 -04:00
Will Daly
bfaadd47ab Updated testing documentation to reflect changes to how requirements are 
installed.
 2013-05-23 22:30:09 -04:00
cahrens
138ad3988f Update test (and set PREVIEW_LMS_BASE to something different so we can actually test the method). 2013-05-23 17:06:02 -04:00
cahrens
a03a4fdd07 PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). Make this work locally as well. 
https://edx.lighthouseapp.com/projects/102637/tickets/331
 2013-05-23 16:45:10 -04:00
cahrens
522b76e847 PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). 
https://edx.lighthouseapp.com/projects/102637/tickets/331
 2013-05-23 16:27:05 -04:00
Ned Batchelder
ebc991cce6 Merge pull request #2094 from edx/ned/make-numpy-and-scipy-both-install 
Put numpy into a pre.txt so that everything will actually install.
 2013-05-23 12:03:07 -07:00
Chris Dodge
b6090952da randomize_module.py was missing 'import lxml' to support definition_to_xml(). Also, fix serialization of show_timezone to expect a bool 2013-05-23 14:24:36 -04:00
caesar2164
94300608a0 Merge pull request #2112 from edx/feature/giulio/variablize-colors 
fixing video-bg-image and homepage-bg-image urls
 2013-05-23 11:21:23 -07:00
Calen Pennington
69beea854c Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports 
Record junit reports of jasmine tests
 2013-05-23 11:06:34 -07:00
Giulio Gratta
538ffe6fbe fixing video-bg-image and homepage-bg-image urls 2013-05-23 11:04:24 -07:00
David Baumgold
007a4e534f Merge pull request #2110 from edx/fix/db/lettuce-tests 
Fix lettuce tests
 2013-05-23 09:55:56 -07:00
David Baumgold
cf1e906c13 Fix lettuce tests 2013-05-23 12:50:19 -04:00
caesar2164
ba93f45341 Merge pull request #2050 from edx/feature/giulio/variablize-colors 
first round of color replacements with variables
 2013-05-23 09:47:04 -07:00