Commit Graph

9295 Commits (7b4307fcebcd6bcca0d55383cd016cd640b69be2)
 

Author SHA1 Message Date
Gabriel Engel 7b4307fceb Merge pull request #5800 from RocketChat/oauth-server-fix 9 years ago
Gabriel Engel a460856734 Merge pull request #5799 from RocketChat/fix/5790-search-click 9 years ago
Marcelo Schmidt 649f75c920
Fix "athorized" typo 9 years ago
Marcelo Schmidt f26fc24541
Set serviceData id based on Rocket.Chat _id 9 years ago
Rodrigo Nascimento 0620020b4e
Fix toolbar search click 9 years ago
Gabriel Engel dad206f19a Merge pull request #5792 from RocketChat/fix-internalhubot-username 9 years ago
Marcelo Schmidt 0821885d5c
Migration related to #5780 9 years ago
Marcelo Schmidt d2b8f2922e
Migration for related to #5780 9 years ago
Gabriel Engel 63f076bdf8
update dependencies 9 years ago
Gabriel Engel 18a11a2466 Merge pull request #5766 from RocketChat/jquery3-photoswipe 9 years ago
Gabriel Engel 8a8c9109bc Merge pull request #5767 from Kiran-Rao/livechat-refactor 9 years ago
Gabriel Engel 9d55b68e76 Merge pull request #5786 from RocketChat/improvement/roles-cache 9 years ago
Gabriel Engel af9a1c9a33 Fix test 9 years ago
Rodrigo Nascimento 43427f3136
Activate cache on roles 9 years ago
Karl Prieb 5c9546f9aa add gallery to attachment list 9 years ago
Rodrigo Nascimento d3876ea24a
Reduce spotlight method calls 9 years ago
Gabriel Engel effb679990 Merge pull request #5779 from citec/develop 9 years ago
Gabriel Engel 40f18f3606 Merge pull request #5727 from RocketChat/remove-browser-references 9 years ago
Gabriel Engel 317b5e3b48 Merge pull request #5784 from RocketChat/direct-message-test-fix 9 years ago
Martin Schoeler 5607da9555 try to fix the failing test 9 years ago
Jaime Alberto Sanchez Hidalgo b81a254fdd Add missing required sessionId to api.ai call on externalMessage 9 years ago
Gabriel Engel ecb3de6734 Merge pull request #5703 from RocketChat/toolbar-search 9 years ago
Karl Prieb 885939bf3d Merge branch 'jquery3-photoswipe' of github.com:RocketChat/Rocket.Chat into jquery3-photoswipe 9 years ago
Karl Prieb 5f64c97b47 resolve merge 9 years ago
Gabriel Engel f44971c788 Merge branch 'develop' into jquery3-photoswipe 9 years ago
Rodrigo Nascimento ad1a1bfa3d
Spotlight and messagePopup improvements 9 years ago
Kiran Rao 37d68fb3e8 Refactor livechat sidenav 9 years ago
Karl Prieb a1d021412e fix package.json again 9 years ago
Karl Prieb c1444aab3f update package.json 9 years ago
Karl Prieb 9577694b09 tabs 9 years ago
Karl Prieb ad3251757d upgrade jquery to v3 and implement photoswipe 9 years ago
Rodrigo Nascimento 20e1d05ea1
Merge remote-tracking branch 'origin/develop' into toolbar-search 9 years ago
Gabriel Engel 1591c5b69a Merge pull request #5758 from RocketChat/feature/notification-reply 9 years ago
Rodrigo Nascimento 55aa8c722c
Prevent errors 9 years ago
Gabriel Engel c6118a063a Merge pull request #5759 from RocketChat/Sing-Li-patch-1 9 years ago
SingLi 6830cbe72b Cleanup and fix link 9 years ago
Rodrigo Nascimento 710477070f
Add migration to remove rocket.cat as first admin 9 years ago
Rodrigo Nascimento 6ca9b47f68
Fix cache $ne operator 9 years ago
Martin Schoeler e4f5a529ac moved some elements to global 9 years ago
Rodrigo Nascimento c1b05131b4
Enable notification reply when supported 9 years ago
Martin Schoeler 292fe12bde Merged branch develop into remove-browser-references 9 years ago
Gabriel Engel 96570e6e06 Merge pull request #5745 from RocketChat/hide-loading 9 years ago
Gabriel Engel dc837d0b3a Merge pull request #5743 from RocketChat/fix/api-json-parse-error 9 years ago
Gabriel Engel ddfd757496 Merge pull request #5742 from nishimaki10/change-curl-example 9 years ago
Gabriel Engel 540f6731ef Merge pull request #5736 from RocketChat/prometheus-monitoring 9 years ago
Martin Schoeler 470c7124f5 Merged branch develop into remove-browser-references 9 years ago
Gabriel Engel 90380cdbb2 Merge pull request #5735 from nishimaki10/more-info-integration 9 years ago
Karl Prieb 737aeb2365 show loading animation only when room is loading new messages 9 years ago
Rodrigo Nascimento ac4137689e Update package.json 9 years ago
Rodrigo Nascimento 44b4ea7e1b
Return correct error when parsing json on api 9 years ago