Commits · 5a18fe51705cb93a02b3a0ebb77eaa0d2b989158 · Administrator / AloqaIM-Android

27 Apr, 2018 9 commits
- Merge pull request #11 from RocketChat/develop · 5a18fe51
  divyanshu bhargava authored Apr 27, 2018
```
merge
```
  5a18fe51
- Merge pull request #1195 from RocketChat/new/generic-file-attachment · 77385b2d
  Rafael Kellermann Streit authored Apr 27, 2018
```
[NEW] Add GenericFileAttachment
```
  77385b2d
- Merge branch 'new/generic-file-attachment' of... · 5d9d88d9
  Lucio Maciel authored Apr 27, 2018
```
Merge branch 'new/generic-file-attachment' of github.com:RocketChat/Rocket.Chat.Android into new/generic-file-attachment
```
  5d9d88d9
- Merge branch 'develop' into new/generic-file-attachment · 3715659e
  Lucio Maciel authored Apr 27, 2018
  
  3715659e
- Merge pull request #1167 from divyanshub024/empty-chat-view · a8e4c3c7
  Filipe de Lima Brito authored Apr 27, 2018
```
[NEW] No chat message shown on empty chat list
```
  a8e4c3c7
- fixed position issue · 1b14a0c1
  Divyanshu Bhargava authored Apr 27, 2018
  
  1b14a0c1
- Merge pull request #1204 from RocketChat/fix/reply-with-username · 380d3688
  Rafael Kellermann Streit authored Apr 27, 2018
```
[FIX] Use username when building replies always
```
  380d3688
- Remove Markwon image dependency and ensure @ is being sent along with the username · 7eaa9971
  Leonardo Aramaki authored Apr 27, 2018
  
  7eaa9971
- Add '@' to display name on reply banner if server uses username otherwise stick to the real name · 4780e4eb
  Leonardo Aramaki authored Apr 27, 2018
  
  4780e4eb
26 Apr, 2018 18 commits
- Remove redundant 'suspend' modifiers and unused construtor params · 407a7248
  Leonardo Aramaki authored Apr 26, 2018
  
  407a7248
- Few typo fixes · de2270bb
  Leonardo Aramaki authored Apr 26, 2018
  
  de2270bb
- Use username on the reply/citation markdown · ea6006ba
  Leonardo Aramaki authored Apr 26, 2018
  
  ea6006ba
- Merge branch 'develop' into new/generic-file-attachment · d1454c13
  Rafael Kellermann Streit authored Apr 26, 2018
  
  d1454c13
- Merge pull request #1194 from RocketChat/new/custom-oauth · 6b2bdf3b
  Rafael Kellermann Streit authored Apr 26, 2018
```
[NEW] Support to login using Custom OAuth
```
  6b2bdf3b
- Check the enable social accounts size before showing the FAB. · cda5a0bc
  Filipe de Lima Brito authored Apr 26, 2018
  
  cda5a0bc
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/custom-oauth · 700a17e5
  Filipe de Lima Brito authored Apr 26, 2018
  
  700a17e5
- minor issue · 70d541d9
  Divyanshu Bhargava authored Apr 26, 2018
  
  70d541d9
- added translations · d31bc860
  Divyanshu Bhargava authored Apr 26, 2018
  
  d31bc860
- bug solved · d01d6745
  Divyanshu Bhargava authored Apr 26, 2018
  
  d01d6745
- Merge branch 'develop-2.x' into empty-chat-view · 4668cc99
  Divyanshu Bhargava authored Apr 26, 2018
```
# Conflicts:
#	app/src/main/res/values-hi-rIN/strings.xml
```
  4668cc99
- Merge pull request #1202 from RocketChat/fix/show-more-icon-in-oauth-view · c5d717f3
  Rafael Kellermann Streit authored Apr 26, 2018
```
[FIX]  Show more social account icon not showing
```
  c5d717f3
- Merge pull request #10 from RocketChat/develop · c54037ca
  divyanshu bhargava authored Apr 26, 2018
```
merge
```
  c54037ca
- Fix the show more social account icon not showing, · c862cb9d
  Filipe de Lima Brito authored Apr 26, 2018
```
Plus fix file indentation.
```
  c862cb9d
- Merge pull request #1198 from TheMythPT/patch-1 · 9f49e746
  Rafael Kellermann Streit authored Apr 26, 2018
```
[I18N] French translation (new PR)
```
  9f49e746
- [I18N] French translation (new PR) · 6674dfa8
  Vitor authored Apr 26, 2018
```
New PR as the other seemed to be borked
```
  6674dfa8
- Merge branch 'develop' into new/generic-file-attachment · c1ba6431
  Lucio Maciel authored Apr 26, 2018
  
  c1ba6431
- Enable dom storage. · f5b5e956
  Filipe de Lima Brito authored Apr 26, 2018
  
  f5b5e956
25 Apr, 2018 13 commits
- Add msg_preview_file to string files (not translated) · 7fae0085
  Lucio Maciel authored Apr 25, 2018
  
  7fae0085
- Add GenericFileAttachment · 9c713200
  Lucio Maciel authored Apr 25, 2018
  
  9c713200
- Merge pull request #1188 from TheMythPT/patch-3 · ea3a17cc
  Filipe de Lima Brito authored Apr 25, 2018
```
[I18N] Spanish translation
```
  ea3a17cc
- Add support to login through custom OAuth. · aa9fa69c
  Filipe de Lima Brito authored Apr 25, 2018
  
  aa9fa69c
- Update classpath version. · 24e92939
  Filipe de Lima Brito authored Apr 25, 2018
  
  24e92939
- Update Kotlin version. · e6f84745
  Filipe de Lima Brito authored Apr 25, 2018
  
  e6f84745
- Merge pull request #1186 from TheMythPT/patch-1 · bdac1db4
  Leonardo Aramaki authored Apr 25, 2018
```
[I18N] Fixed typos in pt-BR translation
```
  bdac1db4
- Merge pull request #1192 from RocketChat/i18n/add-french-localization-file · c9c114dd
  Leonardo Aramaki authored Apr 25, 2018
```
[I18N] Add French localization strings.xml file
```
  c9c114dd
- Add French localization strings.xml file · 30a2eff4
  Leonardo Aramaki authored Apr 25, 2018
  
  30a2eff4
- Merge pull request #1191 from RocketChat/fix/updated-reactions-not-showing · c7c63126
  Lucio Maciel authored Apr 25, 2018
```
[FIX] Updated reactions not showing
```
  c7c63126
- Remove log · 7e29bed9
  Leonardo Aramaki authored Apr 25, 2018
  
  7e29bed9
- Add ReactionsAdapter to Moshi instance provided by Dagger · dc5e1525
  Leonardo Aramaki authored Apr 25, 2018
  
  dc5e1525
- Update strings.xml · 2bb5b611
  Vitor authored Apr 25, 2018
```
Very first translation to Spanish
```
  2bb5b611