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.

Sign up for GitHub

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

Jump to bottom

[NEW] Improve history generation #10319

Merged
merged 1 commit into from
Apr 4, 2018
Merged

[NEW] Improve history generation #10319

merged 1 commit into from
Apr 4, 2018

Conversation

rodrigok
Copy link
Member

@rodrigok rodrigok commented Apr 3, 2018

No description provided.

@rodrigok rodrigok added this to the 0.63.0 milestone Apr 3, 2018
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10319 April 3, 2018 21:15 Inactive
@rodrigok rodrigok force-pushed the improvements/better-history branch from 16287de to 831c5ad Compare April 3, 2018 21:18
@rodrigok rodrigok had a problem deploying to rocket-chat-pr-10319 April 3, 2018 21:18 Failure
@rodrigok rodrigok force-pushed the improvements/better-history branch from 831c5ad to 0b6071e Compare April 3, 2018 21:20
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-10319 April 3, 2018 21:20 Inactive
@rodrigok rodrigok force-pushed the improvements/better-history branch from 0b6071e to 492daea Compare April 3, 2018 21:21
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-10319 April 3, 2018 21:21 Inactive
@rodrigok rodrigok force-pushed the improvements/better-history branch from 492daea to c3b305d Compare April 3, 2018 21:23
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-10319 April 3, 2018 21:24 Inactive
@rodrigok rodrigok force-pushed the improvements/better-history branch from c3b305d to c3a3a4d Compare April 3, 2018 21:27
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-10319 April 3, 2018 21:27 Inactive
@rodrigok rodrigok force-pushed the improvements/better-history branch from c3a3a4d to 39de44b Compare April 3, 2018 21:30
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-10319 April 3, 2018 21:31 Inactive
@rodrigok rodrigok force-pushed the improvements/better-history branch from 39de44b to a584666 Compare April 3, 2018 21:42
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-10319 April 3, 2018 21:42 Inactive
@rodrigok rodrigok force-pushed the improvements/better-history branch from a584666 to 6d84b28 Compare April 3, 2018 22:17
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-10319 April 3, 2018 22:17 Inactive
@rodrigok rodrigok force-pushed the improvements/better-history branch from 6d84b28 to cf71021 Compare April 3, 2018 22:18
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-10319 April 3, 2018 22:18 Inactive
@rodrigok rodrigok force-pushed the improvements/better-history branch from cf71021 to e0d9b44 Compare April 3, 2018 22:25
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-10319 April 3, 2018 22:26 Inactive
@rodrigok rodrigok force-pushed the improvements/better-history branch from e0d9b44 to 5a0325f Compare April 3, 2018 23:48
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-10319 April 3, 2018 23:49 Inactive
graywolf336
graywolf336 previously approved these changes Apr 4, 2018
View reviewed changes
.scripts/set-version.js Outdated
@@ -1,3 +1,4 @@
/* eslint-disable */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
@@ -1,4 +1,6 @@
#!/usr/bin/env node

/* eslint-disable */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

@rodrigok rodrigok force-pushed the improvements/better-history branch from 5a0325f to 13cebfb Compare April 4, 2018 01:16
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-10319 April 4, 2018 01:16 Inactive
@rodrigok rodrigok force-pushed the improvements/better-history branch from 13cebfb to 4d5bbae Compare April 4, 2018 01:21
@rodrigok rodrigok merged commit 72f0586 into develop Apr 4, 2018
@rodrigok rodrigok deleted the improvements/better-history branch April 4, 2018 02:20
@rodrigok rodrigok mentioned this pull request Apr 4, 2018
Merged
trongthanh added a commit to goalifyplus/Goalify.Chat that referenced this pull request Apr 6, 2018
@trongthanh
Merge branch 'develop' into goalify
3fc91c1 
* 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
@trongthanh
Merge branch 'goalify'
f8248f3 
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@graywolf336 graywolf336 graywolf336 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.63.0
Development

Successfully merging this pull request may close these issues.
3 participants
@rodrigok @graywolf336 @engelgabriel