Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'siacs/master' into development | Christian S | 2016-01-13 | 29 | -45/+91 |
|\ | |||||
| * | show key fetch error in activity when there are no keys to be used | Daniel Gultsch | 2016-01-13 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-01-12 | 1 | -2/+2 |
| |\ | |||||
| | * | s/TOR/Tor/g | Sam Whited | 2016-01-12 | 1 | -2/+2 |
| | | | |||||
| * | | pulled translations from transifex | Daniel Gultsch | 2016-01-12 | 25 | -75/+117 |
| |/ | |||||
| * | use match_parent as height in conversations overview | Daniel Gultsch | 2016-01-12 | 1 | -2/+2 |
| | | |||||
| * | Revert "Add additional warnings to OMEMO purge key function" | Daniel Gultsch | 2016-01-12 | 1 | -2/+0 |
| | | | | | | | | This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03. | ||||
| * | Add additional warnings to OMEMO purge key function | Andreas Straub | 2016-01-12 | 1 | -0/+2 |
| | | | | | | | | | | | | People continue to press the "don't press this" button. Maybe adding some warnings indicating that this button will not fix their problems will help... | ||||
| * | new art renders | Daniel Gultsch | 2016-01-11 | 25 | -0/+0 |
| | | |||||
| * | don't use the word phone in strings | Daniel Gultsch | 2016-01-11 | 1 | -6/+5 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-01-11 | 25 | -63/+14 |
| | | |||||
| * | ask to be excluded from battery optimization | Daniel Gultsch | 2016-01-11 | 2 | -169/+216 |
| | | |||||
* | | add missing strings | Christian S | 2016-01-10 | 2 | -1/+17 |
| | | |||||
* | | Merge branch 'development' of https://github.com/kriztan/Pix-Art-Messenger ↵ | Christian S | 2016-01-10 | 1 | -0/+2 |
|\ \ | | | | | | | | | | into development | ||||
| * | | added missing german strings | Christian S | 2016-01-05 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'siacs/master' into development | Christian S | 2016-01-10 | 25 | -98/+164 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | let the user decide on whether or not to compress pictures | Daniel Gultsch | 2016-01-09 | 3 | -11/+33 |
| | | |||||
| * | 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 | 8 | -8/+31 |
| | | |||||
| * | show icon in conversations overview when notifications are disabled | Daniel Gultsch | 2016-01-08 | 16 | -76/+97 |
| | | |||||
* | | copy commits | Christian S | 2016-01-04 | 3 | -2/+10 |
|\| | |||||
| * | Allow entering a JID from 'choose contact'. thanks @singpolyma | Daniel Gultsch | 2016-01-04 | 3 | -2/+10 |
| | | | | | | | | | | fixes #1611 fixes #1602 | ||||
| * | properly rotate avatars | Daniel Gultsch | 2016-01-04 | 1 | -2/+2 |
| | | |||||
* | | hide settings, accounts and updater in all menus except in main window | Christian S | 2015-12-29 | 3 | -31/+0 |
| | | |||||
* | | deduplicate strings | Christian S | 2015-12-28 | 1 | -8/+2 |
| | | |||||
* | | copy commits | Christian S | 2015-12-28 | 3 | -2/+104 |
|\| | |||||
| * | code cleanup | Daniel Gultsch | 2015-12-23 | 1 | -0/+1 |
| | | |||||
| * | show certificate information | Daniel Gultsch | 2015-12-23 | 2 | -0/+95 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-12-20 | 2 | -6/+44 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-12-17 | 5 | -35/+429 |
| | | |||||
* | | corrected strings | Christian S | 2015-12-16 | 1 | -21/+0 |
| | | |||||
* | | modified strings | Christian S | 2015-12-16 | 2 | -51/+2 |
| | | |||||
* | | copy commits | Christian S | 2015-12-16 | 2 | -15/+89 |
|\| | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-12-13 | 3 | -7/+106 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-12-11 | 2 | -2/+38 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-12-07 | 8 | -11/+234 |
| | | |||||
| * | 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 |
| | | |||||
| * | pulled new translations from transifex | Daniel Gultsch | 2015-12-02 | 26 | -285/+879 |
| | | |||||
| * | 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 |
| |/ | |||||
| * | introduced build-time paranoia mode that disables unencrypted chats and ↵ | Daniel Gultsch | 2015-12-01 | 1 | -1/+3 |
| | | | | | | | | forces TOR | ||||
| * | 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 | 4 | -1/+73 |
| | |