Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #1

Merged
merged 5,249 commits into from
Jun 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5249 commits
Select commit Hold shift + click to select a range
6b2a10e
Merge branch 'master' into patch-1
balcsida Apr 7, 2018
4e57a59
Merge pull request #10234 from RocketChat/release-process
rodrigok Apr 9, 2018
ea4f9d4
Update PULL_REQUEST_TEMPLATE.md
rodrigok Apr 9, 2018
5feba12
[FIX] Snaps installations are breaking on avatar requests
rodrigok Apr 9, 2018
632cd6f
Merge pull request #10390 from RocketChat/hotfix/snap-avatar
rodrigok Apr 9, 2018
8ded580
Merge pull request #10384 from RocketChat/rodrigok-patch-1
rodrigok Apr 9, 2018
1472a2d
Update allowed labels by the rocket.cat gh bot (#10360)
Apr 9, 2018
89372c1
Fix incoming integrations being able to trigger a new message with a …
graywolf336 Apr 10, 2018
c1c3f23
Use Node 8.9 for CI build
rodrigok Apr 10, 2018
792b10c
Merge pull request #10405 from RocketChat/hotifx/node-ci
rodrigok Apr 10, 2018
0ec458e
[FIX] Updated OpenShift Template to take an Image as a Param (#9946)
christianh814 Apr 10, 2018
79c023e
add redhat dockerfile to master (#10408)
geekgonecrazy Apr 10, 2018
b6b8b9e
Don't expose the 'settings' property on users to regular users via th…
graywolf336 Apr 10, 2018
eb12969
Fix and improve vietnamese translation (#10397)
Apr 11, 2018
c4c0f67
[OTHER] Post to redhat registries api when tagging new release (#10414)
geekgonecrazy Apr 13, 2018
b703b94
Adds option to show real name on user popup list (#10444)
gdelavald Apr 16, 2018
5cdcda8
Remove the developer warning on the rest api (#10441)
graywolf336 Apr 16, 2018
f6a08e6
Adds autocomplete option to settings fields (#10439)
gdelavald Apr 16, 2018
c9c0d8d
added delete channel button (#10438)
ggazzo Apr 16, 2018
9502915
Add reply box to quote and add quote on reply (#10437)
gdelavald Apr 16, 2018
bdd28e9
Add some missing translations (#10435)
gdelavald Apr 16, 2018
fa91f8d
fix text ellipsis on sidebar-item (#10430)
ggazzo Apr 16, 2018
29cbbef
Removes click listener and remove pointer events to null on icons (#1…
gdelavald Apr 16, 2018
a982399
[FIX] Add users popup list is broke (#10409)
karlprieb Apr 16, 2018
8124a12
[NEW] Room Announcements module (#10396)
gdelavald Apr 16, 2018
154fc88
Docker-compose to use mmapv1 storage engine for mongo (#10336)
geekgonecrazy Apr 16, 2018
f64e03c
[FIX] Desktop notifications not displayed when agent has not focused …
renatobecker Apr 16, 2018
c978136
[NEW] Rocketapps inputs (#10394)
ggazzo Apr 16, 2018
34e607c
[FIX] Renaming agent's username within Livechat's department (#10344)
renatobecker Apr 16, 2018
05ae7d6
Release 0.63.2 (#10476)
graywolf336 Apr 17, 2018
2de1530
Change from API scope to read_user, so we only have read access (#10225)
rafaelks Apr 17, 2018
cb34777
[FIX] Fix wrong grouping on messages when server is slow (#10472)
gdelavald Apr 17, 2018
ddcaa5b
[FIX] render popover to other side on RTL (#10428)
ggazzo Apr 17, 2018
1c2803c
[NEW] REST API rooms.favorite endpoint to favorite and unfavorite roo…
MarcosSpessatto Apr 17, 2018
96384c3
[FIX]: Fix the error of profile image not being shown in directory se…
lunaticmonk Apr 17, 2018
2591768
[FIX] Message view mode setting was missing at user's preferences (#…
kaiiiiiiiii Apr 17, 2018
fe903c2
enables admin ui for manage-emoji permission (#10171)
c0dzilla Apr 17, 2018
304bc49
Added one2mail.info to default blocked domain list (#10218)
elaine-jackson Apr 17, 2018
88c8070
[FIX] Fix highlight multi words (#10083)
nemani Apr 17, 2018
3115ec6
[FIX] Missing page not found (#6673)
Apr 17, 2018
2c856c0
[NEW] Twilio MMS support for LiveChat integration (#7964)
t3hchipmunk Apr 17, 2018
1f85615
[FIX] Livechat translation files being ignored (#10369)
renatobecker Apr 17, 2018
cf6e741
[NEW] Livechat setting to customize ended conversation message (#10108)
renatobecker Apr 17, 2018
5187149
Add REST endpoint chat.reportMessage, to report a message (#10354)
MarcosSpessatto Apr 17, 2018
16b6190
[NEW] REST endpoint to recover forgotten password (#10371)
MarcosSpessatto Apr 17, 2018
2411702
[FIX] Owner unable to delete channel or group from APIs (#9729)
c0dzilla Apr 17, 2018
5091f17
[FIX] Missing i18n translation key for "Unread" (#10387)
Hudell Apr 18, 2018
62f6b77
[NEW] Body of the payload on an incoming webhook is included on the r…
Hudell Apr 18, 2018
6fe8e11
[FIX] "Idle Time Limit" using milliseconds instead of seconds (#9824)
kaiiiiiiiii Apr 18, 2018
adb3f97
[FIX] Button on user info contextual bar scrolling with the content (…
okaybroda Apr 18, 2018
ccbfbc5
[OTHER] Develop sync (#10487)
graywolf336 Apr 18, 2018
b97b223
[FIX] The 'channel.messages' REST API Endpoint error (#10485)
rafaelks Apr 18, 2018
80e6be3
Update some i18n values
graywolf336 Apr 18, 2018
f072189
[FIX] Links being embedded inside of blockquotes (#10496)
gdelavald Apr 18, 2018
5a3ea7b
[FIX] Russian translation of "False" (#10418)
strangerintheq Apr 18, 2018
abb0bd6
[FIX] Empty panel after changing a user's username (#10404)
Hudell Apr 18, 2018
2592990
[OTHER] More Listeners for Apps & Utilize Promises inside Apps (#10335)
graywolf336 Apr 18, 2018
27413c6
[FIX] Unique identifier file not really being unique (#10341)
abernix Apr 18, 2018
957628b
Fixed custom fields misalignment in registration form (#10463)
dschuan Apr 18, 2018
d23c643
Correct the column positions in the directory search for users (#10454)
lunaticmonk Apr 19, 2018
fb3a6d9
Show error message when email verification fails (#10446)
Hudell Apr 19, 2018
45f611e
[FIX] Add oauth services missing fields, and indicate whether the oau…
MarcosSpessatto Apr 19, 2018
68a2b6d
[FIX] The 'channel.messages' REST API Endpoint error (#10485)
rafaelks Apr 18, 2018
3eeab6e
Bump version to 0.63.3
graywolf336 Apr 19, 2018
4398912
Add the history of v0.63.3
graywolf336 Apr 19, 2018
cbc951c
Merge pull request #10504 from RocketChat/release-0.63.3
graywolf336 Apr 19, 2018
981e150
[FIX] Directory sort and column sizes were wrong (#10403)
ggazzo Apr 19, 2018
b67e4ce
Remove "secret" from REST endpoint /settings.oauth response
MarcosSpessatto Apr 19, 2018
a9fb4da
Fix: Remove "secret" from REST endpoint /settings.oauth response (#10…
graywolf336 Apr 19, 2018
76f7c73
[FIX] Change dropdown element types (#10482)
kaiiiiiiiii Apr 19, 2018
ee06a91
[NEW] Add REST /directory endpoint (#10442)
MarcosSpessatto Apr 19, 2018
2d123a8
Develop sync (#10505)
graywolf336 Apr 20, 2018
bec34f7
- Support passing extra connection options to the Mongo driver. See h…
saplla Apr 20, 2018
92e1f7e
Merge branch 'develop' into mongo-connection-options
saplla Apr 20, 2018
fe663cf
[FIX] Fix REST spotlight to allow searches with # and @ (#10410)
MarcosSpessatto Apr 20, 2018
6f2702d
[FIX] Rename method to clean history of messages (#10498)
MarcosSpessatto Apr 20, 2018
bc548e7
[FIX] Missing user data on files uploaded through the API (#10473)
Hudell Apr 20, 2018
68b0641
[NEW] Add Search Provider Framework (#10110)
tkurz Apr 20, 2018
93b1641
[NEW] Ignore user on channels (#10517)
ggazzo Apr 20, 2018
81a3fb1
Add user object to responses in /*.files Rest endpoints (#10480)
MarcosSpessatto Apr 20, 2018
136e9ca
[NEW] Broadcast Channels (#9950)
ggazzo Apr 21, 2018
816d110
[BREAK] Validate incoming message schema (#9922)
MarcosSpessatto Apr 21, 2018
fee30ad
[NEW] GDPR - Right to access and Data Portability (#9906)
Hudell Apr 21, 2018
27f312d
[NEW] Option to mute group mentions (@all and @here) (#10502)
Hudell Apr 21, 2018
a506ee0
dependencies update
engelgabriel Apr 21, 2018
d7e5c1e
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
engelgabriel Apr 21, 2018
c9980c2
Included missing lib (#10532)
Hudell Apr 21, 2018
4470941
Remove duplicated key from en.i18n.json
rodrigok Apr 21, 2018
7c0be92
Merge branch 'develop' into mongo-connection-options
engelgabriel Apr 21, 2018
0097258
Bump version to 0.64.0-rc.0
rodrigok Apr 21, 2018
a2e14af
Regression: Upload was not working (#10543)
rodrigok Apr 21, 2018
8f1a24e
Regression: Revert announcement structure (#10544)
gdelavald Apr 21, 2018
2231c6d
LingoHub based on develop (#10545)
engelgabriel Apr 21, 2018
6f50c6c
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Apr 21, 2018
bba44ac
Bump version to 0.64.0-rc.1
rodrigok Apr 21, 2018
ed50536
- Merge call to `setConnectionOptions` with existing call elsewhere
saplla Apr 23, 2018
da2e2b7
Merge branch 'develop' into mongo-connection-options
saplla Apr 23, 2018
84f4f4a
Merge branch 'develop' into mongo-connection-options
saplla Apr 23, 2018
20b0fd2
Merge branch 'mongo-connection-options' of github.com:saplla/Rocket.C…
saplla Apr 23, 2018
3dd2912
- Lint changes
saplla Apr 23, 2018
ca118a2
- Remove undefined object
saplla Apr 23, 2018
bbf2843
Fix regression with announcement bar being displayed without content …
gdelavald Apr 23, 2018
44be02f
Fix issues with the rooms and apps (#10559)
graywolf336 Apr 23, 2018
01d2aea
Regression: Webhooks breaking duo to a too restrict test (#10555)
rodrigok Apr 23, 2018
b80fb84
Map consumerKey to clientId (fix Twitter) (#10560)
cardoso Apr 23, 2018
a8fe146
Deps update (#10549)
engelgabriel Apr 23, 2018
d8afb60
[FIX] Unclear ShowFormLogin i18n English Text #10501
graywolf336 Apr 23, 2018
4fa3bca
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Apr 24, 2018
71ab8e4
Bump version to 0.64.0-rc.2
rodrigok Apr 24, 2018
ace243e
Merge branch 'develop' into mongo-connection-options
saplla Apr 24, 2018
fda38bb
Fix the attachments and fields incorrectly failing on validation (#10…
graywolf336 Apr 24, 2018
cf277bc
Regression: Remove added mentions on quote/reply (#10571)
gdelavald Apr 24, 2018
f1ad310
Fix inconsistent response of settings.oauth endpoint (#10553)
MarcosSpessatto Apr 24, 2018
159ad34
[FIX] Wordpress oAuth authentication wasn't behaving correctly (#10550)
kaiiiiiiiii Apr 24, 2018
42f706b
Merge branch 'develop' into release-candidate
sampaiodiego Apr 24, 2018
198e458
Bump version to 0.64.0-rc.3
sampaiodiego Apr 24, 2018
2d403f2
Merge branch 'develop' into mongo-connection-options
saplla Apr 25, 2018
26acb0e
[FIX] Stop Firefox announcement overflowing viewport (#10503)
brendangadd Apr 25, 2018
280dbed
Added target="_blank" to homepage and support link. (#10575)
kaiiiiiiiii Apr 25, 2018
d0c5ae3
Add some information regarding Zapier and Bots to the integrations pa…
graywolf336 Apr 25, 2018
aeda3b3
fixed problems with margin negative (#10558)
ggazzo Apr 26, 2018
0942ed3
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Apr 26, 2018
e7e18a7
Bump version to 0.64.0-rc.4
rodrigok Apr 26, 2018
75d69f0
[FIX] Integrations with room data not having the usernames filled in …
graywolf336 Apr 26, 2018
20ce928
Adds Visual Studio Code debugging configuration (#10586)
graywolf336 Apr 26, 2018
387ec9a
Enable the 'Store_Last_Message' by default
graywolf336 Apr 26, 2018
9a8cd30
[FIX] Member list search with no results (#10599)
ggazzo Apr 27, 2018
751d07d
[FIX] Missing "Administration" menu for users with some administratio…
kaiiiiiiiii Apr 27, 2018
7ba14d1
Fix the Apps and Livechats not getting along well with each other (#1…
graywolf336 Apr 27, 2018
72a855a
Fix /api/v1/settings.oauth not sending needed info for SAML & CAS (#1…
cardoso Apr 27, 2018
b5a8e2b
Regression: Various search provider fixes (#10591)
tkurz Apr 27, 2018
e3fcbcb
Fix updating apps not working on multi-instance servers
graywolf336 Apr 27, 2018
6db1dec
Fix the misspellings of 'recieved' to 'received' on the apps...whoopies
graywolf336 Apr 27, 2018
4cc2433
Merge branch 'develop' into fix/enable-last-message-by-default
engelgabriel Apr 27, 2018
3d5aa6a
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Apr 28, 2018
59f88e2
Bump version to 0.64.0
rodrigok Apr 28, 2018
6dc6c18
Merge remote-tracking branch 'origin/master' into release-0.64.0
rodrigok Apr 28, 2018
2fae79a
Merge pull request #10613 from RocketChat/release-0.64.0
rodrigok Apr 28, 2018
1f33583
Do not add a migration to enable Store_Last_Message to all installations
rodrigok Apr 28, 2018
d17f6ba
[FIX] E-mails were hidden some information
rodrigok Apr 28, 2018
4f7a017
Merge branch 'develop' into mongo-connection-options
engelgabriel Apr 28, 2018
0d07699
[FIX] Regression on 0.64.0 was freezing the application when posting …
rodrigok Apr 30, 2018
0284d73
Look for URLs on parsed markdown HTML
sampaiodiego May 1, 2018
4754ec4
Merge branch 'develop' into regression/fix-multi-instance-apps
engelgabriel May 1, 2018
72cc787
dependencies update
engelgabriel May 3, 2018
dce4d0e
Merge pull request #10648 from RocketChat/deps-update
rodrigok May 3, 2018
73e8ba3
Merge pull request #10627 from RocketChat/hotfix/url-parse-freeze
rodrigok May 3, 2018
7ba58f4
Merge pull request #10611 from RocketChat/regression/fix-multi-instan…
rodrigok May 3, 2018
94011de
Merge branch 'develop' into mongo-connection-options
saplla May 3, 2018
2f6a9af
Merge pull request #10615 from RocketChat/improvements/email-template
rodrigok May 3, 2018
7bbf956
Merge pull request #10529 from saplla/mongo-connection-options
rodrigok May 3, 2018
cfe6c08
Merge pull request #10597 from RocketChat/fix/enable-last-message-by-…
rodrigok May 3, 2018
9e42f42
Merge remote-tracking branch 'origin/develop' into release-0.64.1
rodrigok May 3, 2018
f8c99e2
Bump version to 0.64.1
rodrigok May 3, 2018
54738c0
Merge pull request #10660 from RocketChat/release-0.64.1
rodrigok May 3, 2018
333179d
Merge branch 'master' into patch-1
balcsida May 3, 2018
97cb92b
changed saml integration to store data on mongo instead of memory
Hudell May 4, 2018
6e9acfb
Update saml_server.js
rodrigok May 5, 2018
b2ef99b
Merge pull request #10681 from RocketChat/fix.saml-on-multi-instances
rodrigok May 5, 2018
aaed87d
[FIX] Fix create channel, when created a readonly channel (#10665)
MarcosSpessatto May 5, 2018
8a61b42
Correct links to Rocket.Chat documentation (#10674)
winterstefan May 5, 2018
3d05bdc
Fix flickering on message-box emoji icon (#10678)
gdelavald May 5, 2018
9bd5de3
add `npm run postinstall` into build script (#10524)
peccu May 5, 2018
13b761c
[FIX] Improve desktop notification formatting (#10445)
Sameesunkaria May 8, 2018
f58c185
Fixed the problem of missing descriptions on message attachments (#10…
Hudell May 8, 2018
9f70755
[BREAK] Improvements to notifications logic (#10686)
sampaiodiego May 9, 2018
66f719e
LingoHub Update :rocket: (#10691)
engelgabriel May 9, 2018
08149eb
[NEW] Setup Wizard (#10523)
karlprieb May 9, 2018
e8054b9
[FIX] Improve wordpress OAuth settings (#10724)
Hudell May 11, 2018
4e9f025
[NEW] Add /api/v1/channels.roles & /api/v1/groups.roles (#10607)
cardoso May 11, 2018
69add44
Changes source of text for announcement modal content (#10733)
gdelavald May 11, 2018
b995ed6
[FIX] Send a message when muted returns inconsistent result in chat.s…
MarcosSpessatto May 11, 2018
1b8e8a5
More improvements on send notifications logic (#10736)
sampaiodiego May 11, 2018
e9251df
Fix notifications for direct messages (#10760)
sampaiodiego May 15, 2018
db2492c
Add setting and expose prometheus on port 9100 (#10766)
rodrigok May 15, 2018
7e25b1c
Wizard improvements (#10776)
rodrigok May 15, 2018
19e8100
Add badge back to push notifications (#10779)
rodrigok May 16, 2018
ae67d4d
Better metric for notifications (#10786)
rodrigok May 16, 2018
474fbff
Improvement to push notifications on direct messages (#10788)
sampaiodiego May 16, 2018
51a6b40
Prometheus: Improve metric names (#10789)
rodrigok May 16, 2018
5bfbb98
[FIX] Not escaping special chars on mentions (#10793)
erhan- May 17, 2018
5f5914e
Regression: Fix wrong wizard field name (#10804)
rodrigok May 17, 2018
6d7b726
Prometheus: Fix notification metric (#10803)
rodrigok May 17, 2018
d3446aa
Regression: Autorun of wizard was not destroyed after completion (#10…
rodrigok May 17, 2018
c297420
Prometheus: Add metric to track hooks time (#10798)
rodrigok May 17, 2018
2117624
Prevent setup wizard redirects (#10811)
rodrigok May 18, 2018
83982a8
Stop caching private settings (#10625)
Hudell May 18, 2018
fbe8c99
[NEW] Add REST API endpoints `channels.setCustomFields` and `groups.s…
xbolshe May 18, 2018
9824687
[NEW] Add REST API endpoints `channels.counters`, `groups.counters an…
xbolshe May 18, 2018
0f5cffa
[FIX] UI was not disabling the actions when users has had no permissi…
chuckAtCataworx May 18, 2018
d6ff269
Add verification to authorize get images with X-user-id and X-auth-to…
MarcosSpessatto May 18, 2018
8160a5f
[FIX] Fix rest /me endpoint (#10662)
MarcosSpessatto May 18, 2018
f83cb34
Add REST endpoint to mark messages as unread (#10778)
MarcosSpessatto May 18, 2018
e0f7684
[NEW] REST API endpoint `settings` now allow set colors and trigger a…
ThomasRoehl May 18, 2018
1e55207
Add Rest endpoint to get username suggestion (#10702)
MarcosSpessatto May 18, 2018
58d455f
major dependencies update (#10661)
engelgabriel May 18, 2018
6178aee
Remove old translations (#10448)
Hudell May 18, 2018
d2001ca
[FIX] disable/enable System Messages (#10704)
ggazzo May 18, 2018
89ff78a
[NEW] View pinned message's attachment (#10214)
c0dzilla May 18, 2018
e358a3c
[FIX] Enabling "Collapse Embedded Media by Default" hides replies, qu…
c0dzilla May 18, 2018
105715e
Release 0.64.2 (#10812)
rodrigok May 18, 2018
107afcc
[NEW] lazy load image attachments (#10608)
ggazzo May 18, 2018
a67ff58
Develop sync (#10815)
rodrigok May 18, 2018
9c93dd0
[NEW] Return the result of the `/me` endpoint within the result of th…
MarcosSpessatto May 18, 2018
0855f73
The Livechat settings of the 'color' types were not appearing correc…
renatobecker May 18, 2018
986cde3
[NEW] Enable/disable Livechat registration form fields (#10584)
renatobecker May 18, 2018
1070edf
When a manager tried to send a message in a live room, an error was b…
renatobecker May 18, 2018
3ed656b
[NEW] Implement a local password policy (#9857)
graywolf336 May 20, 2018
d53c94c
Apps: Command Previews, Message and Room Removal Events (#10822)
graywolf336 May 21, 2018
4d48163
Bump version to 0.65.0-rc.0
rodrigok May 21, 2018
1cbddee
Update room.html (#10715)
Mr-Gryphon May 21, 2018
8b87585
[NEW] Add view-broadcast-member-list permission (#10753)
cardoso May 21, 2018
4ed57e0
[FIX] Livechat sidebar using "Unread on Top" user preference (#10734)
renatobecker May 21, 2018
202bb31
Fix REST /me regression (#10833)
MarcosSpessatto May 21, 2018
3ffd9e6
[FIX] Broadcast/ Read only issues (#10835)
ggazzo May 21, 2018
dd8116d
Create temp folder if it doesn't exist (#10837)
Hudell May 21, 2018
5682c69
Fix: Regression on users avatar in admin pages (#10836)
ggazzo May 22, 2018
655c7c9
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok May 22, 2018
ee5f4be
Bump version to 0.65.0-rc.1
rodrigok May 22, 2018
275c2b0
Fix: Clarify the wording of the release issue template (#10520)
graywolf336 May 22, 2018
955c0c2
Regression: Make settings `Site_Name` and `Language` public again (#1…
rodrigok May 22, 2018
2244ba9
Fix layout badge cutting on unread messages for long names (#10846)
kos4live May 22, 2018
07cb9ab
[FIX] Missing pagination fields in the response of REST /directory en…
MarcosSpessatto May 23, 2018
888e2d9
Allow click on command previews and add setting to control apps enabl…
graywolf336 May 23, 2018
e1ef24b
Regression: Fix email notification preference not showing correct sel…
sampaiodiego May 23, 2018
9fce784
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok May 23, 2018
13ac25b
Bump version to 0.65.0-rc.2
rodrigok May 23, 2018
90f4b7d
fix search shortcut text
MartinSchoeler May 25, 2018
e9a98b2
[FIX] The first users was not set as admin some times (#10878)
rodrigok May 25, 2018
599a61c
Fixed a typo on error message for push token API (#10857)
rafaelks May 25, 2018
1714de2
Adds flex-box to preview commands (#10883)
gdelavald May 26, 2018
048ae30
Fix: Regression Lazyload fix shuffle avatars (#10887)
ggazzo May 26, 2018
ebd915a
LingoHub Update :rocket: (#10886)
engelgabriel May 26, 2018
0bcc966
[FIX] Manage apps layout (#10882)
gdelavald May 26, 2018
02c13a4
Fixed slackbridge (#10875)
iliaal May 26, 2018
c0e4ed6
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok May 26, 2018
ec69a18
Bump version to 0.65.0-rc.3
rodrigok May 26, 2018
6a2fc0e
Merge branch 'release-candidate' into release-0.65.0
rodrigok May 28, 2018
3025acf
Bump version to 0.65.0
rodrigok May 28, 2018
6d6d8be
Release 0.65.0 (#10893)
rodrigok May 28, 2018
9cd892d
Merge branch 'release-0.65.0'
rodrigok May 28, 2018
7c1af8b
Merge pull request #10851 from RocketChat/leave-room-bug
rodrigok May 29, 2018
e9cc198
Merge pull request #10904 from RocketChat/lazyload-fix-regression
rodrigok May 29, 2018
fca761f
Merge pull request #10928 from RocketChat/fix-email-notification-link
rodrigok May 29, 2018
c6b8818
Merge pull request #10934 from RocketChat/prevent-sending-exceptions-…
rodrigok May 29, 2018
40133be
Merge pull request #10940 from RocketChat/fix-livechat-not-loading
engelgabriel May 30, 2018
65e6153
Bump version to 0.65.1
sampaiodiego May 30, 2018
8349c36
Merge pull request #10947 from RocketChat/release-0.65.1
sampaiodiego May 30, 2018
8415f15
[FIX] Display vertical scrollbar on demand
engelgabriel Jun 2, 2018
44548c5
[FIX] Search shortcut text
engelgabriel Jun 2, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
281 changes: 281 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,281 @@
defaults: &defaults
working_directory: ~/repo

version: 2
jobs:
build:
<<: *defaults
docker:
- image: circleci/node:8.9

steps:
- checkout

# - restore_cache:
# keys:
# - node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}

# - restore_cache:
# keys:
# - meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}

- run:
name: Install Meteor
command: |
# Restore bin from cache
set +e
METEOR_SYMLINK_TARGET=$(readlink ~/.meteor/meteor)
METEOR_TOOL_DIRECTORY=$(dirname "$METEOR_SYMLINK_TARGET")
set -e
LAUNCHER=$HOME/.meteor/$METEOR_TOOL_DIRECTORY/scripts/admin/launch-meteor
if [ -e $LAUNCHER ]
then
echo "Cached Meteor bin found, restoring it"
sudo cp "$LAUNCHER" "/usr/local/bin/meteor"
else
echo "No cached Meteor bin found."
fi

# only install meteor if bin isn't found
command -v meteor >/dev/null 2>&1 || curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh

- run:
name: Versions
command: |
npm --versions
node -v
meteor --version
meteor npm --versions
meteor node -v
git version

- run:
name: Meteor npm install
command: |
# rm -rf node_modules
# rm -f package-lock.json
meteor npm install

- run:
name: Lint
command: |
meteor npm run lint
meteor npm run stylelint

- run:
name: Unit Test
command: |
meteor npm run testunit

# - restore_cache:
# keys:
# - meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}

# - restore_cache:
# keys:
# - livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}

# - restore_cache:
# keys:
# - livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}

- run:
name: Build Rocket.Chat
command: |
if [[ $CIRCLE_TAG ]]; then meteor reset; fi
set +e
meteor add rocketchat:lib
set -e
meteor build --server-only --directory /tmp/build-test

- run:
name: Prepare build
command: |
mkdir /tmp/build/
cd /tmp/build-test
tar czf /tmp/build/Rocket.Chat.tar.gz bundle
cd /tmp/build-test/bundle/programs/server
npm install

# - save_cache:
# key: node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
# paths:
# - ./node_modules

# - save_cache:
# key: meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
# paths:
# - ./.meteor/local

# - save_cache:
# key: livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
# paths:
# - ./packages/rocketchat-livechat/app/node_modules

# - save_cache:
# key: livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
# paths:
# - ./packages/rocketchat-livechat/app/.meteor/local

# - save_cache:
# key: meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
# paths:
# - ~/.meteor

- persist_to_workspace:
root: /tmp/
paths:
- build-test
- build

- store_artifacts:
path: /tmp/build

test-with-oplog:
<<: *defaults
docker:
- image: circleci/node:8.9-browsers
- image: mongo:3.4
command: [mongod, --nojournal, --noprealloc, --smallfiles, --replSet=rs0]

environment:
TEST_MODE: "true"
MONGO_URL: mongodb://localhost:27017/testwithoplog
MONGO_OPLOG_URL: mongodb://localhost:27017/local

steps:
- attach_workspace:
at: /tmp

- checkout

- run:
name: Install dependencies
command: |
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
sudo apt-get update
sudo apt-get install -y mongodb-org-shell

- run:
name: Configure Replica Set
command: |
mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
mongo --eval 'rs.status()'

- run:
name: NPM install
command: |
npm install

- run:
name: Run Tests
command: |
for i in $(seq 1 5); do npm test && s=0 && break || s=$? && sleep 1; done; (exit $s)

- store_artifacts:
path: .screenshots/

test-without-oplog:
<<: *defaults
docker:
- image: circleci/node:8.9-browsers
- image: circleci/mongo:3.4

environment:
TEST_MODE: "true"
MONGO_URL: mongodb://localhost:27017/testwithoplog

steps:
- attach_workspace:
at: /tmp

- checkout

- run:
name: NPM install
command: |
npm install

- run:
name: Run Tests
command: |
for i in $(seq 1 5); do npm test && s=0 && break || s=$? && sleep 1; done; (exit $s)

- store_artifacts:
path: .screenshots/

deploy:
<<: *defaults
docker:
- image: circleci/node:8.9

steps:
- attach_workspace:
at: /tmp

- checkout

- run:
name: Install AWS cli
command: |
if [[ $CIRCLE_PULL_REQUESTS ]]; then exit 0; fi;

sudo apt-get -y -qq update
sudo apt-get -y -qq install python3.4-dev
curl -O https://bootstrap.pypa.io/get-pip.py
python3.4 get-pip.py --user
export PATH=~/.local/bin:$PATH
pip install awscli --upgrade --user

- run:
name: Publish assets
command: |
if [[ $CIRCLE_PULL_REQUESTS ]]; then exit 0; fi;

export PATH=~/.local/bin:$PATH
export CIRCLE_TAG=${CIRCLE_TAG:=}

source .circleci/setartname.sh
source .circleci/setdeploydir.sh
bash .circleci/setupsig.sh
bash .circleci/namefiles.sh
# echo ".circleci/sandstorm.sh"

aws s3 cp $ROCKET_DEPLOY_DIR/ s3://download.rocket.chat/build/ --recursive

bash .circleci/update-releases.sh
bash .circleci/docker.sh
bash .circleci/snap.sh
bash .circleci/redhat-registry.sh

workflows:
version: 2
build-and-test:
jobs:
- build:
filters:
tags:
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
- test-with-oplog:
requires:
- build
filters:
tags:
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
- test-without-oplog:
requires:
- build
filters:
tags:
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
- deploy:
requires:
- test-with-oplog
- test-without-oplog
filters:
branches:
only: develop
tags:
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/

13 changes: 13 additions & 0 deletions .circleci/docker.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

CURL_URL="https://registry.hub.docker.com/u/rocketchat/rocket.chat/trigger/$DOCKER_TRIGGER_TOKEN/"

if [[ $CIRCLE_TAG ]]; then
CURL_DATA='{"source_type":"Tag","source_name":"'"$CIRCLE_TAG"'"}';
else
CURL_DATA='{"source_type":"Branch","source_name":"'"$CIRCLE_BRANCH"'"}';
fi

curl -H "Content-Type: application/json" --data "$CURL_DATA" -X POST "$CURL_URL"
8 changes: 8 additions & 0 deletions .circleci/namefiles.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

FILENAME="$ROCKET_DEPLOY_DIR/rocket.chat-$ARTIFACT_NAME.tgz";

ln -s /tmp/build/Rocket.Chat.tar.gz "$FILENAME"
gpg --armor --detach-sign "$FILENAME"
12 changes: 12 additions & 0 deletions .circleci/redhat-registry.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

if [[ $CIRCLE_TAG ]]; then
curl -X POST \
https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
-H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
-H 'Cache-Control: no-cache' \
-H 'Content-Type: application/json' \
-d '{"tag":"'$CIRCLE_TAG'"}'
fi
23 changes: 23 additions & 0 deletions .circleci/setartname.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
if [[ $CIRCLE_TAG ]]; then
export ARTIFACT_NAME="$(npm run version --silent)"
else
export ARTIFACT_NAME="$(npm run version --silent).$CIRCLE_BUILD_NUM"
fi

if [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+ ]]; then
SNAP_CHANNEL=candidate
RC_RELEASE=candidate
RC_VERSION=$CIRCLE_TAG
elif [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
SNAP_CHANNEL=stable
RC_RELEASE=stable
RC_VERSION=$CIRCLE_TAG
else
SNAP_CHANNEL=edge
RC_RELEASE=develop
RC_VERSION=0.60.0-develop
fi

export SNAP_CHANNEL
export RC_RELEASE
export RC_VERSION
2 changes: 2 additions & 0 deletions .circleci/setdeploydir.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export ROCKET_DEPLOY_DIR="/tmp/deploy"
mkdir -p $ROCKET_DEPLOY_DIR
8 changes: 8 additions & 0 deletions .circleci/setupsig.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

cp .circleci/sign.key.gpg /tmp
gpg --yes --batch --passphrase=$GPG_PASSWORD /tmp/sign.key.gpg
gpg --allow-secret-key-import --import /tmp/sign.key
rm /tmp/sign.key
Binary file added .circleci/sign.key.gpg
Binary file not shown.
38 changes: 38 additions & 0 deletions .circleci/snap.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

# Add launchpad to known hosts
ssh-keyscan -t rsa -H git.launchpad.net > ~/.ssh/known_hosts

echo "Preparing to trigger a snap release for $SNAP_CHANNEL channel"

cd $PWD/.snapcraft

# We need some meta data so it'll actually commit. This could be useful to have for debugging later.
echo -e "Tag: $CIRCLE_TAG\r\nBranch: $CIRCLE_BRANCH\r\nBuild: $CIRCLE_BUILD_NUM\r\nCommit: $CIRCLE_SHA1" > buildinfo

# Clone launchpad repo for the channel down.
git clone -b $SNAP_CHANNEL git+ssh://rocket.chat.buildmaster@git.launchpad.net/rocket.chat launchpad

# Rarely will change, but just incase we copy it all
cp -r resources buildinfo launchpad/
sed s/#{RC_VERSION}/$RC_VERSION/ snapcraft.yaml > launchpad/snapcraft.yaml
sed s/#{RC_VERSION}/$RC_VERSION/ resources/prepareRocketChat > launchpad/resources/prepareRocketChat

cd launchpad
git add resources snapcraft.yaml buildinfo

# Set commit author details
git config user.email "buildmaster@rocket.chat"
git config user.name "CircleCI"

# Another place where basic meta data will live for at a glance info
git commit -m "CircleCI Build: $CIRCLE_BUILD_NUM CircleCI Commit: $CIRCLE_SHA1"

# Push up up to the branch of choice.
git push origin $SNAP_CHANNEL

# Clean up
cd ..
rm -rf launchpad
Loading