Commits · befa16fcbb18a5c862222ff0303c2ea2f6cc7f62 · Administrator / AloqaIM-Android

14 Feb, 2018 5 commits
- Merge branch 'filipedelimabrito-feature/document-upload' into develop-2.x · befa16fc
  Lucio Maciel authored Feb 14, 2018
  
  befa16fc
- Use a temporary file for uploading. · de94ddbf
  Lucio Maciel authored Feb 14, 2018
  
  de94ddbf
- Merge branch 'feature/document-upload' of... · c8efc00b
  Lucio Maciel authored Feb 14, 2018
```
Merge branch 'feature/document-upload' of https://github.com/filipedelimabrito/Rocket.Chat.Android into filipedelimabrito-feature/document-upload
```
  c8efc00b
- Fix wrong indentation. · c4a62ea8
  Filipe de Lima Brito authored Feb 14, 2018
  
  c4a62ea8
- Revert "Show groupable messages." · aa269d78
  Filipe de Lima Brito authored Feb 14, 2018
  
  aa269d78
13 Feb, 2018 1 commit
- Add UriInteractor.kt and rename relative_layout to root_layout (fragment_chat_room.xml) · e207fa00
  Filipe de Lima Brito authored Feb 13, 2018
  
  e207fa00
12 Feb, 2018 1 commit

Merge branch 'develop-2.x' of... · 3f67f9c2

Filipe de Lima Brito authored Feb 12, 2018

Merge branch 'develop-2.x' of https://github.com/RocketChat/Rocket.Chat.Android into feature/document-upload

3f67f9c2

10 Feb, 2018 1 commit
- Bump version · 7455ab37
  Lucio Maciel authored Feb 10, 2018
  
  7455ab37
09 Feb, 2018 10 commits
- Implements the file upload using RocketChatClient. · 89f38952
  Filipe de Lima Brito authored Feb 09, 2018
  
  89f38952
- Merge pull request #733 from RocketChat/message-actions · 03387f6c
  Lucio Maciel authored Feb 09, 2018
```
[NEW][WIP] Message actions - Reply, Quote, Copy, Delete, Edit and Pin/Unpin
```
  03387f6c
- Remove serverUrl from PinnedMessagesPresenter · 86bba856
  Leonardo Aramaki authored Feb 09, 2018
  
  86bba856
- Merge pull request #736 from aniketsingh03/update-doc · 6a133806
  Filipe de Lima Brito authored Feb 09, 2018
```
[DOCS] Build details in README.md
```
  6a133806
- Add Upload File feature · 2e5f7c8b
  Filipe de Lima Brito authored Feb 09, 2018
  
  2e5f7c8b
- Remove mistaken param · 398823fc
  Leonardo Aramaki authored Feb 09, 2018
  
  398823fc
- Remove serverUrl param from PinnedMessagesAdapter · 59a8a6e5
  Leonardo Aramaki authored Feb 09, 2018
  
  59a8a6e5
- Remove unused param · 5a4563c1
  Leonardo Aramaki authored Feb 09, 2018
  
  5a4563c1
- Improve doc · 82cd4ae5
  Leonardo Aramaki authored Feb 09, 2018
  
  82cd4ae5
- Remove serverUrl from ChatRoomAdapter constructor · 5df2bf4b
  Leonardo Aramaki authored Feb 09, 2018
  
  5df2bf4b
08 Feb, 2018 15 commits
- Fix url markdown parsing and change style for usernames · 2cd3446d
  Leonardo Aramaki authored Feb 08, 2018
  
  2cd3446d
- Add try-catch when loading rooms · 37795ffb
  Leonardo Aramaki authored Feb 08, 2018
  
  37795ffb
- Remove unused import · f2db559a
  Leonardo Aramaki authored Feb 08, 2018
  
  f2db559a
- Fix showIcons logic on ActionsAdapter · 19c98388
  Leonardo Aramaki authored Feb 08, 2018
  
  19c98388
- Fix imports · 037fa2f2
  Leonardo Aramaki authored Feb 08, 2018
  
  037fa2f2
- Add permission checks to edit and pin · 2dad9429
  Leonardo Aramaki authored Feb 08, 2018
  
  2dad9429
- Add extensions to show Toast · a0869f09
  Leonardo Aramaki authored Feb 08, 2018
  
  a0869f09
- More refactoring · 50fa7847
  Leonardo Aramaki authored Feb 08, 2018
  
  50fa7847
- A bit of refactoring · 7cd40441
  Leonardo Aramaki authored Feb 08, 2018
  
  7cd40441
- Change async/await constructs for withContext · a739a997
  Leonardo Aramaki authored Feb 08, 2018
  
  a739a997
- Remove coroutine explicit cancellation · de501c7c
  Leonardo Aramaki authored Feb 08, 2018
  
  de501c7c
- Separate BottomSheet and adapters in separate packages · 5da0491d
  Leonardo Aramaki authored Feb 08, 2018
  
  5da0491d
- Filter out previously pinned messages that were remove deleted · 8c419945
  Leonardo Aramaki authored Feb 08, 2018
  
  8c419945
- Some refactoring · 692b65f3
  Leonardo Aramaki authored Feb 08, 2018
  
  692b65f3
- Merge pull request #732 from RocketChat/markdown-support · 7c8e577d
  Leonardo Aramaki authored Feb 08, 2018
```
[NEW] Markdown support
```
  7c8e577d
07 Feb, 2018 7 commits
- adds rocket chat logo · 0a9f1ef6
  aniket authored Feb 07, 2018
  
  0a9f1ef6
- makes suggested changes · 7ccc861f
  aniket authored Feb 07, 2018
  
  7ccc861f
- Merge branch 'markdown-support' into message-actions · 2f59e9e2
  Leonardo Aramaki authored Feb 07, 2018
  
  2f59e9e2
- Fix return type from mapper function · 0749391e
  Leonardo Aramaki authored Feb 07, 2018
  
  0749391e
- Turn drawable property immutable on QuoteMarginSpan · e1110ec4
  Leonardo Aramaki authored Feb 07, 2018
  
  e1110ec4
- Change link color to colorAccent · 1e80d270
  Leonardo Aramaki authored Feb 07, 2018
  
  1e80d270
- Merge branch 'markdown-support' into message-actions · df9f1480
  Leonardo Aramaki authored Feb 07, 2018
  
  df9f1480