Commits · master · briar / briar

10 May, 2021 4 commits
- Merge branch 'create-testdata-zero-values' into 'master' · 61ca2a39
  akwizgran authored May 10, 2021
```
Add button to zero values when creating test data

See merge request !1447
```
  61ca2a39
- Merge branch '2032-connect-via-bt-crash' into 'master' · 88537b93
  akwizgran authored May 10, 2021
```
Remove duplicate code due to merge mistake

Closes #2032

See merge request !1456
```
  88537b93
- Add button to zero values when creating test data · e6c004e8
  Daniel Lublin authored May 03, 2021
  
  e6c004e8
- Remove duplicate code due to merge mistake. · dc7290da
  akwizgran authored May 10, 2021
  
  dc7290da
06 May, 2021 4 commits
- Merge branch '2005-connect-via-bt-error' into 'master' · 9dff8bd6
  akwizgran authored May 06, 2021
```
Connect via Bluetooth: Wait before showing an error Toast

See merge request !1446
```
  9dff8bd6
- Merge branch 'master' into '2005-connect-via-bt-error' · 35c2f601
  akwizgran authored May 06, 2021
```
# Conflicts:
#   briar-android/src/main/java/org/briarproject/briar/android/conversation/BluetoothConnecter.java
```
  35c2f601
- Merge branch '2027-pause-polling-when-doing-connect-via-bt' into 'master' · 471a2372
  akwizgran authored May 06, 2021
```
Disable polling while doing connect-via-BT

Closes #2027

See merge request !1450
```
  471a2372
- Disable polling while doing connect-via-BT · fba028db
  Daniel Lublin authored May 04, 2021
  
  fba028db
05 May, 2021 4 commits
- Merge branch '2009-xiaomi-setup-screen' into 'master' · c647c526
  Torsten Grote authored May 05, 2021
```
Show instructions for locking Briar to the Xiaomi recent apps list

Closes #2009

See merge request !1451
```
  c647c526
- Move input state methods to UiUtils. · cad5edcf
  akwizgran authored May 05, 2021
  
  cad5edcf
- Add full stop. · 38f70bb6
  akwizgran authored May 05, 2021
  
  38f70bb6
- Show instructions for locking Briar to the Xiaomi recent apps list. · 33bdc81b
  akwizgran authored May 05, 2021
  
  33bdc81b
04 May, 2021 2 commits
- Merge branch 'allow-one-unreachable-bridge' into 'master' · 21fd7f5e
  Torsten Grote authored May 04, 2021
```
Allow BridgeTest to pass if one bridge is unreachable

See merge request !1449
```
  21fd7f5e
- Allow BridgeTest to pass if one bridge is unreachable. · 6354e91b
  akwizgran authored May 04, 2021
  
  6354e91b
03 May, 2021 6 commits
- Merge branch '2012-update-bubbles-after-removing-messages' into 'master' · 8123c063
  Torsten Grote authored May 03, 2021
```
Update disappearing message bubbles after removing messages

Closes #2012

See merge request !1448
```
  8123c063
- Update disappearing message bubbles after removing messages. · 663c6483
  akwizgran authored May 03, 2021
  
  663c6483
- Bump version numbers for 1.3.3 release. · bee4e949
  akwizgran authored May 03, 2021
  
  bee4e949
- Update translations. · c44bdc87
  akwizgran authored May 03, 2021
  
  c44bdc87
- Merge branch '1894-viewmodel-for-rssfeed-activities' into 'master' · 423ecf71
  Torsten Grote authored May 03, 2021
```
Introduce ViewModel for RssFeed*Activity

Closes #1894

See merge request !1366
```
  423ecf71
- Introduce RssFeedViewModel · 73c7882c
  Daniel Lublin authored Apr 20, 2021
```
Furnishing the RssFeed function as a single activity with fragments for
Manage and Import.
```
  73c7882c
30 Apr, 2021 3 commits
- Wait for an incoming connection before showing an error Toast · 552b9ef2
  Torsten Grote authored Apr 30, 2021
  
  552b9ef2
