Commits · 012a240a766f3d96a4accf2ba57f2426b43d1cac · Administrator / AloqaIM-Android

02 Sep, 2018 1 commit
- ChatRoomAdapter#prependData improved, checked on files, reply, quote, reaction actions · 012a240a
  Kiryl Vashyla authored Sep 02, 2018
  
  012a240a
29 Aug, 2018 7 commits
- Merge branch 'develop' into fix/chat_history_sync · 8a6ad2b5
  Kiryl Vashyla authored Aug 29, 2018
  
  8a6ad2b5
- Merge pull request #1618 from RocketChat/new/google-analytics-for-firebase · 17b02002
  Lucio Maciel authored Aug 29, 2018
```
[NEW] Add the support for the Google Analytics For Firebase
```
  17b02002
- Fix indentation. · f2041937
  Filipe de Lima Brito authored Aug 29, 2018
  
  f2041937
- Revert "Merge branch 'v3.0.0' into develop" · 6316d76b
  Filipe de Lima Brito authored Aug 29, 2018
```
This reverts commit bc96fc74, reversing
changes made to 9e631abd.
```
  6316d76b
- Merge branch 'v3.0.0' into develop · bc96fc74
  Filipe de Lima Brito authored Aug 29, 2018
  
  bc96fc74
- Merge branch 'develop' into new/google-analytics-for-firebase · 4e3936ca
  Filipe de Lima Brito authored Aug 29, 2018
  
  4e3936ca
- Merge branch 'develop' into fix/chat_history_sync · fbd3e3f5
  Kiryl Vashyla authored Aug 29, 2018
  
  fbd3e3f5
28 Aug, 2018 8 commits
- Merge pull request #1567 from RocketChat/emoji-custom-support · 9e631abd
  Lucio Maciel authored Aug 28, 2018
```
[NEW] Emoji custom support
```
  9e631abd
- Use resources for size, update buildTools version · 72c5bbc0
  Lucio Maciel authored Aug 28, 2018
  
  72c5bbc0
- Merge branch 'develop' into fix/chat_history_sync · 4f56377f
  Kiryl Vashyla authored Aug 28, 2018
  
  4f56377f
- Merge branch 'develop' into emoji-custom-support · 96338a2f
  Lucio Maciel authored Aug 28, 2018
  
  96338a2f
- Merge pull request #1620 from RocketChat/Shailesh351-upstrem-button-action · 46a8c3dc
  Lucio Maciel authored Aug 28, 2018
```
[NEW] Add support for initial Rich Messaging
```
  46a8c3dc
- Update to AGP 3.2.0-rc02 · 9f49a1bd
  Lucio Maciel authored Aug 28, 2018
  
  9f49a1bd
- PR #1615 fixes · 81023221
  Kiryl Vashyla authored Aug 28, 2018
  
  81023221
- Add the support for the Google Analytics For Firebase · 8ce5d9d3
  Filipe de Lima Brito authored Aug 28, 2018
  
  8ce5d9d3
27 Aug, 2018 1 commit

Merge branch 'upstrem-button-action' of... · c8f8cb1a

Lucio Maciel authored Aug 27, 2018

Merge branch 'upstrem-button-action' of https://github.com/Shailesh351/Rocket.Chat.Android into Shailesh351-upstrem-button-action

c8f8cb1a

25 Aug, 2018 4 commits
- loadMissingMessages() improved: unused messages polling from local repository removed · c8ec586b
  Kiryl Vashyla authored Aug 25, 2018
  
  c8ec586b
- sync date saving updated, checked on device · 7760bd1a
  Kiryl Vashyla authored Aug 25, 2018
  
  7760bd1a
- kotlin NPE on the username assert fixed · 9f281645
  Kiryl Vashyla authored Aug 25, 2018
  
  9f281645
- Merge branch 'develop' into upstrem-button-action · 433c5455
  Shailesh Baldaniya authored Aug 25, 2018
  
  433c5455
24 Aug, 2018 6 commits
- minor: fixme removed because it fixed · 588945e7
  Kiryl Vashyla authored Aug 24, 2018
  
  588945e7
- Chat history issues fx: on presenter and repository side · be16d670
  Kiryl Vashyla authored Aug 24, 2018
  
  be16d670
- Chat history issues fx: on adapter side · f15bca5b
  Kiryl Vashyla authored Aug 24, 2018
  
  f15bca5b
- Merge pull request #1614 from RocketChat/project/fix-building-error · aaf1bedd
  Lucio Maciel authored Aug 24, 2018
```
[FIX] Building error
```
  aaf1bedd
- Fix ChatRoomFragment.kt · 4a534c96
  Filipe de Lima Brito authored Aug 24, 2018
  
  4a534c96
- fix: Indentation and nullability · 894b61ec
  Shailesh Baldaniya authored Aug 24, 2018
  
  894b61ec
23 Aug, 2018 12 commits
- Merge branch 'upstrem-button-action' of... · 8837b6df
  Lucio Maciel authored Aug 23, 2018
```
Merge branch 'upstrem-button-action' of https://github.com/Shailesh351/Rocket.Chat.Android into Shailesh351-upstrem-button-action
```
  8837b6df
- Fix building error · b4bc6fef
  Filipe de Lima Brito authored Aug 23, 2018
```
Down backing to 3.3.0-alpha05 due to a bug related with HandlerContext error. Fix wrong importing package.
```
  b4bc6fef
- Merge pull request #1613 from RocketChat/revert-1611-fix/HandlerContext-error · 8c31dff7
  Filipe de Lima Brito authored Aug 23, 2018
```
Revert "[FIX] Temporary workaround for HandlerContext error."
```
  8c31dff7
- fix: Small fix · ee657f5b
  Shailesh Baldaniya authored Aug 23, 2018
```
Merge branch 'temp-button-action' into upstrem-button-action
```
  ee657f5b
- Revert "[FIX] Temporary workaround for HandlerContext error." · cd55a6b4
  Lucio Maciel authored Aug 23, 2018
  
  cd55a6b4
- Merge pull request #1595 from RocketChat/new/answers-analytics · 8c65d4a5
  Filipe de Lima Brito authored Aug 23, 2018
```
[NEW] Analytics for Answer (Fabric).
```
  8c65d4a5
- Merge branch 'develop' into new/answers-analytics · ba40ed52
  Filipe de Lima Brito authored Aug 23, 2018
  
  ba40ed52
- Merge pull request #1606 from luckcoolla/patch-1 · 9e86c3dc
  Filipe de Lima Brito authored Aug 23, 2018
```
layout_avatar duplicate removed
```
  9e86c3dc
- Merge branch 'develop' into patch-1 · 275b9f8a
  Filipe de Lima Brito authored Aug 23, 2018
  
  275b9f8a
- Merge branch 'develop' into upstrem-button-action · 00aa5de8
  Shailesh Baldaniya authored Aug 23, 2018
  
  00aa5de8
- feat: Add horizontal and vertical buttons · 611b0086
  Shailesh Baldaniya authored Aug 23, 2018
  
  611b0086
- Merge branch 'develop' into new/answers-analytics · 8f18d180
  Filipe de Lima Brito authored Aug 23, 2018
  
  8f18d180
22 Aug, 2018 1 commit
- Merge pull request #1611 from RocketChat/fix/HandlerContext-error · 7301cde4
  Filipe de Lima Brito authored Aug 22, 2018
```
[FIX] Temporary workaround for HandlerContext error.
```
  7301cde4