Commits · 247bcaba79594b60fdab8b017c9316985a9386fa · Administrator / AloqaIM-Android

27 Jun, 2018 3 commits
- Merge branch 'project/emoji-as-a-module' of... · 247bcaba
  Leonardo Aramaki authored Jun 27, 2018
```
Merge branch 'project/emoji-as-a-module' of github.com:RocketChat/Rocket.Chat.Android into project/emoji-as-a-module
```
  247bcaba
- Add versions.minSdk · c0211aee
  Leonardo Aramaki authored Jun 27, 2018
  
  c0211aee
- Add optional documentation · e026fd20
  Leonardo Aramaki authored Jun 27, 2018
  
  e026fd20
26 Jun, 2018 3 commits
- Merge branch 'develop' into project/emoji-as-a-module · 77bcd4d6
  Leonardo Aramaki authored Jun 26, 2018
  
  77bcd4d6
- Merge pull request #1411 from Pitstopper/patch-3 · 80cfd440
  Filipe de Lima Brito authored Jun 26, 2018
```
[IMPROVEMENT] Improvements in Russian translation
```
  80cfd440
- [IMPROVEMENT] Improvements in Russian translation · 976f4f17
  Pitstopper authored Jun 26, 2018
```
Added translation "Mentions" section.
```
  976f4f17
25 Jun, 2018 6 commits
- Merge pull request #1396 from RocketChat/new/mention-list · 30e95cc9
  Filipe de Lima Brito authored Jun 25, 2018
```
[NEW] Mention list
```
  30e95cc9
- Add constraintlayout dep · e4f40bb8
  Leonardo Aramaki authored Jun 25, 2018
  
  e4f40bb8
- Add missing resources · d2ed00ee
  Leonardo Aramaki authored Jun 25, 2018
  
  d2ed00ee
- Solve lint complaints · 2d86aa1f
  Leonardo Aramaki authored Jun 25, 2018
  
  2d86aa1f
- Add default translation for emoji on the app to avoid lint complaints · 9e7b84ca
  Leonardo Aramaki authored Jun 25, 2018
  
  9e7b84ca
- Move out whole emoji codebase to a separate module · 7df2c20e
  Leonardo Aramaki authored Jun 25, 2018
  
  7df2c20e
22 Jun, 2018 3 commits
- No need to specify the room type to get the mentions. · 11d9eea4
  Filipe de Lima Brito authored Jun 22, 2018
  
  11d9eea4
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/mention-list · f780d4ee
  Filipe de Lima Brito authored Jun 22, 2018
  
  f780d4ee
- Merge pull request #1404 from Pitstopper/patch-2 · a69a4f71
  Rafael Kellermann Streit authored Jun 22, 2018
```
[IMPROVEMENT] Improvements in Russian translation
```
  a69a4f71
21 Jun, 2018 1 commit
- Update strings.xml · 5d9b29a9
  Pitstopper authored Jun 21, 2018
  
  5d9b29a9
20 Jun, 2018 7 commits
- Merge branch 'new/mention-list' of github.com:RocketChat/Rocket.Chat.Android into new/mention-list · 7129d28c
  Filipe de Lima Brito authored Jun 20, 2018
  
  7129d28c
- Gets the room from DB instead of in-memory. · 7e6f4841
  Filipe de Lima Brito authored Jun 20, 2018
  
  7e6f4841
- Applies code style. · 0f21d5e0
  Filipe de Lima Brito authored Jun 20, 2018
  
  0f21d5e0
- Merge pull request #1389 from RocketChat/build-instructions · 32b5ac05
  Filipe de Lima Brito authored Jun 20, 2018
```
[CHORE] Update instruction on how to build this project.
```
  32b5ac05
- Merge branch 'develop' into new/mention-list · c31b87ad
  Filipe de Lima Brito authored Jun 20, 2018
  
  c31b87ad
- Merge branch 'develop' into build-instructions · 883cc595
  Filipe de Lima Brito authored Jun 20, 2018
  
  883cc595
- Merge pull request #1384 from RocketChat/feature/compress-image · c448359d
  Lucio Maciel authored Jun 20, 2018
```
[NEW] Compress image
```
  c448359d
19 Jun, 2018 17 commits
- Add mention list feature. · b74ee777
  Filipe de Lima Brito authored Jun 19, 2018
  
  b74ee777
- Merge branch 'feature/compress-image' of... · 590aedde
  Filipe de Lima Brito authored Jun 19, 2018
```
Merge branch 'feature/compress-image' of github.com:RocketChat/Rocket.Chat.Android into feature/compress-image
```
  590aedde
- Simplifies function. · c7c89643
  Filipe de Lima Brito authored Jun 19, 2018
  
  c7c89643
- Merge branch 'develop' into feature/compress-image · af2a52f0
  Filipe de Lima Brito authored Jun 19, 2018
  
  af2a52f0
- Merge branch 'develop' into build-instructions · 8d2eed71
  Filipe de Lima Brito authored Jun 19, 2018
  
  8d2eed71
- Merge pull request #1393 from divyanshub024/message-confirm · 18e06ae0
  Filipe de Lima Brito authored Jun 19, 2018
```
[IMPROVEMENT] Confirm before deleting the message
```
  18e06ae0
- Merge branch 'develop' into feature/compress-image · e2029191
  Filipe de Lima Brito authored Jun 19, 2018
  
  e2029191
- Merge branch 'develop' into message-confirm · cfd7193b
  Filipe de Lima Brito authored Jun 19, 2018
  
  cfd7193b
- Merge pull request #1355 from RocketChat/feature/create-channel · 796f6c26
  Lucio Maciel authored Jun 19, 2018
```
[NEW] Create channel
```
  796f6c26
- Merge branch 'develop' into message-confirm · 747370d2
  divyanshu bhargava authored Jun 19, 2018
  
  747370d2
- use context instead of activity · f66024bb
  divyanshu authored Jun 19, 2018
  
  f66024bb
- Merge branch 'develop' into feature/create-channel · ac3a68f1
  Filipe de Lima Brito authored Jun 19, 2018
  
  ac3a68f1
- Merge branch 'develop' into feature/compress-image · dc28b88d
  Filipe de Lima Brito authored Jun 19, 2018
  
  dc28b88d
- Merge pull request #1391 from divyanshub024/chat-list-scroll-down · cb8df3c7
  Filipe de Lima Brito authored Jun 19, 2018
```
[FIX] Chat list scrolls down when a new message arrives in a channel.
```
  cb8df3c7
- Merge remote-tracking branch 'origin/develop-2.x' into develop-2.x · d5621af4
  divyanshu authored Jun 19, 2018
  
  d5621af4
- Confirm delete message · e03d596b
  divyanshu authored Jun 19, 2018
  
  e03d596b
- Merge pull request #27 from RocketChat/develop · 59264420
  divyanshu bhargava authored Jun 19, 2018
```
merge
```
  59264420