Commits · 14133a9a71f51d10676dd09c96f8be67a2f6b69c · Administrator / AloqaIM-Android

04 Jul, 2017 8 commits
- Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.Android into develop · 14133a9a
  Filipe de Lima Brito authored Jul 04, 2017
  
  14133a9a
- Merge pull request #334 from filipedelimabrito/develop · 625dbcaf
  Leonardo Aramaki authored Jul 04, 2017
```
Fix #268
```
  625dbcaf
- Merge branch 'develop' into develop · db07be9b
  Leonardo Aramaki authored Jul 04, 2017
  
  db07be9b
- Update MessageRenderer.java · bdbb6d94
  Filipe de Lima Brito authored Jul 04, 2017
  
  bdbb6d94
- Add waiting view to hostname screen · 2aeb9ed5
  Filipe de Lima Brito authored Jul 04, 2017
  
  2aeb9ed5
- Merge pull request #338 from RocketChat/ghTemplate · cac8330a
  Rafael Kellermann Streit authored Jul 04, 2017
```
Asking for device name and android version on issue template
```
  cac8330a
- Update MessageRenderer.java · 221a90e5
  Filipe de Lima Brito authored Jul 04, 2017
  
  221a90e5
- aasking for device name and android version on issue template · 6a52974f
  Matheus Jardim authored Jul 04, 2017
  
  6a52974f
01 Jul, 2017 9 commits
- Merge branch 'develop' into develop · 1dd4230a
  Rafael Kellermann Streit authored Jul 01, 2017
  
  1dd4230a
- Merge pull request #333 from RocketChat/v1_0_15 · a4bcfe64
  Rafael Kellermann Streit authored Jul 01, 2017
```
bumping app version to 1.0.15
```
  a4bcfe64
- Handle Unsynced messages · 18a4ea4d
  Filipe de Lima Brito authored Jul 01, 2017
  
  18a4ea4d
- Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.Android into iss268 · 371eaf41
  Filipe de Lima Brito authored Jul 01, 2017
  
  371eaf41
- bumping app version · 6dee6ab3
  Matheus Jardim authored Jul 01, 2017
  
  6dee6ab3
- Rename attrs · 5e6ad5c8
  Filipe de Lima Brito authored Jul 01, 2017
  
  5e6ad5c8
- Update classpath · 7863cc5b
  Filipe de Lima Brito authored Jul 01, 2017
  
  7863cc5b
- Merge pull request #332 from RocketChat/fix/bump-rpc-timeout · 982d5e4e
  Matheus Jardim Bernardes authored Jul 01, 2017
```
Bumped timeout from 4000 to 20000 ms as it seems a more reasonable
```
  982d5e4e
- Bumped timeout from 4000 to 20000 ms as it seems a more reasonable · 5ea3a3d5
  Leonardo Aramaki authored Jul 01, 2017
```
threshold.

Also updating a sending message's sync state to SyncState.SYNCED at Realm
in case a sending message is successfully sent.
This sync status update fix is related to issue
https://github.com/RocketChat/Rocket.Chat.Android/issues/268
```
  5ea3a3d5
24 Jun, 2017 1 commit
- Merge pull request #307 from VoiSmart/fix_247_change-hostname · 841593bc
  Matheus Jardim Bernardes authored Jun 24, 2017
```
Fix 247 change hostname
```
  841593bc
23 Jun, 2017 2 commits
- Merge branch 'develop' into fix_247_change-hostname · 606d8ea0
  Vincenzo authored Jun 23, 2017
  
  606d8ea0
- Merge pull request #320 from RocketChat/fix_318 · 0afa0820
  Rafael Kellermann Streit authored Jun 23, 2017
```
Rotating display looses text in input
```
  0afa0820
16 Jun, 2017 1 commit
- #1 - Change Hostname on logout - fixed RC Cache Crash and RealmConfiguration access same file error · 5f7280f6
  Enzo authored Jun 16, 2017
  
  5f7280f6
13 Jun, 2017 1 commit
- Rotating display looses text in input · 1d721b36
  Matheus Jardim authored Jun 13, 2017
  
  1d721b36
12 Jun, 2017 1 commit

Merge branch 'fix_247_change-hostname' of... · b83023b3

Enzo authored Jun 12, 2017

Merge branch 'fix_247_change-hostname' of https://github.com/VoiSmart/Rocket.Chat.Android into fix_247_change-hostname

pull from repo

b83023b3

09 Jun, 2017 3 commits
- Merge branch 'develop' into fix_247_change-hostname · d9aff05a
  Vincenzo authored Jun 09, 2017
  
  d9aff05a
- Merge pull request #317 from RocketChat/codacy-badge · 449d6243
  Rafael Kellermann Streit authored Jun 09, 2017
```
Create README.md
```
  449d6243
- Create README.md · aea82e9e
  Matheus Jardim Bernardes authored Jun 09, 2017
  
  aea82e9e
08 Jun, 2017 3 commits
- Merge pull request #309 from RocketChat/v1_0_14 · 654b6bb6
  Matheus Jardim Bernardes authored Jun 08, 2017
```
bumping versionCode and versionName
```
  654b6bb6
- bumping versionCode and versionName · fb01741c
  Matheus Jardim authored Jun 08, 2017
  
  fb01741c
- Merge pull request #308 from RocketChat/fix_283 · 92897f89
  Matheus Jardim Bernardes authored Jun 08, 2017
```
Fix PR #283
```
  92897f89
07 Jun, 2017 5 commits
- Merge branch 'fix_247_change-hostname' of... · cb42e219
  Enzo authored Jun 07, 2017
```
Merge branch 'fix_247_change-hostname' of https://github.com/VoiSmart/Rocket.Chat.Android into fix_247_change-hostname

merging from origin
```
  cb42e219
- Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.Android... · a59a2c6a
  Enzo authored Jun 07, 2017
```
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.Android into fix_247_change-hostname

merging from remote upstream (RocketChat.Android repo)
```
  a59a2c6a
- Merge branch 'develop' into fix_noti_and_round_avatar · 3f2453b2
  Matheus Jardim Bernardes authored Jun 07, 2017
  
  3f2453b2
- Merge branch 'develop' into fix_247_change-hostname · 4bf98ee3
  Matheus Jardim Bernardes authored Jun 07, 2017
  
  4bf98ee3
- Merge pull request #302 from RocketChat/fix_293_2 · 0d7ec7c9
  Matheus Jardim Bernardes authored Jun 07, 2017
```
moved OAuth webviews loading from onResume to onCreate
```
  0d7ec7c9
06 Jun, 2017 2 commits
- Merge branch 'develop' into fix_293_2 · 34df0085
  Matheus Jardim Bernardes authored Jun 06, 2017
  
  34df0085
- Merge pull request #303 from RocketChat/v1.0.13 · f85c1cc2
  Matheus Jardim Bernardes authored Jun 06, 2017
```
bumping versionCode
```
  f85c1cc2
05 Jun, 2017 2 commits
- #1 - Change Hostname on logout - added comments · a805d039
  Enzo authored Jun 05, 2017
  
  a805d039
- #1 - Change Hostname on logout - first commit · 79024d78
  Enzo authored Jun 05, 2017
  
  79024d78
03 Jun, 2017 2 commits
- bumping versionCode · 30eb5f07
  Matheus Jardim authored Jun 03, 2017
  
  30eb5f07
- moved OAuth webviews loading from onResume to onCreate · 70435e8b
  Matheus Jardim authored Jun 03, 2017
  
  70435e8b