Commits · bd38ebcb784b8606c804ed05523902543fc408e7 · Administrator / AloqaIM-Android

29 Mar, 2018 4 commits
- IntDef expects Ints · bd38ebcb
  Lucio Maciel authored Mar 29, 2018
  
  bd38ebcb
- Merge pull request #961 from RocketChat/feature/migration · c7a33414
  Lucio Maciel authored Mar 29, 2018
```
[NEW][WIP] Migration of authentications from legacy
```
  c7a33414
- Revert removed urls when saving tokens · 261553b4
  Leonardo Aramaki authored Mar 29, 2018
  
  261553b4
- Add check to whether app already a migration already happened · 24a9b0a5
  Leonardo Aramaki authored Mar 29, 2018
  
  24a9b0a5
28 Mar, 2018 3 commits
- Save to TokenRepository and guard with try/catch · a43b7c89
  Lucio Maciel authored Mar 28, 2018
  
  a43b7c89
- Merge branch 'feature/multi-server' into feature/migration · 15bbe966
  Lucio Maciel authored Mar 28, 2018
  
  15bbe966
- Merge branch 'develop-2.x' into feature/multi-server · 0836f86f
  Lucio Maciel authored Mar 28, 2018
  
  0836f86f
27 Mar, 2018 5 commits
- Better multi server support, support push notifications · 4505780c
  Lucio Maciel authored Mar 27, 2018
  
  4505780c
- Merge pull request #964 from RocketChat/project/dependencies-update · ba95c1ab
  Lucio Maciel authored Mar 27, 2018
```
[CHORE] Update app dependencies.
```
  ba95c1ab
- Merge branch 'develop-2.x' into project/dependencies-update · c51a97c7
  Filipe de Lima Brito authored Mar 27, 2018
  
  c51a97c7
- Update app dependencies. · 93db630c
  Filipe de Lima Brito authored Mar 27, 2018
  
  93db630c
- Merge branch 'develop-2.x' into feature/migration · 63243b18
  Rafael Kellermann Streit authored Mar 27, 2018
  
  63243b18
26 Mar, 2018 10 commits
- Merge pull request #946 from divyanshub024/emoji-empty-view · 5505e764
  Leonardo Aramaki authored Mar 26, 2018
```
[IMPROVEMENT] Show empty msg in recent emoji picker
```
  5505e764
- Merge remote-tracking branch 'origin/emoji-empty-view' into emoji-empty-view · 9923298e
  Divyanshu Bhargava authored Mar 26, 2018
  
  9923298e
- removed snake cases · f12d3399
  Divyanshu Bhargava authored Mar 26, 2018
  
  f12d3399
- Merge branch 'develop-2.x' into feature/migration · 4bfb9b10
  Leonardo Aramaki authored Mar 26, 2018
  
  4bfb9b10
- Merge branch 'develop-2.x' into emoji-empty-view · 4b9fc144
  Leonardo Aramaki authored Mar 26, 2018
  
  4b9fc144
- Merge pull request #917 from WideChat/pjl_customtabs · 1456a347
  Leonardo Aramaki authored Mar 26, 2018
```
[NEW] Chrome custom tabs support
```
  1456a347
- Merge branch 'develop-2.x' into pjl_customtabs · 7c8d979d
  Leonardo Aramaki authored Mar 26, 2018
  
  7c8d979d
- 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
25 Mar, 2018 3 commits
- Add a null-check on fetching settings · 801f6da3
  Leonardo Aramaki authored Mar 25, 2018
  
  801f6da3
- Fix null safe check · a9ebf737
  Leonardo Aramaki authored Mar 25, 2018
  
  a9ebf737
- Implement migration of data Realm to preferences · 04a10cad
  Leonardo Aramaki authored Mar 25, 2018
  
  04a10cad
24 Mar, 2018 2 commits
- Implement fetch info from old Realm files · f6429d6f
  Leonardo Aramaki authored Mar 24, 2018
  
  f6429d6f
- Include realm dependencies · c3a2d172
  Leonardo Aramaki authored Mar 24, 2018
  
  c3a2d172
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 8 commits
- Add pt-br translation · d2cc3161
  Lucio Maciel authored Mar 21, 2018
  
  d2cc3161
- Fix some issues. · ed3b28c1
  Lucio Maciel authored Mar 21, 2018
  
  ed3b28c1
- Initial multi server support... · 0d5bbd04
  Lucio Maciel authored Mar 21, 2018
  
  0d5bbd04
- 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