chrisndodge
cd0f4b8194
Merge pull request #18 from edx/fix/cdodge/bad-link-in-activation-email
...
[STUD-177] Fix/cdodge/bad link in activation page
2013-06-02 11:36:31 -07:00
Chris Dodge
91d3f4ddff
add simple content check for the activation page when the user is not logged in
2013-06-02 00:43:17 -04:00
James Tauber
d2bb831781
Merge pull request #34 from antoviaque/install-requirements-pre
...
Install steps - Add numpy requirement in manual installation steps
2013-06-01 19:56:26 -07:00
Christina Roberts
52b76c87f4
Merge pull request #11 from edx/feature/christina/metadata-ui
...
Feature/christina/metadata ui
2013-06-01 16:01:53 -07:00
cahrens
4d311f44cd
Code review feedback.
2013-06-01 18:46:09 -04:00
Xavier Antoviaque
388e6b856f
Install steps - Add numpy requirement in manual installation steps
...
When `pip install -r requirements/edx/pre.txt` is omitted before running
`pip install -r requirements/edx/base.txt`, it would cause API versions
mistmatch when `make cms` is run. `make cms` would automatically run pip
with pre.txt and install a different version of numpy, *after* base.txt
and post.txt have been run through pip.
2013-06-01 14:07:24 -03:00
James Tauber
f27f664d46
Merge pull request #26 from edx/jtauber/fix-overview
...
small tweaks to overview doc
2013-06-01 06:07:46 -07:00
James Tauber
e503da47b9
Merge pull request #31 from edx/nate/edx-platform-ruby-gemset
...
Change Ruby gemset to edx-platform
2013-05-31 19:52:01 -07:00
Nate Hardison
1f1a43a424
Change Ruby gemset to edx-platform
...
The `create-dev-env.sh` script now creates a gemset called edx-
platform, so make sure that this matches.
The right thing to do would be to have `create-dev-env.sh` peek at
this file and create a gemset with the appropriate name.
2013-05-31 17:46:24 -07:00
James Tauber
223c3b238c
updated README with boilerplate
2013-05-31 18:28:39 -04:00
Slater-Victoroff
04842087fc
Merge pull request #25 from edx/slater/new_mac_dev_script
...
Slater/new mac dev script
2013-05-31 15:14:53 -07:00
Slater-Victoroff
57e43770d5
cleaning up, some syntax fixed and edge cases considered
2013-05-31 17:51:03 -04:00
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
James Tauber
f0abdce65a
small tweaks to overview doc
2013-05-31 16:22:59 -04:00
Slater-Victoroff
0b0b36028c
Added ubuntu requirements for better mysql support
2013-05-31 16:10:11 -04:00
cahrens
486d085d1e
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
2013-05-31 16:00:09 -04:00
cahrens
a82daf0710
Change to Backbone collection.
2013-05-31 15:59:53 -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
VikParuchuri
4a997842c7
Merge pull request #2 from edx/fix/vik/single-step-oe
...
Fix js that prevented single step OE problems (ie only self assessment) ...
2013-05-31 12:10:45 -07:00
Jay Zoldak
cd82bd054d
Merge pull request #20 from edx/zoldak/distribute-version
...
require distribute >= because there is an old branch out there that messes up the build server
2013-05-31 12:09:17 -07: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
VikParuchuri
1c0bcf476a
Merge pull request #3 from edx/fix/vik/speed-up-oe-test
...
Fix/vik/speed up oe test
2013-05-31 11:05:35 -07:00
Peter Baratta
343d9019e0
Merge pull request #15 from edx/pbaratta/fix/trailing-period
...
Add test and functionality for trailing period in [Numerical/Formula]Response
2013-05-31 10:20:46 -07:00
Vik Paruchuri
badd3a8d13
Properly stub out the controller_qs variable in the tested module. Test times out without this.
2013-05-31 13:14:19 -04:00
Vik Paruchuri
9281a80089
Fix js that prevented single step OE problems (ie only self assessment) from working
2013-05-31 13:08:41 -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
marco
290d049c29
Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui
2013-05-31 12:41:13 -04:00
Slater-Victoroff
a76adc2871
Added useful requirements and removed problematic scipy
2013-05-31 12:40:43 -04:00
marco
72e1fab1c4
SASS variable and naming standards sync-up based on @talbs feedback completed
2013-05-31 12:40:40 -04:00
Peter Baratta
ff3997e72e
Add test to verify a single period is not accepted as input
2013-05-31 12:37:14 -04:00
Slater-Victoroff
ab2a919c92
more tests run, some requirements added for graphviz on ubuntu
2013-05-31 12:22:45 -04:00
Chris Dodge
87daba69ea
Merge branch 'master' of github.com:edx/edx-platform into fix/cdodge/bad-link-in-activation-email
2013-05-31 11:53:49 -04:00
David Ormsbee
aae3380aa9
Merge pull request #16 from edx/feature/e0d/remove-request-debugger
...
RFC: removing the request debugger entirely.
2013-05-31 08:36:16 -07:00
John Jarvis
23e98314f4
Merge pull request #19 from edx/jarv/django-upgrade
...
updating django minor release
2013-05-31 08:33:42 -07:00
cahrens
57f8bbf69d
Updates to Selenium test based on feedback.
2013-05-31 11:26:31 -04:00
cahrens
ab5834fb41
Pylint cleanup.
2013-05-31 11:26:19 -04:00
Chris Dodge
7efcd98135
fix up styles in header for this particular use case
2013-05-31 11:25:28 -04:00
Jay Zoldak
a5ee903ef5
Pin capa to require distribute greater than 28 because an old branch had it at 30
2013-05-31 11:24:49 -04:00
Slater-Victoroff
1699d24c9a
Successful on mac, almost there on ubuntu
2013-05-31 11:24:07 -04:00
e0d
2e84540af0
removing the request debugger entirely.
2013-05-31 11:15:28 -04:00
John Jarvis
800ec068bd
updating django minor release
2013-05-31 11:15:15 -04:00
Chris Dodge
62bacea371
use the right link to the login page in a particular use case: clicking activation email when not logged in
2013-05-31 11:10:14 -04:00
