aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/AndroidManifest.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-301-0/+6
|\
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-0/+6
* | Merge branch 'refs/heads/siacs/master' into welcome-screenChristian S2016-04-211-2/+12
|\|
| * added magic create welcome screenDaniel Gultsch2016-04-191-3/+13
* | Merge branch 'siacs/master' into developmentChristian S2016-01-131-0/+1
|\|
| * 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
* | implement direct sharing in android 6.0. fixes #1321Daniel Gultsch2015-12-111-1/+10
* | copy commitsChristian S2015-11-291-5/+0
|\|
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-5/+0
* | copy Avatar Crop patchChristian S2015-11-071-0/+1
|\ \
| * | users are now able to crop their avatar picturesPhilip Flohr2015-11-061-1/+1
| |/
* | Version bumpChristian S2015-10-311-1/+2
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-311-0/+4
|\|
| * Handle some orientation changes manuallysaqura2015-10-251-0/+4
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-201-50/+53
|\|
| * open manage account + certificate chooser when cbe mode is enabledDaniel Gultsch2015-10-201-60/+65
* | updated AppUpdater a bitChristian S2015-10-101-1/+2
* | copy commitsChristian S2015-10-101-0/+1
|\|
| * introduced expert options to set status to away and xa if screen is off or if...Daniel Gultsch2015-10-081-0/+1
* | updated startup intent againChristian S.2015-10-061-1/+1
* | updated startup intentChristian S.2015-10-061-0/+2
* | added intent to start app after update automaticallyChristian S.2015-10-061-0/+3
* | changed theme of appupdaterChristian S2015-09-271-1/+1
* | updated to version 1.6.12 beta and changelogChristian S2015-09-261-6/+2
* | copy commitsChristian S2015-09-261-5/+1
|\|
| * Export logs to SD card preferencefiaxh2015-09-211-0/+1
* | modified AppUpdaterChristian S2015-09-201-1/+2
* | show the update dialog and not the whole activityChristian S2015-09-201-1/+1
* | version 1.6.9 betaChristian S2015-09-061-13/+28
|/
* 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
* 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