- Merge branch '1827-target-api-30' into 'master' · 683af1ec
  Torsten Grote authored Apr 30, 2021
```
Raise target API level to 30, upgrade build tools to 30.0.3

Closes #1827

See merge request !1445
```
  683af1ec
- Raise target API level to 30, upgrade build tools to 30.0.3. · 77ed1531
  akwizgran authored Apr 30, 2021
  
  77ed1531
27 Apr, 2021 4 commits
- Merge branch '1962-connect-via-bt-backend' into 'master' · 3d725576
  akwizgran authored Apr 27, 2021
```
Implement connect via Bluetooth backend

Closes #1962

See merge request !1412
```
  3d725576
- Implement backend for connect via bluetooth · e2a11d42
  Daniel Lublin authored Apr 17, 2021
  
  e2a11d42
- Merge branch 'translation-update-script' into 'master' · 0f5ea6ae
  akwizgran authored Apr 27, 2021
```
Add script to update Android app translations

See merge request !1442
```
  0f5ea6ae
- Merge branch 'prevent-double-pipelines' into 'master' · 5b2c9b85
  akwizgran authored Apr 27, 2021
```
Avoid duplicate CI pipelines running at the same time

See merge request !1443
```
  5b2c9b85
26 Apr, 2021 5 commits
- Avoid duplicate CI pipelines running at the same time · 94921230
  Torsten Grote authored Apr 26, 2021
```
Docs:
https://docs.gitlab.com/ee/ci/yaml/README.html#switch-between-branch-pipelines-and-merge-request-pipelines
https://docs.gitlab.com/ee/ci/yaml/README.html#avoid-duplicate-pipelines
```
  94921230
- Add script to update Android app translations · 34788356
  Torsten Grote authored Apr 26, 2021
```
add German and Spanish (incl. video) play store listing
```
  34788356
- Bump version numbers for 1.3.2 release. · 2f719d7f
  akwizgran authored Apr 26, 2021
  
  2f719d7f
- Enable features for 1.3 release. · eb2e8d75
  akwizgran authored Apr 26, 2021
  
  eb2e8d75
- Update translations. · 338d2882
  akwizgran authored Apr 26, 2021
  
  338d2882
23 Apr, 2021 5 commits
- Merge branch '1743-huawei-app-launch' into 'master' · 03fe1a2d
  Torsten Grote authored Apr 23, 2021
```
Add button for opening Huawei battery settings during setup

See merge request !1441
```
  03fe1a2d
- Merge branch 'fastlane-metadata-upload' into 'master' · ade48c7b
  akwizgran authored Apr 23, 2021
```
Update Google play listing and language mappings

See merge request !1440
```
  ade48c7b
- Add button for opening Huawei battery settings during setup. · 4a8d89e2
  akwizgran authored Apr 23, 2021
  
  4a8d89e2
- Google play listing now available in: · 0fed1681
  Torsten Grote authored Apr 23, 2021
```
* Persian
* Galician
* Lithuanian
* Turkish
* Chinese (Simplified)
```
  0fed1681
- Merge branch 'fastlane-metadata-upload' into 'master' · 93ad4830
  akwizgran authored Apr 23, 2021
```
Update Play Store listing and add Catalan translation

See merge request !1439
```
  93ad4830
22 Apr, 2021 3 commits
- Update Play Store listing and add Catalan translation · d995e739
  Torsten Grote authored Apr 22, 2021
  
  d995e739
- Merge branch '1914-create-viewmodels-directly-after-injection' into 'master' · 1d271bab
  Torsten Grote authored Apr 22, 2021
```
Create ViewModels directly after injection

Closes #1914

See merge request !1432
```
  1d271bab
- Merge branch '1883-resource-ids-will-be-non-final' into 'master' · a9d2aa93
  Torsten Grote authored Apr 22, 2021
```
Replace switch statements with resource ids with if-then-else

Closes #1883

See merge request !1438
```
  a9d2aa93