aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-1864-305/+554
|\
| * 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
| | * Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-1764-285/+538
| | |\
| | | * 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
| | | * pulled translations from transifexDaniel Gultsch2016-04-1029-86/+27
| | | * 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
| | | * 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
| | | * removed ernoexception in exchange for a regular exeption to prevent verify er...Daniel Gultsch2016-04-081-3/+2
| | | * pulled translations from transifexDaniel Gultsch2016-04-082-3/+23
| | | * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-074-2/+55
| | | * prevent null pointer when checking http upload max sizeDaniel Gultsch2016-04-071-6/+6
| | | * better detect broken pepDaniel Gultsch2016-04-052-2/+10
| | | * switched around info and items query to avoid race conditionDaniel Gultsch2016-04-041-1/+1
| | | * pulled translations from transifexDaniel Gultsch2016-04-0412-26/+71
| | | * removed unnecessary wait for disconnectDaniel Gultsch2016-04-041-6/+0
| | | * made sure the disco#items query has returned before finalizing the bindDaniel Gultsch2016-04-041-12/+24
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-162-3/+8
| | |\ \ | | |/ / | |/| |
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-074-6/+125
| | |\ \
| | * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-0612-144/+135
| | |\ \ \
| | * | | | update to beta-2 and new logo for betatrz/beta-2lookshe2016-04-0630-0/+0
* | | | | | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-1713-20/+390
|/ / / / /
* | | | | Fixed null pointer exception in case of IOException before uploading file to ...steckbrief2016-04-161-2/+7
* | | | | Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message'steckbrief2016-04-071-1/+1
| |_|/ / |/| | |
* | | | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-074-6/+123
| |/ / |/| |
* | | Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-0612-144/+134
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-0517-53/+196
|\| |
| * | Merge tag '1.11.3' into trz/rebaselookshe2016-04-0517-53/+196
| |\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:37:23 +0000