Commits · 17d2e22c2c52539e2917c93ad529796e5071db97 · Administrator / AloqaIM-Android

18 Jun, 2018 1 commit
- fix bottom row emoji · 17d2e22c
  divyanshu authored Jun 18, 2018
  
  17d2e22c
16 Jun, 2018 1 commit
- Merge pull request #26 from RocketChat/develop · d3ab9c1f
  divyanshu bhargava authored Jun 16, 2018
```
merge
```
  d3ab9c1f
15 Jun, 2018 6 commits
- Merge pull request #1382 from RocketChat/refactor/viewmodel-to-uimodel · b3b80d2b
  Filipe de Lima Brito authored Jun 15, 2018
```
[REFACTOR] Rename *ViewModel to *UiModel
```
  b3b80d2b
- Merge branch 'develop' into refactor/viewmodel-to-uimodel · e3ed5627
  Filipe de Lima Brito authored Jun 15, 2018
  
  e3ed5627
- Merge branch 'develop' into refactor/viewmodel-to-uimodel · 966c2057
  Filipe de Lima Brito authored Jun 15, 2018
  
  966c2057
- Exclude META-INF/main.kotlin_module on build.gradle · 70855e95
  Lucio Maciel authored Jun 15, 2018
  
  70855e95
- Update kotlin and coroutines · b6a3d738
  Lucio Maciel authored Jun 15, 2018
  
  b6a3d738
- Rename *ViewModel to *UiModel · 542d2bd3
  Lucio Maciel authored Jun 15, 2018
  
  542d2bd3
14 Jun, 2018 5 commits
- Merge pull request #25 from RocketChat/develop · 977db671
  divyanshu bhargava authored Jun 14, 2018
```
merge
```
  977db671
- Merge pull request #1368 from RocketChat/fix/db-chatrooms-merge-issues · 38fc3787
  Lucio Maciel authored Jun 14, 2018
```
[FIX] merge issues from chatrooms db
```
  38fc3787
- Use final API 28 · 9641f291
  Lucio Maciel authored Jun 14, 2018
  
  9641f291
- Missing migrations to androidx · 335f0808
  Lucio Maciel authored Jun 14, 2018
  
  335f0808
- Merge pull request #24 from RocketChat/develop · d4d5cc75
  divyanshu bhargava authored Jun 14, 2018
```
merge
```
  d4d5cc75
13 Jun, 2018 6 commits
- Fix build after merge · 84fee449
  Lucio Maciel authored Jun 13, 2018
  
  84fee449
- Merge pull request #1363 from divyanshub024/keyboard-landscape · 56f14d8d
  Filipe de Lima Brito authored Jun 13, 2018
```
[BUG] Closing keyboard also close the chatroom activity in landscape view
```
  56f14d8d
- Merge pull request #23 from RocketChat/develop · dd64a723
  divyanshu bhargava authored Jun 13, 2018
```
merge
```
  dd64a723
- Merge branch 'develop' into keyboard-landscape · e9402f07
  divyanshu bhargava authored Jun 13, 2018
  
  e9402f07
- Disabling the fullscreen editing view for soft keyboard · 13923910
  divyanshu authored Jun 13, 2018
  
  13923910
- Merge pull request #1317 from RocketChat/feature/db-chatrooms · 41e500a1
  Lucio Maciel authored Jun 13, 2018
```
[Feature] Room DB on Chat rooms screen
```
  41e500a1
12 Jun, 2018 6 commits
- Merge branch 'develop' into feature/db-chatrooms · fc4c7f31
  Lucio Maciel authored Jun 12, 2018
  
  fc4c7f31
- Remove empty function · 8cebabf5
  Lucio Maciel authored Jun 12, 2018
  
  8cebabf5
- Merge branch 'develop' into feature/db-chatrooms · bb20f4bc
  Lucio Maciel authored Jun 12, 2018
  
  bb20f4bc
- Merge pull request #1359 from divyanshub024/improve-hindi-translation · 5db6d4d8
  Filipe de Lima Brito authored Jun 12, 2018
```
[IMPROVEMENT] Improvement in Hindi translations
```
  5db6d4d8
- Improvement in Hindi translation · 23b42ef1
  divyanshu authored Jun 12, 2018
  
  23b42ef1
- Merge pull request #22 from RocketChat/develop · 7968c5f8
  divyanshu bhargava authored Jun 12, 2018
```
merge
```
  7968c5f8
11 Jun, 2018 11 commits
- Merge pull request #1356 from RocketChat/release/2.3.0-hotfix2-to-develop · 4d125818
  Lucio Maciel authored Jun 11, 2018
```
[MERGE] Merge master into develop
```
  4d125818
- Merge branch 'master' into develop · 8022f3b9
  Lucio Maciel authored Jun 11, 2018
  
  8022f3b9
- Merge pull request #1344 from RocketChat/improvement/web-view-cache · 36f6db3d
  Lucio Maciel authored Jun 11, 2018
```
[IMPROVEMENT] Removes web view cookies for OAuth and SSO.
```
  36f6db3d
- Merge pull request #1351 from RocketChat/release/2.3.0-hotfix2 · 72fb3e02
  Lucio Maciel authored Jun 11, 2018
```
[RELEASE] 2.3.2 - HOTFIX
```
  72fb3e02
- Merge branch 'develop' into improvement/web-view-cache · ca906535
  Lucio Maciel authored Jun 11, 2018
  
  ca906535
- Clear the cookies always the webview is opened. · 002a800e
  Filipe de Lima Brito authored Jun 11, 2018
  
  002a800e
- Remove import · fc47bcfe
  Lucio Maciel authored Jun 11, 2018
  
  fc47bcfe
- Remove empty line · bbac4050
  Lucio Maciel authored Jun 11, 2018
  
  bbac4050
- Actually we don't need a whole object, just use a top-level fun · a85ec59d
  Lucio Maciel authored Jun 11, 2018
  
  a85ec59d
- Move SettingsRepository declaration to the correct place · 0816dd5f
  Lucio Maciel authored Jun 11, 2018
  
  0816dd5f
- Move consts declarations inside the class and to the top of it. · 2d354c7c
  Lucio Maciel authored Jun 11, 2018
  
  2d354c7c
10 Jun, 2018 2 commits
- Merge pull request #1354 from divyanshub024/no-chat-msg · 8ea0a6a1
  Filipe de Lima Brito authored Jun 10, 2018
```
[IMPROVEMENT] Code optimisation for empty chat view
```
  8ea0a6a1
- code optimisation for empty file view · 93c5172b
  divyanshu authored Jun 10, 2018
  
  93c5172b
09 Jun, 2018 1 commit
- Merge pull request #21 from RocketChat/develop · f515a781
  divyanshu bhargava authored Jun 09, 2018
```
merge
```
  f515a781
08 Jun, 2018 1 commit
- Merge pull request #1350 from divyanshub024/loading-view-bug · afe5a739
  Filipe de Lima Brito authored Jun 08, 2018
```
[BUG] set loading view to top of all view
```
  afe5a739