| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'trz/rename' into trz/rebase | steckbrief | 2017-01-11 | 4 | -18/+21 |
| |\ | |||||
| * | | 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 |
| |\| | |||||
| * | | Added columns to fileparams table: url, original file name, key and ivtrz/beta-5 | steckbrief | 2017-01-04 | 3 | -224/+276 |
| | | | | | | | | | | | 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 | 5 | -33/+76 |
| |\| | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-05-09 | 3 | -9/+10 |
| |\| | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-23 | 1 | -5/+5 |
| |\| | | | | | | | | | | | | | | | | | 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 | 2 | -4/+1 |
| |\| | |||||
| * | | Merge tag '1.11.7' into trz/merge_1.11.7 | lookshe | 2016-04-17 | 5 | -11/+56 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | add setting for quick sharing | Daniel Gultsch | 2016-04-14 | 1 | -2/+25 |
| | | | | |||||
| | * | | hacky workaround to determine if uri points to private file on < lolipop | Daniel Gultsch | 2016-04-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | added share uri button to conference details | Daniel Gultsch | 2016-04-12 | 1 | -0/+17 |
| | | | | |||||
| | * | | fixed 'connecting…' button | Daniel Gultsch | 2016-04-10 | 1 | -3/+6 |
| | | | | |||||
| | * | | don't show contact details when in conversations with self | Daniel Gultsch | 2016-04-09 | 2 | -1/+4 |
| | | | | |||||
| | * | | check file owner when attaching files or using them as avatar | Daniel Gultsch | 2016-04-07 | 1 | -2/+11 |
| | | | | |||||
| | * | | prevent null pointer when checking http upload max size | Daniel Gultsch | 2016-04-07 | 1 | -6/+6 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-06 | 8 | -78/+57 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | ||||
| * | | | Merge tag '1.11.3' into trz/rebase | lookshe | 2016-04-05 | 6 | -10/+43 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | don't ask for resource when server uses http upload v0.1 | Daniel Gultsch | 2016-04-02 | 2 | -5/+4 |
| | | | | |||||
| | * | | check max http file size when attaching files | Daniel Gultsch | 2016-04-01 | 3 | -6/+39 |
| | | | | |||||
| | * | | add methods to check max file size for http upload | Daniel Gultsch | 2016-03-31 | 1 | -1/+1 |
| | | | | |||||
| | * | | save otr fingerprint in message | Daniel Gultsch | 2016-03-31 | 2 | -3/+3 |
| | | | | |||||
| * | | | fixed installation error "W/PackageManager: Can't install because provider ↵trz/beta-1 | lookshe | 2016-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | name de.thedevstack.conversationsplus (in package eu.siacs.conversations) is already used by de.thedevstack.conversationsplus" | ||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-04-01 | 1 | -1/+6 |
| |\ \ \ | | |/ | |/| | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-30 | 1 | -1/+3 |
| |\| | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-30 | 1 | -0/+2 |
| |\| | | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-29 | 1 | -20/+9 |
| |\| | | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-29 | 5 | -70/+28 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.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/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | ||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-29 | 10 | -84/+52 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java | ||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-28 | 1 | -1/+1 |
| |\| | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-27 | 1 | -2/+23 |
| |\| | | |||||
| * | | | FS#169 - Merge Conversations 1.11.2 into Conversations+ dev | lookshe | 2016-03-25 | 5 | -13/+31 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | allow to delete attachments. fixes #1539 | Daniel Gultsch | 2016-03-23 | 1 | -7/+25 |
| | | | | |||||
| | * | | be less strict when sharing EXTRA_TEXT intents | Daniel Gultsch | 2016-03-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | don't show v\omemo keys as such if not enabled | Daniel Gultsch | 2016-03-20 | 2 | -4/+5 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-22 | 1 | -25/+37 |
| |\ \ \ | | |/ | |/| | |||||
| * | | | Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1 | lookshe | 2016-03-20 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 1 | -1/+1 |
| | |\| | | |||||
| * | | | | fixed merge errors | lookshe | 2016-03-20 | 2 | -19/+25 |
| | | | | | |||||
| * | | | | Merge tag '1.11.1' into trz/merge_1.11.1 | lookshe | 2016-03-17 | 4 | -59/+100 |
| |\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml | ||||
| | * | | made it possible to share text files | Daniel Gultsch | 2016-03-16 | 1 | -7/+8 |
| | | | | |||||
| | * | | reworked sharewith activity to stay open during sharing | Daniel Gultsch | 2016-03-16 | 2 | -30/+66 |
| | | | | | | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked | ||||
| | * | | added logging in case fragment wasn't attached | Daniel Gultsch | 2016-03-13 | 1 | -0/+5 |
| | | | | |||||
| | * | | fixed recursive call instead of call to super in PublishProfileActivity | Daniel Gultsch | 2016-03-13 | 1 | -5/+1 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-15 | 1 | -1/+1 |
| |\ \ \ | | |/ | |/| | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-12 | 1 | -1/+1 |
| |\| | | |||||
| * | | | Added method to get body from message if hasMeCommand and harmonized ↵ | lookshe | 2016-03-12 | 1 | -3/+3 |
| | | | | | | | | | | | | | extraction of fileextension (FS#38) | ||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 3 | -77/+11 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/widget/Switch.java src/main/res/layout/account_row.xml src/main/res/layout/contact_key.xml | ||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 3 | -16/+7 |
| |\| | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java | ||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-10 | 1 | -2/+1 |
| |\| | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java | ||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |