Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.

Commit 926a466

Browse files
brianlovinbrianlovin
authored
Merge pull request #5037 from withspectrum/3.1.5
3.1.5
2 parents 71cbca5 + a055b52 commit 926a466

File tree

12 files changed

+73
-74
lines changed

12 files changed

+73
-74
lines changed

‎analytics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"rethinkhaberdashery": "^2.3.32",
2323
"sanitize-filename": "^1.6.1",
2424
"sha1": "^1.1.1",
25-
"source-map-support": "^0.5.11",
25+
"source-map-support": "^0.5.12",
2626
"toobusy-js": "^0.5.1"
2727
}
2828
}

‎analytics/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -627,10 +627,10 @@ sha1@^1.1.1:
627627
charenc ">= 0.0.1"
628628
crypt ">= 0.0.1"
629629

630-
source-map-support@^0.5.11:
631-
version "0.5.11"
632-
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
633-
integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
630+
source-map-support@^0.5.12:
631+
version "0.5.12"
632+
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
633+
integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
634634
dependencies:
635635
buffer-from "^1.0.0"
636636
source-map "^0.6.0"

‎api/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"apollo-upload-client": "^9.1.0",
99
"aws-sdk": "2.200.0",
1010
"axios": "^0.16.2",
11-
"b2a": "^1.0.10",
11+
"b2a": "^1.0.11",
1212
"babel-plugin-replace-dynamic-import-runtime": "^1.0.2",
1313
"babel-plugin-styled-components": "^1.10.0",
1414
"babel-plugin-transform-flow-strip-types": "^6.22.0",
@@ -44,7 +44,7 @@
4444
"express": "^4.16.4",
4545
"express-enforces-ssl": "^1.1.0",
4646
"express-hot-shots": "^1.0.2",
47-
"express-session": "^1.15.2",
47+
"express-session": "^1.16.1",
4848
"faker": "^4.1.0",
4949
"find-with-regex": "^1.1.3",
5050
"flow-typed": "^2.5.1",
@@ -106,7 +106,7 @@
106106
"react-router": "^4.0.0-beta.7",
107107
"react-router-dom": "^4.0.0-beta.7",
108108
"react-textarea-autosize": "^4.0.5",
109-
"react-transition-group": "^2.8.0",
109+
"react-transition-group": "^2.9.0",
110110
"react-trend": "^1.2.4",
111111
"recompose": "^0.23.1",
112112
"redis-tag-cache": "^1.2.1",

‎api/yarn.lock

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,10 +1546,10 @@ axios@^0.16.2:
15461546
follow-redirects "^1.2.3"
15471547
is-buffer "^1.1.5"
15481548

1549-
b2a@^1.0.10:
1550-
version "1.0.10"
1551-
resolved "https://registry.yarnpkg.com/b2a/-/b2a-1.0.10.tgz#979271967ae2dd6d0bafea827ab5d02bb0362c01"
1552-
integrity sha512-qRdfj/Abk64Wp1QKE5t4dG+ioF87/er959LgzyBg0DGBNNQMcOzljC5lpFeYeFFUcUdtUhwofDRRo/0YM8Il1Q==
1549+
b2a@^1.0.11:
1550+
version "1.0.11"
1551+
resolved "https://registry.yarnpkg.com/b2a/-/b2a-1.0.11.tgz#3e1e27bab975606348ff24e8ea84a4fd6d3bec62"
1552+
integrity sha512-x+zEGHuG+mSvN+OxrKH8baFssxPjkXvgAjSuLbKrNstX6RpYIykp0BAvbuB1y8tfFwZ4EuXF5OC6m5/D3d12wQ==
15531553

15541554
babel-code-frame@^6.26.0:
15551555
version "6.26.0"
@@ -3024,11 +3024,6 @@ cors@^2.8.4, cors@^2.8.5:
30243024
object-assign "^4"
30253025
vary "^1"
30263026

