Commits · 2f9342131eedacdf6b78cb45a3e3cff77f0fa03d · Administrator / AloqaIM-Android

14 Apr, 2018 1 commit
- Merge branch 'develop-2.x' into new/color-attachment · 2f934213
  Leonardo Aramaki authored Apr 14, 2018
  
  2f934213
13 Apr, 2018 15 commits
- ColorAttachment (need a better name) · 7c3e43aa
  Lucio Maciel authored Apr 13, 2018
  
  7c3e43aa
- Merge pull request #1073 from RocketChat/new/offline-sending · 3e480b2f
  Rafael Kellermann Streit authored Apr 13, 2018
```
[IMPROVEMENT] Offline message sending support
```
  3e480b2f
- Fix indentation · d5693bdd
  Leonardo Aramaki authored Apr 13, 2018
  
  d5693bdd
- Fix regression on adapter unsent items to sent · d90e9a4c
  Leonardo Aramaki authored Apr 13, 2018
  
  d90e9a4c
- Merge branch 'develop-2.x' into new/offline-sending · d8024c9e
  Leonardo Aramaki authored Apr 13, 2018
  
  d8024c9e
- Remove unused constant · fbaf478c
  Leonardo Aramaki authored Apr 13, 2018
  
  fbaf478c
- Merge pull request #1079 from RocketChat/fix/more-login-options · f066382a
  Filipe de Lima Brito authored Apr 13, 2018
```
[FIX] Fix more login options
```
  f066382a
- Merge branch 'develop-2.x' into fix/more-login-options · b406d6d8
  Filipe de Lima Brito authored Apr 13, 2018
  
  b406d6d8
- Fix more login options · 86768871
  Lucio Maciel authored Apr 13, 2018
  
  86768871
- Merge pull request #1072 from RocketChat/project/sdk-changes · d0e17275
  Filipe de Lima Brito authored Apr 13, 2018
```
[PROJECT] Change SDK imports.
```
  d0e17275
- Remove hack to connect to unsecured servers · 7b00bc8e
  Leonardo Aramaki authored Apr 13, 2018
  
  7b00bc8e
- Fix loading same page always on chat · 5f2696ac
  Leonardo Aramaki authored Apr 13, 2018
  
  5f2696ac
- Do schedule resend of failed messages whenever connection state is set to... · e605713a
  Leonardo Aramaki authored Apr 13, 2018
```
Do schedule resend of failed messages whenever connection state is set to connected; also fix some typos
```
  e605713a
- Merge branch 'new/offline-sending' of... · c83fedd2
  Leonardo Aramaki authored Apr 13, 2018
```
Merge branch 'new/offline-sending' of github.com:RocketChat/Rocket.Chat.Android into new/offline-sending
```
  c83fedd2
- Prefix keys on SharedPreferencesMessageRepository with the server url · 913d062e
  Leonardo Aramaki authored Apr 13, 2018
  
  913d062e
12 Apr, 2018 8 commits
- Merge branch 'develop-2.x' into new/offline-sending · fc197e77
  Rafael Kellermann Streit authored Apr 12, 2018
  
  fc197e77
- Merge branch 'develop-2.x' into project/sdk-changes · 6d73aff8
  Filipe de Lima Brito authored Apr 12, 2018
  
  6d73aff8
- Merge pull request #1066 from divyanshub024/empty-pin-msg · 2e5639c0
  Rafael Kellermann Streit authored Apr 12, 2018
```
[NEW] No pinned message shown on empty pin List
```
  2e5639c0
- Merge branch 'develop-2.x' into empty-pin-msg · c09f75ff
  Rafael Kellermann Streit authored Apr 12, 2018
  
  c09f75ff
- Merge pull request #797 from robertwessen/develop-2.x · 29dcfdae
  Rafael Kellermann Streit authored Apr 12, 2018
```
[IMPROVEMENT] networkSecurityConfig for API 24+ to allow user imported root CAs as trust anchors
```
  29dcfdae
- Merge branch 'develop-2.x' into develop-2.x · ba80f760
  Rafael Kellermann Streit authored Apr 12, 2018
  
  ba80f760
- Remove possible messages stuck with duplicate id for any reason from the resend job queue · 480d5032
  Leonardo Aramaki authored Apr 12, 2018
  
  480d5032
- Set sort order for getAllUnsent() from the oldest · df21f5a4
  Leonardo Aramaki authored Apr 12, 2018
  
  df21f5a4
11 Apr, 2018 16 commits
- Merge branch 'develop-2.x' into new/offline-sending · 15abcd8c
  Leonardo Aramaki authored Apr 11, 2018
  
  15abcd8c
- Load offline messages first then load missing messages · cea99c1d
  Leonardo Aramaki authored Apr 11, 2018
  
  cea99c1d
- Merge pull request #1074 from RocketChat/fix/always-run-on-ui-thread · eb838602
  Rafael Kellermann Streit authored Apr 11, 2018
```
[FIX] always run view callbacks on ui thread
```
  eb838602
- Sort saved local messages according to their timestamps · 6b157720
  Leonardo Aramaki authored Apr 11, 2018
  
  6b157720
- More fixes. · 70316799
  Lucio Maciel authored Apr 11, 2018
  
  70316799
- Fix timestamp for offline messages and showing saved local messages on chat · 903ca99c
  Leonardo Aramaki authored Apr 11, 2018
  
  903ca99c
- Remove unused import · 998f24f2
  Leonardo Aramaki authored Apr 11, 2018
  
  998f24f2
- More indent fix · dc39cd3d
  Leonardo Aramaki authored Apr 11, 2018
  
  dc39cd3d
- Merge branch 'new/offline-sending' of... · 6d555753
  Leonardo Aramaki authored Apr 11, 2018
```
Merge branch 'new/offline-sending' of github.com:RocketChat/Rocket.Chat.Android into new/offline-sending
```
  6d555753
- Fix indentation · 8017ab42
  Leonardo Aramaki authored Apr 11, 2018
  
  8017ab42
- Merge branch 'develop-2.x' into develop-2.x · 2c2eda14
  Rafael Kellermann Streit authored Apr 11, 2018
  
  2c2eda14
- Merge branch 'develop-2.x' into new/offline-sending · 1961ae4c
  Leonardo Aramaki authored Apr 11, 2018
  
  1961ae4c
- Add ui { } DSL to run stuff on the UI thread and check for valid · fcbaf1bd
  Lucio Maciel authored Apr 11, 2018
```
fragment and view
```
  fcbaf1bd
- Remove Toast when some exception occurs when sending message. · 82e19204
  Leonardo Aramaki authored Apr 11, 2018
  
  82e19204
- Remove retryIO when sending messages letting the JobScheduler to do this job... · 48d817fa
  Leonardo Aramaki authored Apr 11, 2018
```
Remove retryIO when sending messages letting the JobScheduler to do this job and always keep the send button enabled since we are now offline
```
  48d817fa
- Change SDK imports names. · d293407e
  Filipe de Lima Brito authored Apr 11, 2018
  
  d293407e