Commits · bb20f4bc30861b20fa9a2593034f51965519d196 · Administrator / AloqaIM-Android

12 Jun, 2018 1 commit
- Merge branch 'develop' into feature/db-chatrooms · bb20f4bc
  Lucio Maciel authored Jun 12, 2018
  
  bb20f4bc
11 Jun, 2018 11 commits
- Merge pull request #1356 from RocketChat/release/2.3.0-hotfix2-to-develop · 4d125818
  Lucio Maciel authored Jun 11, 2018
```
[MERGE] Merge master into develop
```
  4d125818
- Merge branch 'master' into develop · 8022f3b9
  Lucio Maciel authored Jun 11, 2018
  
  8022f3b9
- Merge pull request #1344 from RocketChat/improvement/web-view-cache · 36f6db3d
  Lucio Maciel authored Jun 11, 2018
```
[IMPROVEMENT] Removes web view cookies for OAuth and SSO.
```
  36f6db3d
- Merge pull request #1351 from RocketChat/release/2.3.0-hotfix2 · 72fb3e02
  Lucio Maciel authored Jun 11, 2018
```
[RELEASE] 2.3.2 - HOTFIX
```
  72fb3e02
- Merge branch 'develop' into improvement/web-view-cache · ca906535
  Lucio Maciel authored Jun 11, 2018
  
  ca906535
- Clear the cookies always the webview is opened. · 002a800e
  Filipe de Lima Brito authored Jun 11, 2018
  
  002a800e
- Remove import · fc47bcfe
  Lucio Maciel authored Jun 11, 2018
  
  fc47bcfe
- Remove empty line · bbac4050
  Lucio Maciel authored Jun 11, 2018
  
  bbac4050
- Actually we don't need a whole object, just use a top-level fun · a85ec59d
  Lucio Maciel authored Jun 11, 2018
  
  a85ec59d
- Move SettingsRepository declaration to the correct place · 0816dd5f
  Lucio Maciel authored Jun 11, 2018
  
  0816dd5f
- Move consts declarations inside the class and to the top of it. · 2d354c7c
  Lucio Maciel authored Jun 11, 2018
  
  2d354c7c
10 Jun, 2018 2 commits
- Merge pull request #1354 from divyanshub024/no-chat-msg · 8ea0a6a1
  Filipe de Lima Brito authored Jun 10, 2018
```
[IMPROVEMENT] Code optimisation for empty chat view
```
  8ea0a6a1
- code optimisation for empty file view · 93c5172b
  divyanshu authored Jun 10, 2018
  
  93c5172b
09 Jun, 2018 1 commit
- Merge pull request #21 from RocketChat/develop · f515a781
  divyanshu bhargava authored Jun 09, 2018
```
merge
```
  f515a781
08 Jun, 2018 6 commits
- Merge pull request #1350 from divyanshub024/loading-view-bug · afe5a739
  Filipe de Lima Brito authored Jun 08, 2018
```
[BUG] set loading view to top of all view
```
  afe5a739
- Merge branch 'develop' into improvement/web-view-cache · 27b77fd4
  Filipe de Lima Brito authored Jun 08, 2018
  
  27b77fd4
- Remove debugging code... · d6ff7773
  Lucio Maciel authored Jun 08, 2018
  
  d6ff7773
- Add a crashlytics wrapper to add more info to crash reports · 886ce558
  Lucio Maciel authored Jun 08, 2018
  
  886ce558
- Merge branch 'develop' into loading-view-bug · f7b670a0
  divyanshu bhargava authored Jun 08, 2018
  
  f7b670a0
- set loading view to top of all view · 44aa1530
  divyanshu authored Jun 08, 2018
  
  44aa1530
07 Jun, 2018 2 commits
- Merge pull request #1348 from divyanshub024/empty-file-view · da3b3ee0
  Filipe de Lima Brito authored Jun 07, 2018
```
[BUG] Empty file view
```
  da3b3ee0
- show empty file view · b1d7014b
  divyanshu authored Jun 07, 2018
  
  b1d7014b
06 Jun, 2018 4 commits
- Remove created by comment · 73eb4e89
  Lucio Maciel authored Jun 06, 2018
  
  73eb4e89
- Merge pull request #1345 from RocketChat/release/2.3.0-hotfix1 · 1182d85f
  Filipe de Lima Brito authored Jun 06, 2018
```
[FIX] 2.3.0 hotfix1
```
  1182d85f
- Separate the current and connecting server url interactors/repository · 2f8a6f1d
  Lucio Maciel authored Jun 06, 2018
```
New Http Logger to not log the auth token. Some dagger scopping changes
```
  2f8a6f1d
- Merge pull request #20 from RocketChat/develop · 0eaa05dd
  divyanshu bhargava authored Jun 06, 2018
```
merge
```
  0eaa05dd
05 Jun, 2018 8 commits
- Fix crash on AuthenticationActivity · 9cb060ab
  Lucio Maciel authored Jun 05, 2018
  
  9cb060ab
- Don't crash if can't launch the browser intent · a6a58c8f
  Lucio Maciel authored Jun 05, 2018
  
  a6a58c8f
- More idiomatic kotlin · dbee09cd
  Lucio Maciel authored Jun 05, 2018
  
  dbee09cd
- Removes web view cookies. · b7b83e11
  Filipe de Lima Brito authored Jun 05, 2018
  
  b7b83e11
- Merge branch 'beta' of github.com:RocketChat/Rocket.Chat.Android into develop · 26ead887
  Filipe de Lima Brito authored Jun 05, 2018
  
  26ead887
- Merge pull request #1337 from divyanshub024/screen-orientation · d46037d4
  Filipe de Lima Brito authored Jun 05, 2018
```
[BUG] SaveInstanceState on orientation change
```
  d46037d4
- Merge branch 'develop' into screen-orientation · fe793f40
  Filipe de Lima Brito authored Jun 05, 2018
  
  fe793f40
- Merge pull request #1314 from RocketChat/beta · 5a9f819f
  Rafael Kellermann Streit authored Jun 05, 2018
```
[RELEASE] Merge beta in master
```
  5a9f819f
04 Jun, 2018 4 commits
- Merge pull request #1340 from RocketChat/improvement/recommended-server-version · 9da37707
  Rafael Kellermann Streit authored Jun 04, 2018
```
[CHORE] Update recommended server version.
```
  9da37707
- Update recommended server version. · b1fc4c56
  Filipe de Lima Brito authored Jun 04, 2018
  
  b1fc4c56
- Merge pull request #1339 from Pitstopper/patch-1 · 45f52fb7
  Filipe de Lima Brito authored Jun 04, 2018
```
[FIX] Update strings.xml (RU)
```
  45f52fb7
- Update strings.xml · 017338e8
  Pitstopper authored Jun 04, 2018
  
  017338e8
02 Jun, 2018 1 commit
- removed unnecessary imports · 4ad42ac5
  Divyanshu Bhargava authored Jun 02, 2018
  
  4ad42ac5