Chris Dodge
fbe2cde6e5
add simple unit test on the defaulting of the settings
2013-07-11 14:31:53 -04:00
Chris Dodge
c3ad168b10
also add some defaulting to the querying of the settings where it defaults to an empty set
2013-07-11 12:12:42 -04:00
Chris Dodge
b39edd821c
seems like we need to define COURSES_WITH_UNSAFE_CODE in cms.envs.common.py, although cms.envs.common.py imports lms.envs.common (where this is defined).
2013-07-11 12:05:07 -04:00
John Jarvis
67f8d48840
Merge pull request #367 from edx/jarv/gce-email-backend
...
adding option for file based backend
2013-07-11 08:02:47 -07:00
David Baumgold
11fa458692
Merge pull request #368 from edx/db/fix-course-team-add-user
...
Fix course team JS to handle non-200 status codes
2013-07-11 07:17:34 -07:00
David Baumgold
1f7fcaed50
Separate Mako logic and JS logic
2013-07-11 09:39:32 -04:00
David Baumgold
cffa013314
Fix course team JS to handle non-200 status codes
2013-07-11 09:30:50 -04:00
Jason Bau
4b59a85dae
Merge pull request #336 from edx/fix/jbau/parameterize-s3-upload-bucket-name
...
Parameterize aws s3 bucket name for forum uploads
2013-07-10 14:51:08 -07:00
Jonah Stanley
786f422ffa
Merge pull request #298 from edx/jonahstanley/acceptance-tests-unique-database
...
Jonahstanley/acceptance tests unique database
2013-07-10 14:09:28 -07:00
David Baumgold
17f2b7d988
Merge pull request #361 from edx/antoviaque/vagrant-rbenv
...
Add support for Vagrant install, and switch from RVM to rbenv
2013-07-10 13:33:05 -07:00
JonahStanley
a0900f09cc
Commented why Acceptance_static is needed
2013-07-10 16:23:26 -04:00
JonahStanley
a896ccfff7
Added in a comment
...
This explains why acceptance_static is used
2013-07-10 16:21:11 -04:00
John Jarvis
5b16fbe369
adding option for file based backend
2013-07-10 16:05:37 -04:00
JonahStanley
4685cacc7b
Databases are now cleaned properly
...
Acceptance_static is used to prevent collect static from using a seed
test.py had its seed removed due to redundancy
2013-07-10 15:28:23 -04:00
David Baumgold
cb62797306
Merge pull request #347 from edx/update-sass
...
Update SASS and Bourbon, add Neat
2013-07-10 11:09:11 -07:00
chrisndodge
9824ba43cf
Merge pull request #364 from edx/fix/cdodge/change-log-level-on-course-delete
...
change log levels on the delete course utility. Otherwise they get filte...
2013-07-10 10:52:06 -07:00
David Ormsbee
7993d5c1fc
Merge pull request #348 from edx/bugfix/ichuang/idasbhoard-track-json
...
tracking in idashboard should only log json-serializable objects
2013-07-10 10:17:30 -07:00
David Baumgold
18474986f3
Removed deprecated mixins from _textbooks.scss
2013-07-10 13:00:07 -04:00
Adam
2af1132894
Merge pull request #350 from edx/fix/adam/less-noise
...
move setting changes in tests to override_settings
2013-07-10 09:48:55 -07:00
dcadams
a5f8607c7e
Merge pull request #357 from edx/bugfix/dcadams/enroll_emails
...
Fix course url link in enrollment emails.
2013-07-10 09:47:53 -07:00
Chris Dodge
1b377260cc
change log levels on the delete course utility. Otherwise they get filtered out in production environments (min set to WARN level)
2013-07-10 12:34:39 -04:00
Ned Batchelder
3bd590c1f6
Merge pull request #363 from edx/ned/fix-noisy-docs
...
Ned/fix noisy docs
2013-07-10 09:20:43 -07:00
Ned Batchelder
8997ed0322
Suggestions from James: mitx is old-school, as is autogeneration.
2013-07-10 12:19:53 -04:00
Ned Batchelder
55d4d98031
static_template_view.models is gone, remove it from docs.
2013-07-10 11:39:54 -04:00
Ned Batchelder
7f193bcaad
We don't need to run sphinx on our tests.
2013-07-10 11:39:22 -04:00
jkarni
d0e5786250
Update CHANGELOG.rst
2013-07-10 11:38:18 -04:00
Ned Batchelder
a3d496a882
Set sys.path properly for docs to build.
...
We used to do it this way, I'm not sure why it was changed.
Our settings files add directories to the path, so we need to
do it here so that names will be importable.
2013-07-10 11:38:00 -04:00
ihoover
bec731207a
Merge pull request #362 from edx/ihoover/login_enrollment_refactor
...
refactor login and enrollment test cases to use the mongo modulestore
2013-07-10 08:06:32 -07:00
David Baumgold
64835febe6
vagrant: .bash_profile loads .bashrc
...
Otherwise, `vagrant ssh` doesn't load the rbenv shims, because that line is in
the .bashrc file.
2013-07-10 10:51:32 -04:00
ihoover
5a03d93000
refactor login and enrollment test cases to use the mongo modulestore
...
added namee to authors file
2013-07-10 10:34:14 -04:00
Adam Palay
d056c8a8f2
replace test setting changes with test-specific mock.patch.dicts
2013-07-10 10:18:58 -04:00
Adam
3b662ee063
Merge pull request #358 from edx/fix/adam/file-upload
...
fix to problems with uploading files
2013-07-10 07:07:28 -07:00
David Baumgold
0a2eda6361
Switch from RVM to rbenv
2013-07-10 09:48:37 -04:00
Xavier Antoviaque
f3a484bd72
vagrant: Windows - Additional instructions to deal with symlinks
2013-07-10 09:26:44 -04:00
Xavier Antoviaque
a0edbe714b
vagrant: Fix prereqs update when prereqs had been fetched outside of VM
2013-07-10 09:26:44 -04:00
Xavier Antoviaque
77af84347d
vagrant: Installation instruction tweaks from Yarko & Windows testing
2013-07-10 09:26:43 -04:00
Xavier Antoviaque
c24807effa
vagrant: Windows - Bind node_modules to a ext4 partition for symlinks
2013-07-10 09:26:43 -04:00
Xavier Antoviaque
2a656d0a9b
vagrant: Windows - Exclude README from ws_migration
...
Windows doesn't differentiate between files with/without executable bit,
so this can't be used to exclude the README file from the migrations to
be executed, when the sources are accessed from a Windows partition.
2013-07-10 09:26:43 -04:00
Xavier Antoviaque
27c739bbd4
vagrant: Prevent git from altering line endings altogether
2013-07-10 09:26:43 -04:00
Xavier Antoviaque
3364521b32
vagrant: Requirement on VirtualBox 4.2.12 for compatibility with Vagrant
2013-07-10 09:26:43 -04:00
Xavier Antoviaque
d8c922b321
vagrant: Windows - Preserve Unix line return format, added extensions
2013-07-10 09:26:43 -04:00
Xavier Antoviaque
5db56573d9
vagrant: Remove rvm Ubuntu package installation (triggers rvm bug)
2013-07-10 09:26:43 -04:00
Xavier Antoviaque
055ef6e1aa
vagrant: Update README (QA, link to wiki & disk space requirement)
2013-07-10 09:26:43 -04:00
Xavier Antoviaque
214734d1dc
vagrant: Set $PROJECT_HOME - $BASE was set to the default path
...
Yarko's `$BASE` patch has been merged and rewritten since
the original pull request was created, resulting in the `$BASE` being
incorrectly set to the default `/home/vagrant/edx_all` by the new code.
2013-07-10 09:26:42 -04:00
Xavier Antoviaque
ee4b34b6ad
vagrant: Moves from /opt/edx-platform to /opt/edx/edx-platform
...
To allow the vagrant user to create the /opt/edx/[log|data|db] folders
2013-07-10 09:26:42 -04:00
David Baumgold
293aaedc33
Vagrant: install edx-platform under /opt
...
Compatibility with the Filesystem Hierarchy Standard: http://www.pathname.com/fhs/
2013-07-10 09:26:42 -04:00
Xavier Antoviaque
e614d1aa6f
vagrant: Normalize shell script EOL to Unix LF
2013-07-10 09:26:42 -04:00
Xavier Antoviaque
1404076732
Vagrant: Add support for Vagrant install (vagrant up)
...
Cf README, this adds support to install and setup a dev instance through
Vagrant. The Vagrantfile at the root handles the vagrant commands like
`vagrant up`.
Provisioning is done by the shell script `vagrant-provisionning.sh`,
which is a light wrapper around the `create-dev-setup.sh` which does
most of the job using the standard process, but limiting possible
side-effect by ensuring the environment on which the install is
performed is clean.
Based on an Ubuntu precise 12.04 LTS.
2013-07-10 09:26:42 -04:00
Xavier Antoviaque
947908e028
Install: Fix install script freeze (syncdb superuser account creation)
...
Since the output is passed through tee, when the django admin asks the
user if he would like to create a super user account, it blocks the
install, without even showing the question.
Disabled interactivity for syncdb.
2013-07-10 09:26:42 -04:00
Xavier Antoviaque
9971c799b2
Install: Make apt-get and mkvirtualenv output log friendly
...
Added options to make the output of `apt-get` and `mkvirtualenv`
friendlier to getting logged. This allows to be more easily recorded in
log files or when the install is performed through utilities - like
Vagrant.
2013-07-10 09:26:42 -04:00
