Commits · 660dbd80b9012ad3be2dd500c9175c7282e33f06 · edx / edx-platform · GitLab

31 May, 2013 4 commits
- small fix · 660dbd80
  Slater-Victoroff committed May 31, 2013
  
  660dbd80 Browse Files
- Removed starting courseware clone · 433043b1
  Slater-Victoroff committed May 31, 2013
  
  433043b1 Browse Files
- Fixed first stage bugs · 49ed93a4
  Slater-Victoroff committed May 31, 2013
  
  49ed93a4 Browse Files
- Draft 1 of cross-platform bash script is complete, but more testing needs to be done · b2cd6915
  Slater-Victoroff committed May 31, 2013
  
  b2cd6915 Browse Files
30 May, 2013 8 commits
- Added directory structure tests · 5883ee8a
  Slater-Victoroff committed May 30, 2013
  
  5883ee8a Browse Files
- Bringing the create-dev-env.sh script up to date and generalizing for mac and debian-based systems · 9cdcc9df
  Slater-Victoroff committed May 30, 2013
  
  9cdcc9df Browse Files
- Merge branch 'slater/new_mac_dev_script' of https://github.com/edx/edx-platform… · 72377e1a
```
Merge branch 'slater/new_mac_dev_script' of https://github.com/edx/edx-platform into slater/new_mac_dev_script
```
  Slater-Victoroff committed May 30, 2013
  72377e1a Browse Files
- Updated documentation in doc and README and made some small edits to bash script… · 715e324b
```
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
```
  Slater-Victoroff committed May 30, 2013
  715e324b Browse Files
- Removed numpy and scipy files · e493ada3
  Slater-Victoroff committed May 30, 2013
  
  e493ada3 Browse Files
- Merge branch 'slater/new_mac_dev_script' of https://github.com/edx/edx-platform… · 84149f8f
```
Merge branch 'slater/new_mac_dev_script' of https://github.com/edx/edx-platform into slater/new_mac_dev_script
```
  Slater-Victoroff committed May 30, 2013
  84149f8f Browse Files
- Updated documentation in doc and README and made some small edits to bash script… · 0d56b9c2
```
Updated documentation in doc and README and made some small edits to bash script for added robustness
```
  Slater-Victoroff committed May 30, 2013
  0d56b9c2 Browse Files
- Added documenntation to the docs folder and edited the mac bash script in response to tests · 8b6bdb92
  Slater-Victoroff committed May 30, 2013
  
  8b6bdb92 Browse Files
29 May, 2013 1 commit
- Added largely functional bash script for setting up dev environment on macs. Due… · 4335d7a2
```
Added largely functional bash script for setting up dev environment on macs. Due date of June 1st for open source deadline.
```
  Slater-Victoroff committed May 29, 2013
  4335d7a2 Browse Files
24 May, 2013 3 commits
- Merge pull request #2118 from edx/fix/frances/studio-iconcleanup · d2880586
```
Removed old icon references and files
```
  frances botsford committed May 24, 2013
  d2880586 Browse Files
- Merge pull request #2113 from edx/fix/cdodge/few-xml-serialize-fixes · 27c6816b
```
randomize_module.py was missing 'import lxml' to support definition_to_x...
```
  chrisndodge committed May 24, 2013
  27c6816b Browse Files
- removed old icon css and js files and references that are no longer needed · dfb623a2
  Frances Botsford committed May 24, 2013
  
  dfb623a2 Browse Files
23 May, 2013 24 commits
- Merge pull request #2094 from edx/ned/make-numpy-and-scipy-both-install · ebc991cc
```
Put numpy into a pre.txt so that everything will actually install.
```
  Ned Batchelder committed May 23, 2013
  ebc991cc Browse Files
- randomize_module.py was missing 'import lxml' to support definition_to_xml().… · b6090952
```
randomize_module.py was missing 'import lxml' to support definition_to_xml(). Also, fix serialization of show_timezone to expect a bool
```
  Chris Dodge committed May 23, 2013
  b6090952 Browse Files
