Commits · e3989237c707058d88ef90ccacf325c6a18d7ff3 · Administrator / AloqaIM-Android · GitLab

30 Mar, 2018 5 commits
- Merge branch 'develop-2.x' into lang-hindi · e3989237
  divyanshu bhargava authored Mar 30, 2018
  
  e3989237
- Merge remote-tracking branch 'origin/lang-hindi' into lang-hindi · 5f4cce90
  Divyanshu Bhargava authored Mar 30, 2018
  
  5f4cce90
- minor changes · 26641276
  Divyanshu Bhargava authored Mar 30, 2018
  
  26641276
- Merge pull request #959 from RocketChat/perf-and-fixes · 2176c0ce
  Rafael Kellermann Streit authored Mar 30, 2018
```
[HOTFIX] Small pack of fixes
```
  2176c0ce
- Merge pull request #971 from pcforgeek/fix-actionmode-always-showing-on-profile-screen · 373227c4
  Rafael Kellermann Streit authored Mar 30, 2018
```
[FIX] Fixed ActionMode always showing on Profile Screen
```
  373227c4
29 Mar, 2018 27 commits
- Merge branch 'develop-2.x' into perf-and-fixes · e5d8c11a
  Leonardo Aramaki authored Mar 29, 2018
  
  e5d8c11a
- Merge branch 'develop-2.x' into perf-and-fixes · a992e747
  Leonardo Aramaki authored Mar 29, 2018
  
  a992e747
- Merge branch 'develop-2.x' into lang-hindi · 7b0dda78
  Filipe de Lima Brito authored Mar 29, 2018
  
  7b0dda78
- Merge pull request #973 from RocketChat/new/login-with-linkedin · 40fc6074
  Lucio Maciel authored Mar 29, 2018
```
[NEW] Login with Linkedin (OAuth).
```
  40fc6074
- Merge branch 'develop-2.x' into lang-hindi · 07ac0274
  Filipe de Lima Brito authored Mar 29, 2018
  
  07ac0274
- Fix mege issue. · df61f11e
  Lucio Maciel authored Mar 29, 2018
  
  df61f11e
- Merge branch 'develop-2.x' into new/login-with-linkedin · 68e47bd7
  Lucio Maciel authored Mar 29, 2018
  
  68e47bd7
- Merge pull request #969 from RocketChat/new/login-with-google · f9d6c822
  Lucio Maciel authored Mar 29, 2018
```
[NEW] Login with Google (OAuth).
```
  f9d6c822
- Fix merge issue · 35b4b62b
  Lucio Maciel authored Mar 29, 2018
  
  35b4b62b
- More idiomatic kotlin · 632896ef
  Lucio Maciel authored Mar 29, 2018
  
  632896ef
- Merge branch 'develop-2.x' into new/login-with-google · ef21a9ad
  Lucio Maciel authored Mar 29, 2018
  
  ef21a9ad
- Merge pull request #966 from RocketChat/new/login-with-github · a62ab7fe
  Lucio Maciel authored Mar 29, 2018
```
[NEW] Login with GitHub (OAuth).
```
  a62ab7fe
- Merge branch 'develop-2.x' into new/login-with-github · 30eec406
  Lucio Maciel authored Mar 29, 2018
  
  30eec406
- Merge pull request #965 from RocketChat/new/login-with-gitlab · e797d903
  Lucio Maciel authored Mar 29, 2018
```
[NEW] Login with Gitlab (OAuth).
```
  e797d903
- Compilation fixes · 7d813c93
  Lucio Maciel authored Mar 29, 2018
  
  7d813c93
- Merge branch 'develop-2.x' into new/login-with-gitlab · 9876f654
  Lucio Maciel authored Mar 29, 2018
  
  9876f654
- Add login with Linkedin. · 06f8df87
  Filipe de Lima Brito authored Mar 29, 2018
  
  06f8df87
- Merge branch 'develop-2.x' into lang-hindi · f136cf38
  divyanshu bhargava authored Mar 29, 2018
  
  f136cf38
- Localization in Hindi · 3d2ec050
  Divyanshu Bhargava authored Mar 29, 2018
  
  3d2ec050
- Merge pull request #950 from RocketChat/feature/multi-server · 03b36264
  Lucio Maciel authored Mar 29, 2018
```
[WIP][NEW] Initial multi server support...
```
  03b36264
- Some fixes for multi server · c576db29
  Lucio Maciel authored Mar 29, 2018
  
  c576db29
- IntDef expects Ints · bd38ebcb
  Lucio Maciel authored Mar 29, 2018
  
  bd38ebcb
- Merge pull request #961 from RocketChat/feature/migration · c7a33414
  Lucio Maciel authored Mar 29, 2018
```
[NEW][WIP] Migration of authentications from legacy
```
  c7a33414
- Revert removed urls when saving tokens · 261553b4
  Leonardo Aramaki authored Mar 29, 2018
  
  261553b4
- Add check to whether app already a migration already happened · 24a9b0a5
  Leonardo Aramaki authored Mar 29, 2018
  
  24a9b0a5
- Fixed ActionMode always showing on Profile Screen · 73d28230
  pcforgeek authored Mar 29, 2018
  
  73d28230
- Merge pull request #3 from RocketChat/develop-2.x · c256c4e3
  divyanshu bhargava authored Mar 29, 2018
```
merge
```
  c256c4e3
28 Mar, 2018 7 commits
- Save to TokenRepository and guard with try/catch · a43b7c89
  Lucio Maciel authored Mar 28, 2018
  
  a43b7c89
- Merge branch 'feature/multi-server' into feature/migration · 15bbe966
  Lucio Maciel authored Mar 28, 2018
  
  15bbe966
- Add Google login suppot (OAuth). · a63a549b
  Filipe de Lima Brito authored Mar 28, 2018
  
  a63a549b
- Merge branch 'develop-2.x' into feature/multi-server · 0836f86f
  Lucio Maciel authored Mar 28, 2018
  
  0836f86f
- Add github login support. · c72fe476
  Filipe de Lima Brito authored Mar 28, 2018
  
  c72fe476
- Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into new/login-with-gitlab · 043a275f
  Filipe de Lima Brito authored Mar 28, 2018
  
  043a275f
- Add login with Gitlab (OAuth). · cd71b275
  Filipe de Lima Brito authored Mar 28, 2018
  
  cd71b275
27 Mar, 2018 1 commit
- Better multi server support, support push notifications · 4505780c
  Lucio Maciel authored Mar 27, 2018
  
  4505780c

Technounit-GROUP 2023