Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update PublishProfilePictureActivity.java | Christian S | 2016-01-11 | 1 | -1/+1 |
| | |||||
* | 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 | ||||
| * | Merge pull request #61 from siacs/master | Christian S | 2016-01-06 | 4 | -4/+16 |
| |\ | | | | | | | copy commits | ||||
| * | | added missing german strings | Christian S | 2016-01-05 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'siacs/master' into development | Christian S | 2016-01-10 | 36 | -133/+302 |
|\ \ \ | |/ / |/| | | |||||
| * | | bump version code for beta | Daniel Gultsch | 2016-01-09 | 1 | -2/+2 |
| | | | |||||
| * | | let the user decide on whether or not to compress pictures | Daniel Gultsch | 2016-01-09 | 4 | -13/+41 |
| | | | |||||
| * | | automatically adjust image compression to keep files under 512MiB | Daniel Gultsch | 2016-01-09 | 2 | -8/+15 |
| | | | |||||
| * | | added Config.java variable to change the default notification behaviour to ↵ | Daniel Gultsch | 2016-01-08 | 2 | -1/+3 |
| | | | | | | | | | | | | always | ||||
| * | | don't show snackbar when notifications are disabled or paused | Daniel Gultsch | 2016-01-08 | 2 | -11/+0 |
| | | | |||||
| * | | show per conference notification settings in details activity | Daniel Gultsch | 2016-01-08 | 12 | -17/+114 |
| | | | |||||
| * | | show icon in conversations overview when notifications are disabled | Daniel Gultsch | 2016-01-08 | 17 | -76/+109 |
| | | | |||||
| * | | Merge pull request #1641 from fiaxh/uuid-fix | Daniel Gultsch | 2016-01-08 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | Correct uuid check according to RFC 4122 | ||||
| | * | Correct uuid check according to RFC 4122 | fiaxh | 2016-01-05 | 1 | -1/+1 |
| | | | |||||
| * | | avoid duplicate messages when sending files to mucs. fixes #1635 | Daniel Gultsch | 2016-01-06 | 1 | -2/+10 |
| | | | |||||
| * | | added missing synchronize when pushing messages from mam backlog | Daniel Gultsch | 2016-01-04 | 1 | -1/+3 |
| | | | |||||
| * | | null check in getOriginalPath | Daniel Gultsch | 2016-01-04 | 2 | -1/+3 |
| |/ | |||||
* | | Merge branch 'refs/heads/siacs-master' into development | Christian S | 2016-01-04 | 19 | -143/+303 |
|\ \ | |||||
| * | | copy commits | Christian S | 2016-01-04 | 19 | -143/+303 |
|/| | | |/ | |||||
| * | version bump to 1.8.4 and changelog | Daniel Gultsch | 2016-01-04 | 2 | -2/+7 |
| | | |||||
| * | Allow entering a JID from 'choose contact'. thanks @singpolyma | Daniel Gultsch | 2016-01-04 | 7 | -63/+230 |
| | | | | | | | | | | fixes #1611 fixes #1602 | ||||
| * | only report error after third unsuccesful attempt to connect | Daniel Gultsch | 2016-01-04 | 1 | -1/+1 |
| | | |||||
| * | properly rotate avatars | Daniel Gultsch | 2016-01-04 | 4 | -52/+48 |
| | | |||||
| * | show trust keys activties if own keys are undecided | Daniel Gultsch | 2016-01-04 | 1 | -4/+5 |
| | | |||||
| * | add obb url to unencrypted messages | Daniel Gultsch | 2016-01-03 | 1 | -0/+1 |
| | | |||||
| * | edit account activity was still showing the omemo key with leading 0x05. ↵ | Daniel Gultsch | 2016-01-03 | 1 | -2/+2 |
| | | | | | | | | fixes #1631 | ||||
| * | removed xhtml body. fixes #1594 | Daniel Gultsch | 2016-01-01 | 1 | -12/+0 |
| | | |||||
| * | use actual message timestamp instead of delay when updating last seen. fixes ↵ | Daniel Gultsch | 2015-12-31 | 2 | -7/+8 |
| | | | | | | | | #1618 | ||||
| * | Fix OMEMO session creating loggin | Andreas Straub | 2015-12-31 | 1 | -1/+1 |
| | | | | | | | | | | Now prints the correct JID to the log when finding devices without sessions. | ||||
* | | Update CHANGELOG.md | Christian S | 2015-12-29 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'refs/heads/siacs-master' into development | Christian S | 2015-12-29 | 2 | -1/+4 |
|\ \ | |||||
| * | | copy commits | Christian S | 2015-12-29 | 2 | -1/+4 |
| |\| | |||||
| | * | version bump and changelog | Daniel Gultsch | 2015-12-29 | 2 | -2/+9 |
| | | | |||||
| | * | handle null names in getColorForName | Daniel Gultsch | 2015-12-29 | 1 | -1/+1 |
| | | | |||||
| * | | hide settings, accounts and updater in all menus except in main window | Christian S | 2015-12-29 | 4 | -31/+8 |
| | | | |||||
* | | | hide settings, accounts and updater in all menus except in main window | Christian S | 2015-12-29 | 4 | -31/+8 |
| | | | |||||
* | | | translated readme into German | Christian S | 2015-12-29 | 1 | -200/+100 |
|/ / | |||||
* | | version 1.8.3 + changes | Christian S | 2015-12-28 | 2 | -2/+5 |
| | | |||||
* | | deduplicate strings | Christian S | 2015-12-28 | 1 | -8/+2 |
| | | |||||
* | | Merge branch 'refs/heads/siacs-master' into development | Christian S | 2015-12-28 | 17 | -71/+362 |
|\ \ | |||||
| * | | copy commits | Christian S | 2015-12-28 | 17 | -71/+362 |
|/| | | |/ | |||||
| * | strip leading 0x05 off omemo fingerprints | Daniel Gultsch | 2015-12-27 | 1 | -4/+7 |
| | | |||||
| * | lower case all fingerprints. fixes #1521 | Daniel Gultsch | 2015-12-27 | 1 | -1/+2 |
| | | |||||
| * | dedublicate bookmarks | Daniel Gultsch | 2015-12-27 | 1 | -3/+7 |
| | | |||||
| * | fixed stuck at omemo encryption when x509 verification is being used | Daniel Gultsch | 2015-12-27 | 1 | -7/+7 |
| | | |||||
| * | register context menu long click listener on message text. fixes #1614 | Daniel Gultsch | 2015-12-27 | 1 | -1/+1 |
| | | |||||
| * | made text selectable again unless text contains more than 1 link | Daniel Gultsch | 2015-12-26 | 1 | -0/+11 |
| | | | | | | | | fixes #1615 | ||||
| * | code cleanup | Daniel Gultsch | 2015-12-23 | 3 | -25/+5 |
| | | |||||
| * | show certificate information | Daniel Gultsch | 2015-12-23 | 10 | -10/+240 |
| | |