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

13771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Slater-Victoroff
5883ee8a5a Added directory structure tests 2013-05-30 15:03:48 -04:00
Slater-Victoroff
9cdcc9df8c Bringing the create-dev-env.sh script up to date and generalizing for mac and debian-based systems 2013-05-30 14:52:15 -04:00
Slater-Victoroff
72377e1a55 Merge branch 'slater/new_mac_dev_script' of https://github.com/edx/edx-platform into slater/new_mac_dev_script 2013-05-30 11:16:08 -04:00
Slater-Victoroff
715e324b29 Updated documentation in doc and README and made some small edits to bash script for added robustness 
Added documenntation to the docs folder and edited the mac bash script in response to tests
 2013-05-30 11:15:00 -04:00
Slater-Victoroff
e493ada3ff Removed numpy and scipy files 2013-05-30 11:11:05 -04:00
Slater-Victoroff
84149f8f78 Merge branch 'slater/new_mac_dev_script' of https://github.com/edx/edx-platform into slater/new_mac_dev_script 2013-05-30 10:55:54 -04:00
Slater-Victoroff
0d56b9c2ff Updated documentation in doc and README and made some small edits to bash script for added robustness 2013-05-30 10:55:39 -04:00
Slater-Victoroff
8b6bdb92c2 Added documenntation to the docs folder and edited the mac bash script in response to tests 2013-05-30 10:11:14 -04:00
Slater-Victoroff
4335d7a208 Added largely functional bash script for setting up dev environment on macs. Due date of June 1st for open source deadline. 2013-05-29 13:14:08 -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
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
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
Ned Batchelder
4a92949218 scipy can go back into base. MySQL-python really does have to be installed after distribute has been updated by base.txt, I tested it. 2013-05-22 17:05:41 -04:00
David Baumgold
4736527952 Add Jasmine tests to cover AJAX error notifications 2013-05-22 15:55:56 -04:00
David Baumgold
be8daf7468 /event was returning invalid JSON: fix it 2013-05-22 15:55:56 -04:00
David Baumgold
0a7222b123 Allow an AJAX call to specify that it should not notify on error 
Because there are some cases where it's OK to fail, and it's not the user's fault
 2013-05-22 15:55:56 -04:00
Brian Talbot
2359c43855 studio - revises z-index/element depth levels for modals, notifications, prompts, and alerts to use universal .depth Sass extends 2013-05-22 15:55:56 -04:00