Commit Graph

14504 Commits (daf6b034336c1dc3cac609f55df00a53c7592a75)
 

Author SHA1 Message Date
Marcos Defendi daf6b03433 Merge branch 'develop' into feature/rest-api-message-read-receipts 8 years ago
Rodrigo Nascimento 98d4395108
Merge pull request #10152 from RocketChat/fix-dynamic-css 8 years ago
Rodrigo Nascimento 3c65529682
Merge pull request #9816 from RocketChat/feature/rest-api-oauth-integrations 8 years ago
Rodrigo Nascimento 19f0d93c6e
Merge pull request #9629 from RocketChat/feature/rest-api-custom-emoji-list 8 years ago
Rodrigo Nascimento b8da215ba2
Merge pull request #9947 from Hudell/right-to-be-forgotten 8 years ago
Rodrigo Nascimento eee685f962
Merge pull request #10105 from RocketChat/feature/rest-api-mentions-of-channel 8 years ago
Rodrigo Nascimento 4ab41bc042
Merge pull request #10160 from RocketChat/fix-extended-view-sidebar 8 years ago
Rodrigo Nascimento 893219781c
Merge pull request #10082 from kb0304/bugfix-10026 8 years ago
Rodrigo Nascimento 46366fa72d
Merge pull request #9584 from kb0304/bugfix-7268 8 years ago
Marcos Defendi 5287b16b64 Merge branch 'develop' into feature/rest-api-mentions-of-channel 8 years ago
Bradley Hilton dbd84724af
Add english i18n strings for the new leave permissions 8 years ago
Marcos Defendi 49c300cfb0 added count, total, and offset fields in response object 8 years ago
Bradley Hilton c5e411c290
Merge branch 'develop' into bugfix-7268 8 years ago
Rodrigo Nascimento f50679daaa
Merge pull request #10128 from RocketChat/feature/rest-channel-notifications-settings 8 years ago
Karl Prieb 5be5cef97f remove sidebar item name overflow 8 years ago
Karan Bedi 6a2c1d1314
Merge branch 'develop' into bugfix-10026 8 years ago
Rodrigo Nascimento 245cdb22de
Merge pull request #10103 from Hudell/remove-private-history-route 8 years ago
Rodrigo Nascimento ee574bbd50
Merge pull request #9866 from sumedh123/sidebar-userstatus 8 years ago
Karan Bedi 534db4165e
Merge branch 'develop' into bugfix-10026 8 years ago
Rodrigo Nascimento 0128874163
Merge pull request #9672 from sumedh123/file-upload-list 8 years ago
Rodrigo Nascimento 70552f84bf
Merge pull request #9783 from sumedh123/capitalize-status 8 years ago
Rodrigo Nascimento 48a62169c9
Merge pull request #9739 from sumedh123/url-detection 8 years ago
Rodrigo Nascimento 0ed0cfb847
Merge pull request #9860 from Joe-mcgee/feature/overflow-popover-scrolling 8 years ago
Rodrigo Nascimento 5cafdc0b4f
Merge pull request #10086 from ubarsaiyan/reply-preview 8 years ago
Rodrigo Nascimento 7ceae2b87b
Merge pull request #10104 from RocketChat/ggazzo-fix 8 years ago
Rodrigo Nascimento 7bedc04409
Merge pull request #10123 from RocketChat/livechat-support-agents-phone-fields 8 years ago
Rodrigo Nascimento 79db195054
Merge pull request #9872 from ramrami/fix-webrtc-confirm-dialog 8 years ago
Karan Bedi ad999f1a2d
Merge branch 'develop' into bugfix-10026 8 years ago
Rodrigo Nascimento 13c6f83483
Merge pull request #10081 from kb0304/bugfix-10057 8 years ago
Marcos Defendi 1097e87d5a Merge branch 'develop' into feature/rest-api-mentions-of-channel 8 years ago
Marcos Defendi 443f804f28 Merge remote-tracking branch 'origin/feature/rest-api-mentions-of-channel' into feature/rest-api-mentions-of-channel 8 years ago
Marcos Defendi 90a44b83e8 added pagination to channels.getAllUserMentionsByChannel endpoint. 8 years ago
Marcos Defendi 9796c1d4e3 added pagination to channels.getAllUserMentionsByChannel endpoint. 8 years ago
Marcos Defendi 81394e90fe fix find subscription method 8 years ago
Taylor 8fdb4d2722
Merge branch 'develop' into feature/overflow-popover-scrolling 8 years ago
Karl Prieb 969f3c7d5a Extended view mode on sidebar is broked 8 years ago
Rodrigo Nascimento 79b4526cfc
Merge pull request #10154 from RocketChat/app-message-listener 8 years ago
Bradley Hilton 097ae4c7bc
Merge branch 'develop' into app-message-listener 8 years ago
Bradley Hilton a21f662e13
Improve the persistence layer and update the apps engine and definition packages 8 years ago
Rodrigo Nascimento a2e028ea05
Merge pull request #10148 from RocketChat/mention-feature-request-forums 8 years ago
Rodrigo Nascimento a8c4ba153a
Merge pull request #10090 from pierreozoux/patch-1 8 years ago
Karl Prieb cd690532b4 dynamic-css script isn't working on old browsers 8 years ago
Utkarsh Barsaiyan 25b125ec38 Indentation fix 8 years ago
Marcos Defendi 406719605f fix tests, changed the find way to retrieve subscription and fix validation to channels.notifications 8 years ago
Utkarsh Barsaiyan 9832e406f0
Indentation fix 8 years ago
Utkarsh Barsaiyan 348759d3b2
Merge branch 'develop' into reply-preview 8 years ago
Rodrigo Nascimento 6adae8b0d6
Merge pull request #10144 from RocketChat/feature/rest-list-all-oauth-services 8 years ago
Rodrigo Nascimento 5d582035b8
Merge pull request #10016 from RocketChat/sidebar-viewmode-admin-option 8 years ago
Rodrigo Nascimento c20f3fd5e3
Merge pull request #8667 from mutdmour/feature/8336 8 years ago
Rodrigo Nascimento d4ec941482
Update custom_oauth_server.js 8 years ago