- Merge pull request #2112 from edx/feature/giulio/variablize-colors · 94300608
```
fixing video-bg-image and homepage-bg-image urls
```
  caesar2164 committed May 23, 2013
  94300608 Browse Files
- Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports · 69beea85
```
Record junit reports of jasmine tests
```
  Calen Pennington committed May 23, 2013
  69beea85 Browse Files
- fixing video-bg-image and homepage-bg-image urls · 538ffe6f
  Giulio Gratta committed May 23, 2013
  
  538ffe6f Browse Files
- Merge pull request #2110 from edx/fix/db/lettuce-tests · 007a4e53
```
Fix lettuce tests
```
  David Baumgold committed May 23, 2013
  007a4e53 Browse Files
- Fix lettuce tests · cf1e906c
  David Baumgold committed May 23, 2013
  
  cf1e906c Browse Files
- Merge pull request #2050 from edx/feature/giulio/variablize-colors · ba93f453
```
first round of color replacements with variables
```
  caesar2164 committed May 23, 2013
  ba93f453 Browse Files
- fix bad css and clean up after rebase/merge · 566a8b38
  Giulio Gratta committed May 23, 2013
  
  566a8b38 Browse Files
- fixed hardcoded changes left over from parent theme branch backport · 93258c54
  Giulio Gratta committed May 23, 2013
  
  93258c54 Browse Files
- first round of color replacements with variables · 3dd5733c
  Giulio Gratta committed May 23, 2013
  
  3dd5733c Browse Files
- Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master · a8084628
```
Feature/cdodge/autoprovision forums master
```
  chrisndodge committed May 23, 2013
  a8084628 Browse Files
- Merge pull request #2090 from edx/fix/cale/amazon-ses-errors · 257dae63
```
Fix/cale/amazon ses errors
```
  Calen Pennington committed May 23, 2013
  257dae63 Browse Files
- Merge pull request #2109 from edx/ned/hotfix-disable-codejail-memory-limit · 9e542aa5
```
Use the latest CodeJail, with 0 default for memory limit.
```
  Ned Batchelder committed May 23, 2013
  9e542aa5 Browse Files
- Removed references to server_error.js · 082e24c6
  David Baumgold committed May 23, 2013
  
  082e24c6 Browse Files
- Use the latest CodeJail, with 0 default for memory limit. · 1224204b
  Ned Batchelder committed May 23, 2013
  
  1224204b Browse Files
- Merge pull request #2084 from edx/fix/will/lettuce-browser-size · a4ad495b
```
Set the browser size on startup of acceptance tests.
```
  Will Daly committed May 23, 2013
  a4ad495b Browse Files
- Merge pull request #2087 from edx/backbone-notifications-font-awesome · a15a2836
```
Backbone notifications & font awesome integration

oh thank god this is finally getting merged
```
  David Baumgold committed May 23, 2013
  a15a2836 Browse Files
- Handle errors while sending emails around changing user data · f521b8e8
```
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
```
  Calen Pennington committed May 23, 2013
  f521b8e8 Browse Files
- Merge branch 'master' into feature/cdodge/autoprovision-forums-master · e6a1a9fa
  Jay Zoldak committed May 23, 2013
  
  e6a1a9fa Browse Files
- jasmine-jquery compatiblity post-backport · c26edbd6
  David Baumgold committed May 23, 2013
  
  c26edbd6 Browse Files
- Merge pull request #2106 from edx/fix/nate/application-mako-crash · af8b509e
```
Use .get instead of [] to access env hash
```
  Jay Zoldak committed May 23, 2013
  af8b509e Browse Files
- Capture Mako exit code and fail fast if necessary · daa0ac2f
```
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.
```
  Nate Hardison committed May 22, 2013
  daa0ac2f Browse Files
- Use "is not None" convention · f8261982
  Nate Hardison committed May 22, 2013
  
  f8261982 Browse Files