Commits · neilalexander/p2p · Neil Alexander / element-ios

07 May, 2021 1 commit
- BLE fixes for P2P demo · 495715dc
  Neil Alexander authored May 07, 2021
  
  495715dc
23 Apr, 2021 1 commit
- Make configuration tweaks · 6b82d051
  Neil Alexander authored Apr 23, 2021
  
  6b82d051
22 Apr, 2021 5 commits
- Merge tag 'v1.3.5' into neilalexander/p2p-updated · 14e5689b
  Neil Alexander authored Apr 22, 2021
  
  14e5689b
- Merge branch 'release/1.3.5/master' · b6ff5f7d
  manuroe authored Apr 22, 2021
  
  b6ff5f7d
- finish version++ · 248795c2
  manuroe authored Apr 22, 2021
  
  248795c2
- Merge pull request #4256 from vector-im/release/1.3.5/release · ce00ad8f
  manuroe authored Apr 22, 2021
```
Release 1.3.5
```
  ce00ad8f
- version++ · d671df41
  manuroe authored Apr 22, 2021
  
  d671df41
21 Apr, 2021 15 commits
- Merge pull request #4250 from vector-im/fix_room_leave · 3cbeba85
  ismailgulek authored Apr 21, 2021
```
Fixes on Room Leave
```
  3cbeba85
- Merge pull request #4135 from vector-im/gh-actions · 2e9da81b
  manuroe authored Apr 21, 2021
```
Introduce GitHub Actions
```
  2e9da81b
- Update CHANGES.rst · bcd82c97
  Ismail Gulek authored Apr 21, 2021
  
  bcd82c97
- Hide scroll to bottom when room is left · b4f4d9a0
  Ismail Gulek authored Apr 21, 2021
  
  b4f4d9a0
- Pop view controller if pushed before · b800cbbe
  Ismail Gulek authored Apr 21, 2021
  
  b800cbbe
- Merge pull request #4219 from vector-im/element_4218 · 21bcfe4b
  Gil Eluard authored Apr 21, 2021
```
Make room settings screen configurable dynamically
```
  21bcfe4b
- GH Actions: Polish · 29552ce9
  manuroe authored Apr 21, 2021
  
  29552ce9
- Merge branch 'develop' into element_4218 · b1e932a3
  Gil Eluard authored Apr 21, 2021
```
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
```
  b1e932a3
- Merge pull request #4212 from vector-im/element_4211 · 8fab4438
  Gil Eluard authored Apr 21, 2021
```
Make joining public rooms configurable
```
  8fab4438
- GH Actions: Increase test expectation timeout. Machines are slow · 8ce5f1cb
  manuroe authored Apr 21, 2021
  
  8ce5f1cb
- Merge branch 'develop' into element_4211 · ae3b6950
  Gil Eluard authored Apr 21, 2021
```
# Conflicts:
#	CHANGES.rst
```
  ae3b6950
- Merge pull request #4246 from vector-im/element_4245 · 6123b3ee
  Gil Eluard authored Apr 21, 2021
```
Show / Hide integrations and actions in rooms
```
  6123b3ee
- Podfile.lock reverted · 30e7373d
  Gil Eluard authored Apr 21, 2021
  
  30e7373d
- Podfile.lock · 0e678dac
  Gil Eluard authored Apr 21, 2021
  
  0e678dac
- GH Actions: Use a separate job for tests to save time · d1c2f528
  manuroe authored Apr 21, 2021
  
  d1c2f528
20 Apr, 2021 18 commits
- GH Actions: Add cached for bundler and pods · 59f1dd25
  manuroe authored Apr 20, 2021
  
  59f1dd25
- GH Actions: Make tests work probably better · e573f167
  manuroe authored Apr 20, 2021
  
  e573f167
- GH Actions: Run tests in another way · 0d3b4150
  manuroe authored Apr 20, 2021
  
  0d3b4150
- GH Actions: Run projects tests · dbcd2c90
  manuroe authored Apr 20, 2021
  
  dbcd2c90
- Fastlane: Add a lane for tests · 5286164d
  manuroe authored Apr 20, 2021
  
  5286164d
- Updated CHANGES.rst · a8e3b9db
  Gil Eluard authored Apr 20, 2021
  
  a8e3b9db
- Merge branch 'develop' into element_4218 · 27f51f86
  Gil Eluard authored Apr 20, 2021
```
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
```
  27f51f86
- Merge branch 'develop' into element_4211 · 5d63f431
  Gil Eluard authored Apr 20, 2021
```
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
```
  5d63f431
- Show / Hide integrations and actions in rooms · e4b5358f
  Gil Eluard authored Apr 20, 2021
```
- Initial Build Settings
```
  e4b5358f
- Show / Hide integrations and actions in rooms · 16da1f56
  Gil Eluard authored Apr 20, 2021
  
  16da1f56
- Merge branch 'develop' into gh-actions · a9dcfce6
  manuroe authored Apr 20, 2021
  
  a9dcfce6
- Merge pull request #4244 from vector-im/fix_public_search · db92fb4f
  SBiOSoftWhare authored Apr 20, 2021
```
PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off
```
  db92fb4f
- Merge branch 'develop' into fix_public_search · 873aa9fd
  SBiOSoftWhare authored Apr 20, 2021
  
  873aa9fd
- Merge pull request #4238 from vector-im/MadLittleMods/gitter.im-room-directory · 2cfe9441
  manuroe authored Apr 20, 2021
```
Add gitter.im to default list of room directories
```
  2cfe9441
- Merge branch 'develop' into MadLittleMods/gitter.im-room-directory · 15f98301
  manuroe authored Apr 20, 2021
  
  15f98301
- Merge pull request #4243 from vector-im/element_4242 · cafed69c
  Gil Eluard authored Apr 20, 2021
```
Show/Hide public directory in Unified Search
```
  cafed69c
- Update changes · dff2a7ea
  SBiOSoftWhare authored Apr 20, 2021
  
  dff2a7ea
- DirectoryRecentTableViewCell: Do not use "directory_search_results_more_than"... · 55ebed6f
  SBiOSoftWhare authored Apr 20, 2021
```
DirectoryRecentTableViewCell: Do not use "directory_search_results_more_than" string when there is no rooms and the search is on.
```
  55ebed6f