aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-0913-111/+140
|\
| * XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-0913-108/+132
* | version name set to beta-3trz/beta-3steckbrief2016-05-021-1/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-2322-71/+560
|\|
| * 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-1870-312/+638
| |\
| * | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-1717-38/+393
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-1810-80/+94
|\ \ \ | | |/ | |/|
| * | Implements FS#137: build flavorssteckbrief2016-04-184-50/+89
| * | 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
* | | Merge commit 'remotes/origin/trz/rename~4' into trz/rebasesteckbrief2016-04-180-0/+0
|\| |
| * | removed unused stringlookshe2016-04-171-1/+0
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-1771-275/+573
| |\ \ | |/ / |/| |
* | | @Overrides addedtrz/merge_1.11.7lookshe2016-04-171-0/+6
* | | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-1771-310/+573
|\ \ \
| * | | 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
| * | | update gradle and gradle pluginDaniel Gultsch2016-04-093-4/+4
| * | | use startdate as lower bound when querying archive with after=xDaniel Gultsch2016-04-091-13/+3
| * | | don't show contact details when in conversations with selfDaniel Gultsch2016-04-093-1/+8
| * | | use last received message id when querying archiveDaniel Gultsch2016-04-091-7/+17
| * | | transform nimbuzz workaround into a more general 'waitForDisco' conditionDaniel Gultsch2016-04-091-6/+11
| * | | add required disco#items query to timeout listDaniel Gultsch2016-04-081-1/+4
| * | | increase version code to fix nasty bug in 1.11.5 beta1.11.5Daniel Gultsch2016-04-081-1/+1
| * | | removed ernoexception in exchange for a regular exeption to prevent verify er...Daniel Gultsch2016-04-081-3/+2
| * | | version bump to 1.11.5 + changelogDaniel Gultsch2016-04-082-2/+5
| * | | pulled translations from transifexDaniel Gultsch2016-04-082-3/+23
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 13:13:56 +0000