Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity
4,346 Commits 133 Branches 200 Tags
8a15fb242a3eb8a7347d1aa30e877af70803c672
Commit Graph

4346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
akwizgran
8a15fb242a Merge branch 'briar-integration-test-transaction' into 'master' 
Remove custom DB transaction code from BriarIntegrationTest

See merge request briar/briar!946
 2018-10-09 14:16:23 +00:00
akwizgran
18ae388137 Merge branch '1395-low-memory-crash' into 'master' 
Don't use non-AppCompat theme for AppCompat activities

Closes #1395

See merge request briar/briar!947
 2018-10-08 12:03:20 +00:00
Torsten Grote
775031e893 Don't use non-AppCompat theme for AppCompat activities 
Fixes #1395
 2018-10-05 16:50:11 -03:00
Torsten Grote
9f91b91a4f Remove custom DB transaction code from BriarIntegrationTest 2018-10-05 15:41:29 -03:00
akwizgran
87701e5f07 Merge branch 'transactional-db' into 'master' 
Transactional DB interface

See merge request briar/briar!945
 2018-10-05 15:19:40 +00:00
Torsten Grote
3aae01d152 Merge branch 'panic-app-list' into 'master' 
Update list of panic button apps after installing app

Closes #1392

See merge request briar/briar!940
 2018-10-05 14:18:44 +00:00
akwizgran
bc298ba68a Remove unnecessary final modifiers. 2018-10-05 09:34:41 +01:00
akwizgran
2623eaa149 Remove unnecessary throwing variants. 2018-10-05 09:32:01 +01:00
akwizgran
7359b6942a Use transactional DB interface for ForumManagerImpl. 2018-10-04 15:59:10 +01:00
akwizgran
3bcc532b4b Add transactional DB interface. 2018-10-04 15:56:21 +01:00
Administrator
a384450c36 Merge branch '1373-format-numbers' into 'master' 
Format numbers in locale as well (not all languages use the same)

See merge request briar/briar!943
 2018-10-03 11:41:56 +00:00
akwizgran
b375e9873c Merge branch '1409-localize-crash-screen' into 'master' 
Localize crash screen in language defined in settings

Closes #1409

See merge request briar/briar!944
 2018-10-03 07:53:41 +00:00
Torsten Grote
cb30c3885a Localize crash screen in language defined in settings 2018-10-02 17:56:33 -03:00
Torsten Grote
6ee81eb24c Format numbers in locale as well (not all languages use the same) 
Done according to
https://developer.android.com/training/basics/supporting-devices/languages#FormatNumbers
 2018-10-02 17:31:23 -03:00
Torsten Grote
c14ebe82ce Merge branch '1365-keep-screen-on' into 'master' 
Keep screen on while QR code viewfinder is open

See merge request briar/briar!942
 2018-10-02 11:20:46 +00:00
Torsten Grote
00e9f894b1 Merge branch 'remove-tor-patch' into 'master' 
Remove unused patches

See merge request briar/briar!941
 2018-10-02 11:13:06 +00:00
akwizgran
499c586a59 Keep screen on while scanning QR code. 2018-10-02 12:03:29 +01:00
akwizgran
64f9ce7306 Remove unused patches. 2018-10-02 11:49:29 +01:00
akwizgran
39478a7914 Bump version numbers for 1.1.2 release. release-1.1.2 2018-10-01 14:58:45 +01:00
akwizgran
112e71a9cb Bump version numbers for 1.0.2 release. 2018-10-01 14:56:08 +01:00
akwizgran
5650bef310 Update translations. 2018-10-01 14:56:08 +01:00
akwizgran
2a87171c49 Merge branch 'manual-screenshots' into 'master' 
Create Screenshot of Conversation for Manual

Closes #1377

See merge request briar/briar!910
 2018-10-01 13:41:05 +00:00
