| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | version bump to 0.0.50.0.5 | lookshe | 2015-10-05 | 1 | -2/+2 |
| | | |||||
| * | version bump to 0.0.40.0.4 | lookshe | 2015-08-21 | 1 | -2/+2 |
| | | |||||
| * | version bump to 0.0.3 | lookshe | 2015-08-16 | 1 | -2/+2 |
| | | |||||
| * | adjust version code to match fdroid regex | lookshe | 2015-08-13 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2015-08-11 | 1 | -6/+8 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java src/main/java/de/thedevstack/conversationsplus/entities/Account.java src/main/java/de/thedevstack/conversationsplus/entities/Contact.java src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java src/main/java/de/thedevstack/conversationsplus/entities/Message.java src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java src/main/java/eu/siacs/conversations/crypto/OtrEngine.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java src/main/java/eu/siacs/conversations/http/HttpConnection.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/res/layout/activity_about.xml | ||||
| | * | Merge tag '1.5.2' into trz/rebase | lookshe | 2015-08-11 | 1 | -6/+8 |
| | | | |||||
| * | | App-Name changed to "Conversations+" in strings.xml | steckbrief | 2015-06-19 | 1 | -3/+3 |
| |/ | |||||
| * | moved color picker to libs | lookshe | 2015-04-15 | 1 | -0/+1 |
| | | |||||
| * | whatsapp-like smiley implementation | lookshe | 2015-04-12 | 1 | -0/+1 |
| | | |||||
| * | timestamp parsing reverted | steckbrief | 2015-03-31 | 1 | -11/+11 |
| | | |||||
| * | Configurable LED color (Attention: Expert setting because currently only ↵ | steckbrief | 2015-03-31 | 1 | -2/+2 |
| | | | | | text input) | ||||
| * | Changes for emoticon parser reactivated | steckbrief | 2015-03-31 | 1 | -2/+2 |
| | | |||||
| * | bump version code | iNPUTmice | 2015-03-22 | 1 | -2/+2 |
| | | |||||
| * | version bump to 1.2.0-beta | iNPUTmice | 2015-03-19 | 1 | -2/+2 |
| | | |||||
| * | increment version code | iNPUTmice | 2015-02-28 | 1 | -1/+1 |
| | | |||||
| * | version bump to 1.1.0 | iNPUTmice | 2015-02-26 | 1 | -2/+2 |
| | | |||||
| * | version bump to 1.1.0-beta | iNPUTmice | 2015-02-23 | 1 | -2/+2 |
| | | |||||
| * | otr4j has moved to Maven Central | Michael | 2015-02-22 | 1 | -4/+1 |
| | | |||||
| * | version bump to 1.0.5 | iNPUTmice | 2015-02-19 | 1 | -2/+2 |
| | | |||||
| * | version bump to 1.0.4 and changelog | iNPUTmice | 2015-02-16 | 1 | -2/+2 |
| | | |||||
| * | updated bcprov to 1.51 | iNPUTmice | 2015-02-13 | 1 | -1/+1 |
| | | |||||
| * | version bump to 1.0.3 | iNPUTmice | 2015-02-12 | 1 | -2/+2 |
| | | |||||
| * | version bump to 1.0.2 | iNPUTmice | 2015-02-09 | 1 | -2/+2 |
| | | |||||
| * | version bump | iNPUTmice | 2015-02-02 | 1 | -2/+2 |
| | | |||||
| * | bumped version code again | iNPUTmice | 2015-02-01 | 1 | -1/+1 |
| | | |||||
| * | made version codes ready for release candidate in beta channel | iNPUTmice | 2015-01-29 | 1 | -2/+2 |
| | | |||||
| * | changed version code and version name to 1.0-beta2 | iNPUTmice | 2015-01-26 | 1 | -2/+2 |
| | | |||||
| * | update android gradle plugin to 1.0.1 | Michael | 2015-01-25 | 1 | -1/+1 |
| | | |||||
| * | otr4j: update to 0.22 | Michael | 2015-01-20 | 1 | -1/+1 |
| | | |||||
| * | added changelog for 1.0 | iNPUTmice | 2015-01-19 | 1 | -2/+2 |
| | | |||||
| * | Switch to maven central minidns | Rene Treffer | 2015-01-14 | 1 | -1/+1 |
| | | |||||
| * | Don't fail on extra translations | Sam Whited | 2015-01-12 | 1 | -1/+1 |
| | | |||||
| * | use latest support library | Daniel Gultsch | 2015-01-10 | 1 | -1/+1 |
| | | |||||
| * | Add materials theme | Sam Whited | 2015-01-06 | 1 | -3/+3 |
| | | |||||
| * | version bump to 0.10 | Daniel Gultsch | 2015-01-03 | 1 | -2/+2 |
| | | |||||
| * | gradle: fix Cannot set property outputFile on null object. | Michael | 2014-12-09 | 1 | -1/+3 |
| | | |||||
| * | Merge pull request #710 from betheg/as | Daniel Gultsch | 2014-12-09 | 1 | -13/+8 |
| |\ | | | | | update android gradle plugin to 0.14.4 | ||||
| | * | update gradle to 2.2.1 and android gradle plugin to 1.0.0 | Michael | 2014-12-09 | 1 | -1/+1 |
| | | | |||||
| | * | update android gradle plugin to 1.0.0-rc4 | Michael | 2014-12-05 | 1 | -1/+1 |
| | | | |||||
| | * | update android gradle plugin to 0.14.4 | Michael | 2014-11-22 | 1 | -13/+8 |
| | | | | | | | | | | | to work with AS >= 0.9.0 plugin >= 0.14.0 is required also update gradle to 2.2. | ||||
| * | | version bump to 0.9.3 | iNPUTmice | 2014-12-07 | 1 | -2/+2 |
| | | | |||||
| * | | version bump to 0.9.2 | iNPUTmice | 2014-12-03 | 1 | -2/+2 |
| | | | |||||
| * | | version bump to 0.9.1 and changelog | iNPUTmice | 2014-12-01 | 1 | -2/+2 |
| | | | |||||
| * | | version bump to 0.9 | iNPUTmice | 2014-11-29 | 1 | -1/+1 |
| |/ | |||||
| * | bump to version 0.9-alpha to differentiate stack traces. no feature freeze ↵ | iNPUTmice | 2014-11-17 | 1 | -2/+2 |
| | | | | | or anything else | ||||
| * | Merge branch 'master' into development | iNPUTmice | 2014-11-16 | 1 | -2/+2 |
| |\ | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | ||||
| | * | version bump to 0.8.4 | iNPUTmice | 2014-11-16 | 1 | -2/+2 |
| | | | |||||
| * | | Remove unused dependency | Sam Whited | 2014-11-09 | 1 | -4/+1 |
| | | | |||||
| * | | Add jxmpp-stringprep-libidn dependency | Sam Whited | 2014-11-09 | 1 | -2/+6 |
| |/ | |||||
| * | bumped gradle files + changelog | iNPUTmice | 2014-11-09 | 1 | -2/+2 |
| | | |||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |