Slater-Victoroff
|
a267f5ec86
|
Pull request comments addressed, if else condition cleaned up
|
2013-05-31 17:28:47 -04:00 |
|
Slater-Victoroff
|
c5b95e393f
|
merge conflict resolved, whitespace changes
|
2013-05-31 16:54:16 -04:00 |
|
Slater-Victoroff
|
3fc7bb6e42
|
Last requirement that was needed on Jonah's machine. Now working on the fresh Ubuntu install there
|
2013-05-31 16:52:55 -04:00 |
|
Slater-Victoroff
|
68fa1984fa
|
Last requirement that was needed on Jonah's machine. Now working on the fresh Ubuntu install there
|
2013-05-31 16:49:03 -04:00 |
|
Slater-Victoroff
|
9e140dcc32
|
pull request notes attended to
|
2013-05-31 16:31:00 -04:00 |
|
Slater-Victoroff
|
0b0b36028c
|
Added ubuntu requirements for better mysql support
|
2013-05-31 16:10:11 -04:00 |
|
Slater-Victoroff
|
d7ba5db81a
|
Added note about the current state of support for debian based systems to accurately reflect state of development
|
2013-05-31 15:37:30 -04:00 |
|
Slater-Victoroff
|
c87e46969a
|
files cleaned up and debugging nearing the final steps
|
2013-05-31 15:32:40 -04:00 |
|
Slater-Victoroff
|
56433729c6
|
Realized an issue requiring us to remove raring support, fixed a couple more bugs
|
2013-05-31 15:09:13 -04:00 |
|
Slater-Victoroff
|
3b3b5d97e9
|
Removed npm requirement due to node version conflicts
|
2013-05-31 14:58:40 -04:00 |
|
Slater-Victoroff
|
6272e89014
|
Down to node errors on Ubuntu
|
2013-05-31 14:30:56 -04:00 |
|
Slater-Victoroff
|
6f1f0e115c
|
changed ubuntu strategy for numpy and scipy
|
2013-05-31 12:46:44 -04:00 |
|
Slater-Victoroff
|
0ce2ff22f6
|
testing numpy change on ubuntu
|
2013-05-31 12:45:36 -04:00 |
|
Slater-Victoroff
|
a76adc2871
|
Added useful requirements and removed problematic scipy
|
2013-05-31 12:40:43 -04:00 |
|
Slater-Victoroff
|
ab2a919c92
|
more tests run, some requirements added for graphviz on ubuntu
|
2013-05-31 12:22:45 -04:00 |
|
Slater-Victoroff
|
1699d24c9a
|
Successful on mac, almost there on ubuntu
|
2013-05-31 11:24:07 -04:00 |
|
Slater-Victoroff
|
821621cd52
|
small edits mostly taken care of
|
2013-05-31 11:05:20 -04:00 |
|
Slater-Victoroff
|
b489a5d773
|
distribute fix
|
2013-05-31 10:41:59 -04:00 |
|
Slater-Victoroff
|
660dbd80b9
|
small fix
|
2013-05-31 10:38:18 -04:00 |
|
Slater-Victoroff
|
433043b146
|
Removed starting courseware clone
|
2013-05-31 10:37:18 -04:00 |
|
Slater-Victoroff
|
49ed93a4e6
|
Fixed first stage bugs
|
2013-05-31 10:35:26 -04:00 |
|
Slater-Victoroff
|
b2cd6915e4
|
Draft 1 of cross-platform bash script is complete, but more testing needs to be done
|
2013-05-31 10:14:28 -04:00 |
|
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 |
|