aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * republish pgp signature when changing statusDaniel Gultsch2016-05-0510-25/+97
| * refactor captcha response handling to avoid network on main thread exceptionDaniel Gultsch2016-05-053-35/+25
| * clear password field before setting new oneDaniel Gultsch2016-05-041-0/+1
| * fixed npe when calling changepassword activity directlyDaniel Gultsch2016-05-041-2/+4
| * pulled translations from transifexDaniel Gultsch2016-05-044-2/+21
| * spelling fixesklemens2016-05-044-5/+5
| * Renaming of variableSebastian2016-05-031-6/+6
| * fixed presence template dedup for 'online' statusDaniel Gultsch2016-05-031-1/+2
| * use app name in resource suggestionsDaniel Gultsch2016-05-031-1/+1
| * ping all accounts at the same timeDaniel Gultsch2016-05-021-5/+17
| * pulled translations from transifexDaniel Gultsch2016-05-0215-41/+353
| * show only username when registering account with magic createDaniel Gultsch2016-05-022-13/+22
| * removed unnecessary loggingDaniel Gultsch2016-04-301-1/+0
| * properly cancel avatar tasksDaniel Gultsch2016-04-293-5/+8
| * catch ActivityNotFoundException when requesting battery opDaniel Gultsch2016-04-293-2/+13
| * port all android drop down list items to our ownDaniel Gultsch2016-04-293-10/+9
| * catch rare NPE when determining max http sizeDaniel Gultsch2016-04-291-3/+3
| * synchronize around thumbnail cache to avoid loading images twiceDaniel Gultsch2016-04-281-12/+21
| * cancel potential tasks when receiving image preview from cacheDaniel Gultsch2016-04-281-3/+7
| * cleaned up captcha dialogDaniel Gultsch2016-04-283-53/+69
| * don't request disco from selfDaniel Gultsch2016-04-282-3/+1
| * removed unused config variablesDaniel Gultsch2016-04-2710-64/+14
| * made it possible to go back to welcome screen from edit accountDaniel Gultsch2016-04-272-4/+7
| * renamed welcome header to untranslatable 'Start your Conversations'Daniel Gultsch2016-04-271-1/+1
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-267-23/+84
| * fixed table creationDaniel Gultsch2016-04-251-10/+14
| * don't create templates for empty status messagesDaniel Gultsch2016-04-231-2/+6
| * add change prescence to manage account context menuDaniel Gultsch2016-04-233-3/+16
| * show status messages in contact detailsDaniel Gultsch2016-04-233-17/+56
| * expert setting to manually change presenceDaniel Gultsch2016-04-2240-79/+683
| * put welcome screen in scrollviewDaniel Gultsch2016-04-221-62/+67
| * added magic create welcome screenDaniel Gultsch2016-04-1915-7/+348
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-0913-111/+140
|\ \
| * | XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-0913-108/+132
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-2321-70/+559
|\| |
| * | Fixes FS#204: Observe all used directoriessteckbrief2016-04-238-48/+138
| * | Related to FS#134: check if oldversion is smaller then new version on upgradi...steckbrief2016-04-231-2/+1
| * | Removed download decision MUST if the message contains jabber:x:oob:oob/urlsteckbrief2016-04-191-3/+0
| * | Persist Message.treatAsDownloadablesteckbrief2016-04-192-2/+15
| * | Related to FS#134: Set Message flags according to httpupload hintsteckbrief2016-04-193-0/+9
| * | Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-1864-305/+554
| |\ \
| * | | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-1713-20/+390
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-188-80/+42
|\ \ \ \ | | |/ / | |/| |
| * | | Implements FS#137: build flavorssteckbrief2016-04-182-50/+37
| * | | Related to FS#199: fixed merge hickups (message correction setting removed, k...steckbrief2016-04-182-8/+1
| * | | Related to FS#199: Removed unnecessary build configuration variable to hide d...steckbrief2016-04-182-6/+3
| * | | Related to FS#199: Removed unnecessary differentiation between a conversation...steckbrief2016-04-183-16/+1
| * | | removed unused stringlookshe2016-04-171-1/+0
| * | | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-1764-250/+538
| |\ \ \ | |/ / / |/| / / | |/ /
* | | @Overrides addedtrz/merge_1.11.7lookshe2016-04-171-0/+6