Commits · 9c23872183c078f2fc64faca12fc3874f30a99a7 · Administrator / AloqaIM-Android · GitLab

28 Apr, 2018 2 commits
- Merge branch 'develop-2.x' into edited-msg-indicator · 9c238721
  Divyanshu Bhargava authored Apr 28, 2018
  
  9c238721
- Merge pull request #12 from RocketChat/develop · fdb5fa10
  divyanshu bhargava authored Apr 28, 2018
```
merge
```
  fdb5fa10
27 Apr, 2018 18 commits
- Merge pull request #1196 from RocketChat/new/download-received-pictures · 32e8e70f
  Rafael Kellermann Streit authored Apr 27, 2018
```
[NEW] Implement save image to gallery
```
  32e8e70f
- Merge branch 'develop' into new/download-received-pictures · b6849d3a
  Leonardo Aramaki authored Apr 27, 2018
  
  b6849d3a
- Fix alignment and padding on image view toolbar · 4508749d
  Leonardo Aramaki authored Apr 27, 2018
  
  4508749d
- Merge pull request #1207 from RocketChat/fix/reply-with-username · dc5b109e
  Rafael Kellermann Streit authored Apr 27, 2018
```
[FIX] Use username when building replies always (update)
```
  dc5b109e
- Merge pull request #1206 from RocketChat/new/forgot-password · 78539dcb
  Rafael Kellermann Streit authored Apr 27, 2018
```
[NEW] Forgot password
```
  78539dcb
- Replace username by real name if 'UI_Use_Real_Name' is set. Make · 98443fcb
  Leonardo Aramaki authored Apr 27, 2018
```
MessageParser as non-singleton since the server settings changes when
swapping between multiple servers.
```
  98443fcb
- Add proper handling for servers that don't support the forgot password feature. · 644d0ceb
  Filipe de Lima Brito authored Apr 27, 2018
  
  644d0ceb
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/forgot-password · 406cf24f
  Filipe de Lima Brito authored Apr 27, 2018
  
  406cf24f
- Add forgot password feature. · 9964385d
  Filipe de Lima Brito authored Apr 27, 2018
  
  9964385d
- 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 20 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
- Add back arrow to toolbar and tweak some styling · 51e3aed7
  Leonardo Aramaki authored Apr 26, 2018
  
  51e3aed7
- Merge branch 'develop' into new/download-received-pictures · 295fed96
  Leonardo Aramaki authored Apr 26, 2018
  
  295fed96
- Request for 'WRITE_EXTERNAL_STORAGE' permission · 4c76d6ca
  Leonardo Aramaki authored Apr 26, 2018
  
  4c76d6ca
- Merge branch 'develop' into new/generic-file-attachment · c1ba6431
  Lucio Maciel authored Apr 26, 2018
  
  c1ba6431

Technounit-GROUP 2023