Commits · 153ce2f1d02d53ee43383cb3c6faaaa183845ede · Administrator / AloqaIM-Android

17 May, 2018 4 commits
- bug fix · 153ce2f1
  Divyanshu Bhargava authored May 17, 2018
  
  153ce2f1
- bug fix · 02904822
  Divyanshu Bhargava authored May 17, 2018
  
  02904822
- Merge branch 'develop-2.x' into android-draw · 6febea7e
  Divyanshu Bhargava authored May 17, 2018
```
# Conflicts:
#	app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
#	app/src/main/res/values-uk-rUA/strings.xml
```
  6febea7e
- Merge pull request #16 from RocketChat/develop · 2cc54dac
  divyanshu bhargava authored May 17, 2018
```
merge
```
  2cc54dac
16 May, 2018 12 commits
- Merge pull request #1267 from RocketChat/new/starred-message-list · f3e08765
  Filipe de Lima Brito authored May 16, 2018
```
[NEW] Shows favorite message list.
```
  f3e08765
- Removes values-uk-rUA/strings.xml · d1b7d0f6
  Filipe de Lima Brito authored May 16, 2018
  
  d1b7d0f6
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/starred-message-list · 06de18fb
  Filipe de Lima Brito authored May 16, 2018
  
  06de18fb
- minor changes · 228427c5
  Divyanshu Bhargava authored May 16, 2018
  
  228427c5
- minor changes · add600d4
  Divyanshu Bhargava authored May 16, 2018
  
  add600d4
- minor changes · 77a58b36
  Divyanshu Bhargava authored May 16, 2018
  
  77a58b36
- minor changes · 79fd22f3
  Divyanshu Bhargava authored May 16, 2018
  
  79fd22f3
- android draw library · b1660fa7
  Divyanshu Bhargava authored May 16, 2018
  
  b1660fa7
- Merge branch 'android-draw-new' into android-draw · 7b220038
  Divyanshu Bhargava authored May 16, 2018
```
# Conflicts:
#	app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
```
  7b220038
- minor changes · 23df6281
  Divyanshu Bhargava authored May 16, 2018
  
  23df6281
- android draw library · 3bfd149d
  Divyanshu Bhargava authored May 16, 2018
  
  3bfd149d
- Merge pull request #15 from RocketChat/develop · c97f822e
  divyanshu bhargava authored May 16, 2018
```
merge
```
  c97f822e
14 May, 2018 1 commit
- Add broadcast values · 9e70822c
  Leonardo Aramaki authored May 14, 2018
  
  9e70822c
11 May, 2018 6 commits
- Add scrollbar · 7ebd1d98
  Filipe de Lima Brito authored May 11, 2018
  
  7ebd1d98
- Fix formatting · 6af49188
  Filipe de Lima Brito authored May 11, 2018
  
  6af49188
- Allign no_messages_view in the center. · b6e038ee
  Filipe de Lima Brito authored May 11, 2018
  
  b6e038ee
- Remove old chat room icons. · cfc93f42
  Filipe de Lima Brito authored May 11, 2018
  
  cfc93f42
- Remove filtering. · d99a39ec
  Filipe de Lima Brito authored May 11, 2018
  
  d99a39ec
- Shows favorite message list. · 9f6519b9
  Filipe de Lima Brito authored May 11, 2018
  
  9f6519b9
10 May, 2018 4 commits
- Merge pull request #1264 from RocketChat/new/star-unstar-message · 1ceb0a2d
  Filipe de Lima Brito authored May 10, 2018
```
[NEW] Star/Unstar message
```
  1ceb0a2d
- Merge pull request #1254 from RocketChat/new/listen-to-typing-status · d4d4f52c
  Filipe de Lima Brito authored May 10, 2018
```
[NEW] Listen to typing status
```
  d4d4f52c
- Merge pull request #1257 from RocketChat/new/subscription-role-changed · c5302609
  Leonardo Aramaki authored May 10, 2018
```
[NEW] Show subscription role change system messages
```
  c5302609
- Add starr/unstar message feature. · fcb3b431
  Filipe de Lima Brito authored May 10, 2018
  
  fcb3b431
09 May, 2018 1 commit
- Merge pull request #1260 from RocketChat/beta · 913d09c3
  Lucio Maciel authored May 09, 2018
```
[RELEAE] Merge beta into develop
```
  913d09c3
08 May, 2018 10 commits
- Merge branch 'develop' into beta · 3f3ca5c5
  Rafael Kellermann Streit authored May 08, 2018
  
  3f3ca5c5
- Merge pull request #1258 from RocketChat/feature/detect-redirect-on-server-info · 1a1213da
  Rafael Kellermann Streit authored May 08, 2018
```
[NEW] Detect redirect on server info
```
  1a1213da
- Merge pull request #14 from RocketChat/develop · ed432b83
  divyanshu bhargava authored May 08, 2018
```
merge
```
  ed432b83
- Merge branch 'develop' into android-draw · b250364f
  divyanshu bhargava authored May 08, 2018
  
  b250364f
- Merge pull request #1255 from RocketChat/i18n/ukrainian-translation · fe7af2e5
  Filipe de Lima Brito authored May 08, 2018
```
[i18n] Ukrainian translation file.
```
  fe7af2e5
- Merge pull request #1238 from RocketChat/new/send-typing-status · 3383b0f2
  Filipe de Lima Brito authored May 08, 2018
```
[NEW] Send typing status feature.
```
  3383b0f2
- Updates values-uk-rUA/strings.xml · 1d24a47f
  Filipe de Lima Brito authored May 08, 2018
  
  1d24a47f
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into i18n/ukrainian-translation · 57e7a998
  Filipe de Lima Brito authored May 08, 2018
  
  57e7a998
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/send-typing-status · 90d88377
  Filipe de Lima Brito authored May 08, 2018
  
  90d88377
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into... · 1f901f3c
  Filipe de Lima Brito authored May 08, 2018
```
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/listen-to-typing-status
```
  1f901f3c
07 May, 2018 2 commits
- Bump version · db371a22
  Lucio Maciel authored May 07, 2018
  
  db371a22
- Ignore messages sent to read-only channel when the server response is · 1f8478b1
  Lucio Maciel authored May 07, 2018
```
invalid.
```
  1f8478b1