Commit Graph

11338 Commits (35bf10591533d64f3e0fffbeed6bcfc973528d0c)
 

Author SHA1 Message Date
Guilherme Gazzo 35bf105915
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat into color-variables 8 years ago
Guilherme Gazzo 38c0d8b2ed
profile details 8 years ago
Karl Prieb 8c2cf18a8a message box popover 8 years ago
Karl Prieb 21ca3b6546 smile icon 8 years ago
Karl Prieb 4fc85eb5e7 Merge branch 'remove-sanstorm-login-method' into color-variables 8 years ago
Guilherme Gazzo fe7d775b51
Merge branch 'remove-sanstorm-login-method' of github.com:RocketChat/Rocket.Chat into color-variables 8 years ago
Karl Prieb 70c8e977e9 Merge branch 'fix-emojis' into color-variables 8 years ago
Karl Prieb 6e79b6d225 grid 8 years ago
Karl Prieb ac676d5874 Merge branch 'develop' into color-variables 8 years ago
Guilherme Gazzo d98c14d4ad
Merge branch 'color-variables' of github.com:RocketChat/Rocket.Chat into color-variables 8 years ago
Guilherme Gazzo 39bfbbf1a2
message box 8 years ago
Diego Sampaio 00b1c6cc9a
Revert emojione package version upgrade 8 years ago
Diego Sampaio ec5677c52e
Remove Sandstorm login method 8 years ago
Rodrigo Nascimento 5da2763360 Merge pull request #7520 from seekingalpha/room-type-header 8 years ago
Diego Sampaio 7ebb77d0c9
Add header property to roomTypes 8 years ago
Rodrigo Nascimento ea5a319a5e Merge pull request #7523 from seekingalpha/new-message-recipient-data 8 years ago
Rodrigo Nascimento 25fe3493bf Merge pull request #7526 from seekingalpha/room-leaders 8 years ago
Rodrigo Nascimento 9e98a8541f Merge pull request #7525 from RocketChat/toolbar-buttons 8 years ago
SingLi b75b4d3b80 Merge pull request #7492 from RocketChat/MartinSchoeler-patch-1 8 years ago
Martin Schoeler e0a9e70445 Ask for browser and server logs 8 years ago
Gabriel Engel 7f7e5404d9 Merge pull request #7529 from RocketChat/add-close-button-to-flex-tabs 8 years ago
Daniel Schreiber 741608e37b Create new role of leader. Admin can set or remove a leader. Display leader at top of chat when user scrolls up, along with a "Chat Now" button which opens a new direct message with the leader. 8 years ago
Aaron Ogle a33f24d10c A few changes from feedback 8 years ago
Diego Sampaio 4d78bf8e47
Add close button to flex tabs 8 years ago
Diego Sampaio 1f63ec20a4
Add toolbar buttons for iframe API 8 years ago
Daniel Schreiber 790a639af3 Provide room type and recipient (room or direct message) information in global event 8 years ago
Diego Sampaio e8412987c9
Filter CircleCI to build only color-variables branch 8 years ago
Gabriel Engel 3fb761a1f6 Merge pull request #7496 from RocketChat/meteor-update 8 years ago
Daniel Schreiber fa203fdf98 Add room type identifier to room list header 8 years ago
Rodrigo Nascimento f6598ca73a Merge branch 'meteor-update' of https://github.com/RocketChat/Rocket.Chat into meteor-update 8 years ago
Rodrigo Nascimento 3138415278 Fix stylelint command 8 years ago
Gabriel Engel 67b2bc8f0b downgrade stylelint 8 years ago
Gabriel Engel 822c6e30de update meteor to 1.5.1 8 years ago
Gabriel Engel 712dbc483b Merge pull request #7486 from RocketChat/fix-tabbar-embedded-mode 8 years ago
Diego Sampaio f418d48372 Fix Dockerfile 8 years ago
Diego Sampaio 7eeacd7b2c Fix CircleCI Dockerfile 8 years ago
Diego Sampaio cd9c7af356 Remove $HOME .meteor from cache 8 years ago
Diego Sampaio 86ea519f5a Fix yml 8 years ago
Diego Sampaio 89b2675d98 Fix Docker build and add $HOME .meteor to cache 8 years ago
Diego Sampaio 8db769f7ba Add remove Docker 8 years ago
Diego Sampaio 0ffc117c39 Add phantom hack 8 years ago
Diego Sampaio 402c3debd9 Remove lints from CI 8 years ago
Diego Sampaio 75a186c8a4 Add CircleCI 8 years ago
Martin Schoeler fbfac320b6 fix tests 8 years ago
Rodrigo Nascimento a729aaa2ba Merge pull request #7195 from RocketChat/fix-missing-i18n 8 years ago
Rodrigo Nascimento 5b04c2b288 Merge pull request #7325 from jangmarker/fix-rate-limitting-sendMessage 8 years ago
Rodrigo Nascimento 2fa323db2a Merge pull request #7390 from rasos/patch-3 8 years ago
Rodrigo Nascimento f5e3d234da Merge pull request #7394 from RocketChat/fix-create-room-slashcommand 8 years ago
Rodrigo Nascimento 2fec4d8203 Merge pull request #7395 from ryoshimizu/fix-file-upload-broken-when-running-in-subdir-6679 8 years ago
Rodrigo Nascimento eeb773a6d2 Merge pull request #7444 from RocketChat/anonymous-user-join 8 years ago