Commits · 36d38023bb8af20541b9efae3a3e79a30db00ca9 · Administrator / AloqaIM-Android

16 Apr, 2019 3 commits
- Fixed max_file_size_exceeded not taking the expected two arguments · 36d38023
  Hussein El Feky authored Apr 16, 2019
  
  36d38023
- Resolved conflicts · b71a21ca
  Hussein El Feky authored Apr 16, 2019
  
  b71a21ca
- Merge branch 'develop' into patch-1 · f4efa770
  Hussein El Feky authored Apr 16, 2019
  
  f4efa770
15 Apr, 2019 15 commits
- Merge pull request #2208 from NBAMIR/rocket.nbamir · d9f8a831
  Filipe de Lima Brito authored Apr 15, 2019
```
[FIX] Typo in DrawableHelper.kt
```
  d9f8a831
- Merge branch 'develop' into rocket.nbamir · b1ee6ac6
  Filipe de Lima Brito authored Apr 15, 2019
  
  b1ee6ac6
- Merge pull request #2218 from NBAMIR/nbamir3 · 8d05af4a
  Filipe de Lima Brito authored Apr 15, 2019
```
[FIX] Typo in ResetPasswordView.kt
```
  8d05af4a
- Merge branch 'develop' into nbamir3 · 2d50bfe7
  Filipe de Lima Brito authored Apr 15, 2019
  
  2d50bfe7
- Merge pull request #2219 from NBAMIR/nbamir4 · dbf4f47d
  Filipe de Lima Brito authored Apr 15, 2019
```
[FIX] Typo in VersionCheckView.kt
```
  dbf4f47d
- Merge branch 'develop' into nbamir4 · d79abd39
  Filipe de Lima Brito authored Apr 15, 2019
  
  d79abd39
- Merge pull request #2217 from NBAMIR/nba · 0e116b63
  Filipe de Lima Brito authored Apr 15, 2019
```
[FIX] Typo in DatabaseManager.kt
```
  0e116b63
- Merge branch 'develop' into nba · d7859c51
  Filipe de Lima Brito authored Apr 15, 2019
  
  d7859c51
- Merge pull request #2216 from NBAMIR/nbamir2 · 8ef047fa
  Filipe de Lima Brito authored Apr 15, 2019
```
[FIX] Typo in RocketChatApplication.kt
```
  8ef047fa
- Merge branch 'develop' into nbamir2 · 8d4088d0
  Filipe de Lima Brito authored Apr 15, 2019
  
  8d4088d0
- Merge pull request #2215 from NBAMIR/nbamir · aa554d09
  Filipe de Lima Brito authored Apr 15, 2019
```
[FIX] Typo in Analytics.kt
```
  aa554d09
- Merge branch 'develop' into nbamir · 3ffebcfa
  Filipe de Lima Brito authored Apr 15, 2019
  
  3ffebcfa
- Merge pull request #2201 from ThePigsMud/develop · b3529561
  Filipe de Lima Brito authored Apr 15, 2019
```
[FIX] Typo in analytics message
```
  b3529561
- Merge branch 'develop' into develop · 6971a239
  Filipe de Lima Brito authored Apr 15, 2019
  
  6971a239
- Merge pull request #2187 from RocketChat/layout/change-chat-rooms-ui · 5e9b9f61
  Filipe de Lima Brito authored Apr 15, 2019
```
[LAYOUT][IMPROVEMENT][REFACTOR] Changes main UI
```
  5e9b9f61
09 Apr, 2019 9 commits
- [FIX] Typo in VersionCheckView.kt · 92fdb55f
  Noor Binte Amir authored Apr 09, 2019
```
Corrected sentence.
```
  92fdb55f
- [FIX] Typo in ResetPasswordView.kt · d2dfb1b5
  Noor Binte Amir authored Apr 09, 2019
```
Changed "entered" to "has entered" to preserve sentence structure.
```
  d2dfb1b5
- [FIX] Typo in DatabaseManager.kt · 13790ef3
  Noor Binte Amir authored Apr 09, 2019
```
Changed "data base" to "database".
```
  13790ef3
- [FIX] Typo in RocketChatApplication.kt · ad4a6117
  Noor Binte Amir authored Apr 09, 2019
```
Changed "proper" to "properly" and fixed sentence structure.
```
  ad4a6117
- [FIX] Typo in Analytics.kt · 42d791cc
  Noor Binte Amir authored Apr 09, 2019
```
Corrected typos.
```
  42d791cc
- Updated a string resource name · ab24ba31
  Hussein El Feky authored Apr 09, 2019
  
  ab24ba31
- Fixed typos · 2302a061
  Hussein El Feky authored Apr 09, 2019
  
  2302a061
- Fixed typos · 2d8e8631
  Hussein El Feky authored Apr 09, 2019
```
1. Changed statics to statistics
2. Changed improving to improve
```
  2d8e8631
- Update dependencies.gradle · e3c41a6c
  Noor Binte Amir authored Apr 09, 2019
  
  e3c41a6c
08 Apr, 2019 3 commits
- Typo in DrawableHelper.kt · d8f1cd68
  Noor Binte Amir authored Apr 08, 2019
```
Corrected typo 'before tint it' to 'before tinting it'.
```
  d8f1cd68
- Fix user status always being displayed as offline. · 4e5b2997
  Filipe de Lima Brito authored Apr 08, 2019
  
  4e5b2997
- Adds change user status view. · 7c524d97
  Filipe de Lima Brito authored Apr 08, 2019
  
  7c524d97
06 Apr, 2019 3 commits
- Shows the logout dialog before logging out. · bd967505
  Filipe de Lima Brito authored Apr 06, 2019
  
  bd967505
- Updates item_chatroom_header.xml · f11ddfd4
  Filipe de Lima Brito authored Apr 06, 2019
  
  f11ddfd4
- Shows settings view · 5455af45
  Filipe de Lima Brito authored Apr 06, 2019
  
  5455af45
05 Apr, 2019 4 commits
- Fixed typo · 5fcc40b2
  ThePigsMud authored Apr 05, 2019
  
  5fcc40b2
- Removes unused resources. · 6304bd95
  Filipe de Lima Brito authored Apr 05, 2019
  
  6304bd95
- Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into... · 49a9ccea
  Filipe de Lima Brito authored Apr 05, 2019
```
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into layout/change-chat-rooms-ui
```
  49a9ccea
- Saves the sorting and grouping preferences for each server. · 1ceae466
  Filipe de Lima Brito authored Apr 05, 2019
  
  1ceae466
04 Apr, 2019 1 commit
- Shows server view · e463622d
  Filipe de Lima Brito authored Apr 04, 2019
  
  e463622d
03 Apr, 2019 1 commit
- Shows create new channel view · 8dc117d8
  Filipe de Lima Brito authored Apr 03, 2019
  
  8dc117d8
31 Mar, 2019 1 commit
- Changes the UI of the main view. · a99b2e79
  Filipe de Lima Brito authored Mar 31, 2019
  
  a99b2e79