aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
* | @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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
| * | 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 ↵Daniel Gultsch2016-04-101-38/+44
| | | | | | | | | | | | changing status
| * | 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 ↵Daniel Gultsch2016-04-081-3/+2
| | | | | | | | | | | | error on <5.0
| * | version bump to 1.11.5 + changelogDaniel Gultsch2016-04-082-2/+5
| | |
| * | 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
| | |
| * | tell people to build debug instead of releaseDaniel Gultsch2016-04-061-1/+1
| | |
| * | version bump to 1.11.4 + changelog1.11.4Daniel Gultsch2016-04-052-2/+6
| | |
| * | better detect broken pepDaniel Gultsch2016-04-052-2/+10
| | | | | | | | | | | | | | | mark pep as broken when publishing bundle or device list failed reset 'brokenness' when account is getting disabled
| * | fixing travisDaniel Gultsch2016-04-042-4/+11
| | |
| * | 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 branch 'trz/rebase' (early part) into trz/renamelookshe2016-04-170-0/+0
| | |\ | |_|/ |/| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-162-3/+8
|\ \ \ | | |/ | |/|
| * | Fixed null pointer exception in case of IOException before uploading file to ↵steckbrief2016-04-161-2/+7
| | | | | | | | | | | | http host
| * | Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message'steckbrief2016-04-071-1/+1
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-076-56/+131
|\| | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
| * | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-076-56/+129
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 19:19:50 +0000