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

[NEW] Support for dynamic slack and rocket.chat channels #10205

Merged
merged 20 commits into from
Jun 19, 2018
Merged

[NEW] Support for dynamic slack and rocket.chat channels #10205

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
66ab652
Support for dynamic slack and rocket channels
Mar 8, 2017
a6c5a60
Support for dynamic slack and rocket channels
Mar 8, 2017
12923ce
Fixed eslint issue
Mar 8, 2017
6b237ee
Introduced ES2015 Import/Export to resolve dependencies
Mar 9, 2017
6d7f2e5
Merge commit 'refs/pull/6282/head' of github.com:RocketChat/Rocket.Ch…
Hudell Mar 14, 2018
743001e
Lint
Hudell Mar 14, 2018
b9ff9c3
Merge branch 'develop' into dynamic-groups
Hudell Apr 3, 2018
6617119
Merge branch 'develop' into dynamic-groups
Hudell Apr 9, 2018
1323182
Merge branch 'develop' into dynamic-groups
pierre-lehnen-rc May 22, 2018
d76149b
Fixed npm require
pierre-lehnen-rc May 22, 2018
aa6e3db
Merge branch 'develop' into dynamic-groups
Hudell May 22, 2018
3a25103
Merge branch 'develop' into dynamic-groups
pierre-lehnen-rc Jun 5, 2018
ebcbf53
Merge branch 'develop' into dynamic-groups
pierre-lehnen-rc Jun 11, 2018
233163d
Merge branch 'develop' into dynamic-groups
pierre-lehnen-rc Jun 11, 2018
acfca70
Merge branch 'develop' into dynamic-groups
pierre-lehnen-rc Jun 13, 2018
223bb6c
Removed npm.depends
pierre-lehnen-rc Jun 13, 2018
7e333d5
Merge branch 'develop' into dynamic-groups
pierre-lehnen-rc Jun 15, 2018
28f645b
Merge branch 'develop' into dynamic-groups
Hudell Jun 19, 2018
1a18779
removed unnecessary code
pierre-lehnen-rc Jun 19, 2018
48ef397
Merge branch 'dynamic-groups' of github.com:Hudell/Rocket.Chat into d…
pierre-lehnen-rc Jun 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/rocketchat-slackbridge/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The following can be configured in your Rocket.Chat Administration SlackBridge p

#### Group Chat Messages
* Send and receive basic messages
* Delete messages
* Delete messages (Can't delete slack message from rocket)
* Edit messages (Slack doesn't allow editing of BOT messages, so can't edit a Rocket msg in Slack)
* React to messages (as BOT in Slack)

Expand Down
7 changes: 6 additions & 1 deletion packages/rocketchat-slackbridge/package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@ Package.onUse(function(api) {
api.use('rocketchat:logger');

api.addFiles('client/slackbridge_import.client.js', 'client');

api.addFiles('server/logger.js', 'server');
api.addFiles('server/settings.js', 'server');
api.addFiles('server/slackbridge.js', 'server');
api.addFiles('server/slackbridge_import.server.js', 'server');
api.addFiles('server/RocketAdapter.js', 'server');
api.addFiles('server/SlackAdapter.js', 'server');
});

Npm.depends({
'slack-client': '2.0.6'
Copy link
Member

Choose a reason for hiding this comment

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

Why are we adding this here?

});
Loading