Commits · 36ff29d799028d169e4d4bc32aab891aae7300b7 · Administrator / AloqaIM-Android · GitLab

16 Apr, 2018 8 commits
- Merge pull request #1093 from RocketChat/new/auth-deep-link · 36ff29d7
  Rafael Kellermann Streit authored Apr 16, 2018
```
[NEW] Auth deep link
```
  36ff29d7
- Merge branch 'develop-2.x' into new/auth-deep-link · 6091ee3d
  Lucio Maciel authored Apr 16, 2018
  
  6091ee3d
- Merge pull request #1084 from RocketChat/new/color-attachment-again · ee50029f
  Lucio Maciel authored Apr 16, 2018
```
[NEW] ColorAttachment (need a better name)
```
  ee50029f
- Add lint ignores · d6f2ab4b
  Lucio Maciel authored Apr 16, 2018
  
  d6f2ab4b
- Merge branch 'develop-2.x' into new/auth-deep-link · 81a35435
  Lucio Maciel authored Apr 16, 2018
  
  81a35435
- Merge branch 'develop-2.x' into new/color-attachment-again · 0272f85b
  Lucio Maciel authored Apr 16, 2018
  
  0272f85b
- Add support for auth deeplink · 2c847b7c
  Lucio Maciel authored Apr 16, 2018
```
https://rocket.chat/docs/developer-guides/deeplink/
supports both rocketchat://auth and https://go.rocket.chat/auth urls
```
  2c847b7c
- Merge pull request #1088 from divyanshub024/profile-scroll-view · fc2932b1
  Filipe de Lima Brito authored Apr 16, 2018
```
[New] Added scroll view to profile
```
  fc2932b1
14 Apr, 2018 12 commits
- Added scrollView in profile · a9d5640b
  Divyanshu Bhargava authored Apr 14, 2018
  
  a9d5640b
- Add backup config · a3fef50c
  Lucio Maciel authored Apr 14, 2018
  
  a3fef50c
- Merge pull request #6 from RocketChat/develop-2.x · 513931f0
  divyanshu bhargava authored Apr 14, 2018
```
merge
```
  513931f0
- Implement isTemporary in ColorAttachmentViewModel · 63bc35a5
  Lucio Maciel authored Apr 14, 2018
  
  63bc35a5
- ColorAttachment (need a better name) · 87cb4603
  Lucio Maciel authored Apr 13, 2018
  
  87cb4603
- Merge pull request #1080 from RocketChat/chore/release_candidate_1_v2 · 97045a68
  Rafael Kellermann Streit authored Apr 14, 2018
```
[CHORE] Increment version code to 2.0.0-rc1
```
  97045a68
- Merge branch 'develop-2.x' into chore/release_candidate_1_v2 · 5b03e77f
  Rafael Kellermann Streit authored Apr 14, 2018
  
  5b03e77f
- Merge pull request #1083 from RocketChat/revert-1081-new/color-attachment · 635bb18b
  Rafael Kellermann Streit authored Apr 14, 2018
```
Revert "[NEW] ColorAttachment (need a better name)"
```
  635bb18b
- Revert "[NEW] ColorAttachment (need a better name)" · fbee2b03
  Rafael Kellermann Streit authored Apr 14, 2018
  
  fbee2b03
- Merge branch 'develop-2.x' into chore/release_candidate_1_v2 · 31583ce7
  Rafael Kellermann Streit authored Apr 14, 2018
  
  31583ce7
- Merge pull request #1081 from RocketChat/new/color-attachment · 057d07b8
  Rafael Kellermann Streit authored Apr 14, 2018
```
[NEW] ColorAttachment (need a better name)
```
  057d07b8
- Merge branch 'develop-2.x' into new/color-attachment · 2f934213
  Leonardo Aramaki authored Apr 14, 2018
  
  2f934213
13 Apr, 2018 16 commits
- ColorAttachment (need a better name) · 7c3e43aa
  Lucio Maciel authored Apr 13, 2018
  
  7c3e43aa
- Increment version code to RC1 · 2d4570f3
  Rafael Kellermann Streit authored Apr 13, 2018
  
  2d4570f3
- Merge pull request #1073 from RocketChat/new/offline-sending · 3e480b2f
  Rafael Kellermann Streit authored Apr 13, 2018
```
[IMPROVEMENT] Offline message sending support
```
  3e480b2f
- Fix indentation · d5693bdd
  Leonardo Aramaki authored Apr 13, 2018
  
  d5693bdd
- Fix regression on adapter unsent items to sent · d90e9a4c
  Leonardo Aramaki authored Apr 13, 2018
  
  d90e9a4c
- Merge branch 'develop-2.x' into new/offline-sending · d8024c9e
  Leonardo Aramaki authored Apr 13, 2018
  
  d8024c9e
- Remove unused constant · fbaf478c
  Leonardo Aramaki authored Apr 13, 2018
  
  fbaf478c
- Merge pull request #1079 from RocketChat/fix/more-login-options · f066382a
  Filipe de Lima Brito authored Apr 13, 2018
```
[FIX] Fix more login options
```
  f066382a
- Merge branch 'develop-2.x' into fix/more-login-options · b406d6d8
  Filipe de Lima Brito authored Apr 13, 2018
  
  b406d6d8
- Fix more login options · 86768871
  Lucio Maciel authored Apr 13, 2018
  
  86768871
- Merge pull request #1072 from RocketChat/project/sdk-changes · d0e17275
  Filipe de Lima Brito authored Apr 13, 2018
```
[PROJECT] Change SDK imports.
```
  d0e17275
- Remove hack to connect to unsecured servers · 7b00bc8e
  Leonardo Aramaki authored Apr 13, 2018
  
  7b00bc8e
- Fix loading same page always on chat · 5f2696ac
  Leonardo Aramaki authored Apr 13, 2018
  
  5f2696ac
- Do schedule resend of failed messages whenever connection state is set to... · e605713a
  Leonardo Aramaki authored Apr 13, 2018
```
Do schedule resend of failed messages whenever connection state is set to connected; also fix some typos
```
  e605713a
- Merge branch 'new/offline-sending' of... · c83fedd2
  Leonardo Aramaki authored Apr 13, 2018
```
Merge branch 'new/offline-sending' of github.com:RocketChat/Rocket.Chat.Android into new/offline-sending
```
  c83fedd2
- Prefix keys on SharedPreferencesMessageRepository with the server url · 913d062e
  Leonardo Aramaki authored Apr 13, 2018
  
  913d062e
12 Apr, 2018 4 commits
- Merge branch 'develop-2.x' into new/offline-sending · fc197e77
  Rafael Kellermann Streit authored Apr 12, 2018
  
  fc197e77
- Merge branch 'develop-2.x' into project/sdk-changes · 6d73aff8
  Filipe de Lima Brito authored Apr 12, 2018
  
  6d73aff8
- Merge pull request #1066 from divyanshub024/empty-pin-msg · 2e5639c0
  Rafael Kellermann Streit authored Apr 12, 2018
```
[NEW] No pinned message shown on empty pin List
```
  2e5639c0
- Merge branch 'develop-2.x' into empty-pin-msg · c09f75ff
  Rafael Kellermann Streit authored Apr 12, 2018
  
  c09f75ff

Technounit-GROUP 2023