Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valera Rozuvan
6794b73d99 Added videoalpha version 1 to the advanced components in studio. 2013-05-24 10:14:18 +03:00
Will Daly
bfaadd47ab Updated testing documentation to reflect changes to how requirements are 
installed.
 2013-05-23 22:30:09 -04:00
Peter Baratta
2793bb4337 Add few more tests; fix a small bug with parallel resistors 2013-05-23 17:43:26 -04:00
Peter Baratta
2486f7c271 Fixed docstrings and other comments from PR review 2013-05-23 17:38:16 -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
Brian Talbot
1371c8d0da revises alignment of advanced editor and cheatsheet toggle 2013-05-23 13:27:23 -04:00
Brian Talbot
7940ca54ad studio - adjusts visual vertical spacing of save/cancel actions in modal editing windows on unit and page edits. 2013-05-23 13:27:22 -04: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
e0d
a16cb4b134 resolved confict based on change branching later than the live hotfix branch 2013-05-23 12:35:36 -04:00
cahrens
1a8a721998 Will not do unrelated test at this time. 2013-05-23 12:31:20 -04: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
cahrens
48703af234 Merge. 2013-05-23 11:41:26 -04:00
cahrens
c95b44d851 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-05-23 11:41:12 -04:00
cahrens
c8d6d5d283 Selenium tests. 2013-05-23 11:34:02 -04:00
Peter Baratta
1de8c4d321 Merge branch 'master' into pbaratta/calc-tests 2013-05-23 11:11:08 -04:00
Peter Baratta
70898a06da Pep8 fix 2013-05-23 11:09:23 -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
Peter Baratta
db261dc1c3 Add docstrings; test divsion by zero at Response level 2013-05-23 10:18:30 -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
Calen Pennington
7ef6132194 Make factories return unicode data 
Django always returns string data from the database as unicode objects
(ref: https://docs.djangoproject.com/en/1.4/ref/unicode/#models).
Therefor, our factories should do the same
 2013-05-22 21:38:07 -04:00
Calen Pennington
a282153337 Cleaned up whitespace in docs 2013-05-22 21:38:03 -04:00
Calen Pennington
dcefd9e991 Taught rake test_lms and test_cms to run specific tests by passing a single argument 2013-05-22 21:37:48 -04:00
Calen Pennington
2add58bb5a Create sequences for names, emails, and usernames in UserFactory 2013-05-22 21:35:49 -04:00
Chris Dodge
3fceb46953 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-22 20:44:22 -04:00
Nate Hardison
a0b6a176f2 Use .get instead of [] to access env hash 
If the `THEME_NAME` environment token isn't defined, then the
application.scss.mako file will crash during preprocessing. Use
.get to avoid a crash.
 2013-05-22 14:49:22 -07:00
David Baumgold
350c5460af Revert "Update jasmine-jquery to 1.5.1" 
This reverts commit 90a9c386eb.
 2013-05-22 17:29:52 -04:00