aboutsummaryrefslogtreecommitdiffstats
path: root/libs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* deleted unused library (FS#51)lookshe2016-03-231-0/+0
|
* Fixes FS#153 - Check if url, phone and email are linkified correctlylookshe2016-03-081-0/+10
|
* Fixes FS#150 - Swipe out conversation kills applookshe2016-03-071-0/+0
| | | | stacktrace told "java.lang.NoClassDefFoundError: com.nineoldandroids.view.ViewHelper"
* Fixes: FS#94 - wrong size on emojicon keyboardtrz/1.10.1.1lookshe2016-03-062-3/+20
|
* Fixed runtime errors with axolotl libraries.steckbrief2016-02-125-0/+0
| | | | Now the libraries from maven are added.
* axolotl resources changed from maven to jcentersteckbrief2016-02-124-0/+0
|
* Some runtime dependencies addedsteckbrief2016-02-112-0/+0
|
* Fixed third party library references in gradlesteckbrief2016-02-1124-35/+0
|
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-1143-1794/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml CHANGELOG.md README.md art/render.rb build.gradle libs/openpgp-api-lib/build.gradle settings.gradle src/main/AndroidManifest.xml 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/Conversation.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/entities/MucOptions.java src/main/java/eu/siacs/conversations/entities/Transferable.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/generator/PresenceGenerator.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/IqParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.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/AbstractConnectionManager.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.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/ConferenceDetailsActivity.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/ManageAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.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/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/ExceptionHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/PhoneHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/utils/Xmlns.java src/main/java/eu/siacs/conversations/xml/XmlReader.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/JingleConnectionManager.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/drawable-hdpi/ic_launcher.png src/main/res/drawable-hdpi/ic_notification.png src/main/res/drawable-mdpi/ic_launcher.png src/main/res/drawable-mdpi/ic_notification.png src/main/res/drawable-xhdpi/ic_launcher.png src/main/res/drawable-xhdpi/ic_notification.png src/main/res/drawable-xxhdpi/ic_launcher.png src/main/res/drawable-xxhdpi/ic_notification.png src/main/res/drawable-xxxhdpi/ic_launcher.png src/main/res/drawable-xxxhdpi/ic_notification.png src/main/res/layout/account_row.xml src/main/res/layout/activity_about.xml src/main/res/layout/activity_change_password.xml src/main/res/layout/activity_contact_details.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/activity_publish_profile_picture.xml src/main/res/layout/activity_verify_otr.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/enter_jid_dialog.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/join_conference_dialog.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/layout/message_status.xml src/main/res/layout/quickedit.xml src/main/res/values-ar-rEG/strings.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-fa-rIR/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-iw/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/values/themes.xml src/main/res/xml/preferences.xml
| * Use OpenPGP-API 9.0fiaxh2015-11-0944-1829/+0
| |
| * really update build toolsDaniel Gultsch2015-06-022-2/+2
| |
* | Log error in case logcat command could not be executed; Show toast in case ↵steckbrief2015-12-172-6/+39
| | | | | | | | nothing is copied
* | Fixes FS#88, Code cleanupsteckbrief2015-12-141-4/+5
| |
* | Fixes FS#88: Avoid smilie repacement in time messagessteckbrief2015-12-141-4/+9
| |
* | Build cleanup: libraries added as local resources, removed unused proguard ↵steckbrief2015-12-1427-2180/+0
| | | | | | | | configs, removed SwipyRefreshLayout as module and added as binary dependency, moved 3rd party binaries to separate folder
* | Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-1012-1/+496
| |
* | Implements FS#83: Reload from last received messagesteckbrief2015-12-049-0/+2112
| |
* | fixes FS#42 - Smilie replacement in urllookshe2015-08-211-1/+25
| |
* | fix wrong class type usagelookshe2015-08-161-2/+1
| |
* | fixes FS#13 - Change smiley replacement patterns to be case insensitivelookshe2015-08-161-34/+18
| |
* | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-1620-0/+115
| |
* | Merged https://github.com/ankushsachdeva/emojicon/pull/16lookshe2015-08-151-4/+24
| |
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-112-2/+2
| |
* | moved color picker to libslookshe2015-04-1534-0/+852
| |
* | whatsapp-like smiley implementationlookshe2015-04-121018-0/+4064
| |
* | Merge master-originsteckbrief2015-02-2023-2948/+0
|\| | | | | | | | | | | | | | | | | | | Conflicts: 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/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
| * Switch to maven central minidnsRene Treffer2015-01-1423-2948/+0
| |
* | changes to get it working under eclipselookshe2015-01-109-0/+30
|/
* update android gradle plugin to 0.14.4Michael2014-11-221-2/+5
| | | | | to work with AS >= 0.9.0 plugin >= 0.14.0 is required also update gradle to 2.2.
* Subtree merged in openpgp api libSam Whited2014-10-2845-6/+1829
|
* Subtree merged in minidnsSam Whited2014-10-2823-0/+2945
|
* Remove minidns dirSam Whited2014-10-281-6/+0
|
* Subtree merged in MemorizingTrustManagerSam Whited2014-10-2835-0/+1875
|
* Move submodules back to libs/Sam Whited2014-10-263-0/+12
|
* Pull otr4j form Maven repoSam Whited2014-10-261-0/+0
|
* Suppress lint errors and remove bcprovSam Whited2014-10-221-0/+0
|
* Add build deps and move build props to build fileSam Whited2014-10-222-0/+0