aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-1629-197/+911
|\
| * moved other name parsing into seperate methodDaniel Gultsch2015-10-151-40/+45
| * use constants for oids in xmppdomainverifierDaniel Gultsch2015-10-151-2/+5
| * more checks for xmppdomainverifier and better wildcard handlingDaniel Gultsch2015-10-151-4/+10
| * use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier. fixe...Daniel Gultsch2015-10-152-2/+116
| * clear bitmap cache before running out of memoryDaniel Gultsch2015-10-141-0/+9
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-146-34/+74
| * work with muc services that change the message idDaniel Gultsch2015-10-142-1/+3
| * cleaned up some code. log last tagDaniel Gultsch2015-10-131-8/+14
| * set cursor to end of jid in edit accountDaniel Gultsch2015-10-131-2/+3
| * add config variable to enable x509 verificationDaniel Gultsch2015-10-124-24/+28
| * code clean upDaniel Gultsch2015-10-1211-47/+19
| * enable SASL EXTERNAL (certificate loginDaniel Gultsch2015-10-112-3/+90
| * add menu item in account details to renew certificateDaniel Gultsch2015-10-115-60/+217
| * Clean upAndreas Straub2015-10-112-13/+5
| * Improve InvalidJidException handling in Jid classAndreas Straub2015-10-111-2/+2
| * Merge pull request #1461 from akallabeth/captcha_supportDaniel Gultsch2015-10-115-24/+235
| |\
| | * Captcha support.Armin Novak2015-10-115-24/+235
| * | prevent null pointer when trying to display device fingerprints of not existi...Daniel Gultsch2015-10-111-0/+3
| |/
| * initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-095-44/+146
* | make success false as standardChristian S.2015-10-141-1/+1
* | check if update server answers successfully...Christian S.2015-10-141-1/+7
* | changed update urlChristian S2015-10-131-1/+1
* | show encryption in uiChristian S2015-10-101-2/+2
* | updated AppUpdater a bitChristian S2015-10-103-63/+45
* | copy commitsChristian S2015-10-106-32/+117
|\|
| * do not dismiss editAccountActivity when still trying to register new accountDaniel Gultsch2015-10-091-1/+3
| * catch exception when unregistering receivers that have not been registered be...Daniel Gultsch2015-10-081-3/+11
| * removed oob element from file messagesDaniel Gultsch2015-10-081-1/+0
| * introduced expert options to set status to away and xa if screen is off or if...Daniel Gultsch2015-10-084-28/+104
* | changed log outputs of updater and delete old...Christian S2015-10-102-17/+29
* | Merge branch 'Update_Startup' into developmentChristian S2015-10-072-2/+16
|\ \
| * | update UpdaterChristian S2015-10-061-1/+12
| * | added changelog to JSON object in updaterChristian S.2015-10-061-1/+2
| * | Added more info to alertboxChristian S.2015-10-061-1/+3
* | | Merge branch 'siacs/master' into developmentChristian S2015-10-079-165/+254
|\ \ \ | |/ / |/| / | |/
| * add xhtml image tag to unencrypted image urls. add oob tag to all files that ...Daniel Gultsch2015-10-071-2/+18
| * do mam query after joinDaniel Gultsch2015-10-061-1/+3
| * Use MAM for MUC initial history retrievalsaqura2015-10-062-28/+66
| * Properly check for MUC MAM supportsaqura2015-10-061-6/+8
| * Show whether MAM is supported in MUCssaqura2015-10-062-1/+17
| * changed store path for filesDaniel Gultsch2015-10-061-20/+10
| * clean up log exporting service. properly end service after exportingDaniel Gultsch2015-10-061-102/+106
| * clear notification and activate grace period when receiving chat marker from ...Daniel Gultsch2015-10-061-1/+5
| * try to catch plattform bugsDaniel Gultsch2015-10-021-1/+6
| * properly recycle bitmapsDaniel Gultsch2015-10-021-4/+16
* | Merge pull request #43 from siacs/masterChristian S.2015-10-031-14/+16
|\|
| * don't put conference joins into pending on initial bindDaniel Gultsch2015-10-011-11/+14
| * reset muc options immediately befor joinDaniel Gultsch2015-10-011-3/+2
* | copy commitsChristian S2015-10-018-35/+124
|\|