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

[NEW] Livechat guest pool based on department #7678

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
bbe237b
[FIX] Some updates were returning errors when based on queries with p…
rodrigok Jul 4, 2018
9c917b0
Bump version to 0.66.1
rodrigok Jul 4, 2018
098af04
Merge pull request #11343 from RocketChat/release-0.66.1
rodrigok Jul 4, 2018
d4a88ea
Merge remote-tracking branch 'origin/master' into develop-sync
rodrigok Jul 4, 2018
d68f3ad
Bump version to 0.67.0-develop
rodrigok Jul 4, 2018
acc6a41
[FIX] Loading avatar suggestions with no internet connection
AmShaegar13 Jul 4, 2018
f142a57
Merge pull request #11348 from RocketChat/develop-sync
rodrigok Jul 5, 2018
6ae3e83
[FIX] Parse inline code without space before initial backtick (#9754)
c0dzilla Jul 5, 2018
4d0a434
[IMPROVE] Stop sort callbacks on run (#11330)
ggazzo Jul 5, 2018
231c60b
[FIX] Message attachment's fields with different sizes (#11342)
sampaiodiego Jul 5, 2018
abe6762
[FIX] web app manifest errors as reported by Chrome DevTools (#9991)
justinribeiro Jul 5, 2018
4ff83f4
[FIX] Message popup responsiveness in slash commands (#11313)
tassoevan Jul 5, 2018
2029b2c
Send setting Allow_Marketing_Emails to statistics collector (#11359)
rodrigok Jul 5, 2018
f25a58e
Fix migration 125 checking for settings field (#11364)
sampaiodiego Jul 6, 2018
215cfb0
Remove file snap store doesn't like (#11365)
geekgonecrazy Jul 6, 2018
66180c6
[FIX] SVG icons code (#11319)
tassoevan Jul 6, 2018
c33816e
[FIX] Livechat not sending desktop notifications (#11266)
renatobecker Jul 6, 2018
05a6e15
[FIX] Livechat not sending desktop notifications (#11266)
renatobecker Jul 6, 2018
0cc4ef4
Remove file snap store doesn't like (#11365)
geekgonecrazy Jul 6, 2018
f290d21
Fix migration 125 checking for settings field (#11364)
sampaiodiego Jul 6, 2018
0bb569b
Send setting Allow_Marketing_Emails to statistics collector (#11359)
rodrigok Jul 5, 2018
a412e17
Bump version to 0.66.2
sampaiodiego Jul 6, 2018
5dab073
Merge pull request #11366 from RocketChat/release-0.66.2
sampaiodiego Jul 6, 2018
9051537
[NEW] Additional Livechat iFrame API's (#10918)
renatobecker Jul 6, 2018
2bbb7ff
Merge remote-tracking branch 'origin/master' into develop-sync
rodrigok Jul 9, 2018
af8c310
Bump version to 0.67.0-develop
rodrigok Jul 9, 2018
35d245d
Merge pull request #11399 from RocketChat/develop-sync
rodrigok Jul 9, 2018
1449a17
[FIX] sort fname sidenav (#11358)
ggazzo Jul 9, 2018
89f1a65
[FIX] All messages notifications via email were sent as mention alert…
rodrigok Jul 9, 2018
6cf953a
[FIX] Livechat taking inquiry leading to 404 page (#11406)
renatobecker Jul 9, 2018
5208a6e
[FIX] Livechat taking inquiry leading to 404 page (#11406)
renatobecker Jul 9, 2018
ee93adf
[FIX] All messages notifications via email were sent as mention alert…
rodrigok Jul 9, 2018
ac30265
Bump version to 0.66.3
sampaiodiego Jul 10, 2018
d02d0e3
Merge pull request #11410 from RocketChat/release-0.66.3
sampaiodiego Jul 10, 2018
3041771
Bump version to 0.67.0-develop
sampaiodiego Jul 10, 2018
72a489c
Merge pull request #11417 from RocketChat/develop-sync
sampaiodiego Jul 10, 2018
38ad52b
replace ’ with '
engelgabriel Jul 10, 2018
b86489e
[WIP][BREAK] Remove cache layer and internal calculated property `roo…
rodrigok Jul 11, 2018
9b1842f
Bump version to 0.67.0-rc.0
rodrigok Jul 11, 2018
4c099d8
[NEW] Livechat File Upload (#10514)
renatobecker Jul 13, 2018
8ede4d8
[NEW] Accept resumeToken as query param to log in (#11443)
sampaiodiego Jul 14, 2018
ab5cf21
[NEW] Make WebRTC not enabled by default (#11489)
MartinSchoeler Jul 17, 2018
3c8795c
[FIX] record popup on small screens (#11349)
ggazzo Jul 17, 2018
eca6a71
[FIX] Custom fields wrap to new line (#10119)
PhpXp Jul 17, 2018
27f5a93
[FIX] Fixed svg for older chrome browsers bug #11414 (#11416)
tpDBL Jul 17, 2018
14a21ed
[FIX] broadcast channel reply (#11462)
ggazzo Jul 17, 2018
22b7550
[FIX] Only escape HTML from details in toast error messages (#11459)
tassoevan Jul 17, 2018
0f45d3f
[FIX] Remove title attribute from sidebar items (#11298)
tassoevan Jul 17, 2018
f44b85c
[IMPROVE] Allow markdown in room topic/announcement/description (#11408)
tassoevan Jul 18, 2018
057eda9
[NEW] Sorting channels by number of users in directory (#9972)
Jul 18, 2018
a5a4573
Fix dependency issue in redhat image (#11497)
geekgonecrazy Jul 18, 2018
3b4513f
Replaced old logo with the new ones (#11491)
brunosquadros Jul 18, 2018
278e9a3
[FIX] Decrease room leader bar z-index (#11450)
tassoevan Jul 18, 2018
4b3b70d
[NEW] Privacy for custom user fields (#11332)
vynmera Jul 19, 2018
48d9a2b
[NEW] search only default tone emoji Popup search (#10017)
Jul 19, 2018
4cb588f
[FIX] Refinements in message popup mentions (#11441)
tassoevan Jul 19, 2018
e46a42b
[NEW] Room files search form (#11486)
tassoevan Jul 19, 2018
3c8d011
[NEW] Send user status to client (#11303)
HappyTobi Jul 19, 2018
3a0d5e1
[BREAK] Update GraphQL structure of the login mutation (#11430)
engelgabriel Jul 19, 2018
5f8bfb9
[FIX] RocketChat.settings.get causing memory leak (sometimes) (#11487)
ggazzo Jul 19, 2018
22fe38e
[IMPROVE] Typing indicators now use Real Names (#11164)
vynmera Jul 19, 2018
fa6413e
[FIX] Logos safe area (#11508)
brunosquadros Jul 19, 2018
090b254
Update release issue template to use Houston CLI (#11499)
rodrigok Jul 19, 2018
655521c
[IMPROVE] Set default max upload size to 100mb (#11327)
cardoso Jul 20, 2018
f70ccbd
[NEW][BREAK] Message retention policy and pruning (#11236)
vynmera Jul 20, 2018
e530505
[FIX] Snap font issue for sharp (#11514)
geekgonecrazy Jul 20, 2018
5de3d88
[FIX] empty blockquote (#11526)
ggazzo Jul 20, 2018
b1ed07c
[FIX] Check for channels property on message object before parsing me…
tassoevan Jul 20, 2018
1c303c2
Merge remote-tracking branch 'origin/release-candidate' into release-…
sampaiodiego Jul 20, 2018
5851b60
Bump version to 0.67.0
sampaiodiego Jul 20, 2018
40cb40e
[FIX] Loading and setting fixes for i18n and RTL (#11363)
tassoevan Jul 20, 2018
cd90037
[FIX] SAML issues (#11135)
Hudell Jul 21, 2018
071c409
[FIX] Mixed case channel slugs (#9449)
soundstorm Jul 21, 2018
20df3c5
Regression: Add missing LiveChat permission to allow removing closed …
renatobecker Jul 21, 2018
23cbc71
[BREAK] Remove deprecated /user.roles endpoint (#11493)
MarcosSpessatto Jul 21, 2018
fb7d38e
[FIX] Unlimited upload file size not working (#11471)
Hudell Jul 21, 2018
212597a
Merge pull request #11533 from RocketChat/release-0.67.0
sampaiodiego Jul 21, 2018
3feb7a0
Merge remote-tracking branch 'origin/master' into develop-sync
sampaiodiego Jul 21, 2018
21e4cd2
Bump version to 0.68.0-develop
sampaiodiego Jul 21, 2018
ebf60e1
[FIX] Invalid permalink URLs for Direct Messages (#11507)
Hudell Jul 21, 2018
399ad6f
[FIX] Add customFields property to /me REST endpoint response (#11496)
MarcosSpessatto Jul 21, 2018
42ee6a9
[FIX] Send Livechat back to Guest Pool (#10731)
renatobecker Jul 21, 2018
1ec0b65
[NEW] Add /roles.list REST endpoint to retrieve all server roles (#11…
MarcosSpessatto Jul 21, 2018
5214656
[FIX] Marked parser breaking announcements and mentions at the start …
vynmera Jul 21, 2018
706975b
[NEW] Add /users.deleteOwnAccount REST endpoint to an user delete his…
MarcosSpessatto Jul 21, 2018
32b3a03
Merge branch 'develop' into develop-sync
sampaiodiego Jul 21, 2018
811e1a2
[FIX] Unreads counter for new rooms on /channels.counters REST endpoi…
MarcosSpessatto Jul 21, 2018
121a8ec
[FIX] Change pagination field to `count` on /chat.search REST endpoin…
MarcosSpessatto Jul 21, 2018
56ee716
Merge pull request #11536 from RocketChat/develop-sync
sampaiodiego Jul 21, 2018
e245640
Revert: Mixed case channel slugs #9449 (#11537)
sampaiodiego Jul 21, 2018
6b8dff6
[FIX] Render reply preview with message as a common message (#11534)
tassoevan Jul 21, 2018
1dbd50d
[FIX] New favicons size too small (#11524)
brunosquadros Jul 21, 2018
27cba38
[NEW] Setting to disable 2FA globally (#11328)
Hudell Jul 21, 2018
82d0679
Bump version to 0.68.0-rc.0
sampaiodiego Jul 21, 2018
03e5c26
Regression: nonReactive to nonreactive (#11550)
ggazzo Jul 23, 2018
845a756
Regression: Update cachedCollection version (#11561)
ggazzo Jul 24, 2018
b49e696
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Jul 27, 2018
40d6890
Bump version to 0.68.0-rc.1
sampaiodiego Jul 27, 2018
d6809d0
Regression: Make message popup user mentions reactive again (#11567)
tassoevan Jul 27, 2018
8fdb12d
LingoHub Update :rocket: (#11587)
engelgabriel Jul 27, 2018
bcd8f36
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Jul 27, 2018
7c8b319
Bump version to 0.68.0-rc.2
sampaiodiego Jul 27, 2018
2a7a14a
Updated icon assets
engelgabriel Jul 27, 2018
33138f9
Regression: Fix prune message's translations (#11590)
sampaiodiego Jul 28, 2018
f997c17
Regression: Fix prune message's translations (#11590)
sampaiodiego Jul 28, 2018
82c84bd
Bump version to 0.68.0-rc.3
sampaiodiego Jul 28, 2018
6600dd6
Bump version to 0.68.0
sampaiodiego Jul 28, 2018
047dce9
Merge pull request #11591 from RocketChat/release-0.68.0
sampaiodiego Jul 28, 2018
c105cde
Merge remote-tracking branch 'origin/master' into develop-sync
sampaiodiego Jul 30, 2018
3373931
Bump version to 0.69.0-develop
sampaiodiego Jul 30, 2018
cbe1426
Merge pull request #11606 from RocketChat/develop-sync
sampaiodiego Jul 30, 2018
e91cb62
livechat: removed exposed api
vkislichenko Jul 30, 2018
0e0ae73
[FIX] Jump to message search result action (#11613)
tassoevan Jul 30, 2018
163ceee
[FIX] HipChat importer wasn’t compatible with latest exports (#11597)
rodrigok Jul 31, 2018
4ed88fb
[FIX] HipChat importer wasn’t compatible with latest exports (#11597)
rodrigok Jul 31, 2018
3f42673
[FIX] Jump to message search result action (#11613)
tassoevan Jul 30, 2018
1b00437
Updated icon assets
engelgabriel Jul 27, 2018
3f74d89
Bump version to 0.68.1
sampaiodiego Jul 31, 2018
70ec361
Merge pull request #11616 from RocketChat/release-0.68.1
sampaiodiego Jul 31, 2018
d37f478
[FIX] Incorrect migration version in v130.js (#11544)
c0dzilla Aug 1, 2018
c13e609
[FIX] Incorrect migration version in v130.js (#11544)
c0dzilla Aug 1, 2018
d59e56c
Bump version to 0.68.2
sampaiodiego Aug 1, 2018
7b665b4
Merge pull request #11630 from RocketChat/release-0.68.2
sampaiodiego Aug 1, 2018
bc95070
[FIX] Missing chat history for users without permission `preview-c-ro…
Hudell Aug 1, 2018
5bde6a5
[FIX] User info APIs not returning customFields correctly (#11625)
MarcosSpessatto Aug 1, 2018
37dfdba
[FIX] Prune translations in German (#11631)
rndmh3ro Aug 1, 2018
3935218
[FIX] Prune translation on room info panel (#11635)
sampaiodiego Aug 1, 2018
c40f11c
[FIX] SAML login not working when user has multiple emails (#11642)
Hudell Aug 2, 2018
5de38ba
[FIX] SAML login not working when user has multiple emails (#11642)
Hudell Aug 2, 2018
26fcaa4
[FIX] Prune translation on room info panel (#11635)
sampaiodiego Aug 1, 2018
d820137
[FIX] Prune translations in German (#11631)
rndmh3ro Aug 1, 2018
8dedcec
[FIX] User info APIs not returning customFields correctly (#11625)
MarcosSpessatto Aug 1, 2018
1a47240
[FIX] Missing chat history for users without permission `preview-c-ro…
Hudell Aug 1, 2018
93f5757
Bump version to 0.68.3
sampaiodiego Aug 2, 2018
6594108
Merge pull request #11650 from RocketChat/release-0.68.3
sampaiodiego Aug 2, 2018
9028d10
Merge remote-tracking branch 'upstream/develop' into livechat-guest-p…
vkislichenko Aug 2, 2018
a61affc
Merge remote-tracking branch 'upstream/develop' into livechat-guest-p…
vkislichenko Aug 2, 2018
260593f
changes to merge with new version
vkislichenko Aug 2, 2018
f3bccf7
[IMPROVE] Reducing `saveUser` code complexity (#11645)
Hudell Aug 2, 2018
83e37ba
[IMPROVE] Add nyan rocket on Rocket.Chat preview Docker image (#11684)
ggazzo Aug 7, 2018
409399b
[FIX] Push notifications stuck after db failure (#11667)
sampaiodiego Aug 7, 2018
ab21b00
[FIX] Login logo now centered on small screens (#11626)
wreiske Aug 7, 2018
0252035
[FIX] Regression in prune by user, and update lastMessage (#11646)
vynmera Aug 7, 2018
179fcb3
Fix setup wizard logo
sampaiodiego Aug 8, 2018
5329552
Merge pull request #11708 from RocketChat/fix-setup-wizard-logo
tassoevan Aug 8, 2018
1851295
[FIX] Closed connections being storing on db (#11709)
sampaiodiego Aug 8, 2018
135bdaf
fix: livechat room status
vkislichenko Aug 9, 2018
b342f5e
[FIX] Default server language not being applied (#11719)
sampaiodiego Aug 10, 2018
2a0555a
[FIX] Regression in prune by user, and update lastMessage (#11646)
vynmera Aug 7, 2018
efcc10f
Merge pull request #11708 from RocketChat/fix-setup-wizard-logo
tassoevan Aug 8, 2018
f042e88
[FIX] Default server language not being applied (#11719)
sampaiodiego Aug 10, 2018
65c2a39
Bump version to 0.68.4
sampaiodiego Aug 10, 2018
4e32f62
Merge pull request #11743 from RocketChat/release-0.68.4
sampaiodiego Aug 10, 2018
ddb281e
[IMPROVE] Add template tag #{userdn} to filter LDAP group member form…
crazy-max Aug 13, 2018
11e0fbf
[FIX] message attachments (padding, order and short) (#11740)
ggazzo Aug 13, 2018
8883f82
[WIP] Messagebox fix performance (#11686)
ggazzo Aug 13, 2018
11400b3
[FIX] Render Attachment Pretext When Markdown Specified (#11578)
glstewart17 Aug 13, 2018
71ec6ef
[FIX] Fixing timeAgo function on directory (#11728)
rssilva Aug 13, 2018
ea4890f
[FIX] Sound upload not working in IE and FF (#11139)
vynmera Aug 13, 2018
0484a40
Fix code duplicating characters (#11467)
vynmera Aug 13, 2018
0543d5d
minor modification (#11761)
Atisom Aug 13, 2018
bbd5b59
[FIX] Escape meta data before inject in head tag (#11730)
tassoevan Aug 14, 2018
ca35ab2
[FIX] wrong create date of channels and users on directory view (#11682)
gsperezb Aug 14, 2018
03bf872
[FIX] "User is typing" not working in new Livechat session (#11670)
renatobecker Aug 14, 2018
cdd1b6d
[FIX] Return room ID for groups where user joined (#11703)
timkinnane Aug 15, 2018
c93a17c
[IMPROVE] Role tag UI (#11674)
timkinnane Aug 15, 2018
a84df46
[FIX] Missing twitter:image and og:image tags (#11687)
engelgabriel Aug 15, 2018
c58bc78
[IMPROVE] Warn about push settings that need server restart (#11784)
tassoevan Aug 16, 2018
3d4e5c1
[IMPROVE] Escape parameters before send them to email template (#11644)
tassoevan Aug 16, 2018
e885810
[FIX] Cannot set property 'input' of undefined (#11775)
ggazzo Aug 16, 2018
3237644
[NEW] Make font of unread items bolder for better contrast (#8602)
Aug 16, 2018
1da4477
Add new eslint rules (#11800)
sampaiodiego Aug 16, 2018
d352af1
Regression: more tests to improve messagebox autogrow(#11805)
ggazzo Aug 16, 2018
0621c53
[FIX] Apply Cordova fix in lazy-loaded images sources (#11807)
tassoevan Aug 16, 2018
d631b8f
Additional eslint rules (#11804)
sampaiodiego Aug 17, 2018
b7f897e
[NEW] Setting to set a JS/CSS CDN (#11779)
geekgonecrazy Aug 17, 2018
27ba58a
[FIX] REST endpoints to update user not respecting some settings (#11…
MarcosSpessatto Aug 17, 2018
d2b97fb
Run eslint and unit tests on pre-push hook (#11815)
rodrigok Aug 17, 2018
c7d1116
Do not remove package-lock.json of livechat package (#11816)
rodrigok Aug 17, 2018
860c9c8
Regression: Fix livechat code issues after new lint rules (#11814)
sampaiodiego Aug 17, 2018
c17b344
[FIX] directory search table not clickable lines (#11809)
tassoevan Aug 17, 2018
ab3302b
[FIX] SAML is flooding logfile (#11643)
Hudell Aug 17, 2018
c00439f
[NEW] Setting to block unauthenticated access to avatars (#9749)
Hudell Aug 17, 2018
2cb5f35
[FIX] Removed hardcoded values (#11627)
Hudell Aug 17, 2018
a2118f0
[FIX] App's i18nAlert is only being displayed as "i18nAlert" (#11802)
graywolf336 Aug 17, 2018
5014b42
[NEW] Rich message text and image buttons (#11473)
ubarsaiyan Aug 20, 2018
ba9212a
[FIX] Livechat open room method (#11830)
renatobecker Aug 20, 2018
64d90a5
[FIX] Fix links in `onTableItemClick` of the directroy page (#11543)
ura14h Aug 20, 2018
0289265
[FIX] Fix permalink of message when running system with subdir (#11781)
ura14h Aug 20, 2018
010bfbb
[FIX] Searching by `undefined` via REST when using `query` param (#11…
MarcosSpessatto Aug 20, 2018
6632306
permissions name no break (#11836)
ggazzo Aug 20, 2018
400ebe5
[FIX] minor fixes in hungarian i18n (#11797)
Atisom Aug 20, 2018
2bd941e
[FIX] re-adding margin to menu icon on header (#11778)
rssilva Aug 20, 2018
18e9f92
LingoHub Update :rocket: (#11838)
engelgabriel Aug 20, 2018
d4cb307
[FIX] Results pagination on /directory REST endpoint (#11551)
MarcosSpessatto Aug 20, 2018
71ad654
[FIX] Livechat rooms starting with two unread message counter (#11834)
renatobecker Aug 20, 2018
4c8b111
Fixed the finnish translation and remove some profanities. (#11794)
jukper Aug 20, 2018
436012b
Fixed message pruning translations (#11691)
TheReal1604 Aug 20, 2018
1541588
[NEW] Setting to enable/disable slack bridge reactions (#10217)
Hudell Aug 20, 2018
76fc2df
[NEW] REST endpoint to manage server assets (#11697)
MarcosSpessatto Aug 20, 2018
96ea68f
[FIX] REST `im.members` endpoint not working without sort parameter (…
MarcosSpessatto Aug 20, 2018
5de9f3e
[FIX] Revoked `view-d-room` permission logics (#11522)
Hudell Aug 21, 2018
2c60baf
[NEW] Personal access tokens for users to create API tokens (#11638)
MarcosSpessatto Aug 21, 2018
ed6cb1a
[IMPROVE] Start storing Livechat department within rooms (#11733)
renatobecker Aug 21, 2018
ab75673
[FIX] Some assets were pointing to nonexistent path (#11796)
rodrigok Aug 21, 2018
69241db
[NEW] Slackbridge: send attachment notifications (#10269)
Hudell Aug 21, 2018
4c96bac
[FIX] LiveChat switch department not working (#11011)
renatobecker Aug 21, 2018
a7cd94b
[NEW] Beta support for Big Blue Button video conferencing system (#11…
rodrigok Aug 21, 2018
21c5fb3
[FIX] Delete removed user's subscriptions (#10700)
Hudell Aug 21, 2018
ec4c629
Bump version to 0.69.0-rc.0
sampaiodiego Aug 21, 2018
761cb07
[FIX] Livechat open room method (#11830)
renatobecker Aug 20, 2018
2462a84
Bump version to 0.68.5
sampaiodiego Aug 23, 2018
5a0a19a
Merge pull request #11852 from RocketChat/release-0.68.5
sampaiodiego Aug 23, 2018
2292e1d
Regression: role tag background, unread item font and message box aut…
ggazzo Aug 27, 2018
d81e613
Fix final page wizard logo
sampaiodiego Aug 27, 2018
5c6fa19
[FIX] Translations were not unique per app allowing conflicts among a…
rodrigok Aug 27, 2018
06771c7
[NEW] Internal marketplace for apps (#11864)
rodrigok Aug 28, 2018
09ded4d
App engine merge (#11835)
rodrigok Aug 28, 2018
e080a83
Update marketplaceApiVersion to 1.0.0
rodrigok Aug 28, 2018
45cfa33
Fix apps install from apps list
rodrigok Aug 28, 2018
c4ee28e
Fix some layout of the internal marketplace
rodrigok Aug 28, 2018
0eb0eeb
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Aug 28, 2018
b7f9270
Bump version to 0.69.0-rc.1
sampaiodiego Aug 28, 2018
7d2bade
Merge remote-tracking branch 'origin/release-candidate' into release-…
sampaiodiego Aug 28, 2018
59750a3
Bump version to 0.69.0
sampaiodiego Aug 28, 2018
5d2852b
Merge pull request #11881 from RocketChat/release-0.69.0
sampaiodiego Aug 28, 2018
7ee503d
Merge remote-tracking branch 'upstream/develop' into livechat-guest-p…
vkislichenko Aug 29, 2018
8fc6cb9
[FIX] Hipchat import was failing when importing messages from a non e…
rodrigok Aug 31, 2018
32e5444
[FIX] Hipchat importer was not importing users without emails and upl…
rodrigok Aug 31, 2018
0520d53
[FIX] App updates were not being shown correctly (#11893)
rodrigok Aug 31, 2018
3ad4e0c
[FIX] Duplicated message buttons (#11853)
ubarsaiyan Aug 31, 2018
b9ff52d
[FIX] Duplicated message buttons (#11853)
ubarsaiyan Aug 31, 2018
68d69ce
[FIX] App updates were not being shown correctly (#11893)
rodrigok Aug 31, 2018
0a7c6d9
[FIX] Hipchat importer was not importing users without emails and upl…
rodrigok Aug 31, 2018
8c7d720
[FIX] Hipchat import was failing when importing messages from a non e…
rodrigok Aug 31, 2018
00d5e60
Bump version to 0.69.1
sampaiodiego Aug 31, 2018
0948978
Merge pull request #11918 from RocketChat/release-0.69.1
sampaiodiego Aug 31, 2018
b500bb0
Merge remote-tracking branch 'origin/master' into develop-sync
sampaiodiego Aug 31, 2018
761e06e
Bump version to 0.70.0-develop
sampaiodiego Aug 31, 2018
bf0ceaf
Merge pull request #11921 from RocketChat/develop-sync
sampaiodiego Aug 31, 2018
fb3a248
adding integrations-attachments-example.png
engelgabriel Sep 1, 2018
e458828
[FIX] Typo in a configuration key for SlackBridge excluded bot names …
TobiasKappe Sep 3, 2018
d13525d
[FIX] Missing `fname` property in Livechat rooms (#11849_
renatobecker Sep 3, 2018
ff94a29
[BREAK] Update the default port of the Prometheus exporter (#11351)
thaiphv Sep 3, 2018
8257da6
[FIX] Close popover on shortcuts and writing (#11562)
MartinSchoeler Sep 3, 2018
f96bfdb
[IMPROVE] Refactoring the snap backup scripts to improve UX
der-eismann Sep 3, 2018
590e0d3
Merge branch 'develop' into livechat-guest-pool-based-on-department
vkislichenko Sep 5, 2018
6ab2b2a
Renamed "ID" to "Room ID" for clarity
vkislichenko Sep 5, 2018
184840f
package-lock in rocketchat-katex
vkislichenko Sep 5, 2018
c336b60
fixes
vkislichenko Sep 5, 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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
424 changes: 424 additions & 0 deletions .circleci/config.yml

Large diffs are not rendered by default.

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.66.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
7 changes: 7 additions & 0 deletions .circleci/update-releases.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

curl -X POST \
-H "X-Update-Token: ${UPDATE_TOKEN}" \
https://releases.rocket.chat/update
40 changes: 40 additions & 0 deletions .docker-mongo/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
FROM rocketchat/base:8

ADD . /app
ADD entrypoint.sh /app/bundle/

MAINTAINER buildmaster@rocket.chat

RUN set -x \
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" | tee /etc/apt/sources.list.d/mongodb-org-3.6.list \
&& apt-get update \
&& apt-get install -y --force-yes pwgen mongodb-org \
&& echo "mongodb-org hold" | dpkg --set-selections \
&& echo "mongodb-org-server hold" | dpkg --set-selections \
&& echo "mongodb-org-shell hold" | dpkg --set-selections \
&& echo "mongodb-org-mongos hold" | dpkg --set-selections \
&& echo "mongodb-org-tools hold" | dpkg --set-selections \
&& cd /app/bundle/programs/server \
&& npm install \
&& npm cache clear --force \
&& rm -rf /var/lib/apt/lists/*

VOLUME /app/uploads

WORKDIR /app/bundle

# needs a mongoinstance - defaults to container linking with alias 'mongo'
ENV DEPLOY_METHOD=docker-preview \
NODE_ENV=production \
MONGO_URL=mongodb://localhost:27017/rocketchat \
HOME=/tmp \
PORT=3000 \
ROOT_URL=http://localhost:3000 \
Accounts_AvatarStorePath=/app/uploads

EXPOSE 3000

RUN chmod +x /app/bundle/entrypoint.sh

ENTRYPOINT /app/bundle/entrypoint.sh
49 changes: 49 additions & 0 deletions .docker-mongo/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/bin/bash

echo """

 
 
 
   
      
        
           
           
           
         
         
          
          
          
       
             
           
        
        
    
       
  




"""

echo """
██████╗ ██████╗ ██████╗██╗ ██╗███████╗████████╗ ██████╗██╗ ██╗ █████╗ ████████╗ ██████╗ ██████╗ ███████╗██╗ ██╗██╗███████╗██╗ ██╗
██╔══██╗██╔═══██╗██╔════╝██║ ██╔╝██╔════╝╚══██╔══╝██╔════╝██║ ██║██╔══██╗╚══██╔══╝ ██╔══██╗██╔══██╗██╔════╝██║ ██║██║██╔════╝██║ ██║
██████╔╝██║ ██║██║ █████╔╝ █████╗ ██║ ██║ ███████║███████║ ██║ ██████╔╝██████╔╝█████╗ ██║ ██║██║█████╗ ██║ █╗ ██║
██╔══██╗██║ ██║██║ ██╔═██╗ ██╔══╝ ██║ ██║ ██╔══██║██╔══██║ ██║ ██╔═══╝ ██╔══██╗██╔══╝ ╚██╗ ██╔╝██║██╔══╝ ██║███╗██║
██║ ██║╚██████╔╝╚██████╗██║ ██╗███████╗ ██║██╗╚██████╗██║ ██║██║ ██║ ██║ ██║ ██║ ██║███████╗ ╚████╔╝ ██║███████╗╚███╔███╔╝
╚═╝ ╚═╝ ╚═════╝ ╚═════╝╚═╝ ╚═╝╚══════╝ ╚═╝╚═╝ ╚═════╝╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝╚══════╝ ╚═══╝ ╚═╝╚══════╝ ╚══╝╚══╝
"""

mongod --smallfiles --storageEngine=mmapv1 --fork --config /etc/mongod.conf

until mongo --eval "db" &> /dev/null; do
echo "MongoDB still not ready, sleeping"
sleep 1
done

node main.js
22 changes: 22 additions & 0 deletions .docker-mongo/licenses/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
The MIT License (MIT)

Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

30 changes: 30 additions & 0 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM rocketchat/base:8

ADD . /app

MAINTAINER buildmaster@rocket.chat

RUN set -x \
&& cd /app/bundle/programs/server \
&& npm install \
&& npm cache clear --force \
&& chown -R rocketchat:rocketchat /app

USER rocketchat

VOLUME /app/uploads

WORKDIR /app/bundle

# needs a mongoinstance - defaults to container linking with alias 'mongo'
ENV DEPLOY_METHOD=docker \
NODE_ENV=production \
MONGO_URL=mongodb://mongo:27017/rocketchat \
HOME=/tmp \
PORT=3000 \
ROOT_URL=http://localhost:3000 \
Accounts_AvatarStorePath=/app/uploads

EXPOSE 3000

CMD ["node", "main.js"]
20 changes: 20 additions & 0 deletions .docker/Dockerfile.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM node:8

ADD . /app

ENV RC_VERSION=0.57.0-designpreview \
DEPLOY_METHOD=docker \
NODE_ENV=production \
PORT=3000 \
ROOT_URL=http://localhost:3000

RUN set -x \
&& cd /app/bundle/programs/server \
&& npm install \
&& npm cache clear --force

WORKDIR /app/bundle

EXPOSE 3000

CMD ["node", "main.js"]
48 changes: 48 additions & 0 deletions .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7

ENV RC_VERSION 0.70.0-develop

MAINTAINER buildmaster@rocket.chat

LABEL name="Rocket.Chat" \
vendor="Rocket.Chat" \
version="${RC_VERSION}" \
release="1" \
url="https://rocket.chat" \
summary="The Ultimate Open Source Web Chat Platform" \
description="The Ultimate Open Source Web Chat Platform" \
run="docker run -d --name ${NAME} ${IMAGE}"


# This is ugly... But for some reason npm and node aren't available at this stage.
ENV PATH /opt/rh/rh-nodejs8/root/usr/bin:/opt/app-root/src/node_modules/.bin/:/opt/app-root/src/.npm-global/bin/:/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

RUN set -x \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 \
&& curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download" -o rocket.chat.tgz \
&& curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
&& gpg --verify rocket.chat.tgz.asc \
&& tar -zxf rocket.chat.tgz -C /opt/app-root/src/ \
&& cd /opt/app-root/src/bundle/programs/server \
&& npm install

COPY licenses /licenses

VOLUME /opt/app-root/src/uploads

WORKDIR /opt/app-root/src/bundle

# Hack needed to force use of bundled library instead of system level outdated library
# https://github.com/lovell/sharp/issues/892
ENV LD_PRELOAD=/opt/app-root/src/bundle/programs/server/npm/node_modules/sharp/vendor/lib/libz.so

ENV DEPLOY_METHOD=docker-redhat \
NODE_ENV=production \
MONGO_URL=mongodb://mongo:27017/rocketchat \
HOME=/tmp \
PORT=3000 \
ROOT_URL=http://localhost:3000

EXPOSE 3000

CMD ["node", "main.js"]
22 changes: 22 additions & 0 deletions .docker/licenses/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
The MIT License (MIT)

Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

37 changes: 0 additions & 37 deletions .dockerfiles/dockerfiles/develop/Dockerfile

This file was deleted.

Loading