Commits · 1483458f05e3f303e65fd5d9e5817a1253bfb62b · Administrator / AloqaIM-Android

28 Aug, 2017 16 commits
- Merge branch 'develop' into userstatus-on-toolbar · 1483458f
  Lucio Maciel authored Aug 28, 2017
  
  1483458f
- Update activity_main.xml · 78b7b4e2
  Filipe de Lima Brito authored Aug 28, 2017
  
  78b7b4e2
- Update RoomToolbar.java · 0bbd1810
  Filipe de Lima Brito authored Aug 28, 2017
  
  0bbd1810
- Add ic_menu_white_24dp.xml · 3fb7630e
  Filipe de Lima Brito authored Aug 28, 2017
  
  3fb7630e
- Add ic_lock_white_24dp.xml · 99890c8c
  Filipe de Lima Brito authored Aug 28, 2017
  
  99890c8c
- Add ic_hashtag_white_24dp.xml · a9f59d71
  Filipe de Lima Brito authored Aug 28, 2017
  
  a9f59d71
- Delete ic_hashtag_black_24dp.xml · 57917df0
  Filipe de Lima Brito authored Aug 28, 2017
  
  57917df0
- Delete ic_lock_black_24dp.xml · a088c4ac
  Filipe de Lima Brito authored Aug 28, 2017
  
  a088c4ac
- Delete ic_menu_black_24dp.xml · 85048e2f
  Filipe de Lima Brito authored Aug 28, 2017
  
  85048e2f
- Add toolbar · 4e97d857
  Filipe de Lima Brito authored Aug 28, 2017
  
  4e97d857
- Delete room_toolbar · 5665cbd7
  Filipe de Lima Brito authored Aug 28, 2017
  
  5665cbd7
- Update RoomPresenter.java · f5afa19e
  Filipe de Lima Brito authored Aug 28, 2017
  
  f5afa19e
- Update AbstractChatRoomFragment.java · b00237ca
  Filipe de Lima Brito authored Aug 28, 2017
  
  b00237ca
- Merge pull request #412 from RocketChat/improvement/ui-fixes · a906c68f
  Lucio Maciel authored Aug 28, 2017
```
Minor UI fixes
```
  a906c68f
- Set background color for root parent layout messages to white · 3915de3d
  Leonardo Aramaki authored Aug 28, 2017
  
  3915de3d
- Change color for hostnames at embeded url messages · d9d678b2
  Leonardo Aramaki authored Aug 28, 2017
  
  d9d678b2
26 Aug, 2017 24 commits
- Update RoomToolbar.java · 81d61b2f
  Filipe de Lima Brito authored Aug 26, 2017
  
  81d61b2f
- Update RoomToolbar.java · 3c1d9c6b
  Filipe de Lima Brito authored Aug 26, 2017
  
  3c1d9c6b
- Update RoomToolbar.java · e1f75be9
  Filipe de Lima Brito authored Aug 26, 2017
  
  e1f75be9
- Update MainActivity.java · 563d1856
  Filipe de Lima Brito authored Aug 26, 2017
  
  563d1856
- Update RoomToolbar.java · e9ded7d6
  Filipe de Lima Brito authored Aug 26, 2017
  
  e9ded7d6
- Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.Android... · e2cd661b
  Filipe de Lima Brito authored Aug 26, 2017
```
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.Android into userstatus-on-toolbar
```
  e2cd661b
- Update activity_main.xml · 7bfaa153
  Filipe de Lima Brito authored Aug 26, 2017
  
  7bfaa153
- Update fragment_home.xml · 17cfb46e
  Filipe de Lima Brito authored Aug 26, 2017
  
  17cfb46e
- Delete room_styles.xml · 2023ded9
  Filipe de Lima Brito authored Aug 26, 2017
  
  2023ded9
- Update RoomToolbar.java · c6bbc28c
  Filipe de Lima Brito authored Aug 26, 2017
  
  c6bbc28c
- Add ic_menu_black_24dp.xml · 3dda009f
  Filipe de Lima Brito authored Aug 26, 2017
  
  3dda009f
- Add ic_user_status_black_24dp.xml · 29e85969
  Filipe de Lima Brito authored Aug 26, 2017
  
  29e85969
- Update room_toolbar.xml · 2f8a967b
  Filipe de Lima Brito authored Aug 26, 2017
  
  2f8a967b
- Update badge_styles.xml · 0add5e13
  Filipe de Lima Brito authored Aug 26, 2017
  
  0add5e13
- Update MainActivity.java · 5ca73afb
  Filipe de Lima Brito authored Aug 26, 2017
  
  5ca73afb
- Update RoomToolbar.java · 4eeeae4b
  Filipe de Lima Brito authored Aug 26, 2017
  
  4eeeae4b
- Add drawables. · 3eaa5096
  Filipe de Lima Brito authored Aug 26, 2017
  
  3eaa5096
- Update room_toolbar.xml · f13e42e7
  Filipe de Lima Brito authored Aug 26, 2017
  
  f13e42e7
- Update colors.xml · 130dbf2f
  Filipe de Lima Brito authored Aug 26, 2017
  
  130dbf2f
- Update RoomFragment.java · 03c9f711
  Filipe de Lima Brito authored Aug 26, 2017
  
  03c9f711
- Update HomeFragment.java · ddc2c549
  Filipe de Lima Brito authored Aug 26, 2017
  
  ddc2c549
- Update AbstractChatRoomFragment.java · b741921f
  Filipe de Lima Brito authored Aug 26, 2017
  
  b741921f
- Update MainActivity.java · a2598f67
  Filipe de Lima Brito authored Aug 26, 2017
  
  a2598f67
- Delete unsed drawables. · 7841a072
  Filipe de Lima Brito authored Aug 26, 2017
  
  7841a072