aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2015-10-112-7/+5
| |\| | |
| | * | | Merge pull request #1482 from SafwatHalaby/readmeDaniel Gultsch2015-10-101-5/+3
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Added OMEMO to ReadmeSafwat Halaby2015-10-101-5/+3
| | |/ /
| | * | Merge pull request #1480 from SafwatHalaby/patch-1Andreas Straub2015-10-101-1/+1
| | |\ \
| | | * | Update build system in READMESafwat Halaby2015-10-101-1/+1
| | |/ /
| | * | Merge pull request #1478 from SafwatHalaby/patch-1Daniel Gultsch2015-10-101-1/+1
| | |\ \
| | | * | Fixed a typo in string.xmlSafwat Halaby2015-10-101-1/+1
| | |/ /
| * / / 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-098-44/+156
* | | make success false as standardChristian S.2015-10-141-1/+1
* | | check if update server answers successfully...Christian S.2015-10-141-1/+7
* | | changelogChristian S2015-10-131-0/+1
* | | changed update urlChristian S2015-10-131-1/+1
* | | updated german stringsChristian S2015-10-101-2/+2
* | | updated changelogChristian S2015-10-101-3/+5
* | | version 1.6.13 betaChristian S2015-10-101-1/+1
* | | show encryption in uiChristian S2015-10-101-2/+2
* | | update missing stringsChristian S2015-10-102-0/+10
* | | updated AppUpdater a bitChristian S2015-10-105-73/+52
* | | 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