Commits · 39b3b8ed35486bb6fe154849060f3dc055f6c871 · chat / RocketChatMobileEngine

09 Feb, 2019 3 commits
- 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 7 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
- fixed bottlenck in fileobject creation · 344e9908
  Armin Felder authored Feb 08, 2019
```
 Please enter the commit message for your changes. Lines starting
```
  344e9908
- Merge branch 'winDesktopSupport' into 'master' · 926c1cac
  armin authored Feb 08, 2019
```
win64 compat

See merge request !113
```
  926c1cac
- win64 compat · 980cb377
  Armin Felder authored Feb 08, 2019
  
  980cb377
19 Jan, 2019 8 commits
- Merge branch 'iosInvalidSignatures' into 'master' · 026a42e1
  armin authored Jan 19, 2019
```
Ios invalid signatures

See merge request !112
```
  026a42e1
- Merge branch 'master' into iosInvalidSignatures · 944ece6d
  armin authored Jan 19, 2019
  
  944ece6d
- ad · 8d4535d0
  armin authored Jan 19, 2019
  
  8d4535d0
- sd · a5ca1571
  armin authored Jan 19, 2019
  
  a5ca1571
- corrected invalid signatures · 554ce8d7
  armin authored Jan 19, 2019
  
  554ce8d7
- Merge branch 'clearIosCookies' into 'master' · 86eea63a
  armin authored Jan 19, 2019
```
Clear ios cookies

See merge request !111
```
  86eea63a
- Merge branch 'clearIosCookies' of... · 260b99b0
  armin authored Jan 19, 2019
```
Merge branch 'clearIosCookies' of https://git.fairkom.net/chat/RocketChatMobileEngine into clearIosCookies
```
  260b99b0
- sd · 3970132c
  armin authored Jan 19, 2019
  
  3970132c
17 Jan, 2019 6 commits
- Merge branch 'smallfix' into 'master' · 9e87ce6e
  armin authored Jan 17, 2019
```
fixes mergeconflict

See merge request !110
```
  9e87ce6e
- fixes mergeconflict · 31aba13a
  armin authored Jan 17, 2019
  
  31aba13a
- Merge branch 'typo' into 'master' · 541fa26a
  armin authored Jan 17, 2019
```
fixes typo

See merge request !109
```
  541fa26a
- fixes typo · 84400bc1
  armin authored Jan 17, 2019
  
  84400bc1
- Merge branch 'loginProblemsAfterRegistration' into 'master' · 4c48c19f
  armin authored Jan 17, 2019
```
Login problems after registration

See merge request !108
```
  4c48c19f
- Merge branch 'master' into 'loginProblemsAfterRegistration' · 66adc01c
  armin authored Jan 17, 2019
```
# Conflicts:
#   engine.pro
#   rocketchatserver.cpp
#   rocketchatserver.h
```
  66adc01c
11 Jan, 2019 2 commits
- Merge branch '142-creation-of-rooms-not-working-properly' into 'master' · 9c0c0416
  Dennis authored Jan 11, 2019
```
added error when room cannot be created

See merge request !107
```
  9c0c0416
- added error when room cannot be created · 8c2efd6e
  Dennis Beier authored Jan 11, 2019
  
  8c2efd6e
10 Jan, 2019 3 commits
- Merge branch 'fix-upload-performance' into 'master' · ecd665ab
  Dennis authored Jan 10, 2019
```
fix emoji problems and uplaod problems

See merge request !106
```
  ecd665ab
- Merge branch 'master' of https://git.fairkom.net/chat/RocketChatMobileEngine... · 8eee9ed9
  Dennis Beier authored Jan 10, 2019
```
Merge branch 'master' of https://git.fairkom.net/chat/RocketChatMobileEngine into fix-upload-performance
```
  8eee9ed9
- fix emoji problems and uplaod problems · d9f53570
  Dennis Beier authored Jan 10, 2019
  
  d9f53570
07 Jan, 2019 2 commits
- Merge branch 'commentCodeThatShouldNotHaveBeenMerged' into 'master' · cf9884ca
  armin authored Jan 07, 2019
```
reverts changes that should not have beet commited in 36012136

See merge request !105
```
  cf9884ca
- reverts changes that should not have beet commited in 36012136 · c2cb7885
  armin authored Jan 07, 2019
  
  c2cb7885
04 Jan, 2019 2 commits
- Merge branch 'fix-login-problem' into 'master' · 7fea6181
  Dennis authored Jan 04, 2019
```
fixed little resume problem

See merge request !104
```
  7fea6181
- fixed little resume problem · 4fb03469
  Dennis Beier authored Jan 04, 2019
  
  4fb03469
03 Jan, 2019 2 commits
- Merge branch 'fix-login-problem' into 'master' · a4335f93
  Dennis authored Jan 03, 2019
```
now checking if dbtoken is empty

See merge request !103
```
  a4335f93
- now checking if dbtoken is empty · 3b010c8e
  Dennis Beier authored Jan 03, 2019
  
  3b010c8e
27 Dec, 2018 2 commits
- Merge branch 'fix-emoji-size-in-preview' into 'master' · bde64041
  Dennis authored Dec 27, 2018
```
fixed size of emojis in preview text

See merge request !102
```
  bde64041
- fixed size of emojis in preview text · 15efd1bf
  Dennis Beier authored Dec 27, 2018
  
  15efd1bf
26 Dec, 2018 3 commits
- Merge branch 'fix-downloads' into 'master' · 074d0d34
  Dennis authored Dec 26, 2018
```
deleted strange whitespace

See merge request !101
```
  074d0d34
- deleted strange whitespace · 1ebd147e
  Dennis Beier authored Dec 26, 2018
  
  1ebd147e
- Merge branch 'fix-downloads' into 'master' · e622164b
  Dennis authored Dec 26, 2018
```
Fix downloads

See merge request !100
```
  e622164b