Commit Graph

7 Commits

Author SHA1 Message Date
Landon Wilkins 621d05fecc da licença part 11
add consistent license headers to all source files
(ruby, coffeescript, javascript)

except for vendor files

Change-Id: Ib35e5af93dbd7b2ccc2478535590a813d18f7bf1
Reviewed-on: https://gerrit.instructure.com/110031
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2017-04-27 21:36:17 +00:00
Brian Palmer b112fed315 don't re-calculate the etherpad url when a new user joins
This matches the behavior of other Collaboration sub-classes like google
docs

closes CNVS-9237

test plan:
* set up /plugins/etherpad using one provider, like titanpad.com
* create a collaboration and launch it
* change the plugin settings to another provider, like etherpad.instructure.com/p
* log in as a second user and load the existing document, it should
  still send you to the original doc at titanpad or whatever you
  first configured

Change-Id: I5fbacaae3a9290c6263ef52545d4e9d1a01724ac
Reviewed-on: https://gerrit.instructure.com/26159
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2013-11-08 21:45:44 +00:00
Brian Palmer 77ca8ac013 remove deprecated rails constant usage
basically convert RAILS_ROOT -> Rails.root , RAILS_ENV -> Rails.env ,
RAILS_DEFAULT_LOGGER -> Rails.logger

This is necessary for rails 3

Change-Id: I138e1aa217fa8fb186d23ac09b04031c1e2b665e
Reviewed-on: https://gerrit.instructure.com/18412
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Eric Berry <ericb@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
2013-03-11 12:14:08 -06:00
JT Olds 1a87aeadc2 remove collaborations.yml dependency, refs #5796
Change-Id: I25bca21ea2e538e68c979a563721c5f7c87572c7
Reviewed-on: https://gerrit.instructure.com/6280
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-10-25 17:32:32 -06:00
Brian Whitmer cd3f3c642b etherpad should actually use configured setting
Before it was hard-coded to use typewith.me,
regardless of the config setting.

Change-Id: I80bc55fe56f3a7dd2ff3aa92a0125f81dd1fe419
Reviewed-on: https://gerrit.instructure.com/4607
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-08 14:04:00 -06:00
Brian Whitmer 3623ead12c moving etherpad config to /plugins; refs #4194
Change-Id: Ib4e1dfc9fc7673e68a3b729c082862040a2515c5
Reviewed-on: https://gerrit.instructure.com/3814
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-06-01 22:03:52 -06:00
Brian Whitmer 8b8173dcc9 Initial commit.
closes #6988138
2011-01-31 18:57:29 -07:00