aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'Update_Startup' into developmentChristian S2015-10-075-4/+23
|\ \
| * | 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
| * 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
* | copy commitsChristian S2015-10-018-35/+124
|\|
| * 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-261-6/+2
* | modified read indicator a bitChristian S2015-09-261-4/+4
* | copy commitsChristian S2015-09-2615-11/+224
|\|
| * use Conversations 1.x.y as user agent string in http upload and downloadDaniel Gultsch2015-09-233-3/+6
| * swapped icons for foreground servicesDaniel Gultsch2015-09-227-4/+3
| * Export logs to SD card preferencefiaxh2015-09-215-0/+178
| * Iterator to go through all messages of a conversationfiaxh2015-09-201-0/+38
* | added blue tick as read indicatorChristian S2015-09-268-3/+17
* | corrected importsChristian S2015-09-211-3/+4
* | made app update time configurable in config.javaChristian S2015-09-212-2/+2
* | add german string for 'checking for updates'Christian S.2015-09-211-0/+1
* | add string for 'checking for updates'Christian S.2015-09-211-6/+7
* | disabled touch events on checking for updatesChristian S.2015-09-211-2/+15
* | modified AppUpdaterChristian S2015-09-203-13/+51
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 09:49:11 +0000