Commits · 2e3ee053e631184dd862135cc0de18b094bae5e1 · chat / RocketChatMobileEngine

02 Mar, 2019 1 commit
- ios image picker fixes · 2e3ee053
  armin authored Mar 02, 2019
  
  2e3ee053
27 Feb, 2019 2 commits
- Merge branch 'fixFileUploadAndroid' into 'master' · 1a8cb167
  armin authored Feb 27, 2019
```
fix fileupload on android

See merge request !131
```
  1a8cb167
- fix fileupload on android · 4de277b7
  armin authored Feb 27, 2019
  
  4de277b7
24 Feb, 2019 2 commits
- Merge branch 'messageSearch0.70Compat' into 'master' · 4a59d1e9
  armin authored Feb 24, 2019
```
fixes api change in 0.70 regarding messagesearch

See merge request !130
```
  4a59d1e9
- fixes api change in 0.70 regarding messagesearch · 77eeca37
  armin authored Feb 24, 2019
  
  77eeca37
22 Feb, 2019 10 commits
- Merge branch 'anotherFix' into 'master' · 2485fc00
  armin authored Feb 22, 2019
```
sadasd

See merge request !129
```
  2485fc00
- sadasd · 7a208c50
  armin authored Feb 22, 2019
  
  7a208c50
- Merge branch 'anotherFix' into 'master' · 7a3ee436
  armin authored Feb 22, 2019
```
asd

See merge request !128
```
  7a3ee436
- asd · c1f0fa7b
  armin authored Feb 22, 2019
  
  c1f0fa7b
- Merge branch 'channelSortFix' into 'master' · 01713517
  armin authored Feb 22, 2019
```
ifix channelsorting

See merge request !127
```
  01713517
- ifix channelsorting · 52d8441f
  armin authored Feb 22, 2019
  
  52d8441f
- Merge branch 'fasterChannelInsert' into 'master' · 4f450b8d
  armin authored Feb 22, 2019
```
faster insertion of channels into view

See merge request !126
```
  4f450b8d
- faster insertion of channels into view · f55f8044
  armin authored Feb 22, 2019
  
  f55f8044
- Merge branch 'fixWrongDate' into 'master' · 5a15fd3b
  armin authored Feb 22, 2019
```
Fix wrong date

See merge request !125
```
  5a15fd3b
- improved startup time · 85249a9f
  Armin Felder authored Feb 22, 2019
  
  85249a9f
11 Feb, 2019 3 commits
- Merge branch 'iosWS' into 'master' · 090c78ca
  armin authored Feb 11, 2019
```
iremoved specil ios case as it now works

See merge request !124
```
  090c78ca
- Merge branch 'master' into iosWS · cec2204b
  armin authored Feb 11, 2019
  
  cec2204b
- iremoved specil ios case as it now works · 9e0b4d1e
  armin authored Feb 11, 2019
  
  9e0b4d1e
10 Feb, 2019 4 commits
- Merge branch 'fixMessageInsert' into 'master' · 5948f653
  armin authored Feb 10, 2019
```
Fix message insert

See merge request !123
```
  5948f653
- fix message insert · 967a8364
  Armin Felder authored Feb 10, 2019
  
  967a8364
- Merge branch 'osxcompat' into 'master' · cc6c044a
  armin authored Feb 10, 2019
```
Osxcompat

See merge request !122
```
  cc6c044a
- osx compat · 280a9c47
  armin authored Feb 10, 2019
  
  280a9c47
09 Feb, 2019 14 commits
- Merge branch 'fixgccissue' into 'master' · ae908aa2
  armin authored Feb 09, 2019
```
asd

See merge request !121
```
  ae908aa2
- asd · 6e5155e8
  armin authored Feb 09, 2019
  
  6e5155e8
- Merge branch 'fixgccissue' into 'master' · f47163df
  armin authored Feb 09, 2019
```
iqw

See merge request !120
```
  f47163df
- iqw · 05b1d851
  armin authored Feb 09, 2019
  
  05b1d851
- Merge branch 'removeexecutionPolicy' into 'master' · 7625e5b9
  armin authored Feb 09, 2019
```
removed execution policy as, android ndk does not support it for now

See merge request !119
```
  7625e5b9
- removed execution policy as, android ndk does not support it for now · 28bec27d
  Armin Felder authored Feb 09, 2019
  
  28bec27d
- Merge branch 'mutexProb' into 'master' · 3f8f11dc
  armin authored Feb 09, 2019
```
fixed channel sorting

See merge request !118
```
  3f8f11dc
- Merge branch 'master' into 'mutexProb' · 053bd164
  armin authored Feb 09, 2019
```
# Conflicts:
#   CustomModels/channelmodel.cpp
#   container/sortedvector.cpp
```
  053bd164
- fixed channel sorting · bd69e2a2
  Armin Felder authored Feb 09, 2019
  
  bd69e2a2
- Merge branch 'mutexProb' into 'master' · d0c9c342
  armin authored Feb 09, 2019
```
anged mutex

See merge request !117
```
  d0c9c342
- anged mutex · 52e8b616
  Armin Felder authored Feb 09, 2019
  
  52e8b616
- Merge branch 'fasterChannelLoad' into 'master' · 39b3b8ed
  armin authored Feb 09, 2019
```
Faster channel load

See merge request !116
```
  39b3b8ed
- fix · a1a7bb1d
  Armin Felder authored Feb 09, 2019
  
  a1a7bb1d
- desktop fileupload · 2880990c
  Armin Felder authored Feb 09, 2019
```
 Please enter the commit message for your changes. Lines starting
```
  2880990c
08 Feb, 2019 4 commits
- Merge branch 'fasterChannelLoad' into 'master' · 98a7a3f3
  armin authored Feb 09, 2019
```
Faster channel load

See merge request !115
```
  98a7a3f3
- sd · 8b0061bf
  Armin Felder authored Feb 09, 2019
  
  8b0061bf
- faster channelLoad · d54a0fb4
  Armin Felder authored Feb 09, 2019
  
  d54a0fb4
- Merge branch 'winDesktopSupport' into 'master' · 4096a6f3
  armin authored Feb 08, 2019
```
fixed bottlenck in fileobject creation

See merge request !114
```
  4096a6f3