Commit Graph

9780 Commits (67e3ce6a724a6a9804f28a7f78e3e7f9316e33ba)
 

Author SHA1 Message Date
Maki Nishifuji 67e3ce6a72 Merge remote-tracking branch 'upstream/develop' into add-marked 8 years ago
Gabriel Engel 16ccbd4ff6 Code formatting fix 8 years ago
Gabriel Engel e0fe427c77 Merge pull request #6209 from danielbressan/develop 8 years ago
Gabriel Engel 9dc9ab417e Merge pull request #6242 from RocketChat/improvements/access-token-login 8 years ago
Rodrigo Nascimento ea14a8def7 Remove log and check params 8 years ago
Rodrigo Nascimento d60dca1220 Allow login via OAuth access token. Only for Google only now 8 years ago
Gabriel Engel f80c7755ea Merge pull request #6138 from alexbrazier/feature/google-analytics 8 years ago
Gabriel Engel 5d0fa823ea Merge pull request #6224 from RocketChat/fix-isObject-check-ldap 8 years ago
Maki Nishifuji e67f73d4c0 var to const 8 years ago
Maki Nishifuji e819e57dd7 Merge remote-tracking branch 'upstream/develop' into add-marked 8 years ago
Gabriel Engel 36d06383b4 Merge branch 'master' into develop 8 years ago
Gabriel Engel 938c258d31 Fix to force process to abort if process.exit() times out 8 years ago
Daniel Bressan 9e54f99f76 change const to var for lint 8 years ago
Bradley Hilton 9316e09740
Fix incorrect isObject check on the ldap server sync, closes #5973 8 years ago
Gabriel Engel 0ebae3ac36 Merge pull request #6222 from RocketChat/geekgonecrazy-patch-1 8 years ago
Daniel Bressan 6fdc70aac8 fix lint errors again 8 years ago
Gabriel Engel c812a1a08f Merge pull request #6202 from xklonx/develop 8 years ago
Gabriel Engel c5e1a6feac Merge pull request #6166 from Kiran-Rao/master 8 years ago
Daniel Bressan 466d9b0c04 fix lint errors 8 years ago
Gabriel Engel ba0c13d4ea Merge pull request #6204 from RocketChat/fix-description-edit 8 years ago
Gabriel Engel d9c5b478e1 Merge pull request #6217 from RocketChat/show-file-description 8 years ago
Aaron Ogle 3fdbad6614 Remove oplog requirement for now 8 years ago
Martin Schoeler b0cd6de6b9 make the message object cleaner 8 years ago
Martin Schoeler 55c3614b32 uses figcaption for images 8 years ago
Kiran Rao 036c8c9f8c Client folder ui-master 8 years ago
Martin Schoeler 2c049e39fb show file description for all files 8 years ago
Gabriel Engel cbdc26ded8 Version bump to 0.53.0 8 years ago
Martin Schoeler ad1b0fa51e better way to send a object to update() 8 years ago
Martin Schoeler 9956abaa3b Merged branch develop into fix-description-edit 8 years ago
Martin Schoeler 6ac116e91d added the file description edit 8 years ago
Pavel Krasikov bd5eeab1df logo and sounds fix for apache subfolder proxy (path must be relative to root url like http://domain.com/chat/assets/logo) 8 years ago
Gabriel Engel cca9ce8148 Merge pull request #6164 from Kiran-Rao/vrecord 8 years ago
Gabriel Engel b89e32db2d Merge pull request #6165 from Kiran-Rao/ui-message 8 years ago
Gabriel Engel 58852303ec Merge pull request #6167 from Kiran-Rao/flextab 8 years ago
Martin Schoeler 44c77d3fd0 Merged branch develop into fix-description-edit 8 years ago
Gabriel Engel accf85023d Merge pull request #6168 from Kiran-Rao/admin 8 years ago
Gabriel Engel 012f8a15e8 Merge pull request #6169 from Kiran-Rao/account 8 years ago
Gabriel Engel dec33973a8 Merge pull request #6201 from RocketChat/lingohub_based_on_develop 8 years ago
Gabriel Engel dd657c15b2 LingoHub Update 🚀 8 years ago
Daniel Bressan d87d7d25e5 change const back 8 years ago
Daniel Bressan 69c607152b fix jitsi video chat on mobile 8 years ago
Daniel 771b85a5e4 Merge pull request #1 from RocketChat/develop 8 years ago
Kiran Rao 8bfb297b3e Client folder account 8 years ago
Kiran Rao 60870c3a99 Client folder ui-admin 8 years ago
Kiran Rao 08f435409b Client folder flextab 8 years ago
Kiran Rao bca58bafd8 Client folder ui-message 8 years ago
Kiran Rao f88729aa4e Coffeescript to JS vrecord 8 years ago
Alex Brazier 24cabcf313 Add migration for analytics 8 years ago
Martin Schoeler a4d2eb3261 fix 8 years ago
Martin Schoeler 4247d8042e edit message description 8 years ago