Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
12,801 Commits 1 Branch 0 Tags
234ca0e07616490a0b7f5bc565036abebe4cf2e4
Commit Graph

12801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
234ca0e076 Responding to @jzoldak's comments 2013-05-06 10:29:26 -04:00
David Baumgold
ee6d68e2e0 grammar 2013-05-06 10:29:26 -04:00
David Baumgold
2a09f6bac1 Clarified based on @shnayder's comment 2013-05-06 10:29:26 -04:00
David Baumgold
fa87cccb9b Document old-style rake lms command 2013-05-06 10:29:26 -04:00
David Baumgold
98243b2b53 Document django-admin[update_templates] step 2013-05-06 10:29:26 -04:00
Ned Batchelder
03470fc48e Add a mention of create-dev-env.sh 2013-05-06 10:29:26 -04:00
David Baumgold
06ade12f6a Also need to install Mongo 2013-05-06 10:29:26 -04:00
David Baumgold
fccee7a1e3 Node does virtual environments using npm 2013-05-06 10:29:26 -04:00
David Baumgold
1bda218e17 Clarify purpose of data dir 2013-05-06 10:29:26 -04:00
David Baumgold
a0727ac226 Virtualenv is a tool, and should be surrounded by backticks 2013-05-06 10:29:26 -04:00
David Baumgold
a58f39695a Remove install.txt, because all that information is in the README.md file now 2013-05-06 10:29:25 -04:00
David Baumgold
457b678af7 Wrote a proper README file 
So that no one else will have to go through what I went through. Hopefully.
 2013-05-06 10:29:25 -04:00
David Baumgold
5e288b60ca Merge pull request #1943 from edx/cleanup 
One more attempt at making linters happier
 2013-05-06 07:15:21 -07:00
Sarina
72584b5937 Merge pull request #1914 from edx/fix/sarina/new_formularesponse_defaults 
Fix/sarina/new formularesponse defaults
 2013-05-03 12:32:10 -07:00
David Baumgold
b344976fe7 Making linters happier 2013-05-03 15:08:28 -04:00
jarv
5d729c306b Merge pull request #1942 from edx/fix/jbau/email_timezone_config 
Inserts overrides in env.lms.aws for email settings and timezone
 2013-05-03 11:54:51 -07:00
Jason Bau
7720c0fc8d Inserts overrides in env.lms.aws for email settings and timezone 
overrides what is set in env.lms.common using the lms.env.json
file
 2013-05-03 11:45:21 -07:00
Steve Strassmann
dea1198d75 Merge pull request #1925 from edx/bug/straz/date 
Bug/straz/date - fix date interpolation
 2013-05-03 09:32:00 -07:00
brianhw
a294e2d1ac Merge pull request #1937 from edx/victor/press 
Press updates
 2013-05-03 07:50:26 -07:00
Victor Shnayder
aae40b4378 Press updates 
LH: 381, 382, 383
 2013-05-03 08:55:40 -04:00
e0d
22e147b2c9 Merge pull request #1931 from edx/fix/zoldak/gcli-status 
Change org for gcli status command from mitx to edx
 2013-05-02 11:48:05 -07:00
jarv
161c8cb12e Merge pull request #1929 from edx/jtauber/fix-forks 
fix requirements to use moved forks
 2013-05-02 10:16:46 -07:00
James Tauber
f566b4f003 fix requirements to use moved forks 2013-05-02 13:05:20 -04:00
Jay Zoldak
fc1a22de55 Merge pull request #1921 from edx/fix/zoldak/cms-jasmine-tests 
Remove localization middleware from jasmine test execution
 2013-05-02 09:45:58 -07:00
Jay Zoldak
0b452f6195 Change org for gcli status command from mitx to edx 2013-05-02 12:41:59 -04:00
Steve Strassmann
c9a80ded25 formatted using sublime/formatjs 2013-05-02 10:59:02 -04:00
Steve Strassmann
485d07a722 tabbing 2013-05-02 09:31:53 -04:00
Steve Strassmann
7c972ebf6e fix date interpolation 2013-05-02 09:29:27 -04:00
brianhw
3650316ff5 Merge pull request #1922 from MITx/fix/cdodge/jsi18n-include 
add leading slash to the jsi18n include
 2013-05-01 13:06:38 -07:00
