aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/AndroidManifest.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-221-1/+2
|\
| * Implements FS#78: Allow installation on SD cardsteckbrief2015-10-221-1/+2
* | fix imports and namespacessteckbrief2015-10-051-1/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-051-1/+2
|\|
| * Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac...steckbrief2015-10-051-1/+2
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-111-0/+7
| |\ | |/ |/|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-19/+19
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-0/+7
|/
* Remove title_activity_conversations and use app_name insteadkruks232015-01-301-2/+2
* migrated change password into separate activityDaniel Gultsch2015-01-031-0/+3
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-0/+3
* Allow sending of any filetype via intentSam Whited2014-12-151-1/+1
* initial smp supportiNPUTmice2014-11-111-0/+4
* use proper theme for MTMiNPUTmice2014-11-091-4/+8
* Convert about dialog to activitySam Whited2014-11-041-23/+33
* fixed merge errornfciNPUTmice2014-11-031-1/+0
* Merge branch 'nfc' of https://github.com/siacs/Conversations into nfciNPUTmice2014-11-031-0/+1
|\
| * basic beam code / untestediNPUTmice2014-11-031-22/+20
* | use different filter for nfc intentsiNPUTmice2014-11-031-1/+1
* | basic beam code / untestediNPUTmice2014-11-031-22/+20
|/
* Make conversations the root projectSam Whited2014-10-221-0/+118