update to share

pull/1005/head
Lee Faus 10 years ago
parent 414cf279cb
commit 82c46455b6
  1. 1
      .meteor/packages
  2. 1
      .meteor/versions
  3. 2
      packages/rocketchat-github-enterprise/common.coffee
  4. 4
      packages/rocketchat-github-enterprise/i18n/en.i18n.json
  5. 6
      packages/rocketchat-github-enterprise/startup.coffee
  6. 3
      packages/rocketchat-lib/settings/server/startup.coffee
  7. 3
      server/startup/migrations/v18.coffee

@ -100,3 +100,4 @@ random
ejson
spacebars
check
rocketchat:github-enterprise

@ -125,6 +125,7 @@ rocketchat:custom-oauth@1.0.0
rocketchat:emojione@0.0.1
rocketchat:favico@0.0.1
rocketchat:file@0.0.1
rocketchat:github-enterprise@0.0.1
rocketchat:gitlab@0.0.1
rocketchat:highlight@0.0.1
rocketchat:ldap@0.0.1

@ -1,5 +1,5 @@
config =
serverURL: 'http://faushouse.vm'
serverURL: ''
identityPath: '/api/v3/user'
addAutopublishFields:
forLoggedInUser: ['services.github-enterprise']

@ -1,3 +1,5 @@
{
"API_GitHub_Enterprise_URL" : "GitHub Enterprise"
"API_GitHub_Enterprise_URL" : "GitHub Enterprise Server URL",
"Accounts_OAuth_GitHub_Enterprise_id" : "GitHub OAuth Client Id",
"Accounts_OAuth_GitHub_Enterprise_secret" : "GitHub OAuth Client Secret"
}

@ -1 +1,5 @@
RocketChat.settings.add 'API_GitHub_Enterprise_URL', '', { type: 'string', group: 'API', public: true, i18nLabel: 'rocketchat-github-enterprise:API_GitHub_Enterprise_URL' }
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise', false, {type: 'boolean', group: 'Accounts', section: 'GitHub Enterprise'}
RocketChat.settings.add 'API_GitHub_Enterprise_URL', '', { type: 'string', group: 'Accounts', public: true, section: 'GitHub Enterprise', i18nLabel: 'rocketchat-github-enterprise:API_GitHub_Enterprise_URL' }
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_id', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'rocketchat-github-enterprise:API_GitHub_Enterprise_id' }
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_secret', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'rocketchat-github-enterprise:API_GitHub_Enterprise_secret' }

@ -21,9 +21,6 @@ RocketChat.settings.add 'Accounts_OAuth_Google_secret', '', { type: 'string', gr
RocketChat.settings.add 'Accounts_OAuth_Github', false, { type: 'boolean', group: 'Accounts', section: 'Github', public: true }
RocketChat.settings.add 'Accounts_OAuth_Github_id', '', { type: 'string', group: 'Accounts', section: 'Github' }
RocketChat.settings.add 'Accounts_OAuth_Github_secret', '', { type: 'string', group: 'Accounts', section: 'Github' }
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise', false, { type: 'boolean', group: 'Accounts', section: 'GitHub Enterprise', public: true }
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_id', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise' }
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_secret', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise' }
RocketChat.settings.add 'Accounts_OAuth_Gitlab', false, { type: 'boolean', group: 'Accounts', section: 'Gitlab', public: true }
RocketChat.settings.add 'Accounts_OAuth_Gitlab_id', '', { type: 'string', group: 'Accounts', section: 'Gitlab' }
RocketChat.settings.add 'Accounts_OAuth_Gitlab_secret', '', { type: 'string', group: 'Accounts', section: 'Gitlab' }

@ -12,9 +12,6 @@ Meteor.startup ->
Accounts_Github: 'Accounts_OAuth_Github'
Accounts_Github_id: 'Accounts_OAuth_Github_id'
Accounts_Github_secret: 'Accounts_OAuth_Github_secret'
Accounts_GitHub_Enterprise: 'Accounts_OAuth_GitHub_Enterprise'
Accounts_GitHub_Enterprise_id: 'Accounts_OAuth_GitHub_Enterprise_id'
Accounts_GitHub_Enterprise_secret: 'Accounts_OAuth_GitHub_Enterprise_secret'
Accounts_Gitlab: 'Accounts_OAuth_Gitlab'
Accounts_Gitlab_id: 'Accounts_OAuth_Gitlab_id'
Accounts_Gitlab_secret: 'Accounts_OAuth_Gitlab_secret'

Loading…
Cancel
Save