Merged
Conversation
rodrigok
force-pushed
the
improvements/better-history
branch
from
16287de to
831c5ad
Compare
rodrigok
force-pushed
the
improvements/better-history
branch
from
831c5ad to
0b6071e
Compare
rodrigok
force-pushed
the
improvements/better-history
branch
from
0b6071e to
492daea
Compare
rodrigok
force-pushed
the
improvements/better-history
branch
from
492daea to
c3b305d
Compare
rodrigok
force-pushed
the
improvements/better-history
branch
from
c3b305d to
c3a3a4d
Compare
rodrigok
force-pushed
the
improvements/better-history
branch
from
c3a3a4d to
39de44b
Compare
rodrigok
force-pushed
the
improvements/better-history
branch
from
39de44b to
a584666
Compare
rodrigok
force-pushed
the
improvements/better-history
branch
from
a584666 to
6d84b28
Compare
rodrigok
force-pushed
the
improvements/better-history
branch
from
6d84b28 to
cf71021
Compare
rodrigok
force-pushed
the
improvements/better-history
branch
from
cf71021 to
e0d9b44
Compare
rodrigok
force-pushed
the
improvements/better-history
branch
from
e0d9b44 to
5a0325f
Compare
graywolf336
previously approved these changes
Apr 4, 2018
.scripts/set-version.js
Outdated
Contributor
There was a problem hiding this comment.
It'd be nice if we didn't add this so that it's formatted like the rest of the project. But that can be a future improvement.
.scripts/start.js
Outdated
rodrigok
force-pushed
the
improvements/better-history
branch
from
5a0325f to
13cebfb
Compare
rodrigok
force-pushed
the
improvements/better-history
branch
from
13cebfb to
4d5bbae
Compare
Merged
trongthanh
added a commit
to goalifyplus/Goalify.Chat
that referenced
this pull request
Apr 6, 2018
* develop: (91 commits) [FIX] Audio Message UI fixes (RocketChat#10303) [NEW] Improve history generation (RocketChat#10319) Strip the colons when searching (RocketChat#10323) Bump snap version to include security fix (RocketChat#10313) Update Meteor to 1.6.1.1 (RocketChat#10314) [FIX] Unable to mention after newline in message (RocketChat#10078) [FIX] Wrong pagination information on /api/v1/channels.members (RocketChat#10224) [FIX] Inline code following a url leads to autolinking of code with url (RocketChat#10163) Fixed issue on incoming webhooks that caused the content raw to not be available (RocketChat#10258) [FIX] Missing Translation Key on Reactions (RocketChat#10270) Fix: inputs for rocketchat apps (RocketChat#10274) Fix: chat.react api not accepting previous emojis (RocketChat#10290) Fix: Scroll on content page (RocketChat#10300) [FIX] File had redirect delay when using external storage services and no option to proxy only avatars Add quotes in the endpoint deprecation warning Add deprecation warning to user.roles endpoint Improve pt-BR translations Fix caddy download link to pull from github Renaming channels.notifications Get/Post endpoints to subscriptions.getOne and rooms.saveNotifications Revert the removed endpoint, user.roles ... # Conflicts: # package-lock.json
trongthanh
added a commit
to goalifyplus/Goalify.Chat
that referenced
this pull request
Apr 6, 2018
* goalify: (200 commits) Add S3 upload script Remove root-priviledged command switch gitlab ci config to use shell executor Try another build fix change language not reload temporary disable readonly [FIX] Audio Message UI fixes (RocketChat#10303) [NEW] Improve history generation (RocketChat#10319) Strip the colons when searching (RocketChat#10323) Bump snap version to include security fix (RocketChat#10313) Update Meteor to 1.6.1.1 (RocketChat#10314) [FIX] Unable to mention after newline in message (RocketChat#10078) [FIX] Wrong pagination information on /api/v1/channels.members (RocketChat#10224) [FIX] Inline code following a url leads to autolinking of code with url (RocketChat#10163) Fixed issue on incoming webhooks that caused the content raw to not be available (RocketChat#10258) [FIX] Missing Translation Key on Reactions (RocketChat#10270) Fix: inputs for rocketchat apps (RocketChat#10274) Fix: chat.react api not accepting previous emojis (RocketChat#10290) Fix: Scroll on content page (RocketChat#10300) change weather city to location ... # Conflicts: # .docker/Dockerfile # .sandstorm/sandstorm-pkgdef.capnp # .travis/snap.sh # HISTORY.md # package.json # packages/rocketchat-lib/rocketchat.info # packages/rocketchat-lib/server/functions/deleteUser.js # packages/rocketchat-theme/client/imports/components/main-content.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.