ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,484 Commits 324 Branches 20,019 Tags 1.7 GiB
Ruby 51.2%
JavaScript 33.7%
TypeScript 10.3%
HTML 2.5%
SCSS 1.3%
Other 1%
Go to file
Ryan Shaw 87eba38b3e don't blow away the brandConfig someone else is working on 
closes: CNVS-21804

this will also do a better job of cleaning up
the app/stylesheets/brandable_css_brands dir
(so when you compile sass, it won't do stuff
for brandConfigs that aren't being used anymore)

test plan:
open theme editor, make some changes, hit preview.
as a different user in a different browser,
open theme editor, make changes, press save.
now in the first window, try to hit save.
before it would break, now it will work

Change-Id: I094f737d35c854764a7c361bec4798b8a2203410
Reviewed-on: https://gerrit.instructure.com/58102
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Nathan Rogowski <nathan@instructure.com>
 		2015-07-16 21:59:10 +00:00
Gemfile.d ensure node_modules are up-to-date for guard & compile_assets 2015-07-16 19:17:54 +00:00
app don't blow away the brandConfig someone else is working on 2015-07-16 21:59:10 +00:00
bin rails 4.0.10 2014-09-16 22:07:39 +00:00
client_apps Rereference client_app symlinks to be more specific 2015-07-02 15:01:27 +00:00
config rails4: fix update/delete_all_with_joins with bind values 2015-07-16 15:45:01 +00:00
db/migrate change shared secret from string to text 2015-07-16 15:44:14 +00:00
doc fix typo 2015-07-15 10:03:01 -06:00
docker-compose spec: ensure we wait for a new page load when doing a get 2015-05-02 13:21:05 +00:00
gems quote table names in joins 2015-07-16 16:35:31 +00:00
guard A new way of doing css/sass & New Canvas Theme Editor 2015-07-02 22:42:18 +00:00
lib don't blow away the brandConfig someone else is working on 2015-07-16 21:59:10 +00:00
public remove duplicate score display on individual view grade summary 2015-07-16 16:31:07 +00:00
script fix script/canvas_update to work with brandable_css 2015-07-07 20:41:28 +00:00
spec [NUI] Makes Commons logo appear properly 2015-07-16 21:08:40 +00:00
.bowerrc introduced bower to manage js dependencies 2013-12-13 17:45:57 +00:00
.dockerignore docker-compose based dev environment 2015-03-30 20:59:48 +00:00
.fontcustom-manifest.json Update icons for tinymce editor 2015-06-29 19:48:39 +00:00
.gitignore A new way of doing css/sass & New Canvas Theme Editor 2015-07-02 22:42:18 +00:00
.i18nignore bump rails 3 to github branch for ruby 2.2 compatibility 2015-02-18 22:55:20 +00:00
.jshintrc make jslint settings more sane 2012-08-17 11:04:40 -06:00
.rubocop.yml turn off Rubocop::Cop::Style::WhileUntilModifier 2015-04-28 17:20:55 +00:00
.travis.yml more travis builds 2014-02-10 16:23:19 +00:00
CONTRIBUTING.md add a contributing doc for github coolness 2012-09-19 10:16:04 -06:00
COPYRIGHT Initial commit. 2011-01-31 18:57:29 -07:00
Gemfile use eval_gemfile for bundler goodness 2015-02-18 18:15:14 +00:00
Guardfile ensure node_modules are up-to-date for guard & compile_assets 2015-07-16 19:17:54 +00:00
LICENSE Initial commit. 2011-01-31 18:57:29 -07:00
README.md remove travis.ci badge until we are re-enabled 2014-07-01 23:08:00 +00:00
Rakefile remove rails 2 support 2014-08-06 18:16:19 +00:00
bower.json extract smartbanner out of 'common' into it's own bundle 2015-07-07 20:54:15 +00:00
code_of_conduct.md contributor code of conduct 2014-12-23 18:13:59 +00:00
config.ru start adding rails 3.0 support 2013-03-22 19:08:40 +00:00
docker-compose.yml allow *.canvas.docker in the docker-compose dev environment 2015-04-23 16:47:09 +00:00
gulpfile.babel.js A new way of doing css/sass & New Canvas Theme Editor 2015-07-02 22:42:18 +00:00
karma.conf.js address a number of issues with the js test suite 2015-02-20 16:35:17 +00:00
package.json ThemeEditor: make variables that default to another work 2015-07-15 21:51:02 +00: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.