Commits · 6ba5374ced18ff2601eda54558538a4a571a1e40 · Administrator / AloqaIM-Android · GitLab

31 Mar, 2018 10 commits
- Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into... · 6ba5374c
  Rafael Kellermann Streit authored Mar 31, 2018
```
Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into chore/increment_build_beta1
```
  6ba5374c
- Merge pull request #887 from Shailesh351/sort · 83b4d94c
  Rafael Kellermann Streit authored Mar 31, 2018
```
[NEW] feat: Add sorting option for chatrooms
```
  83b4d94c
- Increment version to beta1 & 2001 · 7ef5572f
  Rafael Kellermann Streit authored Mar 31, 2018
  
  7ef5572f
- Merge pull request #991 from RocketChat/remove-facebook-twitter-meteor-for-now · fa6fdd04
  Rafael Kellermann Streit authored Mar 31, 2018
```
[FIX] Remove Facebook, Twitter and Meteor auth methods
```
  fa6fdd04
- Merge pull request #987 from RocketChat/layout/remove-social-account-view · 42e3bdf9
  Rafael Kellermann Streit authored Mar 31, 2018
```
[LAYOUT] Remove social account view is there is no service available.
```
  42e3bdf9
- Merge pull request #986 from RocketChat/fix/login-with-oauth · 420913be
  Rafael Kellermann Streit authored Mar 31, 2018
```
[FIX] Issues with OAuth.
```
  420913be
- Show/hide chatroom type icon when accessing members list · 7913eb5c
  Leonardo Aramaki authored Mar 31, 2018
  
  7913eb5c
- Remove Facebook, Twitter and Meteor auth methods until we have them implemented · 0f6d0569
  Leonardo Aramaki authored Mar 31, 2018
  
  0f6d0569
- Add workarround when using only Google OAuth. · 1bf32922
  Filipe de Lima Brito authored Mar 31, 2018
  
  1bf32922
- fix: Grouping for Live Chat · 392faa90
  Shailesh Baldaniya authored Mar 31, 2018
  
  392faa90
30 Mar, 2018 12 commits
- Removes the social accounts if there is no OAuth service available. · 12795148
  Filipe de Lima Brito authored Mar 30, 2018
  
  12795148
- Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into fix/login-with-oauth · 8685b5dd
  Filipe de Lima Brito authored Mar 30, 2018
  
  8685b5dd
- fix: Resovle merge conflicts · d0ce271b
  Shailesh Baldaniya authored Mar 30, 2018
  
  d0ce271b
- Fix some issues with OAuth. · 29355692
  Filipe de Lima Brito authored Mar 30, 2018
  
  29355692
- fix: Strings for language traslations · 917b8fb1
  Shailesh Baldaniya authored Mar 15, 2018
  
  917b8fb1
- fix: Headers on search and search results on query · 4d6cd6a0
  Shailesh Baldaniya authored Mar 14, 2018
  
  4d6cd6a0
- feat: Add string traslation for portuguese(pt-rBR) · 779f19d6
  Shailesh Baldaniya authored Mar 14, 2018
  
  779f19d6
- feat: Add Header for chatroom types · 2fcc8b33
  Shailesh Baldaniya authored Mar 14, 2018
  
  2fcc8b33
- feat: Add section adapter · 844403b9
  Shailesh Baldaniya authored Mar 14, 2018
  
  844403b9
- feat: Add sorting option for chatrooms · 0833e3d0
  Shailesh Baldaniya authored Mar 12, 2018
  
  0833e3d0
- 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 18 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 pull request #973 from RocketChat/new/login-with-linkedin · 40fc6074
  Lucio Maciel authored Mar 29, 2018
```
[NEW] Login with Linkedin (OAuth).
```
  40fc6074
- 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 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

Technounit-GROUP 2023