3027-
crc@3.4.4:
3028-
version "3.4.4"
3029-
resolved "https://registry.yarnpkg.com/crc/-/crc-3.4.4.tgz#9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"
3030-
integrity sha1-naHpgOO9RPxck79as9ozeNheRms=
3031-
30323027
crc@^3.5.0:
30333028
version "3.8.0"
30343029
resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
@@ -3388,7 +3383,7 @@ denque@^1.1.0:
33883383
resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.0.tgz#79e2f0490195502107f24d9553f374837dabc916"
33893384
integrity sha512-gh513ac7aiKrAgjiIBWZG0EASyDF9p4JMWwKA8YU5s9figrL5SRNEMT6FDynsegakuhWd1wVqTvqvqAoDxw7wQ==
33903385

3391-
depd@2.0.0:
3386+
depd@2.0.0, depd@~2.0.0:
33923387
version "2.0.0"
33933388
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
33943389
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -3475,7 +3470,7 @@ dogapi@1.1.0:
34753470
minimist "^1.1.1"
34763471
rc "^1.0.0"
34773472

3478-
dom-helpers@^3.3.1:
3473+
dom-helpers@^3.4.0:
34793474
version "3.4.0"
34803475
resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
34813476
integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
@@ -4070,20 +4065,19 @@ express-hot-shots@^1.0.2:
40704065
hot-shots "^5.9.2"
40714066
obj-extend "~0.1.0"
40724067

4073-
express-session@^1.15.2:
4074-
version "1.15.6"
4075-
resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.15.6.tgz#47b4160c88f42ab70fe8a508e31cbff76757ab0a"
4076-
integrity sha512-r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA==
4068+
express-session@^1.16.1:
4069+
version "1.16.1"
4070+
resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.16.1.tgz#251ff9776c59382301de6c8c33411af357ed439c"
4071+
integrity sha512-pWvUL8Tl5jUy1MLH7DhgUlpoKeVPUTe+y6WQD9YhcN0C5qAhsh4a8feVjiUXo3TFhIy191YGZ4tewW9edbl2xQ==
40774072
dependencies:
40784073
cookie "0.3.1"
40794074
cookie-signature "1.0.6"
4080-
crc "3.4.4"
40814075
debug "2.6.9"
4082-
depd "~1.1.1"
4083-
on-headers "~1.0.1"
4076+
depd "~2.0.0"
4077+
on-headers "~1.0.2"
40844078
parseurl "~1.3.2"
4079+
safe-buffer "5.1.2"
40854080
uid-safe "~2.1.5"
4086-
utils-merge "1.0.1"
40874081

40884082
express@^4.16.4:
40894083
version "4.16.4"
@@ -8072,12 +8066,12 @@ react-textarea-autosize@^4.0.5:
80728066
dependencies:
80738067
prop-types "^15.5.8"
80748068

8075-
react-transition-group@^2.8.0:
8076-
version "2.8.0"
8077-
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.8.0.tgz#d6d8f635d81a0955b67348be5d017cff77d6c75f"
8078-
integrity sha512-So23a1MPn8CGoW5WNU4l0tLiVkOFmeXSS1K4Roe+dxxqqHvI/2XBmj76jx+u96LHnQddWG7LX8QovPAainSmWQ==
8069+
react-transition-group@^2.9.0:
8070+
version "2.9.0"
8071+
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
8072+
integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
80798073
dependencies:
8080-
dom-helpers "^3.3.1"
8074+
dom-helpers "^3.4.0"
80818075
loose-envify "^1.4.0"
80828076
prop-types "^15.6.2"
80838077
react-lifecycles-compat "^3.0.4"

