Commits · 020df855ae335427bb90fdda8c31c658593adefd · Administrator / AloqaIM-Android

18 Sep, 2018 1 commit
- Merge branch 'develop' into new/reactions-with-custom-emojis · 020df855
  Leonardo Aramaki authored Sep 18, 2018
  
  020df855
12 Sep, 2018 1 commit
- Add support for custom emojis on reactions · f3292176
  Leonardo Aramaki authored Sep 12, 2018
  
  f3292176
11 Sep, 2018 7 commits
- Merge pull request #1668 from RocketChat/beta · 93d43d3b
  Filipe de Lima Brito authored Sep 11, 2018
```
[RELEASE] Update DEVELOP with BETA
```
  93d43d3b
- Merge branch 'develop' into beta · 884e44ba
  Rafael Kellermann Streit authored Sep 11, 2018
  
  884e44ba
- Merge pull request #1667 from temlife/patch-1 · dff6f0f5
  Rafael Kellermann Streit authored Sep 11, 2018
```
[I18N] Update french translations
```
  dff6f0f5
- Update french translations · 6d5f8f6a
  temlife authored Sep 11, 2018
  
  6d5f8f6a
- Merge pull request #1663 from Zed314/develop · dd5d0d8d
  Filipe de Lima Brito authored Sep 11, 2018
```
[I18N] Fix French translation
```
  dd5d0d8d
- Fix missing escape of apostrophes · 07dde842
  Ziggy Vergne authored Sep 11, 2018
  
  07dde842
- Fix French translation · 05a7d983
  Ziggy Vergne authored Sep 11, 2018
  
  05a7d983
08 Sep, 2018 3 commits
- Bump version · 658cee9a
  Lucio Maciel authored Sep 08, 2018
  
  658cee9a
- More fixes · 33d3b5f0
  Lucio Maciel authored Sep 08, 2018
  
  33d3b5f0
- Merge pull request #1661 from RocketChat/fix/admin-panel-crash · d51c48f4
  Lucio Maciel authored Sep 08, 2018
```
[FIX] Admin panel crash
```
  d51c48f4
07 Sep, 2018 1 commit
- Fix a crash happening when opening the admin panel and changing to another view. · 8650f84f
  Filipe de Lima Brito authored Sep 07, 2018
  
  8650f84f
06 Sep, 2018 18 commits
- Fix for java.lang.IllegalStateException: group_no_file must not be null · c460686d
  Filipe de Lima Brito authored Sep 06, 2018
  
  c460686d
- Merge pull request #1659 from RocketChat/fix/compress-image · 318eff21
  Lucio Maciel authored Sep 06, 2018
```
[FIX] Check file size after compressing the image
```
  318eff21
- Merge branch 'beta' into fix/compress-image · 10387d42
  Lucio Maciel authored Sep 06, 2018
  
  10387d42
- Initialize typeface on init · fbc7df8a
  Lucio Maciel authored Sep 06, 2018
  
  fbc7df8a
- Compress image before checking for the file size. · 2dee6e0a
  Filipe de Lima Brito authored Sep 06, 2018
  
  2dee6e0a
- Merge pull request #1615 from luckcoolla/fix/chat_history_sync · 9567523e
  Lucio Maciel authored Sep 06, 2018
```
[WIP][FIX] Chat history sync
```
  9567523e
- Merge branch 'beta' into fix/chat_history_sync · 0cb06f84
  Lucio Maciel authored Sep 06, 2018
  
  0cb06f84
- PR #1615 minor change · fb9c397b
  Kiryl Vashyla authored Sep 06, 2018
  
  fb9c397b
- finally updated ChatRoomAdapter#prependData code: order of merging chat history updated. · 6df94252
  Kiryl Vashyla authored Sep 06, 2018
  
  6df94252
- PR #1615 fix. Chat synced time associated with roomId · 88caa298
  Kiryl Vashyla authored Sep 06, 2018
  
  88caa298
- Merge pull request #1656 from RocketChat/fix/fix-emoji-crash-gambiarra · b01c1258
  Filipe de Lima Brito authored Sep 06, 2018
```
[FIX] fix emoji crash
```
  b01c1258
- Try/catch when warning custom emojis cache · 8b385cfb
  Lucio Maciel authored Sep 06, 2018
  
  8b385cfb
- Bump version · 8a1cf8d0
  Lucio Maciel authored Sep 06, 2018
  
  8a1cf8d0
- Ugly workaround for emoji crashes when comming back from long time on · 279a8387
  Lucio Maciel authored Sep 06, 2018
```
background
```
  279a8387
- Merge pull request #1655 from RocketChat/layout/update-round-icons · a93e1479
  Lucio Maciel authored Sep 06, 2018
```
[LAYOUT] Update round icons
```
  a93e1479
- Merge branch 'beta' into layout/update-round-icons · 8777fb32
  Lucio Maciel authored Sep 06, 2018
  
  8777fb32
- Merge pull request #1653 from RocketChat/fix/image-aspect-ratio · 296eb5a5
  Lucio Maciel authored Sep 06, 2018
```
[FIX] Preserves the image aspect ratio
```
  296eb5a5
- Merge branch 'beta' into fix/image-aspect-ratio · 638d456c
  Lucio Maciel authored Sep 06, 2018
  
  638d456c
05 Sep, 2018 9 commits
- Update round icons. · ac1666f9
  Filipe de Lima Brito authored Sep 05, 2018
  
  ac1666f9
- Merge pull request #1652 from ArtiomCX75/develop · 88332df2
  Filipe de Lima Brito authored Sep 05, 2018
```
[I18N] Add Ukrainian language
```
  88332df2
- Merge branch 'beta' into develop · 41ffcc30
  Filipe de Lima Brito authored Sep 05, 2018
  
  41ffcc30
- Merge pull request #1654 from divyanshub024/hindi-trans · e60023a8
  Filipe de Lima Brito authored Sep 05, 2018
```
[I18N] Hindi translations 
```
  e60023a8
- Merge branch 'beta' into hindi-trans · 6564b533
  Filipe de Lima Brito authored Sep 05, 2018
  
  6564b533
- Update classpath · 825aedea
  Filipe de Lima Brito authored Sep 05, 2018
  
  825aedea
- Updates strings.xml file · 4853712e
  Filipe de Lima Brito authored Sep 05, 2018
  
  4853712e
- Merge branch 'beta' into fix/chat_history_sync · 79d91e89
  Filipe de Lima Brito authored Sep 05, 2018
  
  79d91e89
- Added new Hindi Translations · 38d11cc8
  divyanshu authored Sep 05, 2018
  
  38d11cc8