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

13803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JonahStanley
ccc253d5c0 Sped up tab lettuce test 2013-05-30 14:56:08 -04:00
JonahStanley
7fe206a9d2 Sped up some Lettuce Tests 2013-05-30 14:23:49 -04:00
JonahStanley
62b74008e6 Added tests for Limited Attempt Problems and Showing the Answer 2013-05-30 14:22:37 -04:00
JonahStanley
c3c4a0e9ad Hopefully fixed registration flakey test 2013-05-28 15:22:47 -04: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
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
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
Giulio Gratta
566a8b3823 fix bad css and clean up after rebase/merge 2013-05-23 09:44:42 -07:00
Giulio Gratta
93258c548f fixed hardcoded changes left over from parent theme branch backport 2013-05-23 09:44:41 -07:00
Giulio Gratta
3dd5733cee first round of color replacements with variables 2013-05-23 09:44:40 -07:00
chrisndodge
a8084628e1 Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master 
Feature/cdodge/autoprovision forums master
 2013-05-23 09:27:36 -07:00
Calen Pennington
257dae634b Merge pull request #2090 from edx/fix/cale/amazon-ses-errors 
Fix/cale/amazon ses errors
 2013-05-23 09:17:51 -07:00
Ned Batchelder
9e542aa548 Merge pull request #2109 from edx/ned/hotfix-disable-codejail-memory-limit 
Use the latest CodeJail, with 0 default for memory limit.
 2013-05-23 09:13:29 -07:00
David Baumgold
082e24c634 Removed references to server_error.js 2013-05-23 12:09:12 -04:00
Ned Batchelder
1224204b4c Use the latest CodeJail, with 0 default for memory limit. 2013-05-23 12:03:02 -04:00
Will Daly
a4ad495bef Merge pull request #2084 from edx/fix/will/lettuce-browser-size 
Set the browser size on startup of acceptance tests.
 2013-05-23 08:00:48 -07:00
David Baumgold
a15a283674 Merge pull request #2087 from edx/backbone-notifications-font-awesome 
Backbone notifications & font awesome integration

oh thank god this is finally getting merged
 2013-05-23 07:31:43 -07:00
Calen Pennington
f521b8e8c0 Handle errors while sending emails around changing user data 
The most common error is Amazon SES having blacklisted an email address.
However, we handle any error being raised during user.email_user.

Fixes JIRA LMS-131
 2013-05-23 10:27:34 -04:00
Jay Zoldak
e6a1a9faaf Merge branch 'master' into feature/cdodge/autoprovision-forums-master 2013-05-23 10:19:39 -04:00
David Baumgold
c26edbd631 jasmine-jquery compatiblity post-backport 2013-05-23 10:14:47 -04:00
Jay Zoldak
af8b509e2d Merge pull request #2106 from edx/fix/nate/application-mako-crash 
Use .get instead of [] to access env hash
 2013-05-23 06:31:51 -07:00
Nate Hardison
daa0ac2f01 Capture Mako exit code and fail fast if necessary 
Capture the exit code of the Mako template engine invocation on
asset preprocessing and abort from the Rake task on failure. This
will prevent the LMS from continuing its attempt to start up,
preventing further configuration errors.
 2013-05-22 19:42:22 -07:00
Nate Hardison
f826198214 Use "is not None" convention 2013-05-22 19:34:14 -07:00
Calen Pennington
b2b6ca5f7b Record junit reports of jasmine tests 2013-05-22 22:01:44 -04:00
Chris Dodge
293d0a8645 special case the db setup for the cms acceptance tests. We need the comment client database tables to be created since we're creating the DB from scratch 2013-05-22 21:58:29 -04:00