Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag '1.11.0' into trz/merge_1.11.0 | lookshe | 2016-03-08 | 1 | -3/+5 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.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/PublishProfilePictureActivity.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/MessageAdapter.java src/main/res/values-bg/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-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml | ||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-03-06 | 1 | -3/+5 |
| | | |||||
* | | Fixes FS#146: Remove Tor-Support | steckbrief | 2016-03-02 | 1 | -3/+0 |
| | | |||||
* | | Removed stupid message correction | steckbrief | 2016-02-23 | 1 | -2/+0 |
| | | |||||
* | | Removed useless 'button-message' to load more messages. Implementation ↵ | steckbrief | 2016-02-23 | 1 | -1/+0 |
| | | | | | | | | already done with a more convenient method | ||||
* | | Merge tag '1.10.0' into trz/merge_1.10.0 | lookshe | 2016-02-22 | 1 | -10/+29 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml 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-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml | ||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-02-19 | 1 | -10/+28 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-02-15 | 1 | -1/+2 |
| | | |||||
* | | Unused preference 'picture_compression'. This feature is configured in our ↵ | steckbrief | 2016-02-13 | 1 | -2/+0 |
| | | | | | | | | variant via 'resize_picture' | ||||
* | | green bubbles and setting to choose green or white bubbles removed | steckbrief | 2016-02-12 | 1 | -2/+0 |
|/ | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-01-16 | 1 | -0/+29 |
| | |||||
* | pulled translations for 1.9.0 release from transifex1.9.0 | Daniel Gultsch | 2016-01-14 | 1 | -2/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-01-12 | 1 | -4/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-01-11 | 1 | -3/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-12-17 | 1 | -0/+5 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-12-07 | 1 | -0/+26 |
| | |||||
* | pulled new translations from transifex | Daniel Gultsch | 2015-12-02 | 1 | -6/+18 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-10-14 | 1 | -1/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-09-15 | 1 | -0/+5 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-09-14 | 1 | -1/+0 |
| | |||||
* | pulled new translations from transifex | Daniel Gultsch | 2015-09-13 | 1 | -0/+2 |
| | |||||
* | pulled updated translations from transifex | Daniel Gultsch | 2015-08-28 | 1 | -1/+0 |
| | |||||
* | added XEP number for http file upload | Daniel Gultsch | 2015-08-27 | 1 | -0/+6 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-08-24 | 1 | -2/+0 |
| | |||||
* | renamed plain text to unencrypted. fixes #1331 | Daniel Gultsch | 2015-08-24 | 1 | -2/+2 |
| | |||||
* | pulled translations from transifex1.6.0 | Daniel Gultsch | 2015-08-19 | 1 | -1/+28 |
| | |||||
* | sync translations with transifex | Daniel Gultsch | 2015-08-03 | 1 | -3/+0 |
| | |||||
* | pulled translations | Daniel Gultsch | 2015-07-18 | 1 | -1/+3 |
| | |||||
* | made 'check image on http host' message more generic. fixed #1281 | Daniel Gultsch | 2015-07-16 | 1 | -5/+3 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-05-26 | 1 | -0/+5 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-04-29 | 1 | -0/+11 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-04-26 | 1 | -0/+3 |
| | |||||
* | added missing translations from transifex | Daniel Gultsch | 2015-04-21 | 1 | -1/+2 |
| | |||||
* | pulled translations from transifex | iNPUTmice | 2015-04-01 | 1 | -0/+4 |
| | |||||
* | pulled more translations | iNPUTmice | 2015-03-19 | 1 | -0/+5 |
| | |||||
* | pulled new translations from transifex | iNPUTmice | 2015-03-16 | 1 | -1/+1 |
| | |||||
* | pulled new translations from transifex | iNPUTmice | 2015-02-23 | 1 | -0/+6 |
| | |||||
* | pulled translations from transifex | iNPUTmice | 2015-02-01 | 1 | -0/+13 |
| | |||||
* | Remove title_activity_conversations and use app_name instead | kruks23 | 2015-01-30 | 1 | -1/+0 |
| | |||||
* | Remove legacy SSL support | Sam Whited | 2015-01-19 | 1 | -1/+0 |
| | |||||
* | fetched translations from transifex | iNPUTmice | 2015-01-19 | 1 | -334/+406 |
| | |||||
* | Correct the download file string on notifications | Sam Whited | 2015-01-17 | 1 | -1/+0 |
| | | | | Fixes #896 | ||||
* | make project translatable via transifex | Daniel Gultsch | 2015-01-09 | 1 | -40/+0 |
| | |||||
* | Updated languages for higher auto accept file sizes and changed labeling to ↵ | Christian Schneppe | 2015-01-05 | 1 | -37/+38 |
| | | | | MiB and KiB | ||||
* | Make `app_name' string untranslatable | Sam Whited | 2014-12-29 | 1 | -1/+0 |
| | | | | | | Remove untranslatable about message Escape single quote in NL translation | ||||
* | Update basque translation | Aitor Beriain | 2014-11-27 | 1 | -0/+6 |
| | |||||
* | Update basque translation | Aitor Beriain | 2014-11-19 | 1 | -0/+56 |
| | |||||
* | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -1/+1 |
| | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | ||||
* | Make conversations the root project | Sam Whited | 2014-10-22 | 2 | -0/+315 |