aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebaselookshe2015-10-051-2/+2
|\ | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
| * version bump to 0.0.5lookshe2015-10-051-2/+2
| |
| * version bump to 0.0.4lookshe2015-08-211-2/+2
| |
| * version bump to 0.0.3lookshe2015-08-161-2/+2
| |
| * adjust version code to match fdroid regexlookshe2015-08-131-1/+1
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-111-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
| * App-Name changed to "Conversations+" in strings.xmlsteckbrief2015-06-191-3/+3
| |
* | 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
|
* timestamp parsing revertedsteckbrief2015-03-311-11/+11
|
* Configurable LED color (Attention: Expert setting because currently only ↵steckbrief2015-03-311-2/+2
| | | | text input)
* Changes for emoticon parser reactivatedsteckbrief2015-03-311-2/+2
|
* bump version code1.2.0iNPUTmice2015-03-221-2/+2
|
* version bump to 1.2.0-beta1.2.0-betaiNPUTmice2015-03-191-2/+2
|
* increment version code1.1.0iNPUTmice2015-02-281-1/+1
|
* version bump to 1.1.0iNPUTmice2015-02-261-2/+2
|
* version bump to 1.1.0-beta1.1.0-betaiNPUTmice2015-02-231-2/+2
|
* otr4j has moved to Maven CentralMichael2015-02-221-4/+1
|
* version bump to 1.0.5iNPUTmice2015-02-191-2/+2
|
* version bump to 1.0.4 and changelogiNPUTmice2015-02-161-2/+2
|
* updated bcprov to 1.511.0.3iNPUTmice2015-02-131-1/+1
|
* version bump to 1.0.3iNPUTmice2015-02-121-2/+2
|
* version bump to 1.0.2iNPUTmice2015-02-091-2/+2
|
* version bump1.0.1iNPUTmice2015-02-021-2/+2
|
* bumped version code again1.0iNPUTmice2015-02-011-1/+1
|
* made version codes ready for release candidate in beta channeliNPUTmice2015-01-291-2/+2
|
* changed version code and version name to 1.0-beta2iNPUTmice2015-01-261-2/+2
|
* update android gradle plugin to 1.0.1Michael2015-01-251-1/+1
|
* otr4j: update to 0.22Michael2015-01-201-1/+1
|
* added changelog for 1.0iNPUTmice2015-01-191-2/+2
|
* Switch to maven central minidnsRene Treffer2015-01-141-1/+1
|
* Don't fail on extra translationsSam Whited2015-01-121-1/+1
|
* use latest support libraryDaniel Gultsch2015-01-101-1/+1
|
* Add materials themeSam Whited2015-01-061-3/+3
|
* version bump to 0.10Daniel Gultsch2015-01-031-2/+2
|
* gradle: fix Cannot set property outputFile on null object.Michael2014-12-091-1/+3
|
* Merge pull request #710 from betheg/asDaniel Gultsch2014-12-091-13/+8
|\ | | | | update android gradle plugin to 0.14.4
| * update gradle to 2.2.1 and android gradle plugin to 1.0.0Michael2014-12-091-1/+1
| |
| * update android gradle plugin to 1.0.0-rc4Michael2014-12-051-1/+1
| |
| * update android gradle plugin to 0.14.4Michael2014-11-221-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.30.9.3iNPUTmice2014-12-071-2/+2
| |
* | version bump to 0.9.20.9.2iNPUTmice2014-12-031-2/+2
| |
* | version bump to 0.9.1 and changelogiNPUTmice2014-12-011-2/+2
| |
* | version bump to 0.90.9iNPUTmice2014-11-291-1/+1
|/
* bump to version 0.9-alpha to differentiate stack traces. no feature freeze ↵iNPUTmice2014-11-171-2/+2
| | | | or anything else
* Merge branch 'master' into developmentiNPUTmice2014-11-161-2/+2
|\ | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
| * version bump to 0.8.40.8.4iNPUTmice2014-11-161-2/+2
| |
* | Remove unused dependencySam Whited2014-11-091-4/+1
| |
* | Add jxmpp-stringprep-libidn dependencySam Whited2014-11-091-2/+6
|/