aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* copy commitsChristian S2015-10-109-34/+136
|\
| * 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-087-28/+122
* | changed log outputs of updater and delete old...Christian S2015-10-102-17/+29
* | startet development of version 1.6.13Christian S2015-10-072-2/+7
* | Merge branch 'Update_Startup' into developmentChristian S2015-10-075-4/+23
|\ \
| * \ Merge remote-tracking branch 'origin/Update_Startup' into Update_StartupChristian S2015-10-070-0/+0
| |\ \
| | * | Added more info to alertboxChristian S2015-10-074-4/+18
| | * | added intent to start app after update automaticallyChristian S2015-10-071-0/+5
| * | | update UpdaterChristian S2015-10-062-2/+12
| * | | Update strings.xmlChristian S.2015-10-061-1/+1
| * | | Update strings.xmlChristian S.2015-10-061-1/+1
| * | | added changelog to JSON object in updaterChristian S.2015-10-061-1/+2
| * | | Added more info to alertboxChristian S.2015-10-061-1/+3
| * | | updated strings for updaterChristian S.2015-10-061-0/+1
| * | | updated German strings for updaterChristian S.2015-10-061-1/+1
| * | | updated startup intent againChristian S.2015-10-061-1/+1
| * | | updated startup intentChristian S.2015-10-061-0/+2
| * | | added intent to start app after update automaticallyChristian S.2015-10-061-0/+3
| |/ /
* | | Merge branch 'siacs/master' into developmentChristian S2015-10-0716-297/+435
|\ \ \ | |/ / |/| / | |/
| * 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-063-2/+47
| * 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
| * pulled translations from transifexDaniel Gultsch2015-10-056-132/+153
| * try to catch plattform bugsDaniel Gultsch2015-10-021-1/+6
| * increased version codeDaniel Gultsch2015-10-021-1/+1
| * properly recycle bitmapsDaniel Gultsch2015-10-021-4/+16
* | changed message ticksChristian S2015-10-036-5/+4
* | 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
* | Merge branch 'siacs-master' into developmentChristian S2015-10-0110-37/+128
|\ \
| * | copy commitsChristian S2015-10-0110-37/+128
|/| | | |/
| * version bump and changelogDaniel Gultsch2015-09-302-2/+7
| * request stanza count after every ibb data stanza to not fill our own stanza q...Daniel Gultsch2015-09-302-6/+9
| * only invoke MTM in interactive mode after direct user inputDaniel Gultsch2015-09-292-11/+26
| * rotate thumbnails. fixes #1438Daniel Gultsch2015-09-291-6/+15
| * fixed NPE when executing rename callback in mucDaniel Gultsch2015-09-281-1/+3
| * 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
* | changed theme of appupdaterChristian S2015-09-271-1/+1
* | updated to version 1.6.12 beta and changelogChristian S2015-09-263-8/+8