Commits · adf3d7e0ba4f579186459fdb615d6592e210f1db · Administrator / AloqaIM-Android

04 Aug, 2018 2 commits
- Merge remote-tracking branch 'origin/develop-2.x' into develop-2.x · adf3d7e0
  divyanshu authored Aug 04, 2018
  
  adf3d7e0
- Merge pull request #44 from RocketChat/develop · bb4d215f
  divyanshu bhargava authored Aug 04, 2018
```
merge
```
  bb4d215f
03 Aug, 2018 2 commits
- Merge pull request #1571 from TacoTheDank/patch-1 · 2358e213
  Filipe de Lima Brito authored Aug 03, 2018
```
[CHORE] Update dependencies
```
  2358e213
- Merge branch 'develop' into patch-1 · dbc30345
  Filipe de Lima Brito authored Aug 03, 2018
  
  dbc30345
02 Aug, 2018 12 commits
- Merge branch 'master' into develop · 2528778c
  Lucio Maciel authored Aug 02, 2018
  
  2528778c
- Merge branch 'beta' · 797a06fc
  Lucio Maciel authored Aug 02, 2018
  
  797a06fc
- Merge pull request #1577 from RocketChat/merge/2_5_1-to-develop · 3facfd9f
  Lucio Maciel authored Aug 02, 2018
```
[MERGE] 2.5.1 to develop
```
  3facfd9f
- Merge branch 'develop' into merge/2_5_1-to-develop · c67bc832
  Lucio Maciel authored Aug 02, 2018
  
  c67bc832
- Merge pull request #1573 from alexfdz/fix_lint_failure_missing_translations · 1c2e675c
  Lucio Maciel authored Aug 02, 2018
```
Added missing spanish translations
```
  1c2e675c
- #1572 Added missing spanish translations · 27fd680c
  alexfdz authored Aug 02, 2018
  
  27fd680c
- Update build.gradle · 35c61920
  TacoTheDank authored Aug 02, 2018
  
  35c61920
- Update gradle-wrapper.properties · fe09ac85
  TacoTheDank authored Aug 02, 2018
  
  fe09ac85
- Update build.gradle · 13436c7e
  TacoTheDank authored Aug 02, 2018
  
  13436c7e
- Update gradle-wrapper.properties · d0d5fa7c
  TacoTheDank authored Aug 02, 2018
  
  d0d5fa7c
- Update build.gradle · 7a01f213
  TacoTheDank authored Aug 02, 2018
  
  7a01f213
- Update dependencies.gradle · 545422e2
  TacoTheDank authored Aug 02, 2018
  
  545422e2
30 Jul, 2018 8 commits
- Merge pull request #1560 from divyanshub024/drawing-black-color · f68e4a56
  Filipe de Lima Brito authored Jul 30, 2018
```
[BUG] Fixed black colour not selected
```
  f68e4a56
- undo · ea6fc6ac
  divyanshu authored Jul 30, 2018
  
  ea6fc6ac
- fix black color select · 91529a31
  divyanshu authored Jul 30, 2018
  
  91529a31
- Merge pull request #43 from RocketChat/develop · 28dccb99
  divyanshu bhargava authored Jul 30, 2018
```
merge
```
  28dccb99
- Merge pull request #1558 from RocketChat/fix/np-ordered-list-md · 479a70e7
  Leonardo Aramaki authored Jul 30, 2018
```
[HOTFIX] Ordered list should iterate over its direct child first
```
  479a70e7
- chore: incremente version code to 2036 · cacb993c
  Leonardo Aramaki authored Jul 30, 2018
  
  cacb993c
- Markdown parser visitor should set to iterate over itds direct children · 38f30006
  Leonardo Aramaki authored Jul 30, 2018
  
  38f30006
- Merge pull request #1552 from RocketChat/beta · 0c11cb56
  Rafael Kellermann Streit authored Jul 30, 2018
```
[RELEASE] merge 2.5.1 to master
```
  0c11cb56
27 Jul, 2018 16 commits
- Update app version · be97e8ff
  Rafael Kellermann Streit authored Jul 27, 2018
  
  be97e8ff
- Merge pull request #1555 from RocketChat/fix/fix-crash-on-baseviewholder · 5b4d1263
  Filipe de Lima Brito authored Jul 27, 2018
```
[FIX] Check if we are in a RESUMED state before showing the Dialog.
```
  5b4d1263
- Check if we are in a RESUMED state before showing the Dialog. · 1be1872f
  Lucio Maciel authored Jul 27, 2018
  
  1be1872f
- Merge pull request #1554 from RocketChat/improvement/more-idiomatic-kotlin · 87ec4725
  Lucio Maciel authored Jul 27, 2018
```
[IMPROVEMENT] More idiomatic kotlin
```
  87ec4725
- Merge branch 'beta' into improvement/more-idiomatic-kotlin · 98414a20
  Filipe de Lima Brito authored Jul 27, 2018
  
  98414a20
- More idiomatic Kotlin code. · 8bd78835
  Filipe de Lima Brito authored Jul 27, 2018
  
  8bd78835
- Merge pull request #1553 from RocketChat/new/wordpress-oauth-login · f14c561a
  Rafael Kellermann Streit authored Jul 27, 2018
```
[NEW] WordPress Oauth login support
```
  f14c561a
- Removes wildcard. · 181cdf5a
  Filipe de Lima Brito authored Jul 27, 2018
  
  181cdf5a
- Merge branch 'beta' of github.com:RocketChat/Rocket.Chat.Android into new/wordpress-oauth-login · 8ded46ea
  Filipe de Lima Brito authored Jul 27, 2018
  
  8ded46ea
- Adds WordPress Oauth login support · c6c0d963
  Filipe de Lima Brito authored Jul 27, 2018
```
Custom (WordPress on-premise) and WordPress-Com.
```
  c6c0d963
- Merge pull request #1550 from RocketChat/fix/notifications-not-cleared · 1fadf89c
  Lucio Maciel authored Jul 27, 2018
```
[FIX] Opened notifications not cleared
```
  1fadf89c
- Merge branch 'beta' into fix/notifications-not-cleared · e24c8728
  Lucio Maciel authored Jul 27, 2018
  
  e24c8728
- Merge pull request #1551 from RocketChat/fix/fix-auth-deeplink · d48a729d
  Lucio Maciel authored Jul 27, 2018
```
[FIX] fix auth deeplink
```
  d48a729d
- Merge branch 'beta' into fix/notifications-not-cleared · e5666a46
  Leonardo Aramaki authored Jul 27, 2018
  
  e5666a46
- Clear received push notifications which were already opened · b491cf03
  Leonardo Aramaki authored Jul 27, 2018
  
  b491cf03
- Fix deeplinking when only providing the host. · 41bccfd0
  Lucio Maciel authored Jul 24, 2018
  
  41bccfd0