Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'siacs/master' into development | Christian S | 2016-01-10 | 2 | -4/+21 |
|\ | |||||
| * | let the user decide on whether or not to compress pictures | Daniel Gultsch | 2016-01-09 | 2 | -1/+17 |
| | | |||||
| * | don't show snackbar when notifications are disabled or paused | Daniel Gultsch | 2016-01-08 | 1 | -1/+0 |
| | | |||||
| * | show per conference notification settings in details activity | Daniel Gultsch | 2016-01-08 | 1 | -2/+4 |
| | | |||||
* | | copy commits | Christian S | 2016-01-04 | 1 | -0/+2 |
|\| | |||||
| * | Allow entering a JID from 'choose contact'. thanks @singpolyma | Daniel Gultsch | 2016-01-04 | 1 | -0/+2 |
| | | | | | | | | | | fixes #1611 fixes #1602 | ||||
* | | copy commits | Christian S | 2015-12-28 | 1 | -0/+8 |
|\| | |||||
| * | code cleanup | Daniel Gultsch | 2015-12-23 | 1 | -0/+1 |
| | | |||||
| * | show certificate information | Daniel Gultsch | 2015-12-23 | 1 | -0/+7 |
| | | |||||
* | | modified strings | Christian S | 2015-12-16 | 1 | -20/+1 |
| | | |||||
* | | copy commits | Christian S | 2015-12-16 | 1 | -0/+20 |
|\| | |||||
| * | modified contact permission dialog | Daniel Gultsch | 2015-12-07 | 1 | -2/+1 |
| | | |||||
| * | ask for contact permissions when first opening StartConversationActivity | Daniel Gultsch | 2015-12-07 | 1 | -0/+3 |
| | | |||||
| * | request storage permission when needed on Android 6.0 | Daniel Gultsch | 2015-12-07 | 1 | -0/+1 |
| | | |||||
| * | implement direct sharing in android 6.0. fixes #1321 | Daniel Gultsch | 2015-12-07 | 1 | -0/+3 |
| | | |||||
| * | renamed x509 verified omemo to v\OMEMO | Daniel Gultsch | 2015-12-02 | 1 | -3/+3 |
| | | |||||
| * | Merge pull request #1545 from SamWhited/show_new_contact_request_messages | Daniel Gultsch | 2015-12-02 | 1 | -2/+2 |
| |\ | | | | | | | Show status message when contact requests presence | ||||
| | * | s/.../…/ in default strings | Sam Whited | 2015-12-01 | 1 | -2/+2 |
| | | | |||||
| * | | users are now able to crop their avatar pictures using the android-crop | Philip Flohr | 2015-12-02 | 1 | -0/+1 |
| | | | | | | | | | | | | library | ||||
| * | | hide message content in notifications in paranoia mode | Daniel Gultsch | 2015-12-02 | 1 | -0/+4 |
| |/ | |||||
| * | introduce config.java variable to optionally show number of connected ↵ | Daniel Gultsch | 2015-12-01 | 1 | -0/+1 |
| | | | | | | | | accounts in notification | ||||
| * | add error state for unavailable tor network | Daniel Gultsch | 2015-12-01 | 1 | -1/+1 |
| | | |||||
| * | initial tor support | Daniel Gultsch | 2015-12-01 | 1 | -0/+8 |
| | | |||||
* | | modified strings | Christian S | 2015-12-12 | 1 | -1/+1 |
| | | |||||
* | | modified contact permission dialog | Daniel Gultsch | 2015-12-12 | 1 | -2/+1 |
| | | |||||
* | | ask for contact permissions when first opening StartConversationActivity | Daniel Gultsch | 2015-12-12 | 1 | -0/+3 |
| | | |||||
* | | request storage permission when needed on Android 6.0 | Daniel Gultsch | 2015-12-12 | 1 | -0/+1 |
| | | |||||
* | | implement direct sharing in android 6.0. fixes #1321 | Daniel Gultsch | 2015-12-11 | 1 | -0/+3 |
| | | |||||
* | | updated strings | Christian S | 2015-12-04 | 1 | -1/+1 |
| | | |||||
* | | renamed x509 verified omemo to v\OMEMO | Daniel Gultsch | 2015-12-04 | 1 | -3/+3 |
| | | |||||
* | | hide message content in notifications in paranoia mode | Daniel Gultsch | 2015-12-04 | 1 | -0/+4 |
| | | |||||
* | | introduce config.java variable to optionally show number of connected… | Daniel Gultsch | 2015-12-04 | 1 | -0/+1 |
| | | | | | | | | … accounts in notification | ||||
* | | add error state for unavailable tor network | Daniel Gultsch | 2015-12-04 | 1 | -0/+1 |
| | | |||||
* | | initial tor support | Daniel Gultsch | 2015-12-04 | 1 | -0/+8 |
| | | |||||
* | | added strings for plugin loader | Christian S | 2015-11-25 | 1 | -0/+4 |
| | | |||||
* | | Update arrays.xml | Christian S | 2015-11-25 | 1 | -2/+2 |
| | | | | | | | | * changed file size for never from 0 to 1 to show the download button instead of link * changed resource Conversations to Pix-Art Messender | ||||
* | | modified some strings | Christian S | 2015-11-15 | 1 | -8/+8 |
| | | | | | | | | * added fork infos to about activity | ||||
* | | changed message background to light yellow | Christian S | 2015-11-14 | 1 | -0/+1 |
| | | |||||
* | | rename Conversations to Pix-Art Messenger | Christian S | 2015-11-14 | 1 | -12/+13 |
| | | |||||
* | | copy Avatar Crop patch | Christian S | 2015-11-07 | 1 | -0/+1 |
|\ \ | |||||
| * | | users are now able to crop their avatar pictures | Philip Flohr | 2015-11-06 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #47 from siacs/master | Christian S | 2015-11-01 | 1 | -0/+3 |
|\| | | | | | copy commits | ||||
| * | indicate cbe in chat message hint | Daniel Gultsch | 2015-10-31 | 1 | -2/+3 |
| | | |||||
| * | explicitly mark verified omemo keys in UI | Daniel Gultsch | 2015-10-31 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-31 | 1 | -1/+2 |
|\| | |||||
| * | Show PGP "please wait" message only when actually decrypting | fiaxh | 2015-10-28 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-20 | 1 | -1/+1 |
|\| | |||||
| * | open manage account + certificate chooser when cbe mode is enabled | Daniel Gultsch | 2015-10-20 | 1 | -0/+1 |
| | | |||||
* | | copy commits | Christian S | 2015-10-17 | 1 | -0/+2 |
|\| | |||||
| * | improved error reporting in trust keys activity | Daniel Gultsch | 2015-10-17 | 1 | -0/+2 |
| | |