| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'trz/rename' into trz/rebase | steckbrief | 2017-01-11 | 8 | -56/+75 |
| |\ | |||||
| * | | related to FS#237 | steckbrief | 2017-01-05 | 1 | -1/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/trz/rename' into trz/rebase | steckbrief | 2017-01-05 | 2 | -27/+19 |
| |\| | |||||
| * | | Fixed errors with notificationstrz/beta-7 | steckbrief | 2017-01-04 | 1 | -3/+6 |
| | | | |||||
| * | | Added columns to fileparams table: url, original file name, key and ivtrz/beta-5 | steckbrief | 2017-01-04 | 10 | -304/+373 |
| | | | | | | | | | | | auto download of files moved from MessageParser to MessageAdapter download and open file representation cleaned up | ||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-10-20 | 30 | -701/+347 |
| |\| | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-05-09 | 10 | -108/+43 |
| |\| | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-23 | 10 | -57/+139 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java | ||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-18 | 6 | -72/+41 |
| |\| | |||||
| * | | @Overrides addedtrz/merge_1.11.7 | lookshe | 2016-04-17 | 1 | -0/+6 |
| | | | |||||
| * | | Merge tag '1.11.7' into trz/merge_1.11.7 | lookshe | 2016-04-17 | 18 | -140/+312 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | always notify by default in conferences | Daniel Gultsch | 2016-04-14 | 2 | -3/+1 |
| | | | | |||||
| | * | | removed unnecessary call to stopSelf() after logging out | Daniel Gultsch | 2016-04-14 | 1 | -5/+11 |
| | | | | |||||
| | * | | add setting for quick sharing | Daniel Gultsch | 2016-04-14 | 1 | -2/+25 |
| | | | | |||||
| | * | | removed unused call to cancel events | Daniel Gultsch | 2016-04-14 | 1 | -1/+0 |
| | | | | |||||
| | * | | create Config varibale to show the disable foreground service button | Daniel Gultsch | 2016-04-13 | 2 | -3/+6 |
| | | | | |||||
| | * | | hacky workaround to determine if uri points to private file on < lolipop | Daniel Gultsch | 2016-04-13 | 3 | -9/+25 |
| | | | | |||||
| | * | | return own jid as true counterpart on self messages in muc | Daniel Gultsch | 2016-04-13 | 1 | -0/+3 |
| | | | | |||||
| | * | | added share uri button to conference details | Daniel Gultsch | 2016-04-12 | 1 | -0/+17 |
| | | | | |||||
| | * | | reverse order in contact chooser | Daniel Gultsch | 2016-04-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | minor code cleanup | Daniel Gultsch | 2016-04-12 | 1 | -3/+1 |
| | | | | |||||
| | * | | republish avatar if server offers non-persistent pep :-( | Daniel Gultsch | 2016-04-11 | 4 | -37/+144 |
| | | | | |||||
| | * | | don't throw IO exception at end of stream | Daniel Gultsch | 2016-04-10 | 1 | -1/+0 |
| | | | | |||||
| | * | | fixed 'connecting…' button | Daniel Gultsch | 2016-04-10 | 1 | -3/+6 |
| | | | | |||||
| | * | | moved authentication into seperate method. force close socket before ↵ | Daniel Gultsch | 2016-04-10 | 1 | -38/+44 |
| | | | | | | | | | | | | | changing status | ||||
| | * | | introduced setting to turn of notification led | Daniel Gultsch | 2016-04-09 | 1 | -1/+4 |
| | | | | |||||
| | * | | use startdate as lower bound when querying archive with after=x | Daniel Gultsch | 2016-04-09 | 1 | -13/+3 |
| | | | | |||||
| | * | | don't show contact details when in conversations with self | Daniel Gultsch | 2016-04-09 | 3 | -1/+8 |
| | | | | |||||
| | * | | use last received message id when querying archive | Daniel Gultsch | 2016-04-09 | 1 | -7/+17 |
| | | | | |||||
| | * | | transform nimbuzz workaround into a more general 'waitForDisco' condition | Daniel Gultsch | 2016-04-09 | 1 | -6/+11 |
| | | | | |||||
| | * | | add required disco#items query to timeout list | Daniel Gultsch | 2016-04-08 | 1 | -1/+4 |
| | | | | |||||
| | * | | removed ernoexception in exchange for a regular exeption to prevent verify ↵ | Daniel Gultsch | 2016-04-08 | 1 | -3/+2 |
| | | | | | | | | | | | | | error on <5.0 | ||||
| | * | | check file owner when attaching files or using them as avatar | Daniel Gultsch | 2016-04-07 | 3 | -2/+54 |
| | | | | |||||
| | * | | prevent null pointer when checking http upload max size | Daniel Gultsch | 2016-04-07 | 1 | -6/+6 |
| | | | | |||||
| | * | | better detect broken pep | Daniel Gultsch | 2016-04-05 | 2 | -2/+10 |
| | | | | | | | | | | | | | | | | mark pep as broken when publishing bundle or device list failed reset 'brokenness' when account is getting disabled | ||||
| | * | | switched around info and items query to avoid race condition | Daniel Gultsch | 2016-04-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | removed unnecessary wait for disconnect | Daniel Gultsch | 2016-04-04 | 1 | -6/+0 |
| | | | | |||||
| | * | | made sure the disco#items query has returned before finalizing the bind | Daniel Gultsch | 2016-04-04 | 1 | -12/+24 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-16 | 2 | -3/+8 |
| |\ \ \ | | |/ | |/| | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-06 | 11 | -144/+92 |
| |\| | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | ||||
| * | | | Merge tag '1.11.3' into trz/rebase | lookshe | 2016-04-05 | 17 | -53/+196 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | don't ask for resource when server uses http upload v0.1 | Daniel Gultsch | 2016-04-02 | 3 | -6/+8 |
| | | | | |||||
| | * | | check max http file size when attaching files | Daniel Gultsch | 2016-04-01 | 6 | -12/+83 |
| | | | | |||||
| | * | | add methods to check max file size for http upload | Daniel Gultsch | 2016-03-31 | 5 | -12/+41 |
| | | | | |||||
| | * | | save otr fingerprint in message | Daniel Gultsch | 2016-03-31 | 6 | -12/+15 |
| | | | | |||||
| | * | | include form fields into caps hash calculation | Daniel Gultsch | 2016-03-31 | 2 | -6/+25 |
| | | | | |||||
| | * | | closed some cursors under error conditions | Daniel Gultsch | 2016-03-31 | 1 | -3/+13 |
| | | | | |||||
| | * | | made setting aes keys in DownloadableFile more readable | Daniel Gultsch | 2016-03-31 | 1 | -12/+8 |
| | | | | |||||
| | * | | Update ShortcutBadger to version 1.1.4 | Christian S | 2016-03-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | fixed installation error "W/PackageManager: Can't install because provider ↵trz/beta-1 | lookshe | 2016-04-03 | 2 | -1/+21 |
| | | | | | | | | | | | | | name de.thedevstack.conversationsplus (in package eu.siacs.conversations) is already used by de.thedevstack.conversationsplus" | ||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |