Commits · d0d5fa7cbe9e2d324d070688484e76bdd8103dba · Administrator / AloqaIM-Android

02 Aug, 2018 3 commits
- 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 3 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
- 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
26 Jul, 2018 5 commits
- Merge pull request #1528 from RocketChat/new/german-translation · 5b66e05c
  Rafael Kellermann Streit authored Jul 26, 2018
```
[NEW] German language support
```
  5b66e05c
- Merge branch 'develop' into new/german-translation · 20b3f486
  Rafael Kellermann Streit authored Jul 26, 2018
  
  20b3f486
- Fix identation · 8abbbc21
  Rafael Kellermann Streit authored Jul 26, 2018
  
  8abbbc21
- Merge pull request #1536 from MasterMNB/new/german-translation · ceacbd37
  Rafael Kellermann Streit authored Jul 26, 2018
```
[I18N] German translation
```
  ceacbd37
- Merge pull request #1538 from Pitstopper/patch-7 · 3cf89758
  Rafael Kellermann Streit authored Jul 26, 2018
```
[I18N] Improvements in Russian translation
```
  3cf89758
25 Jul, 2018 6 commits
- Merge pull request #1534 from divyanshub024/date-format · 4a544458
  Filipe de Lima Brito authored Jul 25, 2018
```
[IMPROVEMENT] Change date format
```
  4a544458
- Format style short to medium · 9a4ccb2c
  divyanshu authored Jul 25, 2018
  
  9a4ccb2c
- Update strings.xml · 64de455e
  Pitstopper authored Jul 25, 2018
  
  64de455e
- Update translation file · 9da93cff
  mkrumbholz authored Jul 25, 2018
```
added translations and did corrections
```
  9da93cff
- date format changed to "MMM dd, YYYY" · fcd8ee4e
  divyanshu authored Jul 25, 2018
  
  fcd8ee4e
- Merge pull request #42 from RocketChat/develop · 1a11fd89
  divyanshu bhargava authored Jul 25, 2018
```
merge
```
  1a11fd89
24 Jul, 2018 5 commits
- Merge branch 'develop' into new/german-translation · 62839020
  Rafael Kellermann Streit authored Jul 24, 2018
  
  62839020
- Merge pull request #1531 from RocketChat/release/merge-2.5.0-on-develop · 0591d06c
  Rafael Kellermann Streit authored Jul 24, 2018
```
[MERGE] Merge 2.5.0 release on develop
```
  0591d06c
- Remove duplicate strings · 01bf1311
  Lucio Maciel authored Jul 24, 2018
  
  01bf1311
- Merge branch 'master' into release/merge-2.5.0-on-develop · 9be27538
  Lucio Maciel authored Jul 24, 2018
  
  9be27538
- Adds german language · 3d8d57e2
  Filipe de Lima Brito authored Jul 24, 2018
  
  3d8d57e2
23 Jul, 2018 6 commits
- Merge pull request #1490 from RocketChat/beta · 68a1626c
  Rafael Kellermann Streit authored Jul 23, 2018
```
[RELEASE] Merge BETA into MASTER
```
  68a1626c
- Increment versionCode · 8dd30e58
  Rafael Kellermann Streit authored Jul 23, 2018
  
  8dd30e58
- Merge pull request #1519 from RocketChat/fix/fix-temporary-status-on-reconnection · afaf3af1
  Filipe de Lima Brito authored Jul 23, 2018
```
[FIX] fix temporary status on reconnection
```
  afaf3af1
- Merge pull request #1516 from Pitstopper/patch-6 · 671b9393
  Filipe de Lima Brito authored Jul 23, 2018
```
[i18n] Improvements in Russian translation
```
  671b9393
- Merge branch 'beta' into fix/fix-temporary-status-on-reconnection · ec005ba9
  Filipe de Lima Brito authored Jul 23, 2018
  
  ec005ba9
- Set the temporary status on reconnection · bfe48550
  Lucio Maciel authored Jul 23, 2018
  
  bfe48550
22 Jul, 2018 1 commit
- [i18n] Improvements in Russian translation · f126405e
  Pitstopper authored Jul 22, 2018
  
  f126405e
21 Jul, 2018 11 commits
- Increment build number · 33adccb6
  Rafael Kellermann Streit authored Jul 21, 2018
  
  33adccb6
- Merge pull request #1515 from RocketChat/fix/more-fixes-for-2.5.0 · 464a414e
  Filipe de Lima Brito authored Jul 21, 2018
```
[FIX] More fixes for 2.5.0 release
```
  464a414e
- Merge branch 'beta' into fix/more-fixes-for-2.5.0 · 7e9682d9
  Lucio Maciel authored Jul 21, 2018
  
  7e9682d9
- More fixes for 2.5.0 release · e7f17783
  Lucio Maciel authored Jul 21, 2018
  
  e7f17783
- Merge pull request #41 from RocketChat/develop · 31289eee
  divyanshu bhargava authored Jul 21, 2018
```
merge
```
  31289eee
- Merge pull request #1513 from RocketChat/i18n/russian-languague-support · 42dc227c
  Filipe de Lima Brito authored Jul 21, 2018
```
[I18n] Russian languague support
```
  42dc227c
- Merge branch 'develop' into i18n/russian-languague-support · 88d78399
  Filipe de Lima Brito authored Jul 21, 2018
  
  88d78399
- Merge pull request #1500 from RocketChat/fix/typing-status · e83f5175
  Filipe de Lima Brito authored Jul 21, 2018
```
[FIX] Typing status appearing for the current logged in user.
```
  e83f5175
- Fix lint errors for all modules · 043df051
  Leonardo Aramaki authored Jul 21, 2018
  
  043df051
- Merge pull request #845 from pcforgeek/add-day-marker-in-chatroom · 7afef2b9
  Rafael Kellermann Streit authored Jul 21, 2018
```
[NEW] Add day marker in chatroom
```
  7afef2b9
- Merge branch 'add-day-marker-in-chatroom' of... · 83f82e1c
  Leonardo Aramaki authored Jul 21, 2018
```
Merge branch 'add-day-marker-in-chatroom' of https://github.com/pcforgeek/Rocket.Chat.Android into pcforgeek-add-day-marker-in-chatroom
```
  83f82e1c