akwizgran
|
e7dddda7e5
|
Merge branch 'tor-0.3.5.15' into 'master'
Upgrade Tor to 0.3.5.15
Closes #2075
See merge request briar/briar!1483
|
2021-06-17 12:21:01 +00:00 |
|
akwizgran
|
208ff6f3a5
|
Merge branch '2056-view-pager-crash' into 'master'
Migrate to ViewPager2 to fix weird ViewPager crash
Closes #2056
See merge request briar/briar!1484
|
2021-06-17 12:07:04 +00:00 |
|
akwizgran
|
4d31465191
|
Merge branch 'master' into 'tor-0.3.5.15'
# Conflicts:
# bramble-java/build.gradle
|
2021-06-17 12:05:34 +00:00 |
|
Torsten Grote
|
cf987427e0
|
Migrate to ViewPager2 to fix weird ViewPager crash
|
2021-06-16 12:44:04 -03:00 |
|
akwizgran
|
b11b959fd3
|
Merge branch 'upgrade-libraries-1.3' into 'master'
Upgrade libraries after 1.3 release
See merge request briar/briar!1455
|
2021-06-16 13:52:04 +00:00 |
|
Torsten Grote
|
61f660ca1d
|
Upgrade libraries before 1.3 release
|
2021-06-16 10:40:30 -03:00 |
|
akwizgran
|
6d44521016
|
Upgrade Tor to 0.3.5.15.
|
2021-06-16 11:16:10 +01:00 |
|
akwizgran
|
7289f5ba8a
|
Merge branch '2059-no-such-group-exception' into 'master'
Check if group still exists before storing MessageId of thread position
Closes #2059
See merge request briar/briar!1477
|
2021-06-14 14:57:21 +00:00 |
|
Torsten Grote
|
b657c7f347
|
Ignore NoSuchGroupException when storing MessageId of thread position for removed group
|
2021-06-10 15:45:31 -03:00 |
|
Torsten Grote
|
40865425c5
|
Merge branch 'fix-padding-of-contact-exchange-error' into 'master'
Fix missing padding for title in contact exchange error fragment
See merge request briar/briar!1478
|
2021-06-09 11:56:57 +00:00 |
|
Sebastian Kürten
|
f7249f5e84
|
Fix missing padding for title in contact exchange error fragment
|
2021-06-09 13:45:32 +02:00 |
|
Torsten Grote
|
cc04fb05c2
|
Merge branch '1971-tor-0.3.5.14' into 'master'
Upgrade Tor to 0.3.5.14
Closes #1971
See merge request briar/briar!1470
|
2021-05-31 12:02:58 +00:00 |
|
akwizgran
|
58eb1d9e24
|
Upgrade Tor to 0.3.5.14.
|
2021-05-28 11:45:21 +01:00 |
|
akwizgran
|
76b7e6fecf
|
Bump version numbers for 1.3.4 release.
release-1.3.4
beta-1.3.4
alpha-1.3.4
|
2021-05-19 10:47:08 +01:00 |
|
akwizgran
|
980940a7cf
|
Update translations.
|
2021-05-19 10:46:21 +01:00 |
|
akwizgran
|
9a021daae8
|
Merge branch '2043-blog-scrolling' into 'master'
Automatically scroll to our own blog posts
Closes #2043
See merge request briar/briar!1462
|
2021-05-19 09:35:10 +00:00 |
|
Torsten Grote
|
cc9904a454
|
Automatically scroll to our own blog posts
|
2021-05-18 15:39:22 -03:00 |
|
Torsten Grote
|
b0faab9395
|
Merge branch 'remove-failed-bridges' into 'master'
Remove three failed bridges
See merge request briar/briar!1460
|
2021-05-17 17:37:58 +00:00 |
|
akwizgran
|
f1198b47fd
|
Remove three failed bridges.
|
2021-05-17 16:36:00 +01:00 |
|
akwizgran
|
37f2ab555f
|
Update translations.
|
2021-05-17 16:26:22 +01:00 |
|
akwizgran
|
61ca2a391b
|
Merge branch 'create-testdata-zero-values' into 'master'
Add button to zero values when creating test data
See merge request briar/briar!1447
|
2021-05-10 12:05:26 +00:00 |
|
akwizgran
|
88537b9323
|
Merge branch '2032-connect-via-bt-crash' into 'master'
Remove duplicate code due to merge mistake
Closes #2032
See merge request briar/briar!1456
|
2021-05-10 11:55:38 +00:00 |
|
Daniel Lublin
|
e6c004e8f6
|
Add button to zero values when creating test data
|
2021-05-10 13:46:49 +02:00 |
|
akwizgran
|
dc7290dab7
|
Remove duplicate code due to merge mistake.
|
2021-05-10 12:29:28 +01:00 |
|
akwizgran
|
9dff8bd64a
|
Merge branch '2005-connect-via-bt-error' into 'master'
Connect via Bluetooth: Wait before showing an error Toast
See merge request briar/briar!1446
|
2021-05-06 13:14:32 +00:00 |
|
akwizgran
|
35c2f60129
|
Merge branch 'master' into '2005-connect-via-bt-error'
# Conflicts:
# briar-android/src/main/java/org/briarproject/briar/android/conversation/BluetoothConnecter.java
|
2021-05-06 13:03:46 +00:00 |
|
akwizgran
|
471a2372c8
|
Merge branch '2027-pause-polling-when-doing-connect-via-bt' into 'master'
Disable polling while doing connect-via-BT
Closes #2027
See merge request briar/briar!1450
|
2021-05-06 12:59:38 +00:00 |
|
Daniel Lublin
|
fba028db03
|
Disable polling while doing connect-via-BT
|
2021-05-06 11:13:35 +02:00 |
|
Torsten Grote
|
c647c52638
|
Merge branch '2009-xiaomi-setup-screen' into 'master'
Show instructions for locking Briar to the Xiaomi recent apps list
Closes #2009
See merge request briar/briar!1451
|
2021-05-05 16:39:55 +00:00 |
|
akwizgran
|
cad5edcf86
|
Move input state methods to UiUtils.
|
2021-05-05 16:57:25 +01:00 |
|
akwizgran
|
38f70bb6be
|
Add full stop.
|
2021-05-05 13:02:56 +01:00 |
|
akwizgran
|
33bdc81b3e
|
Show instructions for locking Briar to the Xiaomi recent apps list.
|
2021-05-05 12:37:23 +01:00 |
|
Torsten Grote
|
21fd7f5eed
|
Merge branch 'allow-one-unreachable-bridge' into 'master'
Allow BridgeTest to pass if one bridge is unreachable
See merge request briar/briar!1449
|
2021-05-04 12:31:38 +00:00 |
|
akwizgran
|
6354e91b55
|
Allow BridgeTest to pass if one bridge is unreachable.
|
2021-05-04 13:13:57 +01:00 |
|
Torsten Grote
|
8123c06348
|
Merge branch '2012-update-bubbles-after-removing-messages' into 'master'
Update disappearing message bubbles after removing messages
Closes #2012
See merge request briar/briar!1448
|
2021-05-03 16:57:04 +00:00 |
|
akwizgran
|
663c648337
|
Update disappearing message bubbles after removing messages.
|
2021-05-03 15:16:11 +01:00 |
|
akwizgran
|
bee4e94987
|
Bump version numbers for 1.3.3 release.
alpha-1.3.3
|
2021-05-03 13:55:39 +01:00 |
|
akwizgran
|
c44bdc8762
|
Update translations.
|
2021-05-03 13:38:14 +01:00 |
|
Torsten Grote
|
423ecf71d8
|
Merge branch '1894-viewmodel-for-rssfeed-activities' into 'master'
Introduce ViewModel for RssFeed*Activity
Closes #1894
See merge request briar/briar!1366
|
2021-05-03 12:35:32 +00:00 |
|
Daniel Lublin
|
73c7882cc0
|
Introduce RssFeedViewModel
Furnishing the RssFeed function as a single activity with fragments for
Manage and Import.
|
2021-05-03 09:40:40 +02:00 |
|
Torsten Grote
|
552b9ef21a
|
Wait for an incoming connection before showing an error Toast
|
2021-04-30 16:01:54 -03:00 |
|
Torsten Grote
|
683af1ec3a
|
Merge branch '1827-target-api-30' into 'master'
Raise target API level to 30, upgrade build tools to 30.0.3
Closes #1827
See merge request briar/briar!1445
|
2021-04-30 17:44:49 +00:00 |
|
akwizgran
|
77ed15311c
|
Raise target API level to 30, upgrade build tools to 30.0.3.
|
2021-04-30 14:51:49 +01:00 |
|
akwizgran
|
3d72557618
|
Merge branch '1962-connect-via-bt-backend' into 'master'
Implement connect via Bluetooth backend
Closes #1962
See merge request briar/briar!1412
|
2021-04-27 12:27:55 +00:00 |
|
Daniel Lublin
|
e2a11d42f8
|
Implement backend for connect via bluetooth
|
2021-04-27 14:15:10 +02:00 |
|
akwizgran
|
0f5ea6ae66
|
Merge branch 'translation-update-script' into 'master'
Add script to update Android app translations
See merge request briar/briar!1442
|
2021-04-27 11:09:24 +00:00 |
|
akwizgran
|
5b2c9b85f9
|
Merge branch 'prevent-double-pipelines' into 'master'
Avoid duplicate CI pipelines running at the same time
See merge request briar/briar!1443
|
2021-04-27 11:08:13 +00:00 |
|
Torsten Grote
|
94921230d9
|
Avoid duplicate CI pipelines running at the same time
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
|
2021-04-26 15:37:16 -03:00 |
|
Torsten Grote
|
34788356e6
|
Add script to update Android app translations
add German and Spanish (incl. video) play store listing
|
2021-04-26 15:14:06 -03:00 |
|
akwizgran
|
2f719d7f2c
|
Bump version numbers for 1.3.2 release.
alpha-1.3.2
|
2021-04-26 13:50:35 +01:00 |
|