apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merged branch develop into tests-improvements

Browse Source
pull/5096/head
Martin Schoeler 10 years ago
parent c794f1bb6a 1bca3c1f02
commit 4e395d6fc2
7 changed files with 98 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      package.json
  2. 7
      packages/rocketchat-integrations/server/api/api.coffee
  3. 2
      packages/rocketchat-livechat/app/.meteor/versions
  4. 4
      packages/rocketchat-livechat/app/package.json
  5. 12
      server/startup/migrations/v069.coffee
  6. 87
      server/startup/migrations/v069.js
  7. 2
      tests/steps/04-main-elements-render.js

4
package.json
Unescape View File

@ -63,9 +63,9 @@
"eslint": "^3.11.1"
},
"dependencies": {
"babel-runtime": "^6.18.0",
"bcrypt": "^1.0.0",
"jquery": "^2.1.0",
"babel-runtime": "^6.20.0",
"bcrypt": "^1.0.1",
"moment": "^2.17.1",
"moment-timezone": "^0.5.10",
"toastr": "^2.1.2"

7
packages/rocketchat-integrations/server/api/api.coffee
Unescape View File

@ -50,8 +50,11 @@ Api = new Restivus
apiPath: 'hooks/'
auth:
user: ->
if @bodyParams?.payload?
@bodyParams = JSON.parse @bodyParams.payload
payloadKeys = Object.keys @bodyParams
payloadIsWrapped = @bodyParams?.payload? and payloadKeys.length == 1
if payloadIsWrapped and @request.headers['content-type'] is 'application/x-www-form-urlencoded'
@bodyParams = @bodyParams.payload
@integration = RocketChat.models.Integrations.findOne
_id: @request.params.integrationId

2
packages/rocketchat-livechat/app/.meteor/versions
Unescape View File

@ -49,7 +49,7 @@ minimongo@1.0.19
mizzao:timesync@0.4.0
modules@0.7.7
modules-runtime@0.7.7
momentjs:moment@2.17.0
momentjs:moment@2.17.1
mongo@1.1.14
mongo-id@1.0.6
npm-bcrypt@0.9.2

4
packages/rocketchat-livechat/app/package.json
Unescape View File

@ -21,9 +21,9 @@
},
"dependencies": {
"autolinker": "^1.4.0",
"babel-runtime": "^6.18.0",
"bcrypt": "^1.0.0",
"jquery": "^2.1.0",
"babel-runtime": "^6.20.0",
"bcrypt": "^1.0.1",
"moment": "^2.17.1",
"toastr": "^2.1.2"
}

12
server/startup/migrations/v069.coffee
Unescape View File

@ -1,12 +0,0 @@
RocketChat.Migrations.add
version: 69
up: ->
RocketChat.models.Settings.update { "_id": "theme-color-custom-scrollbar-color", "value": "rgba(255, 255, 255, 0.05)" }, { $set: { "editor": "expression", "value": "@transparent-darker" } }
RocketChat.models.Settings.update { "_id": "theme-color-info-font-color", "value": "#aaaaaa" }, { $set: { "editor": "expression", "value": "@secondary-font-color" } }
RocketChat.models.Settings.update { "_id": "theme-color-link-font-color", "value": "#008ce3" }, { $set: { "editor": "expression", "value": "@primary-action-color" } }
RocketChat.models.Settings.update { "_id": "theme-color-status-away", "value": "#fcb316" }, { $set: { "editor": "expression", "value": "@pending-color" } }
RocketChat.models.Settings.update { "_id": "theme-color-status-busy", "value": "#d30230" }, { $set: { "editor": "expression", "value": "@error-color" } }
RocketChat.models.Settings.update { "_id": "theme-color-status-offline", "value": "rgba(150, 150, 150, 0.50)" }, { $set: { "editor": "expression", "value": "@transparent-darker" } }
RocketChat.models.Settings.update { "_id": "theme-color-status-online", "value": "#35ac19" }, { $set: { "editor": "expression", "value": "@success-color" } }
RocketChat.models.Settings.update { "_id": "theme-color-tertiary-background-color", "value": "#eaeaea" }, { $set: { "editor": "expression", "value": "@component-color" } }
RocketChat.models.Settings.update { "_id": "theme-color-tertiary-font-color", "value": "rgba(255, 255, 255, 0.6)" }, { $set: { "editor": "expression", "value": "@transparent-lightest" } }

87
server/startup/migrations/v069.js
Unescape View File

@ -0,0 +1,87 @@
RocketChat.Migrations.add({
version: 69,
up: function() {
RocketChat.models.Settings.update({
'_id': 'theme-color-custom-scrollbar-color',
'value': 'rgba(255, 255, 255, 0.05)'
}, {
$set: {
'editor': 'expression',
'value': '@transparent-darker'
}
});
RocketChat.models.Settings.update({
'_id': 'theme-color-info-font-color',
'value': '#aaaaaa'
}, {
$set: {
'editor': 'expression',
'value': '@secondary-font-color'
}
});
RocketChat.models.Settings.update({
'_id': 'theme-color-link-font-color',
'value': '#008ce3'
}, {
$set: {
'editor': 'expression',
'value': '@primary-action-color'
}
});
RocketChat.models.Settings.update({
'_id': 'theme-color-status-away',
'value': '#fcb316'
}, {
$set: {
'editor': 'expression',
'value': '@pending-color'
}
});
RocketChat.models.Settings.update({
'_id': 'theme-color-status-busy',
'value': '#d30230'
}, {
$set: {
'editor': 'expression',
'value': '@error-color'
}
});
RocketChat.models.Settings.update({
'_id': 'theme-color-status-offline',
'value': 'rgba(150, 150, 150, 0.50)'
}, {
$set: {
'editor': 'expression',
'value': '@transparent-darker'
}
});
RocketChat.models.Settings.update({
'_id': 'theme-color-status-online',
'value': '#35ac19'
}, {
$set: {
'editor': 'expression',
'value': '@success-color'
}
});
RocketChat.models.Settings.update({
'_id': 'theme-color-tertiary-background-color',
'value': '#eaeaea'
}, {
$set: {
'editor': 'expression',
'value': '@component-color'
}
});
return RocketChat.models.Settings.update({
'_id': 'theme-color-tertiary-font-color',
'value': 'rgba(255, 255, 255, 0.6)'
}, {
$set: {
'editor': 'expression',
'value': '@transparent-lightest'
}
});
}
});

2
tests/steps/04-main-elements-render.js
Unescape View File

@ -262,7 +262,7 @@ describe('Main Elements Render', function() {
flexTab.userSearchBar.isVisible().should.be.true;
});
it('should show the show all link', () => {
it.skip('should show the show all link', () => {
flexTab.showAll.isVisible().should.be.true;
});
});

Write Preview
Loading…
Cancel
Save