‎desktop/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
"private": true,
1313
"dependencies": {
1414
"electron-context-menu": "^0.10.1",
15-
"electron-is-dev": "^1.0.1",
15+
"electron-is-dev": "^1.1.0",
1616
"electron-log": "^2.2.17",
1717
"electron-updater": "^4.0.6",
1818
"electron-window-state": "^5.0.3"
1919
},
2020
"devDependencies": {
2121
"electron": "^3.0.13",
2222
"electron-builder": "^20.39.0",
23-
"nodemon": "^1.18.10",
23+
"nodemon": "^1.18.11",
2424
"rimraf": "^2.6.3"
2525
},
2626
"scripts": {

‎desktop/yarn.lock

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,10 @@ chalk@^2.4.2:
429429
escape-string-regexp "^1.0.5"
430430
supports-color "^5.3.0"
431431

432-
chokidar@^2.1.0:
433-
version "2.1.0"
434-
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.0.tgz#5fcb70d0b28ebe0867eb0f09d5f6a08f29a1efa0"
435-
integrity sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ==
432+
chokidar@^2.1.5:
433+
version "2.1.5"
434+
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
435+
integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
436436
dependencies:
437437
anymatch "^2.0.0"
438438
async-each "^1.0.1"
@@ -444,7 +444,7 @@ chokidar@^2.1.0:
444444
normalize-path "^3.0.0"
445445
path-is-absolute "^1.0.0"
446446
readdirp "^2.2.1"
447-
upath "^1.1.0"
447+
upath "^1.1.1"
448448
optionalDependencies:
449449
fsevents "^1.2.7"
450450

@@ -817,6 +817,11 @@ electron-is-dev@^1.0.1:
817817
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.0.1.tgz#6e0a184736fe7aea77d18210b0b0f6a02402c4bc"
818818
integrity sha512-iwM3EotA9HTXqMGpQRkR/kT8OZqBbdfHTnlwcxsjSLYqY8svvsq0MuujsWCn3/vtgRmDv/PC/gKUUpoZvi5C1w==
819819

820+
electron-is-dev@^1.1.0:
821+
version "1.1.0"
822+
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.1.0.tgz#b15a2a600bdc48a51a857d460e05f15b19a2522c"
823+
integrity sha512-Z1qA/1oHNowGtSBIcWk0pcLEqYT/j+13xUw/MYOrBUOL4X7VN0i0KCTf5SqyvMPmW5pSPKbo28wkxMxzZ20YnQ==
824+
820825
electron-log@^2.2.17:
821826
version "2.2.17"
822827
resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.17.tgz#e71e2ebb949fc96ded7cdb99eeee7202e48981d2"
@@ -2006,12 +2011,12 @@ node-pre-gyp@^0.10.0:
20062011
semver "^5.3.0"
20072012
tar "^4"
20082013

2009-
nodemon@^1.18.10:
2010-
version "1.18.10"
2011-
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.10.tgz#3ba63f64eb4c283cf3e4f75f30817e9d4f393afe"
2012-
integrity sha512-we51yBb1TfEvZamFchRgcfLbVYgg0xlGbyXmOtbBzDwxwgewYS/YbZ5tnlnsH51+AoSTTsT3A2E/FloUbtH8cQ==
2014+
nodemon@^1.18.11:
2015+
version "1.18.11"
2016+
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.11.tgz#d836ab663776e7995570b963da5bfc807e53f6b8"
2017+
integrity sha512-KdN3tm1zkarlqNo4+W9raU3ihM4H15MVMSE/f9rYDZmFgDHAfAJsomYrHhApAkuUemYjFyEeXlpCOQ2v5gtBEw==
20132018
dependencies:
2014-
chokidar "^2.1.0"
2019+
chokidar "^2.1.5"
20152020
debug "^3.1.0"
20162021
ignore-by-default "^1.0.1"
20172022
minimatch "^3.0.4"
@@ -3148,10 +3153,10 @@ unzip-response@^2.0.1:
31483153
resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
31493154
integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
31503155

3151-
upath@^1.1.0:
3152-
version "1.1.0"
3153-
resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
3154-
integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
3156+
upath@^1.1.1:
3157+
version "1.1.2"
3158+
resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
3159+
integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
31553160

31563161
update-notifier@^2.5.0:
31573162
version "2.5.0"

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Spectrum",
3-
"version": "3.1.4",
3+
"version": "3.1.5",
44
"license": "BSD-3-Clause",
55
"devDependencies": {
66
"@babel/preset-flow": "^7.0.0",

‎src/components/modals/CreateChannelModal/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class CreateChannelModal extends React.Component<Props, State> {
8787
let lowercaseName = name.toLowerCase().trim();
8888
let slug = slugg(lowercaseName);
8989

90-
if (name.length >= 20) {
90+
if (name.length > 20) {
9191
this.setState({
9292
nameError: true,
9393
});

‎src/views/communitySettings/components/editForm.js

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class EditForm extends React.Component<Props, State> {
8181
changeName = e => {
8282
const name = e.target.value;
8383

84-
if (name.length >= 20) {
84+
if (name.length > 20) {
8585
this.setState({
8686
name,
8787
nameError: true,
@@ -307,13 +307,14 @@ class EditForm extends React.Component<Props, State> {
307307
<SectionTitle>Community Settings</SectionTitle>
308308
<Form onSubmit={this.save}>
309309
<ImageInputWrapper>
310-
{coverPhoto && !/default_images/.test(coverPhoto) && (
311-
<DeleteCoverWrapper>
312-
<DeleteCoverButton onClick={e => this.deleteCoverPhoto(e)}>
313-
<Icon glyph="view-close-small" size={'16'} />
314-
</DeleteCoverButton>
315-
</DeleteCoverWrapper>
316-
)}
310+
{coverPhoto &&
311+
!/default_images/.test(coverPhoto) && (
312+
<DeleteCoverWrapper>
313+
<DeleteCoverButton onClick={e => this.deleteCoverPhoto(e)}>
314+
<Icon glyph="view-close-small" size={'16'} />
315+
</DeleteCoverButton>
316+
</DeleteCoverWrapper>
317+
)}
317318
<CoverInput
318319
onChange={this.setCommunityCover}
319320
defaultValue={coverPhoto}
@@ -398,8 +399,4 @@ class EditForm extends React.Component<Props, State> {
398399
}
399400
}
400401

401-
export default compose(
402-
connect(),
403-
editCommunityMutation,
404-
withRouter
405-
)(EditForm);
402+
export default compose(connect(), editCommunityMutation, withRouter)(EditForm);

‎src/views/newCommunity/components/createCommunityForm/index.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class CreateCommunityForm extends React.Component<Props, State> {
124124
.replace(/-{2,}/g, '-');
125125
let slug = slugg(lowercaseName);
126126

127-
if (name.length >= 20) {
127+
if (name.length > 20) {
128128
this.setState({
129129
nameError: true,
130130
});
@@ -474,13 +474,14 @@ class CreateCommunityForm extends React.Component<Props, State> {
474474
<FormContainer data-cy="create-community-form">
475475
<Form>
476476
<ImageInputWrapper>
477-
{coverPhoto && !/default_images/.test(coverPhoto) && (
478-
<DeleteCoverWrapper>
479-
<DeleteCoverButton onClick={e => this.deleteCoverPhoto(e)}>
480-
<Icon glyph="view-close-small" size={'16'} />
481-
</DeleteCoverButton>
482-
</DeleteCoverWrapper>
483-
)}
477+
{coverPhoto &&
478+
!/default_images/.test(coverPhoto) && (
479+
<DeleteCoverWrapper>
480+
<DeleteCoverButton onClick={e => this.deleteCoverPhoto(e)}>
481+
<Icon glyph="view-close-small" size={'16'} />
482+
</DeleteCoverButton>
483+
</DeleteCoverWrapper>
484+
)}
484485
<CoverInput
485486
onChange={this.setCommunityCover}
486487
defaultValue={coverPhoto}

‎src/views/newCommunity/components/editCommunityForm/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class CommunityWithData extends React.Component<Props, State> {
6969
changeName = e => {
7070
const name = e.target.value;
7171

72-
if (name.length >= 20) {
72+
if (name.length > 20) {
7373
this.setState({
7474
name,
7575
nameError: true,

‎src/views/thread/components/stickyHeader.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as React from 'react';
33
import { connect } from 'react-redux';
44
import compose from 'recompose/compose';
55
import { Link } from 'react-router-dom';
6-
import { UserHoverProfile } from 'src/components/hoverProfile';
6+
import { truncate } from 'src/helpers/utils';
77
import { UserAvatar } from 'src/components/avatar';
88
import { LikeButton } from 'src/components/threadLikes';
99
import { convertTimestampToDate } from 'shared/time-formatting';
@@ -43,7 +43,9 @@ const StickyHeader = (props: Props) => {
4343
username={thread.author.user.username}
4444
/>
4545
<CommunityHeaderMetaCol>
46-
<CommunityHeaderName>{thread.content.title}</CommunityHeaderName>
46+
<CommunityHeaderName>
47+
{truncate(thread.content.title, 80)}
48+
</CommunityHeaderName>
4749
<CommunityHeaderSubtitle>
4850
<Link to={getThreadLink(thread)}>{timestamp}</Link>
4951
</CommunityHeaderSubtitle>

0 commit comments

Comments
 (0)