aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/AndroidManifest.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-0/+9
|\
| * Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-271-0/+9
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-71/+94
| |\ | |/ |/|
* | Fixed parent activity for logoutput activitysteckbrief2016-02-121-3/+3
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-54/+77
|\ \
| * | ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-0/+1
| * | implement direct sharing in android 6.0. fixes #1321Daniel Gultsch2015-12-071-0/+9
| * | users are now able to crop their avatar pictures using the android-cropPhilip Flohr2015-12-021-1/+1
| * | pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-5/+0
| * | Handle some orientation changes manuallysaqura2015-10-251-0/+4
| * | open manage account + certificate chooser when cbe mode is enabledDaniel Gultsch2015-10-201-60/+65
| * | introduced expert options to set status to away and xa if screen is off or if...Daniel Gultsch2015-10-081-0/+1
| * | Export logs to SD card preferencefiaxh2015-09-211-0/+1
| * | single task mode for start conversations activityDaniel Gultsch2015-08-301-0/+1
| * | remove the READ_PHONE_STATE permission.Michael2015-08-231-0/+2
| * | renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-081-1/+1
| * | Ask for key trust when sending messagesAndreas Straub2015-07-191-0/+4
| * | allow sharing multiple images at once. fixes #1090iNPUTmice2015-04-111-0/+7
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-1/+1
|\ \ \ | | |/ | |/|
| * | Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-101-1/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-0/+8
|\| |
| * | Implements FS#67: Introduce central logging class to use log prefix, new acti...steckbrief2015-11-201-0/+8
* | | 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/rebaselookshe2015-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 erroriNPUTmice2014-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