Commits · cb77b33fc99bad73d8e24c9e9301a63bc5a1ac29 · RocketChat / Rocket.Chat

May 19, 2017
- fix anonymous · cb77b33f
  Karl Prieb authored 7 years ago
  
  cb77b33f
- add more private groups button · 05ca0b98
  Karl Prieb authored 7 years ago
  
  05ca0b98
May 18, 2017
- fix tests: change channel selector · db295be1
  Karl Prieb authored 7 years ago
  
  db295be1
- roomlist · ef0c36f1
  Karl Prieb authored 7 years ago
  
  ef0c36f1
- create roomlist · fad4b277
  Karl Prieb authored 7 years ago
  
  fad4b277
- Merge pull request #7006 from RocketChat/rocketchat-ui3 · 57b54ea2
  Rodrigo Nascimento authored 7 years ago
  
  Rocketchat ui3
  57b54ea2
May 17, 2017
- dependencies upgrade · bfa55608
  Gabriel Engel authored 7 years ago
  
  bfa55608
- Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat into rocketchat-ui3 · 1a1911cb
  Guilherme Gazzo authored 7 years ago
  
  1a1911cb
- Merge pull request #6836 from RocketChat/rocketchat-ui2 · 5449f291
  Rodrigo Nascimento authored 7 years ago
  
  converted rocketchat-ui coffee to js part 2
  5449f291
- Merge pull request #6912 from RocketChat/remove-room-from-setting · 03d9cfe4
  Rodrigo Nascimento authored 7 years ago
  
  [FIX] Remove room from roomPick setting
  03d9cfe4
- Fix ESLint setting · 378d469c
  Rodrigo Nascimento authored 7 years ago
  
  378d469c
- Merge pull request #6605 from ggazzo/unit-test-mentions · 4f5b96e6
  Rodrigo Nascimento authored 7 years ago
  
  [NEW] Start running unit tests
  4f5b96e6
- Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat into unit-test-mentions · 53f3d82a
  Guilherme Gazzo authored 7 years ago
  
  53f3d82a
- Merge pull request #6997 from RocketChat/parse-markdown-links-last · 0c3ccab2
  Rodrigo Nascimento authored 7 years ago
  
  [FIX] Parse markdown links last
  0c3ccab2
- Fix ESLint error · d5ee916b
  Rodrigo Nascimento authored 7 years ago
  
  d5ee916b
- Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat into develop · 4c70c643
  Rodrigo Nascimento authored 7 years ago
  
  4c70c643
- Fix lost change · c8f31ae7
  Rodrigo Nascimento authored 7 years ago
  
  c8f31ae7
- Merge branch 'develop' into remove-room-from-setting · 5637ab31
  Marcelo Schmidt authored 7 years ago
  
  Unverified
  
  5637ab31
- Add method back after removal by JS conversion · d088d1a7
  Diego Sampaio authored 7 years ago
  
  Unverified
  
  d088d1a7
- Merge pull request #6999 from darkv/typing_style_patch · 00dbd3d6
  Rodrigo Nascimento authored 7 years ago
  
  [FIX] overlapping text for users-typing-message
  00dbd3d6
- Merge branch 'remove-room-from-setting' of github.com:RocketChat/Rocket.Chat... · ba2ce5fb
  Marcelo Schmidt authored 7 years ago
  
  Merge branch 'remove-room-from-setting' of github.com:RocketChat/Rocket.Chat into remove-room-from-setting
  Unverified
  
  ba2ce5fb
- Merge branch 'develop' into remove-room-from-setting · 48f501af
  Marcelo Schmidt authored 7 years ago
  
  Unverified
  
  48f501af
- Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat into develop · 796b8dd5
  Rodrigo Nascimento authored 7 years ago
  
  796b8dd5
- Try to fix tests failing · 67042cb2
  Rodrigo Nascimento authored 7 years ago
  
  67042cb2
- Merge pull request #7005 from RocketChat/lingohub_based_on_develop · 10dec7df
  Gabriel Engel authored 7 years ago
  
  LingoHub based on develop
  10dec7df
- Update admin.js · 5a5b7dd5
  Marcelo Schmidt authored 7 years ago
  
  Use const instead of let
  5a5b7dd5
- Update admin.js · c20a0de8
  Marcelo Schmidt authored 7 years ago
  
  Use property shorthand
  c20a0de8
- Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat into rocketchat-ui2 · fc2db58d
  Guilherme Gazzo authored 7 years ago
  
  fc2db58d
- fix errors · ce393a16
  Marcelo Schmidt authored 7 years ago
  
  Unverified
  
  ce393a16
- Re-merging conflicted files · c74f1dae
  Marcelo Schmidt authored 7 years ago
  
  Unverified
  
  c74f1dae
- Merge branch 'develop' into remove-room-from-setting · a521920b
  Marcelo Schmidt authored 7 years ago
  
  # Conflicts: # packages/rocketchat-ui-admin/client/admin.coffee
  Unverified
  
  a521920b
- LingoHub Update · ff3b2c03
  Gabriel Engel authored 7 years ago
  
  Manual push by LingoHub User: Gabriel Engel. Project: Rocket.Chat Made with by https://lingohub.com
  ff3b2c03
- Merge pull request #6735 from ggazzo/rocketchat-lib4 · 866e2de9
  Rodrigo Nascimento authored 7 years ago
  
  rocketchat-lib[4] coffee to js
  866e2de9
- Merge branch 'fix-reactions-you' of https://github.com/RocketChat/Rocket.Chat ... · 4009b7d4
  Rodrigo Nascimento authored 7 years ago
  
  Merge branch 'fix-reactions-you' of https://github.com/RocketChat/Rocket.Chat into fix-reactions-you # Conflicts: # packages/rocketchat-ui-message/client/message.coffee
  4009b7d4
- Merge remote-tracking branch 'origin/develop' into fix-reactions-you · 2940c713
  Rodrigo Nascimento authored 7 years ago
  
  # Conflicts: # packages/rocketchat-ui-message/client/message.coffee
  2940c713
- Update message.coffee · d12dfc2d
  Rodrigo Nascimento authored 7 years ago
  
  d12dfc2d
- deleted babelrc · c3d3e276
  Guilherme Gazzo authored 7 years ago
  
  c3d3e276
- removed coffee files · b460bce4
  Guilherme Gazzo authored 7 years ago
  
  b460bce4
- Merge pull request #6987 from RocketChat/rocketchat-importer-slack · bf092520
  Rodrigo Nascimento authored 7 years ago
  
  rocketchat-importer-slack coffee to js
  bf092520
- Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat into rocketchat-lib4 · 6094916f
  Guilherme Gazzo authored 7 years ago
  
  6094916f