Commit Graph

10990 Commits (3c3bb483db39ab191de7cb8c5182551fc52d7212)
 

Author SHA1 Message Date
Aaron Ogle 3c3bb483db Fix migration version 9 years ago
Diego Sampaio 3aa9df8db4 Merge pull request #7157 from RocketChat/fix-reactions 9 years ago
Diego Sampaio 9e873b716d Merge pull request #7154 from RocketChat/remove-missing-coffeescript-dependencies 9 years ago
Aaron Ogle 9331027cdf Switch logic of artifact name (#7158) 9 years ago
Martin Schoeler 56555bcd16 fix reactions 9 years ago
Diego Sampaio b0ec0af1d2
Remove missing CoffeeScript dependencies 9 years ago
Rodrigo Nascimento 5d8e6be64b Merge pull request #7146 from RocketChat/hipchat2js 9 years ago
Rodrigo Nascimento 2bf97fea30 Merge pull request #7145 from RocketChat/unsubscribe2js 9 years ago
Guilherme Gazzo c0a886f5d5 Merge branch 'hipchat2js' of https://github.com/RocketChat/Rocket.Chat into hipchat2js 9 years ago
Guilherme Gazzo b0f4404e45 Update server.js 9 years ago
Guilherme Gazzo ecd3f0557b Update server.js 9 years ago
Guilherme Gazzo 1c2ca72971 Update server.js 9 years ago
Aaron Ogle ea8ce483c3 [FIX] Fix highlightjs bug (#6991) 9 years ago
Rodrigo Nascimento 8bee5761a7 Convert hipchat importer to js 9 years ago
Rodrigo Nascimento 1ca33b3dc5 Convert file unsubscribe.coffee to js 9 years ago
Diego Sampaio d64d1e791a
Fix migration if email already exists 9 years ago
Guilherme Gazzo 2e38466800 Merge pull request #6788 from RocketChat/new-avatar-storage-types 9 years ago
Rodrigo Nascimento bfd693fa94 Merge remote-tracking branch 'origin/develop' into new-avatar-storage-types 9 years ago
Guilherme Gazzo aab82ef9e2 [NEW] Internal Hubot load scripts from custom folders (#7095) 9 years ago
Rodrigo Nascimento 8ff8a66c10 Unit: Fix mentions tests 9 years ago
Rodrigo Nascimento b827c57521 Unit: Fix mentions tests 9 years ago
Rodrigo Nascimento 0a43285c72 Merge remote-tracking branch 'origin/develop' into new-avatar-storage-types 9 years ago
Rodrigo Nascimento 545eeac7ec Fix tests 9 years ago
Rodrigo Nascimento 76534cd998 Merge pull request #6690 from alexbrazier/feature/mention-names 9 years ago
Rodrigo Nascimento 42533ddf1a Merge pull request #7017 from RocketChat/rocketchat-oauth-to-js 9 years ago
Rodrigo Nascimento 9a01e20a0b Merge remote-tracking branch 'origin/develop' into new-avatar-storage-types 9 years ago
Rodrigo Nascimento 2f94694aae Merge pull request #7022 from RocketChat/irc-to-js 9 years ago
Martin Schoeler cc1fec3657 remove the missing coffee files 9 years ago
Martin Schoeler fe5bfdd81d fix eslint 9 years ago
Martin Schoeler 0b3d06fdb0 Bump 9 years ago
Guilherme Gazzo fc0a1ab1f1 Update oauth2-client.js 9 years ago
Rodrigo Nascimento 5e31ce19bf Merge pull request #7055 from bbrauns/fix/ldap_field_map_description 9 years ago
Rodrigo Nascimento b20cff23bc Merge pull request #7030 from pmb0/ldap-fallback-pw-store 9 years ago
Rodrigo Nascimento a3e88a15ad Merge pull request #7059 from RocketChat/increase-onread-for-here-mention 9 years ago
Guilherme Gazzo 19fe2d9194 Update oauthApps.js 9 years ago
Guilherme Gazzo e0ea65c252 Update oauthApp.js 9 years ago
Rodrigo Nascimento dda3cb9d82 Merge pull request #7062 from RocketChat/remove-useless-unit-tests 9 years ago
Rodrigo Nascimento bd6b4ecc2d Merge pull request #7121 from RocketChat/xss-image 9 years ago
Guilherme Gazzo d0929da0f0 Update server.js 9 years ago
Martin Schoeler 65336060fd remove the coffee files 9 years ago
Martin Schoeler 3d8490f89c Merge remote-tracking branch 'origin/develop' into rocketchat-oauth-to-js 9 years ago
Martin Schoeler 9afd5ff38b Merge remote-tracking branch 'origin/develop' into irc-to-js 9 years ago
Rodrigo Nascimento 6be835a5f1 Merge pull request #7094 from RocketChat/fix-failing-tests 9 years ago
Rodrigo Nascimento 3667f378ab Merge pull request #7085 from RocketChat/message-by-id-api 9 years ago
Rodrigo Nascimento 27da645d0a Merge pull request #7084 from colin-campbell/develop 9 years ago
Rodrigo Nascimento d695d10850 Merge pull request #7072 from jm-factorin/markdown-carriage-return 9 years ago
Rodrigo Nascimento 90ef85f07c Merge pull request #7014 from RocketChat/parse-admin-html-descriptions 9 years ago
Martin Schoeler 356d3f11c9 remove coffee files 9 years ago
Martin Schoeler eefffba7b5 Merge remote-tracking branch 'origin/develop' into irc-to-js 9 years ago
Rodrigo Nascimento df71c2ba5f Merge pull request #7018 from RocketChat/rocketchat-importer 9 years ago