Commits · da4106484ce4e476958f03e000927a101b064689 · Administrator / AloqaIM-Android

13 Jul, 2018 5 commits
- Merge branch 'emoji-skin-tone' of github.com:RocketChat/Rocket.Chat.Android into emoji-skin-tone · da410648
  Leonardo Aramaki authored Jul 13, 2018
  
  da410648
- Unbound max width for emoji viewpager category tabs · 5b8b15f6
  Leonardo Aramaki authored Jul 13, 2018
  
  5b8b15f6
- Merge branch 'develop' into emoji-skin-tone · 4f0e92d4
  Rafael Kellermann Streit authored Jul 13, 2018
  
  4f0e92d4
- Fix ids on the skin tone layout · 0951cb05
  Leonardo Aramaki authored Jul 13, 2018
  
  0951cb05
- Merge pull request #1469 from RocketChat/fix/oauth-path · 8c7899c3
  Filipe de Lima Brito authored Jul 13, 2018
```
[FIX] Custom OAuth url
```
  8c7899c3
11 Jul, 2018 17 commits
- Merge branch 'develop' into fix/oauth-path · 57c042ab
  Filipe de Lima Brito authored Jul 11, 2018
  
  57c042ab
- Merge pull request #1473 from divyanshub024/imp-msg-notify · 3f2148d1
  Filipe de Lima Brito authored Jul 11, 2018
```
[IMPROVEMENT] Flat layout structure in message_list.xml
```
  3f2148d1
- Merge branch 'develop' into fix/oauth-path · 0fd53611
  Filipe de Lima Brito authored Jul 11, 2018
  
  0fd53611
- minor changes · 3ab93aa9
  divyanshu authored Jul 11, 2018
  
  3ab93aa9
- Improvement in message notify layout · fd1283a2
  divyanshu authored Jul 11, 2018
  
  fd1283a2
- Merge pull request #39 from RocketChat/develop · 98b0b8f6
  divyanshu bhargava authored Jul 11, 2018
```
merge
```
  98b0b8f6
- Fix project compilation. · 47106322
  Filipe de Lima Brito authored Jul 11, 2018
  
  47106322
- Merge pull request #1437 from shubhsherl/feature_1394 · 064485e3
  Filipe de Lima Brito authored Jul 11, 2018
```
[NEW] Notify new message in the chat room.
```
  064485e3
- Merge branch 'develop' into feature_1394 · f1444428
  Filipe de Lima Brito authored Jul 11, 2018
  
  f1444428
- Merge branch 'develop' into fix/oauth-path · bca530f6
  Filipe de Lima Brito authored Jul 11, 2018
  
  bca530f6
- Merge pull request #1466 from shubhsherl/bug_1464 · 649e1a9f
  Filipe de Lima Brito authored Jul 11, 2018
```
[FIX] Message retain
```
  649e1a9f
- Merge branch 'develop' into bug_1464 · 075d8054
  Filipe de Lima Brito authored Jul 11, 2018
  
  075d8054
- Merge branch 'develop' into fix/oauth-path · 3a442762
  Filipe de Lima Brito authored Jul 11, 2018
  
  3a442762
- Merge pull request #1446 from RocketChat/improvement/draw-and-app-modularization · 33ed32da
  Filipe de Lima Brito authored Jul 11, 2018
```
[IMPROVEMENT] Added project improvements.
```
  33ed32da
- Add brackets in if-statement · ddb5d538
  Shubham Singh authored Jul 11, 2018
  
  ddb5d538
- Merge branch 'emoji-skin-tone' of github.com:RocketChat/Rocket.Chat.Android into emoji-skin-tone · 0267d882
  Leonardo Aramaki authored Jul 11, 2018
  
  0267d882
- Add null-safety checks · 8040652b
  Leonardo Aramaki authored Jul 11, 2018
  
  8040652b
10 Jul, 2018 7 commits
- Better custom oauth url return. · 88174543
  Filipe de Lima Brito authored Jul 10, 2018
```
The authorizePath can include the host itself, so before concacting the host with the authorizePath check if the host is already present in the authorizePath.
```
  88174543
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into... · 77159deb
  Filipe de Lima Brito authored Jul 10, 2018
```
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into improvement/draw-and-app-modularization
```
  77159deb
- Merge pull request #38 from RocketChat/develop · 4a647259
  divyanshu bhargava authored Jul 10, 2018
```
Merge
```
  4a647259
- Merge branch 'develop' into bug_1464 · 5cc11b9b
  Shubham Singh authored Jul 10, 2018
  
  5cc11b9b
- Fix Message retain issue · 94ce1336
  shubhsherl authored Jul 10, 2018
  
  94ce1336
- Merge pull request #1438 from RocketChat/feature/db-spotlight · 33d605bf
  Filipe de Lima Brito authored Jul 10, 2018
```
[FEATURE] DB Spotlight + fixes
```
  33d605bf
- Merge branch 'develop' into feature/db-spotlight · 8b3f094f
  Filipe de Lima Brito authored Jul 10, 2018
  
  8b3f094f
09 Jul, 2018 4 commits
- Merge branch 'develop' into feature_1394 · 117ea19b
  Filipe de Lima Brito authored Jul 09, 2018
  
  117ea19b
- Merge branch 'develop' into emoji-skin-tone · 9c2a508b
  Filipe de Lima Brito authored Jul 09, 2018
  
  9c2a508b
- Merge pull request #1451 from shubhsherl/bug_1447 · b48db851
  Filipe de Lima Brito authored Jul 09, 2018
```
[FIX] Fix Reply with attachment
```
  b48db851
- Change layout for selecting skin tone · fa1f3266
  Leonardo Aramaki authored Jul 09, 2018
  
  fa1f3266
08 Jul, 2018 1 commit
- Fix reply with attachment · 0ec8af4c
  shubhsherl authored Jul 08, 2018
  
  0ec8af4c
07 Jul, 2018 4 commits
- Fix load and skin tone on reactions · f28d2b39
  Leonardo Aramaki authored Jul 07, 2018
  
  f28d2b39
- Merge branch 'emoji-skin-tone' of github.com:RocketChat/Rocket.Chat.Android into emoji-skin-tone · e02df06c
  Leonardo Aramaki authored Jul 07, 2018
  
  e02df06c
- Hide emoji keyboard when message actions bottomsheet is shown · 67e3b35a
  Leonardo Aramaki authored Jul 07, 2018
  
  67e3b35a
- Lazy load emojis, keep fixed emoji dimensions so that TextView does not need... · 2fb447c7
  Leonardo Aramaki authored Jul 07, 2018
```
Lazy load emojis, keep fixed emoji dimensions so that TextView does not need to relayout everytime its wrapping ViewHolder is recycled and other optimizations
```
  2fb447c7
06 Jul, 2018 2 commits
- Merge pull request #1387 from divyanshub024/send-msg-attachments · af2d382d
  Filipe de Lima Brito authored Jul 06, 2018
```
[NEW] Send message with attachments
```
  af2d382d
- Merge branch 'develop' into send-msg-attachments · 59c2ef88
  Filipe de Lima Brito authored Jul 06, 2018
  
  59c2ef88