Commits · 1d502836fbe42f95f71258d376c9af609be02f06 · Administrator / AloqaIM-Android

04 Jul, 2018 3 commits
- Merge branch 'develop' into send-msg-attachments · 1d502836
  Filipe de Lima Brito authored Jul 04, 2018
  
  1d502836
- Merge pull request #1431 from Pitstopper/patch-4 · 4c5a07f7
  Filipe de Lima Brito authored Jul 04, 2018
```
[IMPROVEMENT] Improvements in Russian translation
```
  4c5a07f7
- [IMPROVEMENT] Improvements in Russian translation · f54beb8e
  Pitstopper authored Jul 04, 2018
  
  f54beb8e
03 Jul, 2018 4 commits
- Changes from android to app. · a43d55b8
  Filipe de Lima Brito authored Jul 03, 2018
  
  a43d55b8
- Merge pull request #1407 from ubarsaiyan/imagetext · baf84e1e
  Filipe de Lima Brito authored Jul 03, 2018
```
[IMPROVEMENT] Added text and description fields for Image Attachment
```
  baf84e1e
- Removed the test blank line · 3433aa10
  Utkarsh Barsaiyan authored Jul 03, 2018
  
  3433aa10
- Add newline for test · edf7a3bb
  Utkarsh Barsaiyan authored Jul 03, 2018
  
  edf7a3bb
30 Jun, 2018 9 commits
- Remove @with in UiModelMapper · f6753e2f
  Utkarsh Barsaiyan authored Jun 30, 2018
  
  f6753e2f
- undo · fad3e0c2
  divyanshu authored Jun 30, 2018
```
ci/circleci: code-analysis fix
```
  fad3e0c2
- ci/circleci: code-analysis fix · a0098afd
  divyanshu authored Jun 30, 2018
  
  a0098afd
- removed extra lines · 1c410aa1
  divyanshu authored Jun 30, 2018
  
  1c410aa1
- resolve conflicts · 9595ad8d
  divyanshu authored Jun 30, 2018
  
  9595ad8d
- resolve conflicts · e70f3bef
  divyanshu authored Jun 30, 2018
  
  e70f3bef
- minor changes · 3b1036fc
  divyanshu authored Jun 30, 2018
  
  3b1036fc
- Merge branch 'develop-2.x' into send-msg-attachments · 1e99dd9c
  divyanshu authored Jun 30, 2018
```
# Conflicts:
#	app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
```
  1e99dd9c
- Merge pull request #35 from RocketChat/develop · 36598c5d
  divyanshu bhargava authored Jun 30, 2018
```
merge
```
  36598c5d
29 Jun, 2018 21 commits
- Added text and description fields for Image Attachment · dfcda352
  Utkarsh Barsaiyan authored Jun 29, 2018
  
  dfcda352
- Merge pull request #1422 from RocketChat/fix/lists-on-chat-room · 35ed646c
  Filipe de Lima Brito authored Jun 29, 2018
```
[FIX] Member, Pinned, Favorite and File list not showing bug.
```
  35ed646c
- Merge branch 'develop' into fix/lists-on-chat-room · 4ba9c092
  Filipe de Lima Brito authored Jun 29, 2018
  
  4ba9c092
- Merge pull request #1420 from RocketChat/bottomsheet · 645166da
  Filipe de Lima Brito authored Jun 29, 2018
```
[IMPROVEMENT] Uses framework's Bottomsheet
```
  645166da
- Merge branch 'develop' into bottomsheet · 8b0f2c72
  Filipe de Lima Brito authored Jun 29, 2018
  
  8b0f2c72
- Merge pull request #1414 from RocketChat/new/allow-room-names-whit-special-chars · 001f1a01
  Filipe de Lima Brito authored Jun 29, 2018
```
[NEW] Allow room names whit special chars
```
  001f1a01
- Merge branch 'develop' into new/allow-room-names-whit-special-chars · a9f3f098
  Filipe de Lima Brito authored Jun 29, 2018
  
  a9f3f098
- Merge pull request #1413 from RocketChat/new/set-user-agent · fab68e52
  Filipe de Lima Brito authored Jun 29, 2018
```
[NEW] Set user agent
```
  fab68e52
- Merge branch 'develop' into bottomsheet · 49176f16
  Filipe de Lima Brito authored Jun 29, 2018
  
  49176f16
- Fix the Member, Pinned, Favorite and File list not showing bug. · 84cc9a42
  Filipe de Lima Brito authored Jun 29, 2018
  
  84cc9a42
- Update userAgent String. · d8a4fc25
  Filipe de Lima Brito authored Jun 29, 2018
  
  d8a4fc25
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/set-user-agent · 8252d7d1
  Filipe de Lima Brito authored Jun 29, 2018
  
  8252d7d1
- Brings the toolbar icons visible again. · 0cdd58ee
  Filipe de Lima Brito authored Jun 29, 2018
  
  0cdd58ee
- Merge pull request #1417 from divyanshub024/about-fragment · 327aabf7
  Filipe de Lima Brito authored Jun 29, 2018
```
[IMPROVEMENT] About activity to fragment
```
  327aabf7
- Merge branch 'bottomsheet' of github.com:RocketChat/Rocket.Chat.Android into bottomsheet · 7b5c276b
  Leonardo Aramaki authored Jun 29, 2018
  
  7b5c276b
- Remove sheetMenu dependency in favor of framework bottomsheet · 9afb9d95
  Leonardo Aramaki authored Jun 29, 2018
  
  9afb9d95
- Remove sheetMenu dependency in favor of framework bottomsheet · c6c2fe9d
  Leonardo Aramaki authored Jun 29, 2018
  
  c6c2fe9d
- minor changes · 44dd85f2
  divyanshu authored Jun 29, 2018
  
  44dd85f2
- Merge branch 'develop-2.x' into send-msg-attachments · cb1aebab
  divyanshu authored Jun 29, 2018
```
# Conflicts:
#	app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
#	app/src/main/res/menu/chatroom_actions.xml
```
  cb1aebab
- About Activity to Fragment · e85be350
  divyanshu authored Jun 29, 2018
  
  e85be350
- Merge pull request #34 from RocketChat/develop · 124b8519
  divyanshu bhargava authored Jun 29, 2018
```
merge
```
  124b8519
28 Jun, 2018 3 commits
- Removes wildcard. · 88af8195
  Filipe de Lima Brito authored Jun 28, 2018
  
  88af8195
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into... · db0069f5
  Filipe de Lima Brito authored Jun 28, 2018
```
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/allow-room-names-whit-special-chars
```
  db0069f5
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/set-user-agent · d0c4faaf
  Filipe de Lima Brito authored Jun 28, 2018
  
  d0c4faaf