aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-05-031-1/+1
|\
| * fixed spelling in readmeDaniel Gultsch2016-05-031-1/+1
* | fixed presence template dedup for 'online' statusDaniel Gultsch2016-05-031-1/+2
* | use app name in resource suggestionsDaniel Gultsch2016-05-031-1/+1
|/
* update 'create account' faq entryDaniel Gultsch2016-05-021-8/+1
* ping all accounts at the same timeDaniel Gultsch2016-05-021-5/+17
* version bump to 1.12.0 + changelog1.12.0Daniel Gultsch2016-05-022-2/+6
* 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
* Merge pull request #1821 from kriztan/patch-1Daniel Gultsch2016-04-241-10/+0
|\
| * Update build.gradleChristian S2016-04-231-10/+0
* | 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-1916-7/+349
* version bump to 1.11.7 + changelog1.11.7Daniel Gultsch2016-04-142-2/+7
* always notify by default in conferencesDaniel Gultsch2016-04-142-3/+1
* removed unnecessary call to stopSelf() after logging outDaniel Gultsch2016-04-141-5/+11
* add setting for quick sharingDaniel Gultsch2016-04-143-17/+51
* removed unused call to cancel eventsDaniel Gultsch2016-04-141-1/+0
* create Config varibale to show the disable foreground service buttonDaniel Gultsch2016-04-132-3/+6
* hacky workaround to determine if uri points to private file on < lolipopDaniel Gultsch2016-04-133-9/+25
* return own jid as true counterpart on self messages in mucDaniel Gultsch2016-04-131-0/+3
* added share uri button to conference detailsDaniel Gultsch2016-04-1215-14/+43
* reverse order in contact chooserDaniel Gultsch2016-04-121-1/+1
* minor code cleanupDaniel Gultsch2016-04-121-3/+1
* republish avatar if server offers non-persistent pep :-(Daniel Gultsch2016-04-114-37/+144
* version bump to 1.11.6 + changelog1.11.6Daniel Gultsch2016-04-102-2/+6
* pulled translations from transifexDaniel Gultsch2016-04-1029-86/+27
* add entries to gitignoreDaniel Gultsch2016-04-101-0/+2
* don't throw IO exception at end of streamDaniel Gultsch2016-04-101-1/+0
* fixed 'connecting…' buttonDaniel Gultsch2016-04-101-3/+6
* moved authentication into seperate method. force close socket before changing...Daniel Gultsch2016-04-101-38/+44
* introduced setting to turn of notification ledDaniel Gultsch2016-04-093-5/+15