Commits · 873d6580e8867c933805f6e69db42715292e8bc9 · Administrator / AloqaIM-Android

26 Mar, 2018 3 commits
- Merge branch 'develop-2.x' into emoji-empty-view · 873d6580
  Leonardo Aramaki authored Mar 26, 2018
  
  873d6580
- Merge pull request #948 from divyanshub024/search-width-max · e38a52ce
  Leonardo Aramaki authored Mar 26, 2018
```
Search width set to max
```
  e38a52ce
- Merge branch 'develop-2.x' into search-width-max · 04b15ee6
  Leonardo Aramaki authored Mar 26, 2018
  
  04b15ee6
23 Mar, 2018 5 commits
- Merge pull request #949 from TheGamer007/mark_as_read · 45ea3824
  Filipe de Lima Brito authored Mar 23, 2018
```
[FIX] Properly mark a room as read
```
  45ea3824
- Merge pull request #957 from samrmur/fix-956 · 9670e641
  Filipe de Lima Brito authored Mar 23, 2018
```
[FIX] Fixed Fragment Replacement in ChatRoomActivity
```
  9670e641
- Merge pull request #929 from YusukeIwaki/feature/circleci2.0 · 383b1383
  Rafael Kellermann Streit authored Mar 23, 2018
```
[CI] Upgrade Circle CI to version 2.0
```
  383b1383
- Removed CancelStrategy Test · ee782e1e
  Samer Alabi authored Mar 23, 2018
  
  ee782e1e
- Fixed Fragment Replacement Issue · 47bbafe5
  Samer Alabi authored Mar 23, 2018
  
  47bbafe5
21 Mar, 2018 5 commits
- Fix markRoomAsRead condition, unread marker UI · 1673b61e
  C Shri Akhil authored Mar 21, 2018
```
* Call markRoomAsRead in unsubscribeMessages function
* Center the text in the unread marker instead of right aligning it
```
  1673b61e
- Merge branch 'develop-2.x' into emoji-empty-view · ebff161e
  divyanshu bhargava authored Mar 21, 2018
  
  ebff161e
- minor fixes · b6f109bb
  Divyanshu Bhargava authored Mar 21, 2018
  
  b6f109bb
- fixed conflicted file · 1fd62d7a
  Divyanshu Bhargava authored Mar 21, 2018
  
  1fd62d7a
- requested changes done · 49e68750
  Divyanshu Bhargava authored Mar 21, 2018
  
  49e68750
20 Mar, 2018 3 commits
- Merge pull request #911 from RocketChat/hotfix/keyboard-is-shown-in-member-list · b042c314
  Filipe de Lima Brito authored Mar 20, 2018
```
[FIX] Keyboard is shown when opening the member list view.
```
  b042c314
- search view width set tp max · 9054993a
  Divyanshu Bhargava authored Mar 20, 2018
  
  9054993a
- No recent emoji msg shown in emoji picker · 42d65277
  Divyanshu Bhargava authored Mar 20, 2018
  
  42d65277
19 Mar, 2018 1 commit
- Merge pull request #918 from RocketChat/new/commands · 2e7a0037
  Leonardo Aramaki authored Mar 19, 2018
```
[NEW] Commands
```
  2e7a0037
18 Mar, 2018 1 commit
- Merge pull request #2 from RocketChat/develop-2.x · 62af887c
  divyanshu bhargava authored Mar 18, 2018
```
Rocket.chat 2.0 alpha-1
```
  62af887c
16 Mar, 2018 2 commits
- comment out Unit testing · cac0e8a2
  Yusuke Iwaki authored Mar 16, 2018
  
  cac0e8a2
- try Circle CI 2.0 · 4dd13dda
  Yusuke Iwaki authored Mar 15, 2018
  
  4dd13dda
15 Mar, 2018 4 commits
- Merge pull request #924 from RocketChat/hotfix/handle-exceptions-on-chatRoomsByName · d5fde6a3
  Leonardo Aramaki authored Mar 15, 2018
```
[FIX] Handle exceptions on ChatRoomsPresenter#chatRoomsByName()
```
  d5fde6a3
- Handle exceptions on ChatRoomsPresenter#chatRoomsByName() method · 9115106a
  Leonardo Aramaki authored Mar 15, 2018
  
  9115106a
- Merge pull request #923 from RocketChat/hotfix/delete-messages-with-attachments · 081b079c
  Leonardo Aramaki authored Mar 15, 2018
```
Fix regression when deleting a message with attachments
```
  081b079c
- Fix regression when deleting a message with attachments · a32cb128
  Leonardo Aramaki authored Mar 15, 2018
  
  a32cb128
14 Mar, 2018 6 commits
- Layout adjustments on commands · f4f34ec5
  Leonardo Aramaki authored Mar 14, 2018
  
  f4f34ec5
- Request to run commands if message starts with "/" · f1b43573
  Leonardo Aramaki authored Mar 14, 2018
  
  f1b43573
- Get command description from strings · 0d49577b
  Leonardo Aramaki authored Mar 14, 2018
  
  0d49577b
- Set command list completion restrained to the line start offset · 530a49e9
  Leonardo Aramaki authored Mar 14, 2018
  
  530a49e9
- Showing unlimeted completion suggestions for commands and properly displaying its descriptions · f3224435
  Leonardo Aramaki authored Mar 14, 2018
  
  f3224435
- Add autocomplete to commands · f14e01f3
  Leonardo Aramaki authored Mar 14, 2018
  
  f14e01f3
13 Mar, 2018 10 commits
- Add adapter check before accepting a new suggestion provider · 07a613d3
  Leonardo Aramaki authored Mar 13, 2018
  
  07a613d3
- Fix typo. · e2283ac3
  Filipe de Lima Brito authored Mar 13, 2018
  
  e2283ac3
- Fixes the keyboard shown when opening the member list view. · 09a9a63c
  Filipe de Lima Brito authored Mar 13, 2018
  
  09a9a63c
- Merge pull request #899 from RocketChat/chore/increment_build_number · c101b39a
  Rafael Kellermann Streit authored Mar 13, 2018
```
[CHORE] Increment version code, name and remove suffix for releases
```
  c101b39a
- Increment build version to alpha1 · 81b84e48
  Rafael Kellermann Streit authored Mar 13, 2018
  
  81b84e48
- Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into... · 956f4a46
  Rafael Kellermann Streit authored Mar 13, 2018
```
Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into chore/increment_build_number
```
  956f4a46
- Merge pull request #910 from RocketChat/fix/member-list · 44720ce0
  Rafael Kellermann Streit authored Mar 13, 2018
```
[FIX] Keyboard is shown when opening the member list view.
```
  44720ce0
- Merge pull request #906 from RocketChat/fix/rounded-avatars · 1424c185
  Rafael Kellermann Streit authored Mar 13, 2018
```
[FIX] Rounded avatars
```
  1424c185
- Merge branch 'develop-2.x' of... · 94cb04f7
  Filipe de Lima Brito authored Mar 13, 2018
```
Merge branch 'develop-2.x' of https://github.com/RocketChat/Rocket.Chat.Android into fix/rounded-avatars
```
  94cb04f7
- Merge branch 'develop-2.x' of... · 2f3aab6c
  Filipe de Lima Brito authored Mar 13, 2018
```
Merge branch 'develop-2.x' of https://github.com/RocketChat/Rocket.Chat.Android into fix/member-list
```
  2f3aab6c