Chris Dodge
d807b955f7 add leading slash to the jsi18n include 2013-05-01 15:27:36 -04:00
Nate Hardison
1e21526dab Merge pull request #1853 from MITx/feature/nate/updated-dev-env-setup 
Feature/nate/updated dev env setup
 2013-05-01 10:24:51 -07:00
Nate Hardison
2b17904c93 Replacing .rvmrc with .ruby-gemset 
In order to avoid duplicating the Ruby version between the `.rvmrc`
and the `.ruby-version`, we'll get rid of the `.rvmrc` and use the
`.ruby-gemset` file to specify the gemset. These files are supported
by RVM as documented [here](https://gist.github.com/fnichol/1912050).
 2013-05-01 10:22:57 -07:00
Nate Hardison
61ca49ac36 Adding a check for an existing virtualenv 
This way, packages won't be inadvertently installed into the wrong
virtual environment. I tried to have the check just run `deactivate`,
but I couldn't figure out how to get that working, so the script
just bails.
 2013-05-01 10:22:57 -07:00
Nate Hardison
a3bb4bfb9f Updating dev environment setup 
* Script now installs RVM in conventional location (~/.rvm) by
  default, though it allows for the override if desired. This will
  enable folks to install edX alongside other Ruby projects also
  using RVM.
* Script now uses virtualenvwrapper to ease the process of enabling
  the edX virtualenv and to allow for easy switching back and forth
  between virtualenv projects. It now also installs the "mitx"
  virtualenv in the conventional location of ~/.virtualenv.
* Adding a .rvmrc file so that the Ruby environment will be
  automatically activated (via `rvm use`) whenever the user hits
  the `mitx/` directory.
 2013-05-01 10:22:57 -07:00
Jay Zoldak
bdfe1cff39 Remove localization middleware from jasmine test execution 2013-05-01 11:34:28 -04:00
Jay Zoldak
f2fd90bc61 Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests 
Fix/cale/lms jasmine tests
 2013-05-01 08:23:41 -07:00
Jay Zoldak
7f93443dfb Make the test_root/db directory and add a .gitignore for the db files that will be created there. 2013-05-01 10:53:58 -04:00
Sarina Canelake
2cb3af1e35 Only throw factorial-related exception on factorial raised exception 2013-05-01 10:53:22 -04:00
Christina Roberts
a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo 
Fix/btalbot/studio courseinfo
 2013-04-30 13:34:52 -07:00
Ned Batchelder
cc1a8a4bc7 Merge pull request #1918 from MITx/ned/personal-requirements 
Ned/personal requirements
 2013-04-30 13:13:01 -07:00
Ned Batchelder
5b82ffd2ad A little documentation. 2013-04-30 16:11:22 -04:00
Ned Batchelder
091ca9c3f0 Add a private-requirements.txt for personal changes to how things are installed. Good for installing libs as working dirs. 2013-04-30 16:11:22 -04:00
Christina Roberts
3e314a2c9e Merge pull request #1915 from MITx/feature/christina/xblock-version 
Change xblock version.
 2013-04-30 13:03:15 -07:00
Jay Zoldak
aa4e29d2f1 Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs 2013-04-30 15:22:08 -04:00
Calen Pennington
76599863e6 Compile all coffee and sass before running jasmine tests 2013-04-30 14:09:58 -04:00
Calen Pennington
771937b3da Remove duplicate libraries used while jasmine testing the LMS (as they are also defined in vendor) 2013-04-30 14:09:42 -04:00
Calen Pennington
dfd369b9e9 Make ordering of js bundles during jasmine tests consistant 2013-04-30 14:09:17 -04:00
Christina Roberts
4c97f92245 Merge pull request #1916 from MITx/fix/cdodge/more-broken-template-images 
add more images to support templates
 2013-04-30 09:50:41 -07:00
Chris Dodge
c5d520574d also move the MIT dome image in Latex to be in our source pack 2013-04-30 12:02:58 -04:00
Chris Dodge
1f1a6e3ec5 add more images to support templates 2013-04-30 11:46:49 -04:00