Commits · 6c8253589a6732e910fda6e47199e4f89e296202 · Administrator / AloqaIM-Android

06 Jul, 2018 4 commits
- attachment message with android draw · 6c825358
  divyanshu authored Jul 06, 2018
  
  6c825358
- Merge branch 'develop-2.x' into send-msg-attachments · 9926e3c9
  divyanshu authored Jul 06, 2018
```
# Conflicts:
#	app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
```
  9926e3c9
- Merge pull request #37 from RocketChat/develop · 4d7ea29a
  divyanshu bhargava authored Jul 06, 2018
```
merge
```
  4d7ea29a
- Merge pull request #1249 from divyanshub024/android-draw · 9f240045
  Filipe de Lima Brito authored Jul 06, 2018
```
[NEW] Android draw
```
  9f240045
04 Jul, 2018 3 commits
- Merge branch 'develop' into android-draw · 616b4570
  Filipe de Lima Brito authored Jul 04, 2018
  
  616b4570
- 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 11 commits
- Merge pull request #36 from RocketChat/develop · 96dd998f
  divyanshu bhargava authored Jul 03, 2018
```
merge
```
  96dd998f
- Merge remote-tracking branch 'origin/android-draw' into android-draw · d2d850e4
  divyanshu authored Jul 03, 2018
  
  d2d850e4
- change image quality to 70 · beb205a9
  divyanshu authored Jul 03, 2018
  
  beb205a9
- Merge branch 'develop' into android-draw · bb4de6e7
  divyanshu bhargava authored Jul 03, 2018
  
  bb4de6e7
- requested changes · 008ab53c
  divyanshu authored Jul 03, 2018
  
  008ab53c
- Changes from android to app. · a43d55b8
  Filipe de Lima Brito authored Jul 03, 2018
  
  a43d55b8
- Merge branch 'develop' into android-draw · 287f09b5
  divyanshu bhargava authored Jul 03, 2018
  
  287f09b5
- requested changes · 41adfb58
  divyanshu authored Jul 03, 2018
  
  41adfb58
- 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 16 commits
- Remove @with in UiModelMapper · f6753e2f
  Utkarsh Barsaiyan authored Jun 30, 2018
  
  f6753e2f
- Merge remote-tracking branch 'origin/android-draw' into android-draw · 5a2445c4
  divyanshu authored Jun 30, 2018
  
  5a2445c4
- removed extra spacing · fbdf12f5
  divyanshu authored Jun 30, 2018
  
  fbdf12f5
- Update strings.xml · 0b1f80d3
  divyanshu bhargava authored Jun 30, 2018
  
  0b1f80d3
- Update strings.xml · de65af33
  divyanshu bhargava authored Jun 30, 2018
  
  de65af33
- minor changes · 99b73892
  divyanshu authored Jun 30, 2018
  
  99b73892
- resolved conflicts · 190d0dc5
  divyanshu authored Jun 30, 2018
  
  190d0dc5
- Merge branch 'develop-2.x' into android-draw · 74031054
  divyanshu authored Jun 30, 2018
```
# Conflicts:
#	app/build.gradle
#	app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
#	app/src/main/res/values-hi-rIN/strings.xml
#	settings.gradle
```
  74031054
- 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 6 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