aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2016-01-165-32/+59
|\
| * hide prepare image toasts when attaching multiple imagesDaniel Gultsch2016-01-151-11/+12
| * show toast when image cropper get oomDaniel Gultsch2016-01-151-0/+7
| * catch exception when reading message id from databaseDaniel Gultsch2016-01-151-8/+12
| * nimbuzz.com: don't wait for disco replies to set account to onlineDaniel Gultsch2016-01-152-12/+27
* | Merge branch 'siacs/master' into developmentChristian S2016-01-151-1/+1
|\|
| * fixed typo when reading battery_op settingDaniel Gultsch2016-01-141-1/+1
* | Merge remote-tracking branch 'refs/remotes/origin/AvatarPatch' into developmentChristian S2016-01-131-1/+1
|\ \
| * | Update PublishProfilePictureActivity.javaChristian S2016-01-111-1/+1
* | | Merge pull request #63 from siacs/masterChristian S2016-01-131-5/+10
|\ \ \ | | |/ | |/|
| * | show /me messages in conference notifications without the name of the senderDaniel Gultsch2016-01-131-5/+10
* | | Merge branch 'siacs/master' into developmentChristian S2016-01-1310-212/+436
|\| | | |/ |/|
| * show key fetch error in activity when there are no keys to be usedDaniel Gultsch2016-01-131-1/+8
| * check for file storage permission before selecting avatarDaniel Gultsch2016-01-133-20/+40
| * use batch transactions when writing rosterDheeraj CVR2016-01-131-0/+3
| * throw security exception instead of going to next srv entryDaniel Gultsch2016-01-121-1/+3
| * move some ssl socket modifiers into a seperate helper classDaniel Gultsch2016-01-122-56/+67
| * Implement XEP-0368: SRV records for XMPP over TLSmoparisthebest2016-01-112-104/+220
| * reworked that loop that iterates over various serversDaniel Gultsch2016-01-111-16/+10
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-114-73/+144
* | Merge branch 'siacs/master' into developmentChristian S2016-01-1010-33/+136
|\|
| * let the user decide on whether or not to compress picturesDaniel Gultsch2016-01-091-2/+8
| * automatically adjust image compression to keep files under 512MiBDaniel Gultsch2016-01-092-8/+15
| * added Config.java variable to change the default notification behaviour to al...Daniel Gultsch2016-01-082-1/+3
| * don't show snackbar when notifications are disabled or pausedDaniel Gultsch2016-01-081-10/+0
| * show per conference notification settings in details activityDaniel Gultsch2016-01-084-9/+83
| * show icon in conversations overview when notifications are disabledDaniel Gultsch2016-01-081-0/+12
| * Merge pull request #1641 from fiaxh/uuid-fixDaniel Gultsch2016-01-081-1/+1
| |\
| | * Correct uuid check according to RFC 4122fiaxh2016-01-051-1/+1
| * | avoid duplicate messages when sending files to mucs. fixes #1635Daniel Gultsch2016-01-061-2/+10
| * | added missing synchronize when pushing messages from mam backlogDaniel Gultsch2016-01-041-1/+3
| * | null check in getOriginalPathDaniel Gultsch2016-01-042-1/+3
| |/
* | copy commitsChristian S2016-01-0414-138/+285
|\|
| * Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-044-61/+220
| * only report error after third unsuccesful attempt to connectDaniel Gultsch2016-01-041-1/+1
| * properly rotate avatarsDaniel Gultsch2016-01-043-50/+46
| * show trust keys activties if own keys are undecidedDaniel Gultsch2016-01-041-4/+5
| * add obb url to unencrypted messagesDaniel Gultsch2016-01-031-0/+1
| * edit account activity was still showing the omemo key with leading 0x05. fixe...Daniel Gultsch2016-01-031-2/+2
| * removed xhtml body. fixes #1594Daniel Gultsch2016-01-011-12/+0
| * use actual message timestamp instead of delay when updating last seen. fixes ...Daniel Gultsch2015-12-312-7/+8
| * Fix OMEMO session creating logginAndreas Straub2015-12-311-1/+1
* | copy commitsChristian S2015-12-291-1/+1
|\|
| * handle null names in getColorForNameDaniel Gultsch2015-12-291-1/+1
* | hide settings, accounts and updater in all menus except in main windowChristian S2015-12-291-0/+8
* | copy commitsChristian S2015-12-2814-69/+258
|\|
| * strip leading 0x05 off omemo fingerprintsDaniel Gultsch2015-12-271-4/+7
| * lower case all fingerprints. fixes #1521Daniel Gultsch2015-12-271-1/+2
| * dedublicate bookmarksDaniel Gultsch2015-12-271-3/+7
| * fixed stuck at omemo encryption when x509 verification is being usedDaniel Gultsch2015-12-271-7/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:33:47 +0000