Commits · b83023b30117c6338037d4199f320356330bd390 · Administrator / AloqaIM-Android

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
02 Jun, 2017 1 commit
- Merge branch 'develop' into fix_noti_and_round_avatar · 06310f5a
  Matheus Jardim Bernardes authored Jun 02, 2017
  
  06310f5a
01 Jun, 2017 5 commits
- Merge pull request #300 from RocketChat/fix_277 · 0fe062dd
  Matheus Jardim Bernardes authored Jun 01, 2017
```
replicating #277 code changes
```
  0fe062dd
- Merge branch 'develop' into fix_277 · b2db56c7
  Rafael Kellermann Streit authored Jun 01, 2017
  
  b2db56c7
- Merge pull request #299 from RocketChat/fix_293 · ea07d7fe
  Matheus Jardim Bernardes authored Jun 01, 2017
```
changed inputType of 2FA EditText to number
```
  ea07d7fe
- Merge branch 'develop' into fix_noti_and_round_avatar · 735b3752
  Matheus Jardim Bernardes authored Jun 01, 2017
  
  735b3752
- replicating #277 code changes · 27d2a56e
  Matheus Jardim authored Jun 01, 2017
  
  27d2a56e
31 May, 2017 6 commits
- Merge branch 'develop' into fix_293 · eec4b475
  Rafael Kellermann Streit authored May 31, 2017
  
  eec4b475
- Merge pull request #298 from RocketChat/fix_251 · e1f68b13
  Rafael Kellermann Streit authored May 31, 2017
```
added fresco clear cache on app start
```
  e1f68b13
- changed inputType of 2FA EditText to number · 94790a7d
  Matheus Jardim authored May 31, 2017
  
  94790a7d
- Merge branch 'develop' into fix_251 · 85ee377c
  Matheus Jardim Bernardes authored May 31, 2017
  
  85ee377c
- Merge branch 'develop' into fix_noti_and_round_avatar · a4fea57f
  Matheus Jardim Bernardes authored May 31, 2017
  
  a4fea57f
- added fresco clear cache on app start · 01ed054f
  Matheus Jardim authored May 31, 2017
  
  01ed054f
30 May, 2017 1 commit
- Merge pull request #296 from RocketChat/fix_251 · 1b154fb9
  Rafael Kellermann Streit authored May 30, 2017
```
Fix 251
```
  1b154fb9
29 May, 2017 1 commit
- missing CI fixes · f91727db
  Matheus Jardim authored May 29, 2017
  
  f91727db
27 May, 2017 2 commits
- added missing data to realMessage · 2c96aa60
  Matheus Jardim authored May 27, 2017
  
  2c96aa60
- changes to AbstractRenderer.shouldHandle · b575b920
  Matheus Jardim authored May 27, 2017
  
  b575b920
23 May, 2017 1 commit
- multiple app dependencies up-to-date · 9064f843
  Matheus Jardim authored May 23, 2017
  
  9064f843
22 May, 2017 3 commits
- Merge pull request #294 from RocketChat/fix_284 · 8f8d9816
  Rafael Kellermann Streit authored May 22, 2017
```
Possible fix for 284
```
  8f8d9816
- bumping app version to v1.0.13 · 0350676e
  Matheus Jardim authored May 22, 2017
  
  0350676e
- updating 3rd party dependencies · 7105f87f
  Matheus Jardim authored May 22, 2017
  
  7105f87f
11 May, 2017 2 commits
- Rough fix and fixbug notification · d0197450
  Nguyen Cong authored May 11, 2017
  
  d0197450
- round avatar · 2954d601
  Nguyen Cong authored May 11, 2017
  
  2954d601