Commits · 5b8f49e98e749244192703394dfedd6b3a12a2a3 · Administrator / AloqaIM-Android

28 Dec, 2018 1 commit

Vitor authored Dec 28, 2018

Hope this makes morer sense in the way the sentences are built

5b8f49e9

27 Dec, 2018 1 commit

Update strings.xml · f9a41c5f

Vitor authored Dec 27, 2018

Translated a newly added string and fixed some string positions

f9a41c5f

26 Dec, 2018 8 commits
- Merge pull request #1966 from GOVINDDIXIT/fix#1965 · 4975cdb5
  Filipe de Lima Brito authored Dec 26, 2018
```
[IMPROVEMENT] [DOCS] Update PR template
```
  4975cdb5
- Merge branch 'develop' into fix#1965 · a96f728c
  Govind Dixit authored Dec 26, 2018
  
  a96f728c
- Merge pull request #1964 from GOVINDDIXIT/fix#1963 · 40586ec9
  Filipe de Lima Brito authored Dec 26, 2018
```
[NEW][DOCS] Add Issue templates
```
  40586ec9
- Merge branch 'develop' into fix#1965 · 5638d61d
  Govind Dixit authored Dec 26, 2018
  
  5638d61d
- Update PULL_REQUEST_TEMPLATE.md · 490ba9f2
  Govind Dixit authored Dec 26, 2018
  
  490ba9f2
- Merge branch 'develop' into fix#1963 · 50aa2d61
  Govind Dixit authored Dec 26, 2018
  
  50aa2d61
- Merge pull request #1954 from Pitstopper/patch-4 · 5663c465
  Filipe de Lima Brito authored Dec 26, 2018
```
[i18N] Update RU strings.xml
```
  5663c465
- chore: add Issue templates · 4e86d4bc
  Govind Dixit authored Dec 26, 2018
  
  4e86d4bc
21 Dec, 2018 4 commits
- Update strings.xml · 71a09fd4
  Pitstopper authored Dec 21, 2018
  
  71a09fd4
- Update strings.xml · c5981f1c
  Pitstopper authored Dec 21, 2018
  
  c5981f1c
- Update build.gradle · ac4ffd53
  Rafael Kellermann Streit authored Dec 21, 2018
  
  ac4ffd53
- Merge pull request #1953 from RocketChat/fix/emoji-keyboard · d2429363
  Rafael Kellermann Streit authored Dec 21, 2018
```
[FIX] Emoji keyboard
```
  d2429363
20 Dec, 2018 2 commits
- Fix a bug that keeps the emoji keyboard always opened after sendind a message... · 593b38d8
  Filipe de Lima Brito authored Dec 20, 2018
```
Fix a bug that keeps the emoji keyboard always opened after sendind a message with a emoji at the end.
```
  593b38d8
- Fix bug that keeps the emoji keyboard open when changing the screen while it is open. · 49fecc78
  Filipe de Lima Brito authored Dec 20, 2018
  
  49fecc78
19 Dec, 2018 4 commits
- Merge pull request #1949 from Pitstopper/patch-3 · 39defb0a
  Filipe de Lima Brito authored Dec 19, 2018
```
[i18N] Update RU strings.xml
```
  39defb0a
- Merge branch 'develop' into patch-3 · 736abef9
  Filipe de Lima Brito authored Dec 19, 2018
  
  736abef9
- Merge pull request #1948 from RocketChat/new/draft-message · 391a9361
  Rafael Kellermann Streit authored Dec 19, 2018
```
[IMPROVEMENT] Draft messages
```
  391a9361
- Fix bug with lateinit property being not initialized. · a3830e75
  Filipe de Lima Brito authored Dec 19, 2018
  
  a3830e75
18 Dec, 2018 12 commits
- Update strings.xml · 826d21e6
  Pitstopper authored Dec 18, 2018
  
  826d21e6
- Merge branch 'develop' into new/draft-message · 49eb678e
  Filipe de Lima Brito authored Dec 18, 2018
  
  49eb678e
- Merge pull request #1946 from RocketChat/fix/increase-db-retry · a07ec354
  Filipe de Lima Brito authored Dec 18, 2018
```
[FIX] Increase db retries
```
  a07ec354
- Merge branch 'develop' into fix/increase-db-retry · ca672eea
  Filipe de Lima Brito authored Dec 18, 2018
  
  ca672eea
- Merge pull request #1941 from TheMythPT/patch-1 · 9063d0b0
  Filipe de Lima Brito authored Dec 18, 2018
```
[i18N] Update strings.xml
```
  9063d0b0
- Remove unneeded string and fix some wrong formatting for placeholders. · ced32ca9
  Filipe de Lima Brito authored Dec 18, 2018
  
  ced32ca9
- Update string and fix CI failing status. · 3c7ab662
  Filipe de Lima Brito authored Dec 18, 2018
  
  3c7ab662
- Update translations. · 7259fe61
  Filipe de Lima Brito authored Dec 18, 2018
  
  7259fe61
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into patch-1 · 2f5473a4
  Filipe de Lima Brito authored Dec 18, 2018
  
  2f5473a4
- Merge branch 'develop' into new/draft-message · f727cc8f
  Leonardo Aramaki authored Dec 18, 2018
  
  f727cc8f
- Merge branch 'develop' into fix/increase-db-retry · b7813790
  Leonardo Aramaki authored Dec 18, 2018
  
  b7813790
- Merge pull request #1930 from dabbler011/nullfix · 27b10078
  Leonardo Aramaki authored Dec 18, 2018
```
[FIX] roomid or username required bug
```
  27b10078
17 Dec, 2018 8 commits
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/draft-message · 49126a4a
  Filipe de Lima Brito authored Dec 17, 2018
  
  49126a4a
- Draft messages improvements · 531c5a0f
  Filipe de Lima Brito authored Dec 17, 2018
  
  531c5a0f
- Merge branch 'develop' into nullfix · dd3a2f48
  Leonardo Aramaki authored Dec 17, 2018
  
  dd3a2f48
- Merge branch 'develop' into fix/increase-db-retry · 0b5dce3a
  Leonardo Aramaki authored Dec 17, 2018
  
  0b5dce3a
- Merge pull request #1947 from RocketChat/fix-first-time-dm-dont-show-messages · a2535dd8
  Leonardo Aramaki authored Dec 17, 2018
```
[FIX] Insert ChatRoom on db for the direct message about to be displayed
```
  a2535dd8
- Insert ChatRoom on db for the direct message about to be displayed · 073ca90f
  Leonardo Aramaki authored Dec 17, 2018
  
  073ca90f
- Increase db retries · 0e4c9cee
  Lucio Maciel authored Dec 17, 2018
  
  0e4c9cee
- Merge remote-tracking branch 'origin/nullfix' into nullfix · 000dff58
  Akshat Jain authored Dec 17, 2018
  
  000dff58