Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-06-06 | 1 | -1/+1 |
|\ | |||||
| * | opt-in to send last userinteraction in presence | Daniel Gultsch | 2016-06-04 | 1 | -1/+1 |
| | | |||||
* | | Share link to invite user to start over with Pix-Art Messenger | Christian Schneppe | 2016-06-02 | 1 | -0/+16 |
| | | |||||
* | | integrate image- and video player | Christian Schneppe | 2016-05-28 | 1 | -12/+16 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-27 | 1 | -4/+21 |
|\| | |||||
| * | refactored toasts shown when adhoc creating mucs | Daniel Gultsch | 2016-05-27 | 1 | -3/+20 |
| | | |||||
| * | make newly created conferences private by default | Daniel Gultsch | 2016-05-26 | 1 | -1/+1 |
| | | |||||
* | | catch exception on videopreview | Christian Schneppe | 2016-05-22 | 1 | -18/+22 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-22 | 1 | -9/+15 |
|\| | |||||
| * | show hint in subject quick edit. only show subject as preset | Daniel Gultsch | 2016-05-22 | 1 | -9/+15 |
| | | |||||
* | | detect length of video file | Christian Schneppe | 2016-05-21 | 1 | -14/+20 |
| | | |||||
* | | make thumbs bigger | Christian Schneppe | 2016-05-21 | 1 | -8/+8 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-20 | 1 | -2/+2 |
|\| | |||||
| * | offer offline members to be invited again | Daniel Gultsch | 2016-05-17 | 1 | -1/+1 |
| | | |||||
| * | keep conference members in memory and show them in conference details | Daniel Gultsch | 2016-05-16 | 1 | -3/+1 |
| | | |||||
| * | check if pgpengine is still bound before using it | Daniel Gultsch | 2016-05-12 | 1 | -0/+3 |
| | | |||||
* | | changed colors to standard from @color and add border to images | Christian Schneppe | 2016-05-20 | 1 | -4/+4 |
| | | |||||
* | | use glide as image loader and add a simple video preview | Christian Schneppe | 2016-05-20 | 1 | -122/+29 |
| | | |||||
* | | try out some faster image loader | Christian Schneppe | 2016-05-17 | 1 | -4/+22 |
| | | | | | | | | | | * picasso * glide | ||||
* | | check if pgpengine is still bound before using it | Daniel Gultsch | 2016-05-13 | 1 | -0/+3 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-05-05 | 1 | -7/+32 |
|\| | |||||
| * | republish pgp signature when changing status | Daniel Gultsch | 2016-05-05 | 1 | -7/+32 |
| | | |||||
* | | blue theme | Matthias Rieber | 2016-05-05 | 1 | -1/+1 |
| | | |||||
* | | go directly to the user account via menu | Christian S | 2016-05-05 | 1 | -1/+5 |
| | | |||||
* | | set manually_change_presence to true as default | Christian S | 2016-04-30 | 1 | -1/+1 |
| | | | | | | | | and hide option to set presence for all accounts | ||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-30 | 1 | -16/+22 |
|\| | |||||
| * | cancel potential tasks when receiving image preview from cache | Daniel Gultsch | 2016-04-28 | 1 | -3/+7 |
| | | |||||
| * | removed unused config variables | Daniel Gultsch | 2016-04-27 | 1 | -13/+0 |
| | | |||||
| * | expert setting to manually change presence | Daniel Gultsch | 2016-04-22 | 1 | -0/+15 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-04-03 | 1 | -0/+4 |
|\| | |||||
| * | check max http file size when attaching files | Daniel Gultsch | 2016-04-01 | 1 | -0/+4 |
| | | |||||
* | | Merge pull request #80 from siacs/master | Christian S | 2016-03-20 | 1 | -3/+4 |
|\| | | | | | copy commits | ||||
| * | don't show v\omemo keys as such if not enabled | Daniel Gultsch | 2016-03-20 | 1 | -3/+4 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-17 | 1 | -0/+1 |
|\| | |||||
| * | reworked sharewith activity to stay open during sharing | Daniel Gultsch | 2016-03-16 | 1 | -0/+1 |
| | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked | ||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-13 | 1 | -1/+1 |
|\| | |||||
| * | don't show opt-out of battery optimization dialog when push is enabled | Daniel Gultsch | 2016-03-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-04 | 1 | -1/+15 |
|\| | |||||
| * | rename purge keys positive button to 'purge keys' | Daniel Gultsch | 2016-02-28 | 1 | -1/+1 |
| | | |||||
| * | changed single_account config into more simple lock_settings | Daniel Gultsch | 2016-02-27 | 1 | -0/+14 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-23 | 1 | -3/+14 |
|\| | |||||
| * | use extract account from intent method and final EXTRA_ACCOUNT variable | Daniel Gultsch | 2016-01-22 | 1 | -5/+4 |
| | | |||||
| * | added convenience method to extract account from intent | Daniel Gultsch | 2016-01-22 | 1 | -1/+13 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-13 | 1 | -0/+25 |
|\| | |||||
| * | check for file storage permission before selecting avatar | Daniel Gultsch | 2016-01-13 | 1 | -0/+14 |
| | | |||||
| * | Revert "Add additional warnings to OMEMO purge key function" | Daniel Gultsch | 2016-01-12 | 1 | -26/+2 |
| | | | | | | | | This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03. | ||||
| * | Add additional warnings to OMEMO purge key function | Andreas Straub | 2016-01-12 | 1 | -2/+26 |
| | | | | | | | | | | | | 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... | ||||
| * | ask to be excluded from battery optimization | Daniel Gultsch | 2016-01-11 | 1 | -0/+11 |
| | | |||||
* | | 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 |