Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
6fb520f21e add peer grading to the advanced components check 2013-06-02 14:39:36 -04:00
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
marco
67a29ea94a hides latex compiler in settings tab by making previously specific css sibling selector general enough to find and hide the appropriate div 2013-06-02 12:48:54 -04: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
Chris Dodge
c0899463e3 remove unused import reference 2013-06-02 00:18:35 -04:00
Chris Dodge
ba9a5b3824 add simple check on whether the expected advanced modules appear in the edit unit page when turned on 2013-06-02 00:15:34 -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
Xavier Antoviaque
d606e7fa7d Install steps - Use edx-platform gemset when fetching ruby deps 2013-06-01 20:06:02 -03: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
Xavier Antoviaque
750b1d51ba Install steps - Fixes syntax of update_templates django command 2013-06-01 19:54:08 -03:00
cahrens
4d311f44cd Code review feedback. 2013-06-01 18:46:09 -04:00
Xavier Antoviaque
2a8105145f Install steps - Fixed typo for installation of rvm on Linux 2013-06-01 19:18:29 -03:00
Xavier Antoviaque
906b70cc41 Install steps - Use "Linux" instead of distribution name to detect OS 2013-06-01 17:46:16 -03:00
Xavier Antoviaque
a06e34e2f9 Install steps - Fixes mysql package name dependency for Debian/Ubuntu 
There is no package called `mysql` in Debian/Ubuntu - instead, MySQL is
split into `mysql-client` and `mysql-server`.

Also deeted duplicate package name.
 2013-06-01 17:03:21 -03: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
yarko
dbcef7d743 create-dev-env.sh: if run from repo, set $BASE appropriately 
2 changes:
[1] If PROJECT_HOME is not set, AND create-dev-env.sh is run from a cloned repo, then set BASE to that repo;
else:  (and only finally) set BASE to a default of "$HOME/edx_all"

[2] if PROJECT_HOME is set, or if this is from a repo, don't add edx_all to the BASE name (no need;)
 2013-05-31 23:18:38 -05: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
Peter Fogg
68581610a4 Allow single-click creation of course components that only have one template. 2013-05-31 16:22:51 -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
Peter Fogg
5434f2750e Cleaning up code to fix pylint/pep8 errors. 2013-05-31 15:58:12 -04:00
Ned Batchelder
ae2a507ec8 Remove test_ike.py, Ike says we don't need it, and it looks like a test. 2013-05-31 15:40:51 -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
JonahStanley
286fcece4a Fixed issue of searching for text 
Now the step calls is_text_present and is_text_not_present with a wait time of 5 seconds so that the page can be properly refreshed/reloaded if needed.
This also gets rid of an assert not
 2013-05-31 15:33:56 -04:00
Slater-Victoroff
c87e46969a files cleaned up and debugging nearing the final steps 2013-05-31 15:32:40 -04:00
Ned Batchelder
88d3f253b6 Move symmath to be its own directory, and install it into the sandbox. 2013-05-31 15:22:16 -04:00
JonahStanley
cb9da2cd03 Potentially fixed all flakey tests 
New function was added: is_css_not_present
This function works like is_css_present in that it will wait and can take in an optional argument to wait longer.  This should be used everywhere INSTEAD of not is_css_present as in the latter case, you are telling selenium to wait for the thing you don't want to be there to either be there or time out.
 2013-05-31 15:16:45 -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
Victor Shnayder
e01991eca5 Tweak copy 2013-05-31 14:56:37 -04:00
JonahStanley
3308bb4be7 Fixed pull request comments and refactored the duplicate code 2013-05-31 14:53:29 -04:00
Ned Batchelder
98673f8e6a Somehow, when I moved symmath, I left behind its test files!? 2013-05-31 14:39:23 -04:00
Frances Botsford
92e159ea37 text and style adjustments to help button modal 2013-05-31 14:31:16 -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