Commits · 63c66332455548f47cb55cc0a2d365013fa2ed10 · Administrator / AloqaIM-Android

29 Oct, 2018 2 commits
- Change string from Permalink to Copy permalink and added to all locales · 63c66332
  Leonardo Aramaki authored Oct 29, 2018
  
  63c66332
- Add message action menu item to copy permalink from tapped message · 91f8ec46
  Leonardo Aramaki authored Oct 29, 2018
  
  91f8ec46
24 Oct, 2018 3 commits
- Merge pull request #1770 from Tunous/members-user-status · 2bd72661
  Filipe de Lima Brito authored Oct 24, 2018
```
[NEW] Display user status indicator in members list
```
  2bd72661
- Merge branch 'develop' into members-user-status · f0e411c4
  Filipe de Lima Brito authored Oct 24, 2018
  
  f0e411c4
- Merge pull request #1789 from RocketChat/fix/gif-upload · a1255c05
  Filipe de Lima Brito authored Oct 24, 2018
```
[FIX] Gif files not being animated.
```
  a1255c05
23 Oct, 2018 3 commits
- Merge branch 'develop' into fix/gif-upload · 3f640077
  Filipe de Lima Brito authored Oct 23, 2018
  
  3f640077
- Merge pull request #1788 from RocketChat/support-regular-line-breaks · 427d6ced
  Leonardo Aramaki authored Oct 23, 2018
```
[IMPROVEMENT] Add support to regular line breaks (\n)
```
  427d6ced
- Merge branch 'develop' into members-user-status · c32b2e8e
  Filipe de Lima Brito authored Oct 23, 2018
  
  c32b2e8e
22 Oct, 2018 3 commits
- Merge branch 'develop' into fix/gif-upload · 38a3796f
  Filipe de Lima Brito authored Oct 22, 2018
  
  38a3796f
- Fixes gif files not being animated. · de006382
  Filipe de Lima Brito authored Oct 22, 2018
  
  de006382
- Add support to regular line breaks (\n) · 7730c958
  Leonardo Aramaki authored Oct 22, 2018
  
  7730c958
21 Oct, 2018 1 commit
- Merge pull request #1783 from Tunous/search-dismiss-emoji · 8bb8198b
  Leonardo Aramaki authored Oct 21, 2018
```
[IMPROVEMENT] Dismiss emoji keyboard when starting search
```
  8bb8198b
20 Oct, 2018 4 commits
- Fix emoji keyboard not hiding when closing search · 2879f73e
  Łukasz Rutkowski authored Oct 20, 2018
  
  2879f73e
- Fix reaction button not changing to reaction icon · e05a8379
  Łukasz Rutkowski authored Oct 20, 2018
  
  e05a8379
- Dismiss emoji keyboard when starting search · 4cf60e36
  Łukasz Rutkowski authored Oct 20, 2018
  
  4cf60e36
- Use drawableStart instead of separate ImageView for status indicator · b250e7be
  Łukasz Rutkowski authored Oct 20, 2018
  
  b250e7be
19 Oct, 2018 10 commits
- Merge branch 'develop' into members-user-status · 016ae737
  Leonardo Aramaki authored Oct 19, 2018
  
  016ae737
- Merge pull request #1735 from kb0304/search_click · 79bc2d7d
  Leonardo Aramaki authored Oct 19, 2018
```
[NEW] Not show last message on search icon click
```
  79bc2d7d
- Merge branch 'develop' into search_click · dc38b200
  Rafael Kellermann Streit authored Oct 19, 2018
  
  dc38b200
- Merge pull request #1732 from divyanshub024/visible-ktx · aceef97b
  Rafael Kellermann Streit authored Oct 19, 2018
```
[IMPROVEMENT] Use isVisible Ktx function rather than extension function
```
  aceef97b
- minor changes · 03b64eb2
  divyanshu authored Oct 19, 2018
  
  03b64eb2
- resolve conflicts · 2502679b
  divyanshu authored Oct 19, 2018
  
  2502679b
- Merge branch 'develop-2.x' into visible-ktx · 0e768192
  divyanshu authored Oct 19, 2018
```
# Conflicts:
#	app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt
#	build.gradle
```
  0e768192
- Merge pull request #61 from RocketChat/develop · 2e52e774
  Divyanshu Bhargava authored Oct 19, 2018
```
merge
```
  2e52e774
- Merge branch 'develop' into search_click · 5154d4ff
  Rafael Kellermann Streit authored Oct 19, 2018
  
  5154d4ff
- Merge pull request #1780 from RocketChat/beta · 9b4af327
  Rafael Kellermann Streit authored Oct 19, 2018
```
[CHORE] Merge BETA into DEVELOP
```
  9b4af327
18 Oct, 2018 4 commits
- Increment app version · 65de72ff
  Rafael Kellermann Streit authored Oct 18, 2018
  
  65de72ff
- Merge pull request #1778 from RocketChat/show-stripped-markdown-on-chats-list · c1c85633
  Rafael Kellermann Streit authored Oct 18, 2018
```
[IMPROVEMENT] Show last message on chats list with stripped markdown syntax
```
  c1c85633
- Show last message on chats list with stripped markdown syntax · df089349
  Leonardo Aramaki authored Oct 18, 2018
  
  df089349
- Merge pull request #1775 from RocketChat/beta · 71410e16
  Rafael Kellermann Streit authored Oct 18, 2018
```
[RELEASE] Update DEVELOP with BETA
```
  71410e16
17 Oct, 2018 7 commits
- Remove duplicate setupConnectionInfo(currentServer) · 09c179f1
  Filipe de Lima Brito authored Oct 17, 2018
  
  09c179f1
- Merge pull request #1771 from RocketChat/fix/onboarding · dbfcde7e
  Filipe de Lima Brito authored Oct 17, 2018
```
[FIX] Fixes for Onboarding/Authentication
```
  dbfcde7e
- Merge branch 'beta' into fix/onboarding · 71328567
  Filipe de Lima Brito authored Oct 17, 2018
  
  71328567
- Fix crash after sign in with OAuth account. Fix SAML and Custom OAuth buttons... · b1da349e
  Filipe de Lima Brito authored Oct 17, 2018
```
Fix crash after sign in with OAuth account. Fix SAML and Custom OAuth buttons not showing. Fix style for Custom OAuth and SAML buttons.
```
  b1da349e
- Display user status indicator in members list · af651b43
  Łukasz Rutkowski authored Oct 17, 2018
  
  af651b43
- Merge pull request #1767 from RocketChat/fix/3.0.0-beta2-fixes · c9471b6a
  Rafael Kellermann Streit authored Oct 17, 2018
```
[FIX] 3.0.0-beta2 fixes
```
  c9471b6a
- Add missing imports · 0a57fbd8
  Lucio Maciel authored Oct 17, 2018
  
  0a57fbd8
16 Oct, 2018 3 commits
- Merge branch 'fix/3.0.0-beta2-fixes' of... · f0e4605c
  Leonardo Aramaki authored Oct 16, 2018
```
Merge branch 'fix/3.0.0-beta2-fixes' of github.com:RocketChat/Rocket.Chat.Android into fix/3.0.0-beta2-fixes
```
  f0e4605c
- Make LinkVisitor to visit at document scope instead of text, since long blocks... · 893de9f3
  Leonardo Aramaki authored Oct 16, 2018
```
Make LinkVisitor to visit at document scope instead of text, since long blocks of text with multiple paragraphs can lead to bad perf
```
  893de9f3
- Update version · 861fc125
  Rafael Kellermann Streit authored Oct 16, 2018
  
  861fc125