Commits · cb1aebabe46a0ef325eb94815c359d81d10db97e · Administrator / AloqaIM-Android

29 Jun, 2018 2 commits
- Merge branch 'develop-2.x' into send-msg-attachments · cb1aebab
  divyanshu authored Jun 29, 2018
```
# Conflicts:
#	app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
#	app/src/main/res/menu/chatroom_actions.xml
```
  cb1aebab
- Merge pull request #34 from RocketChat/develop · 124b8519
  divyanshu bhargava authored Jun 29, 2018
```
merge
```
  124b8519
28 Jun, 2018 16 commits
- Merge pull request #1410 from RocketChat/new/star-unstar-chatroom · 3fca09b7
  Filipe de Lima Brito authored Jun 28, 2018
```
[NEW] Favorite/Unfavorite chatroom
```
  3fca09b7
- Adds missing import. · 3cc4aa53
  Filipe de Lima Brito authored Jun 28, 2018
  
  3cc4aa53
- Surrounds with retryIO{} · 56e1ae12
  Filipe de Lima Brito authored Jun 28, 2018
  
  56e1ae12
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/star-unstar-chatroom · 3c7503e1
  Filipe de Lima Brito authored Jun 28, 2018
  
  3c7503e1
- minor changes · 2df5a82f
  divyanshu authored Jun 28, 2018
  
  2df5a82f
- minor changes · 6e7f14b8
  divyanshu authored Jun 28, 2018
  
  6e7f14b8
- minor changes · a6bd19db
  divyanshu authored Jun 28, 2018
  
  a6bd19db
- made requested changes · 17e45a7e
  divyanshu authored Jun 28, 2018
  
  17e45a7e
- Merge remote-tracking branch 'origin/send-msg-attachments' into send-msg-attachments · bf2533c0
  divyanshu authored Jun 28, 2018
```
# Conflicts:
#	app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
```
  bf2533c0
- fixed conflicts · 90017070
  divyanshu authored Jun 28, 2018
  
  90017070
- undo · bb61c0ca
  divyanshu authored Jun 19, 2018
```
fix ci/circleci: code-analysis
```
  bb61c0ca
- undo · d8205c1f
  divyanshu authored Jun 19, 2018
```
fix ci/circleci: code-analysis
```
  d8205c1f
- fix ci/circleci: code-analysis · d37ec6ba
  divyanshu authored Jun 19, 2018
  
  d37ec6ba
- added scroll view to support landscape view · f276d1d5
  divyanshu authored Jun 18, 2018
  
  f276d1d5
- Send message with attachments · a1b6268b
  divyanshu authored Jun 18, 2018
  
  a1b6268b
- Merge branch 'develop' into send-msg-attachments · d3ec6de1
  divyanshu bhargava authored Jun 28, 2018
  
  d3ec6de1
27 Jun, 2018 8 commits
- Merge pull request #33 from RocketChat/develop · 95160c08
  divyanshu bhargava authored Jun 27, 2018
```
merge
```
  95160c08
- Merge pull request #1406 from RocketChat/project/emoji-as-a-module · 847d6e6f
  Leonardo Aramaki authored Jun 27, 2018
```
[PROJECT] Move out whole emoji codebase to a separate module
```
  847d6e6f
- Merge pull request #32 from RocketChat/develop · bf16b6f9
  divyanshu bhargava authored Jun 27, 2018
```
merge
```
  bf16b6f9
- Merge branch 'develop' into project/emoji-as-a-module · 0326e6cd
  Leonardo Aramaki authored Jun 27, 2018
  
  0326e6cd
- Merge pull request #1405 from RocketChat/improvement/quote-redesign · cedc1254
  Leonardo Aramaki authored Jun 27, 2018
```
[IMPROVEMENT] Quote bar redesign and set it to open even if offline 
```
  cedc1254
- 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 6 commits
- Merge branch 'develop' into new/star-unstar-chatroom · 2647a81c
  Filipe de Lima Brito authored Jun 26, 2018
  
  2647a81c
- Merge pull request #31 from RocketChat/develop · 741bc353
  divyanshu bhargava authored Jun 26, 2018
```
merge
```
  741bc353
- Merge branch 'develop' into project/emoji-as-a-module · 77bcd4d6
  Leonardo Aramaki authored Jun 26, 2018
  
  77bcd4d6
- Merge branch 'develop' into improvement/quote-redesign · 70a6f6b6
  Filipe de Lima Brito authored Jun 26, 2018
  
  70a6f6b6
- 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 8 commits
- Merge branch 'develop' into new/star-unstar-chatroom · 002267d7
  Filipe de Lima Brito authored Jun 25, 2018
  
  002267d7
- 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
- Shows the favorite/unfavorite icon for chat rooms. · 2410b216
  Filipe de Lima Brito authored Jun 25, 2018
  
  2410b216
- 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