Commits · 907a2133edf0cf608a5953c05e83d62a70b2ad13 · Administrator / AloqaIM-Android · GitLab

08 Apr, 2018 4 commits
- Merge branch 'develop-2.x' into change-password-layout · 907a2133
  divyanshu bhargava authored Apr 08, 2018
  
  907a2133
- Improvement in fragment_password layout · 848b88ef
  Divyanshu Bhargava authored Apr 08, 2018
  
  848b88ef
- Merge pull request #1000 from RocketChat/docs/planning_document · 48d1e77a
  Rafael Kellermann Streit authored Apr 08, 2018
```
[DOCS] Creates a initial version of our planning document
```
  48d1e77a
- Fixed some issues suggested from @aniketsingh03 · afad4b99
  Rafael Kellermann Streit authored Apr 08, 2018
  
  afad4b99
07 Apr, 2018 8 commits
- Merge pull request #4 from RocketChat/develop-2.x · 678a84e0
  divyanshu bhargava authored Apr 07, 2018
```
merge
```
  678a84e0
- Merge pull request #1042 from RocketChat/chore/increment_build_beta5 · 83b14b60
  Rafael Kellermann Streit authored Apr 07, 2018
```
[CHORE] Increment build version to beta5
```
  83b14b60
- Merge branch 'develop-2.x' into chore/increment_build_beta5 · 4b771b02
  Rafael Kellermann Streit authored Apr 07, 2018
  
  4b771b02
- Merge pull request #3 from RocketChat/develop-2.x · 912363f1
  divyanshu bhargava authored Apr 07, 2018
```
merge
```
  912363f1
- Merge pull request #1041 from RocketChat/fix/swipe-swapping · e80ef3fe
  Leonardo Aramaki authored Apr 07, 2018
```
[FIX] Broken swype by removing the re-enable suggestions code
```
  e80ef3fe
- Fix broken swipe by removing the re-enable suggestions code · 284fcdc3
  Leonardo Aramaki authored Apr 07, 2018
  
  284fcdc3
- Merge pull request #1040 from RocketChat/fix/quote-missing · 40c02838
  Leonardo Aramaki authored Apr 07, 2018
```
[HOTFIX] Fix regex used to strip quote markdown links
```
  40c02838
- Fix regex used to strip quote markdown links · e493926b
  Leonardo Aramaki authored Apr 07, 2018
  
  e493926b
06 Apr, 2018 27 commits
- Increment build version · 032d5e46
  Rafael Kellermann Streit authored Apr 06, 2018
  
  032d5e46
- Merge pull request #1038 from RocketChat/new/direct-reply · d8219843
  Rafael Kellermann Streit authored Apr 06, 2018
```
[NEW] Direct Reply from notification
```
  d8219843
- Merge branch 'develop-2.x' into new/direct-reply · 3e7984fd
  Rafael Kellermann Streit authored Apr 06, 2018
  
  3e7984fd
- Inject NotificationManager · 08174a78
  Leonardo Aramaki authored Apr 06, 2018
  
  08174a78
- Wipe out unused method · e3a4df6b
  Leonardo Aramaki authored Apr 06, 2018
  
  e3a4df6b
- If api level under 23 (N) then show the MainActivity - at first · e5aa863f
  Leonardo Aramaki authored Apr 06, 2018
  
  e5aa863f
- Remove log · a1793f89
  Leonardo Aramaki authored Apr 06, 2018
  
  a1793f89
- Change method called to get NotificationManager to work below api 23 · c2b77d6e
  Leonardo Aramaki authored Apr 06, 2018
  
  c2b77d6e
- Show error Toast when reply fails and show the notification again · 3a91f0c8
  Leonardo Aramaki authored Apr 06, 2018
  
  3a91f0c8
- Merge pull request #1037 from divyanshub024/RTL-layout · 18e1cf9e
  Filipe de Lima Brito authored Apr 06, 2018
```
Improvement in item_chat layout
```
  18e1cf9e
- Merge branch 'develop-2.x' into RTL-layout · 35fe51af
  divyanshu bhargava authored Apr 06, 2018
  
  35fe51af
- Merge pull request #1036 from RocketChat/chore/increment_build_beta4 · c9fe5d91
  Rafael Kellermann Streit authored Apr 06, 2018
```
[CHORE] Increment versionCode to 2006
```
  c9fe5d91
- Improvement in item_chat layout · ed1635be
  Divyanshu Bhargava authored Apr 06, 2018
  
  ed1635be
- Implement direct reply on Android N and above · aa0f574b
  Leonardo Aramaki authored Apr 06, 2018
  
  aa0f574b
- Merge branch 'develop-2.x' into chore/increment_build_beta4 · 299e823c
  Rafael Kellermann Streit authored Apr 06, 2018
  
  299e823c
- Merge pull request #1034 from RocketChat/improvement/get-own-current-status · 3e3b5726
  Rafael Kellermann Streit authored Apr 06, 2018
```
[IMPROVEMENT] Get own current status (REST).
```
  3e3b5726
- Merge branch 'develop-2.x' into chore/increment_build_beta4 · 12696d20
  Rafael Kellermann Streit authored Apr 06, 2018
  
  12696d20
- Increment versionCode to 2006 · 9a53ca8c
  Rafael Kellermann Streit authored Apr 06, 2018
  
  9a53ca8c
- Merge branch 'develop-2.x' into improvement/get-own-current-status · 232e03c2
  Filipe de Lima Brito authored Apr 06, 2018
  
  232e03c2
- Merge pull request #1035 from RocketChat/fix/chatroom-crash · 4b47b911
  Rafael Kellermann Streit authored Apr 06, 2018
```
[FIX] Crash on Chat Room screen
```
  4b47b911
- Merge branch 'develop-2.x' into fix/chatroom-crash · 9914172c
  Filipe de Lima Brito authored Apr 06, 2018
  
  9914172c
- Fix · f06bd9d1
  Lucio Maciel authored Apr 06, 2018
```
https://fabric.io/rocketchat3/android/apps/chat.rocket.android/issues/5ac6b5f636c7b23527a569d0
```
  f06bd9d1
- Merge branch 'develop-2.x' into improvement/get-own-current-status · 77b9cbe4
  Filipe de Lima Brito authored Apr 06, 2018
  
  77b9cbe4
- Merge pull request #989 from divyanshub024/ver-name-number · eea3cb16
  Filipe de Lima Brito authored Apr 06, 2018
```
[NEW] Show version name/code in about screen
```
  eea3cb16
- Merge branch 'develop-2.x' into ver-name-number · 7ffa0e14
  Filipe de Lima Brito authored Apr 06, 2018
  
  7ffa0e14
- Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into... · 46821a8a
  Filipe de Lima Brito authored Apr 06, 2018
```
Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into improvement/get-own-current-status
```
  46821a8a
- Get own current status. · 3e9e5475
  Filipe de Lima Brito authored Apr 06, 2018
  
  3e9e5475
05 Apr, 2018 1 commit
- Merge pull request #1033 from RocketChat/chore/increment_build_beta4 · c0a12e1e
  Rafael Kellermann Streit authored Apr 05, 2018
```
[CHORE] Increment versionCode
```
  c0a12e1e

Technounit-GROUP 2023