Commits · 507413e7c47ae4652e137898e95200d43ce200af · Administrator / AloqaIM-Android

15 Jan, 2019 1 commit
- Merge branch 'develop' into i18n/chinese-translation · 507413e7
  Filipe de Lima Brito authored Jan 15, 2019
  
  507413e7
14 Jan, 2019 6 commits
- Merge pull request #1994 from divyanshub024/fix-alert-dialog · 9ecc0442
  Filipe de Lima Brito authored Jan 14, 2019
```
[BUG] Fix alert dialog Button
```
  9ecc0442
- Fix bad formatting · abd1b487
  Filipe de Lima Brito authored Jan 14, 2019
  
  abd1b487
- Fix Alert Dialog Button · d5acac79
  Divyanshu Bhargava authored Jan 14, 2019
  
  d5acac79
- Merge pull request #71 from RocketChat/develop · b14a2117
  Divyanshu Bhargava authored Jan 14, 2019
```
merge
```
  b14a2117
- Adds Chinese language. · d48b8b6e
  Filipe de Lima Brito authored Jan 14, 2019
  
  d48b8b6e
- Merge pull request #1989 from RocketChat/fix/settings-menu · 07655139
  Rafael Kellermann Streit authored Jan 14, 2019
```
[FIX] Settings menu
```
  07655139
11 Jan, 2019 3 commits
- Increases build number, · 373602fe
  Filipe de Lima Brito authored Jan 11, 2019
  
  373602fe
- Fix the settings items working inconsistently. · b31e9d44
  Filipe de Lima Brito authored Jan 11, 2019
  
  b31e9d44
- Merge pull request #1988 from RocketChat/fix/typing-status · aede1acb
  Rafael Kellermann Streit authored Jan 11, 2019
```
[FIX] Typing status
```
  aede1acb
10 Jan, 2019 2 commits
- increases build number. · 279281a6
  Filipe de Lima Brito authored Jan 10, 2019
  
  279281a6
- Fix a bug that makes the typing status being send multiples time over the socket. · 120dfd0f
  Filipe de Lima Brito authored Jan 10, 2019
  
  120dfd0f
09 Jan, 2019 12 commits
- Merge pull request #1986 from RocketChat/develop · b537e472
  Rafael Kellermann Streit authored Jan 09, 2019
```
[RELEASE] Merge DEVELOP into BETA
```
  b537e472
- Merge branch 'beta' into develop · 35a8ab72
  Filipe de Lima Brito authored Jan 09, 2019
  
  35a8ab72
- Merge pull request #1968 from TheMythPT/patch-2 · d18051a7
  Filipe de Lima Brito authored Jan 09, 2019
```
[I18N] Update Brazilian language translations
```
  d18051a7
- Merge branch 'develop' into patch-2 · bf330304
  Filipe de Lima Brito authored Jan 09, 2019
  
  bf330304
- Merge pull request #1984 from dev-ritik/issue_1943 · b0b9f258
  Filipe de Lima Brito authored Jan 09, 2019
```
[FIX] Mention autocomplete stops working
```
  b0b9f258
- Update string translations. · 16376909
  Filipe de Lima Brito authored Jan 09, 2019
  
  16376909
- Merge branch 'develop' into patch-2 · 43ff6991
  Filipe de Lima Brito authored Jan 09, 2019
  
  43ff6991
- Merge branch 'develop' into issue_1943 · 27a318f1
  Filipe de Lima Brito authored Jan 09, 2019
  
  27a318f1
- Merge pull request #1972 from divyanshub024/patch-1 · 44c8495c
  Filipe de Lima Brito authored Jan 09, 2019
```
[CHORE] Update README.md
```
  44c8495c
- Merge branch 'develop' into patch-1 · a240e7ed
  Filipe de Lima Brito authored Jan 09, 2019
  
  a240e7ed
- Removes unused build status from Travis. Updates coding style section. Uppercase some words. · 1bce883d
  Filipe de Lima Brito authored Jan 09, 2019
  
  1bce883d
- Merge pull request #1974 from RocketChat/fix/user-details · 7f6cf4ff
  Filipe de Lima Brito authored Jan 09, 2019
```
[FIX] User details
```
  7f6cf4ff
08 Jan, 2019 1 commit
- Remove unused layout and improves the showing/hidding toobar anim. · 7440d0b0
  Filipe de Lima Brito authored Jan 08, 2019
  
  7440d0b0
06 Jan, 2019 1 commit
- Fixes @ mention bug. · 073a501c
  dev-ritik authored Jan 06, 2019
  
  073a501c
31 Dec, 2018 4 commits
- Merge pull request #1975 from Jan-NiklasB/patch-1 · e9ed8e21
  Filipe de Lima Brito authored Dec 31, 2018
```
[I18N] Added german translations
```
  e9ed8e21
- Merge branch 'develop' into patch-1 · 1c225e55
  Filipe de Lima Brito authored Dec 31, 2018
  
  1c225e55
- Merge pull request #1977 from Pitstopper/patch-5 · 6e297a0b
  Filipe de Lima Brito authored Dec 31, 2018
```
[I18N] Update  RU strings.xml
```
  6e297a0b
- Open user details view from member list · b8ee33a4
  Filipe de Lima Brito authored Dec 31, 2018
```
- Removes ChatDetailsActivity - using fragment instead;
- more refactor.
```
  b8ee33a4
28 Dec, 2018 10 commits
- Update strings.xml · a8e9bbda
  Pitstopper authored Dec 28, 2018
  
  a8e9bbda
- Merge branch 'develop' into patch-1 · 3355d0d0
  Jan-NiklasB authored Dec 28, 2018
  
  3355d0d0
- Changed "Analyse verfolgung" to "Daten für Analysezwecke" · 62692954
  Jan-NiklasB authored Dec 28, 2018
  
  62692954
- Merge pull request #1967 from GOVINDDIXIT/languages · dad6b622
  Filipe de Lima Brito authored Dec 28, 2018
```
[I18N] Update strings
```
  dad6b622
- Changes the user detais UI. · f015f0d4
  Filipe de Lima Brito authored Dec 28, 2018
  
  f015f0d4
- Update strings.xml · 9334bcb0
  Vitor authored Dec 28, 2018
```
I really need to slow down and read things twice -_-
```
  9334bcb0
- Update strings.xml · 4262cf4f
  Vitor authored Dec 28, 2018
```
Fixed typo -_-
```
  4262cf4f
- Merge branch 'develop' into patch-2 · 5dec3bb2
  Vitor authored Dec 28, 2018
  
  5dec3bb2
- Update strings.xml · 5b8f49e9
  Vitor authored Dec 28, 2018
```
Hope this makes morer sense in the way the sentences are built
```
  5b8f49e9
- Merge branch 'develop' into languages · c519d9d5
  Govind Dixit authored Dec 28, 2018
  
  c519d9d5