aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3lookshe2015-08-241-13/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG.md README.md art/render.rb build.gradle src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/entities/Account.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/DownloadableFile.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.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/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java 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/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/CryptoHelper.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java src/main/res/layout/account_row.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/contact.xml src/main/res/layout/contact_key.xml src/main/res/layout/conversation_list_row.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/values-bg/strings.xml src/main/res/values-ca/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-el/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ko/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ru/strings.xml src/main/res/values-sk/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-v21/themes.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/arrays.xml src/main/res/values/colors.xml src/main/res/values/dimens.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
| * version bump to 1.6.3 and changelog1.6.3Daniel Gultsch2015-08-231-2/+2
| |
| * version bump to 1.6.2 and changelogDaniel Gultsch2015-08-231-2/+2
| |
| * version bump to 1.6.1Daniel Gultsch2015-08-231-2/+2
| |
| * increased version codeDaniel Gultsch2015-08-161-1/+1
| |
| * version bump to 1.6.0Daniel Gultsch2015-08-151-2/+2
| |
| * version bump to 1.6.0-beta.2Daniel Gultsch2015-08-111-2/+2
| |
| * version bump for ShortcutBadgerDaniel Gultsch2015-08-031-1/+1
| |
| * version bump to 1.6.0-betaDaniel Gultsch2015-08-011-2/+2
| |
| * bump to version 1.5.2Daniel Gultsch2015-07-211-2/+2
| |
| * version bump to 1.5.1 and changelogDaniel Gultsch2015-07-211-2/+2
| |
| * very subtleDaniel Gultsch2015-07-211-0/+1
| |
| * Remove duplicate dependencyAndreas Straub2015-07-201-1/+0
| |
| * Refactor trust key ui and show in account detailsAndreas Straub2015-07-191-0/+1
| | | | | | | | | | | | | | | | | | Refactored the trust key row UI element so it can be used in multiple places. It now also uses a slider to toggle the trust state, and the redundant trust state description was removed. EditAccountActivity now shows the keys of other devices associated with that account.
| * CryptoNext persistance layer mockupAndreas Straub2015-07-191-0/+1
| | | | | | | | | | Initial sketch of the peripheral storage infrastructure for the new axolotl-based encryption scheme.
| * shut up linterDaniel Gultsch2015-07-191-1/+1
| |
| * changed switch widgetDaniel Gultsch2015-07-181-0/+1
| |
| * bump version to 1.5.01.5.0Daniel Gultsch2015-07-181-2/+2
| |
| * version bump to 1.5.0-beta.2Daniel Gultsch2015-07-161-2/+2
| |
| * version bump to 1.5.0-betaDaniel Gultsch2015-07-101-2/+2
| |
| * version bump to 1.4.7Daniel Gultsch2015-07-041-2/+2
| |
| * version bump to 1.4.61.4.6Daniel Gultsch2015-07-031-2/+2
| |
| * version bump to 1.4.51.4.5Daniel Gultsch2015-06-291-2/+2
| |
| * Merge branch 'development'1.4.4Daniel Gultsch2015-06-231-1/+2
| |\
| | * version bumpDaniel Gultsch2015-06-041-2/+2
| | |
| | * really update build toolsDaniel Gultsch2015-06-021-1/+1
| | |
| | * stick with 1.4.xDaniel Gultsch2015-06-021-1/+1
| | |
| | * Merge branch 'master' into developmentDaniel Gultsch2015-05-251-1/+1
| | |\
| | * \ Merge branch 'master' into developmentDaniel Gultsch2015-05-211-1/+1
| | |\ \
| | * | | added ShortcutBadger as a dependency to create unread counts on launcher iconDaniel Gultsch2015-05-201-2/+3
| | | | |
| * | | | version bump to 1.4.4Daniel Gultsch2015-06-231-2/+2
| | |_|/ | |/| |
| * | | version bump to 1.4.31.4.3Daniel Gultsch2015-05-251-2/+2
| | |/ | |/|
| * | version bump to 1.4.21.4.2Daniel Gultsch2015-05-211-2/+2
| |/
| * don't allow user to accidentally send empty messages1.4.1Daniel Gultsch2015-05-201-2/+2
| |
| * version bump to 1.4.0Daniel Gultsch2015-05-201-2/+2
| |
| * version bump to 1.4.0-betaDaniel Gultsch2015-05-161-2/+2
| |
| * version bump to 1.4.0-alpha3Daniel Gultsch2015-05-131-2/+2
| |
| * version code bumpedDaniel Gultsch2015-05-071-1/+1
| |
| * bumped version codeDaniel Gultsch2015-05-051-1/+1
| |
| * update build tools and target apiDaniel Gultsch2015-05-041-2/+2
| |
| * version bump to 1.4.0-alpha (in development)Daniel Gultsch2015-05-021-2/+2
| |
| * shut up linter. fixed buildDaniel Gultsch2015-05-021-1/+1
| |
| * version bump to 1.3.01.3.0Daniel Gultsch2015-05-011-2/+2
| |
| * version bump to 1.3.0-betaDaniel Gultsch2015-04-281-2/+2
| |
| * version bump to 1.3.0-betaDaniel Gultsch2015-04-261-2/+2
| |
| * bumped version to 1.3.0-alphaiNPUTmice2015-04-151-2/+2
| |
| * Enable end-conversation by swipe gestureBrianBlade2015-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4 to enable swipe-out for ListViews Re-enable selectableItemBackground Dont end selectedConversation on swipe Call mConversationFragment.reinit() instead. Add separate undo string for swipe MUC. Add blacklistedConversation for undo swipe Update title_undo_swipe_* strings Fix undo(), rename blacklistedConversation Fix discardUndo(); re-init selectedConversation maintain scroll position after undo clear notification when dismissing a conversation modified / simplified maintain scroll position code simplify handling of selectedConversation change undo_muc string, remove notifyDataSetChanged()
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-6/+8
| |
* | moved color picker to libslookshe2015-04-151-0/+1
| |
* | whatsapp-like smiley implementationlookshe2015-04-121-0/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 06:56:25 +0000