Go to file
Ryan Shaw 77138c4d4a Merge remote-tracking branch 'origin/master' into dev/fft
Conflicts:
	app/controllers/collections_controller.rb
	app/views/layouts/application.html.erb
	config/build.js
	lib/tasks/parallel_exclude.rb

Change-Id: Ic9664c29d1469c13b514343915c5929dfb15c6ad
2012-06-26 10:14:46 -06:00
app Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
config Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
db/migrate Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
doc allow linking to a object definition in the api docs 2012-06-22 13:58:20 -06:00
guard parallelize build tasks 2012-04-16 16:38:23 -06:00
lib Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
node_modules AMD Conversion 2012-02-06 16:41:40 -07:00
public Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
script using custom parallelized specs gem for rspec tests 2012-04-23 13:33:29 -06:00
spec Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
vendor/plugins add spec for bb question groups 2012-06-22 09:10:46 -06:00
.gitignore Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
.jshintrc add a rake canvas:check_syntax task to check for js errors 2011-04-20 08:07:30 -06:00
COPYRIGHT Initial commit. 2011-01-31 18:57:29 -07:00
Gemfile Merge remote-tracking branch 'origin/master' into dev/fft 2012-06-26 10:14:46 -06:00
Guardfile getting coffeescript and handlebars to work with plugins 2011-12-30 15:50:16 -07:00
LICENSE Initial commit. 2011-01-31 18:57:29 -07:00
README.md README changes to point more directly to installation instructions 2011-02-01 17:36:01 -07:00
Rakefile using custom parallelized specs gem for rspec tests 2012-04-23 13:33:29 -06:00
config.ru fix non-static image urls 2012-05-18 09:18:59 -06:00
package.json AMD Conversion 2012-02-06 16:41:40 -07:00

README.md

Canvas LMS

Canvas is a new, open-source LMS by Instructure Inc. It is released under the AGPLv3 license for use by anyone interested in learning more about or using learning management systems.

Please see our main wiki page for more information

Installation

Detailed instructions for installation and configuration of Canvas are provided on our wiki.