aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * version bump to 1.4.7Daniel Gultsch2015-07-041-2/+2
| |
| * version bump to 1.4.6Daniel Gultsch2015-07-031-2/+2
| |
| * version bump to 1.4.5Daniel Gultsch2015-06-291-2/+2
| |
| * Merge branch 'development'Daniel 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.3Daniel Gultsch2015-05-251-2/+2
| | |/ | |/|
| * | version bump to 1.4.2Daniel Gultsch2015-05-211-2/+2
| |/
| * don't allow user to accidentally send empty messagesDaniel 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.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 remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-161-12/+19
|\ \
| * | Build cleanup: libraries added as local resources, removed unused proguard ↵steckbrief2015-12-141-12/+19
| | | | | | | | | | | | configs, removed SwipyRefreshLayout as module and added as binary dependency, moved 3rd party binaries to separate folder
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-0/+1
|\| |
| * | Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-101-0/+1
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-1/+2
|\| |
| * | Implements FS#83: Reload from last received messagesteckbrief2015-12-041-1/+2
| | |
* | | 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.50.0.5lookshe2015-10-051-2/+2
| | |
| * | version bump to 0.0.40.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/rebaselookshe2015-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 codeiNPUTmice2015-03-221-2/+2
|
* version bump to 1.2.0-betaiNPUTmice2015-03-191-2/+2
|
* increment version codeiNPUTmice2015-02-281-1/+1
|
* version bump to 1.1.0iNPUTmice2015-02-261-2/+2
|