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] Multiple slackbridges #11346

Merged
merged 30 commits into from
Apr 25, 2019
Merged

[NEW] Multiple slackbridges #11346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
66ab652
Support for dynamic slack and rocket channels
kable-wilmoth Mar 8, 2017
a6c5a60
Support for dynamic slack and rocket channels
kable-wilmoth Mar 8, 2017
12923ce
Fixed eslint issue
kable-wilmoth Mar 8, 2017
6b237ee
Introduced ES2015 Import/Export to resolve dependencies
kable-wilmoth 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
a0d911a
Started working on multiple slackbridges
pierre-lehnen-rc Jun 15, 2018
a4e1bff
Multiple slack bridges
pierre-lehnen-rc Jun 19, 2018
f67adee
fix to avoid receiving back the messages that we send to slack
pierre-lehnen-rc Jun 19, 2018
8dd6392
Merge branch 'develop' into multiple-slackbridges
Hudell Jul 4, 2018
3d08245
Merge branch 'develop' into multiple-slackbridges
pierre-lehnen-rc Oct 3, 2018
c0284dc
Merge branch 'multiple-slackbridges' of github.com:RocketChat/Rocket.…
pierre-lehnen-rc Oct 3, 2018
0c10f94
Solved merge errors
pierre-lehnen-rc Oct 3, 2018
c574eff
Changed the ApiToken setting to multine
pierre-lehnen-rc Oct 3, 2018
1f1a0b6
Merge branch 'develop' into multiple-slackbridges
pierre-lehnen-rc Oct 3, 2018
a97238f
Merge branch 'develop' into multiple-slackbridges
Hudell Nov 19, 2018
0293414
Merge branch 'develop' into multiple-slackbridges
Hudell Dec 5, 2018
3affa8e
Merge branch 'develop' into multiple-slackbridges
pierre-lehnen-rc Apr 25, 2019
e38ba8c
Merge branch 'develop' into multiple-slackbridges
engelgabriel Apr 25, 2019
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
Loading