Commit Graph

5704 Commits

Author SHA1 Message Date
Anton Chekulaev
2e31900957 Merge branch 'dev' into light-theme
# Conflicts:
#	res/layout/activity_create_closed_group.xml
2020-09-02 13:33:16 +10:00
Anton Chekulaev
33876c2fc9 Use localized strings for UI mode dialog. 2020-09-02 13:24:02 +10:00
Anton Chekulaev
744e586cfe Flat action bar styles for the landing activities. 2020-09-02 13:13:19 +10:00
Anton Chekulaev
4b939358e9 Themes & styles cleanup. 2020-09-02 12:47:56 +10:00
Niels Andriesse
8e6920f37e
Merge pull request #309 from loki-project/shared-sender-keys
Remaining Shared Sender Keys Bits & Pieces Part 1/2
2020-09-02 12:06:03 +10:00
nielsandriesse
154181f518 Fix group leaving 2020-09-02 12:03:15 +10:00
Anton Chekulaev
4a39fe9588 Conversation activity theme tweaks. 2020-09-02 11:55:01 +10:00
nielsandriesse
2732b95940 Show a loader while the group is being created 2020-09-02 11:47:54 +10:00
Niels Andriesse
9865bdeece
Merge pull request #310 from RyanRory/open-group-date-handling
Fix Open Group Date Handling
2020-09-02 10:59:40 +10:00
nielsandriesse
55e273276b Update build number 2020-09-02 10:31:07 +10:00
nielsandriesse
146df2c5ef Fix incorrect database query 2020-09-02 10:22:19 +10:00
nielsandriesse
239efa7fc2 Merge branch 'dev' into shared-sender-keys 2020-09-02 09:49:19 +10:00
nielsandriesse
a12d9b4d98 Update build number 2020-09-02 08:54:14 +10:00
Anton Chekulaev
0004e7b387 Tap highlight color restored. 2020-09-01 19:32:43 +10:00
Anton Chekulaev
0992ad4e5b Outlined icons for conversation input panel. 2020-09-01 19:22:30 +10:00
Anton Chekulaev
ecd2dd8ef3 Conversation styling and coloring improvements. 2020-09-01 18:47:50 +10:00
nielsandriesse
6b75d3338f Update build number 2020-09-01 18:31:34 +10:00
nielsandriesse
fcc6304247 Fix path rebuilding 2020-09-01 18:30:54 +10:00
Anton Chekulaev
3236fde416 Adjustments for branded popup button styles. 2020-09-01 17:24:07 +10:00
nielsandriesse
d26712bdb4 Slightly reduce background poll interval 2020-09-01 17:02:08 +10:00
Anton Chekulaev
156b2687b8 Better brand button style for the light mode.
QR code fragment themed.
Minor adjustments to the brand colors for light mode.
2020-09-01 16:58:30 +10:00
nielsandriesse
ae956b732a Update build number 2020-09-01 16:30:35 +10:00
nielsandriesse
ef509d3c58 Show build number in app settings 2020-09-01 16:27:10 +10:00
nielsandriesse
12f35fea04 Update build number 2020-09-01 13:20:03 +10:00
nielsandriesse
59c3f03f9b Update version number 2020-09-01 11:43:12 +10:00
nielsandriesse
968177c012 Add logs 2020-09-01 10:38:16 +10:00
Ryan ZHAO
c0a8e6991d fix open group date handling 2020-09-01 09:48:14 +10:00
nielsandriesse
f0ad59370a Minor refactoring 2020-09-01 09:10:23 +10:00
Niels Andriesse
7c09079bb5
Merge pull request #307 from metaphore/thumbnail-attach-loading-indicator
Thumbnail Loading Indicators
2020-09-01 08:59:38 +10:00
Anton Chekulaev
b05350b5aa Daynight theme for media preview & overview activities. 2020-08-31 23:16:15 +10:00
Anton Chekulaev
4da13f8541 Merge remote-tracking branch 'loki/master' into light-theme 2020-08-31 19:54:47 +10:00
Anton Chekulaev
12f509c07e Merge remote-tracking branch 'loki/master' into thumbnail-attach-loading-indicator 2020-08-31 19:48:10 +10:00
Anton Chekulaev
7cc67daf80 DB attachment record gets properly updated on upload error.
Individual loading indicators per conversation item thumbnail.
2020-08-31 19:46:05 +10:00
nielsandriesse
e7b2e3a223 Debug 2020-08-31 16:03:46 +10:00
nielsandriesse
5957afa147 Debug SSK based closed group editing 2020-08-31 14:54:03 +10:00
nielsandriesse
52f50e3252 Fix SSK based closed group size inconsistency 2020-08-31 13:53:31 +10:00
nielsandriesse
967b621615 Update version number 2020-08-31 11:22:38 +10:00
nielsandriesse
e391ad8edd Fix attachment upload retrying 2020-08-31 10:47:39 +10:00
Anton Chekulaev
f3bb40e024 Loading indicator for message thumbnail view. 2020-08-28 17:38:19 +10:00
nielsandriesse
4b57114f25 Update build number 2020-08-28 08:30:42 +10:00
Niels Andriesse
1e38621c57
Merge pull request #306 from metaphore/qr-code-sharing-fix
Fix Share QR Code Crash
2020-08-28 08:17:02 +10:00
Anton Chekulaev
fe1362187e Use proper file URI for QR code sharing. 2020-08-27 20:53:50 +10:00
Anton Chekulaev
f11478585d Merge branch 'dev' of https://github.com/loki-project/session-android into light-theme 2020-08-27 15:51:54 +10:00
Anton Chekulaev
9d0d2cb07e Light theme feature intro bottom sheet. 2020-08-27 15:50:35 +10:00
nielsandriesse
8705d8675b Update comment 2020-08-27 15:49:16 +10:00
Niels Andriesse
a0b2f5dfb5
Merge pull request #300 from metaphore/qr-code-share-fix
Fix Share QR Code Crash
2020-08-27 15:47:41 +10:00
nielsandriesse
7fdec0ad98 Update version number 2020-08-27 15:41:07 +10:00
nielsandriesse
6139e81799 Update comment 2020-08-27 15:38:47 +10:00
Niels Andriesse
0234ddfd72
Merge pull request #298 from loki-project/photo-sending-bug
Fix Attachment Upload Retrying
2020-08-27 15:29:18 +10:00
Niels Andriesse
a95af86796
Merge pull request #304 from RyanRory/open-group-message-order
Fix Open Group Message Ordering
2020-08-27 15:29:03 +10:00