akwizgran
071d961ed1 Remove debug logging. 2018-09-28 11:31:22 +01:00
akwizgran
cb9efc5fec Fix lint warnings. 2018-09-28 11:28:47 +01:00
akwizgran
f9e292f734 Update panic app list after installing app. 2018-09-28 11:27:08 +01:00
akwizgran
15cb5409e7 Merge branch '1352-panic-ripple-fdroid' into 'master' 
Fix Panic Button bugs

Closes #1109 and #1352

See merge request briar/briar!937
 2018-09-28 09:57:18 +00:00
akwizgran
fd07dc006d Update comment. 2018-09-28 09:55:47 +01:00
akwizgran
cc87c4e37d Merge branch '1391-start-end-api15' into 'master' 
RTL language layout fixes

Closes #1391

See merge request briar/briar!938
 2018-09-28 08:45:17 +00:00
akwizgran
4a10e876f6 Merge branch '1389-notice-shadows' into 'master' 
Fix notice shadows

Closes #1389

See merge request briar/briar!939
 2018-09-28 08:43:06 +00:00
Torsten Grote
fad0057c4a Fix notice shadows 2018-09-27 20:32:13 -03:00
Torsten Grote
5aabfcea9a Unmirror checkboxes in RTL layouts 2018-09-27 19:09:08 -03:00
Torsten Grote
f7d928c774 Fix start/end margins for API 15 
Fixes #1391
 2018-09-27 19:07:13 -03:00
Torsten Grote
bd983d9796 Remove non-functional uninstall panic action 
Fixes #1109
 2018-09-27 18:37:57 -03:00
Torsten Grote
de8d1b7d96 Allow sign out by trusted non-paired panic apps 2018-09-27 18:25:31 -03:00
Torsten Grote
9155f62d0b Remove Amnesty International's key and add F-Droid Ripple key instead 
Fixes #1352
 2018-09-27 18:17:14 -03:00
akwizgran
86684e228a Merge branch 'slow-bridges' into 'master' 
Update bridge list, test for slow bridges

See merge request briar/briar!936
 2018-09-27 16:10:22 +00:00
akwizgran
9615eff649 Add new bridges to replace slow ones. 2018-09-27 16:11:52 +01:00
akwizgran
9381d46f51 Remove two bridges that are slow to bootstrap. 2018-09-27 16:08:14 +01:00
akwizgran
e4a3a1ad40 Delete Tor state after testing each bridge. 2018-09-27 16:07:46 +01:00
akwizgran
905dc2a662 Merge branch 'qr-code-version-errors' into 'master' 
Show different error message if QR code is too new

See merge request briar/briar!934
 2018-09-24 16:42:43 +00:00
Torsten Grote
c2b7f85b8e Remove code from TestDataCreator that breaks encapsulation 2018-09-24 12:37:11 -03:00
Torsten Grote
ae81eb3737 Throw AssertionError when creating an account while a database key is in memory 2018-09-24 12:37:11 -03:00
Torsten Grote
60d949c342 Refactor tests so that all test data is created in the first test 2018-09-24 12:37:11 -03:00
Torsten Grote
1c90e64894 Split up UI and Screenshot tests 
Closes #1377
 2018-09-24 12:37:06 -03:00
Torsten Grote
f0e2d5281f Create Screenshot of Conversation for Manual 2018-09-24 12:34:26 -03:00
akwizgran
c7522dae1f Show different error message if QR code is too new. 2018-09-24 13:21:45 +01:00
Torsten Grote
097d14b9a1 Merge branch 'private-message-visitor' into 'master' 
Use visitor pattern to create conversation items

See merge request briar/briar!933
 2018-09-20 19:04:14 +00:00
akwizgran
0491c3cace Use a visitor to create ConversationItems. 2018-09-20 16:53:48 +01:00
akwizgran
cbae13feca Merge branch 'gradle-4.10' into 'master' 
Upgrade the gradle wrapper to version 4.10.2

See merge request briar/briar!932
 2018-09-20 15:34:33 +00:00
Torsten Grote
b7c8859c82 Upgrade the gradle wrapper to version 4.10.2 2018-09-20 11:52:19 -03:00