akwizgran
|
ab387860a6
|
Removed visibility indicators from private group member list.
|
2017-07-03 16:37:29 +01:00 |
|
akwizgran
|
f63fc94f2b
|
Removed visibility indicators from private group join messages.
|
2017-07-03 16:37:29 +01:00 |
|
Torsten Grote
|
8303175494
|
Merge branch 'use-f-droid-base-docker-image' into 'master'
Use F-Droid's base Docker image
See merge request !556
|
2017-07-03 15:35:28 +00:00 |
|
akwizgran
|
151eb6935b
|
Use F-Droid's base Docker image.
|
2017-07-03 16:17:03 +01:00 |
|
akwizgran
|
6a419c0c7b
|
Merge branch '968-downgrade-h2' into 'master'
Downgrade H2 to 1.4.192
Closes #968
See merge request !550
|
2017-07-03 11:51:35 +00:00 |
|
akwizgran
|
1795b32121
|
Downgrade H2 to 1.4.192.
|
2017-07-03 12:36:45 +01:00 |
|
akwizgran
|
01971768ce
|
Merge branch '970_settings_use_summaries' into 'master'
Split notification settings into title and summary.
Closes #970
See merge request !554
|
2017-07-03 11:19:15 +00:00 |
|
akwizgran
|
ef7483ab01
|
Merge branch '787-tapping-blog-author-opens-same-blog' into 'master'
Don't reopen the same blog when the author is tapped
Closes #787
See merge request !551
|
2017-07-03 10:43:15 +00:00 |
|
akwizgran
|
527d11473d
|
Merge branch '805-introduction-message-layout' into 'master'
Use smaller layout for introduction message screen
Closes #805
See merge request !552
|
2017-07-03 10:40:10 +00:00 |
|
akwizgran
|
775dadc9a0
|
Merge branch '904-notify-tor-controller' into 'master'
Notify Tor controller if Tor has crashed
Closes #904
See merge request !543
|
2017-07-03 09:29:04 +00:00 |
|
akwizgran
|
800b10a988
|
Merge branch '956-tap-protection-ux' into 'master'
Don't show tap protection dialog until it's needed
Closes #956
See merge request !548
|
2017-07-03 09:22:31 +00:00 |
|
akwizgran
|
c977bf047d
|
Removed overrides of showScreenFilterWarning.
|
2017-07-03 10:08:36 +01:00 |
|
goapunk
|
660a25f21d
|
Split notification settings into title and summary.
Signed-off-by: goapunk <noobie@goapunks.net>
|
2017-07-03 09:27:07 +02:00 |
|
Torsten Grote
|
e7fd6d23af
|
Merge branch '962-check-blog-subscription-when-removing-contact' into 'master'
Check personal blog subscription when removing contact
See merge request !549
|
2017-06-30 20:57:52 +00:00 |
|
Torsten Grote
|
46982897f0
|
Merge branch '963-load-thread-list-messages-on-start' into 'master'
Load messages each time activity starts
See merge request !547
|
2017-06-30 20:53:13 +00:00 |
|
Torsten Grote
|
d24de68d64
|
Merge branch '574-upgrade-tor' into 'master'
Upgrade Tor to 0.2.9
Closes #574
See merge request !542
|
2017-06-30 20:36:22 +00:00 |
|
akwizgran
|
7514c46a3f
|
Use smaller layout for introduction message screen.
|
2017-06-30 16:23:16 +01:00 |
|
akwizgran
|
6632c0f8e3
|
Don't reopen the same blog when the author is tapped.
|
2017-06-30 14:24:32 +01:00 |
|
akwizgran
|
79aafcda69
|
Fixed a test, added a regression test.
|
2017-06-30 12:58:44 +01:00 |
|
akwizgran
|
05af21e8dc
|
Check personal blog subscription when removing contact.
|
2017-06-30 12:04:34 +01:00 |
|
akwizgran
|
0dc62cbbdc
|
Fixed a test.
|
2017-06-30 10:01:35 +01:00 |
|
akwizgran
|
f3a084cfd2
|
Removed option to remember shown overlay apps.
|
2017-06-29 18:47:36 +01:00 |
|
akwizgran
|
8b32f82566
|
Don't show tap protection dialog until it's needed.
|
2017-06-29 18:18:39 +01:00 |
|
akwizgran
|
d598b6ed44
|
Load messages each time activity starts.
|
2017-06-26 16:21:25 +01:00 |
|
akwizgran
|
f5dc6f24b9
|
Bumped expiry date to 1 September 2017.
|
2017-06-26 14:50:58 +01:00 |
|
akwizgran
|
37454392da
|
Update Tor binaries to 0.2.9.11.
|
2017-06-23 22:06:00 +01:00 |
|
akwizgran
|
de7f9111d3
|
Update Tor patch to 0.2.9.11.
|
2017-06-23 15:23:26 +01:00 |
|
akwizgran
|
96d2889a6c
|
Notify Tor controller if Tor has crashed.
|
2017-06-23 14:57:00 +01:00 |
|
Torsten Grote
|
f6412d1e9a
|
Merge branch 'spongy-castle-1-56' into 'master'
Upgrade Spongy Castle and some other dependencies
See merge request !541
|
2017-06-15 17:37:22 +00:00 |
|
akwizgran
|
b377cd6b1c
|
Upgrade Spongy Castle and some other dependencies.
|
2017-06-12 17:44:08 +01:00 |
|
Ernir Erlingsson
|
f6cdbda5bb
|
Merge branch 'master' of https://code.briarproject.org/akwizgran/briar
|
2017-05-29 11:06:16 +02:00 |
|
Ernir Erlingsson
|
855c600a3e
|
hotfix list restore NPE for user testing
|
2017-05-29 11:05:46 +02:00 |
|
akwizgran
|
ea6e8303b0
|
Merge branch '954_dont_show_on_startup_failure' into 'master'
Don't show screenfilter warning in StartupFailureActivity
See merge request !539
|
2017-05-29 09:05:18 +00:00 |
|
goapunk
|
d4934040d9
|
Don't show screenfilter warning in StartupFailureActivity
Signed-off-by: goapunk <noobie@goapunks.net>
|
2017-05-22 12:40:33 +02:00 |
|
akwizgran
|
3449677b24
|
Bumped version number and expiry date.
|
2017-05-19 12:07:29 +01:00 |
|
akwizgran
|
1ad3a6646e
|
Merge branch '941-store-correct-parent-id' into 'master'
Store correct original parent ID when rewrapping blog posts
See merge request !534
|
2017-05-12 09:53:27 +00:00 |
|
akwizgran
|
2d10f6b2bd
|
Merge branch '884-emoji-text-view-layout-bug' into 'master'
Remove ellipsizing support from EmojiTextView
Closes #884
See merge request !533
|
2017-05-12 09:35:33 +00:00 |
|
akwizgran
|
5b05424d83
|
Merge branch 'master' into '941-store-correct-parent-id'
# Conflicts:
# briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
|
2017-05-12 09:34:24 +00:00 |
|
akwizgran
|
0826022d82
|
Merge branch 'bring_annotations_in_line' into 'master'
Bring nullable annotation imports in line
See merge request !536
|
2017-05-12 09:33:00 +00:00 |
|
akwizgran
|
a901bfb9cb
|
Merge branch '948-vector-crash' into 'master'
Remove scientific notation from vector drawables to prevent crashes
Closes #948
See merge request !537
|
2017-05-12 09:28:59 +00:00 |
|
akwizgran
|
03cdce122a
|
Merge branch '947-bluetooth-address-crash' into 'master'
Don't crash on empty bluetooth addresses
See merge request !538
|
2017-05-12 09:26:57 +00:00 |
|
goapunk
|
f2e0e16969
|
Bring nullable annotation imports in line
Signed-off-by: goapunk <noobie@goapunks.net>
|
2017-05-12 10:06:56 +02:00 |
|
Torsten Grote
|
0c441e2ff3
|
Don't crash on empty bluetooth addresses
|
2017-05-10 15:06:09 -03:00 |
|
Torsten Grote
|
21302304a5
|
Remove scientific notation from vector drawables to prevent crashes
Details: http://stackoverflow.com/a/40829348
|
2017-05-10 14:56:59 -03:00 |
|
Torsten Grote
|
6839d8b844
|
Merge branch 'wifi-manager-memory-leak' into 'master'
Use application context to get WifiManager
See merge request !535
|
2017-05-10 17:01:52 +00:00 |
|
Torsten Grote
|
aee65a716c
|
Merge branch '798-remove-contact-blogs' into 'master'
Allow to remove pre-shared blogs of our contacts
Closes #798
See merge request !529
|
2017-05-10 16:58:38 +00:00 |
|
Torsten Grote
|
6a07d8f2c9
|
Allow to remove pre-shared blogs of our contacts
|
2017-05-10 13:50:07 -03:00 |
|
Ernir Erlingsson
|
3c1ea81cd0
|
Merge branch '853-disabled-menu-items' into 'master'
Remove theme default color override
Closes #853
See merge request !527
|
2017-05-06 20:26:15 +00:00 |
|
Ernir Erlingsson
|
025f417bc7
|
Merge branch '894-list-position-restore' into 'master'
save and restore list position for threaded lists
Closes #894 and #946
See merge request !528
|
2017-05-06 19:37:02 +00:00 |
|
Ernir Erlingsson
|
c9dcd906c9
|
final pre-merge fixes
|
2017-05-06 21:36:25 +02:00 |
|