aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #47 from siacs/masterChristian S2015-11-013-8/+19
|\
| * indicate cbe in chat message hintDaniel Gultsch2015-10-311-1/+7
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-312-7/+12
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-317-84/+207
|\|
| * Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-303-71/+79
| |\
| | * Show PGP "please wait" message only when actually decryptingfiaxh2015-10-281-1/+5
| | * Decrypt PGP messages in backgroundfiaxh2015-10-282-70/+74
| * | load avatars in message adapter in background taskDaniel Gultsch2015-10-291-11/+92
| * | show encryption type in warned/red messagesDaniel Gultsch2015-10-281-0/+6
| |/
| * Merge pull request #1520 from saqura/self_handle_orientationDaniel Gultsch2015-10-264-1/+29
| |\
| | * Reset the margins manually after rotatingsaqura2015-10-264-1/+29
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2015-10-261-0/+1
|\| |
| * | invalidate menu after backend connection.Daniel Gultsch2015-10-251-0/+1
| |/
* | bug fixed in updaterChristian S2015-10-221-97/+101
* | add offline hint to subtitle if contact is offlineChristian S2015-10-201-1404/+1410
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-205-42/+60
|\|
| * open unknown files with wildcard intentDaniel Gultsch2015-10-202-10/+15
| * open manage account + certificate chooser when cbe mode is enabledDaniel Gultsch2015-10-202-28/+39
| * add nick to bookmark when entering full jid in join conference dialogDaniel Gultsch2015-10-191-4/+6
* | show lastseen as subtitle in chatviewChristian S2015-10-191-2/+3
* | copy commitsChristian S2015-10-174-42/+70
|\|
| * allow redownloading files from remote hosts. fixes #1504Daniel Gultsch2015-10-171-1/+2
| * improved error reporting in trust keys activityDaniel Gultsch2015-10-173-12/+23
| * introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-32/+48
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-167-55/+217
|\|
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-141-2/+1
| * set cursor to end of jid in edit accountDaniel Gultsch2015-10-131-2/+3
| * add config variable to enable x509 verificationDaniel Gultsch2015-10-121-2/+9
| * code clean upDaniel Gultsch2015-10-123-8/+7
| * add menu item in account details to renew certificateDaniel Gultsch2015-10-111-24/+56
| * Merge pull request #1461 from akallabeth/captcha_supportDaniel Gultsch2015-10-112-1/+79
| |\
| | * Captcha support.Armin Novak2015-10-112-1/+79
| * | 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-093-23/+66
* | check if update server answers successfully...Christian S.2015-10-141-1/+7
* | updated AppUpdater a bitChristian S2015-10-101-58/+40
* | copy commitsChristian S2015-10-102-6/+9
|\|
| * do not dismiss editAccountActivity when still trying to register new accountDaniel Gultsch2015-10-091-1/+3
| * introduced expert options to set status to away and xa if screen is off or if...Daniel Gultsch2015-10-081-5/+6
* | changed log outputs of updater and delete old...Christian S2015-10-101-8/+21
* | Merge branch 'Update_Startup' into developmentChristian S2015-10-071-1/+14
|\ \
| * | update UpdaterChristian S2015-10-061-1/+12
| * | Added more info to alertboxChristian S.2015-10-061-1/+3
* | | Merge branch 'siacs/master' into developmentChristian S2015-10-072-2/+18
|\ \ \ | |/ / |/| / | |/
| * Show whether MAM is supported in MUCssaqura2015-10-061-1/+12
| * try to catch plattform bugsDaniel Gultsch2015-10-021-1/+6
* | copy commitsChristian S2015-10-013-11/+71
|\|
| * do tab completion only if neither ctrl nor alt are being pressedDaniel Gultsch2015-09-281-4/+4
| * catch rare activity not found exception when opening downloaded filesDaniel Gultsch2015-09-271-4/+9
| * allow tab completion in conferencesDaniel Gultsch2015-09-272-4/+59