aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values (follow)
Commit message (Expand)AuthorAgeFilesLines
* verify contacts key only on initiating side of smpiNPUTmice2014-11-211-0/+2
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-201-0/+4
* context menu for conversations. fixed #630iNPUTmice2014-11-181-0/+1
* Fix stringferdev12014-11-161-1/+1
* happy hanukkahiNPUTmice2014-11-162-0/+5
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-161-0/+3
* Add incompatible server statusSam Whited2014-11-151-0/+1
* Add security error statusSam Whited2014-11-151-0/+1
* Merge branch 'feature/file_transfer' into developmentiNPUTmice2014-11-151-1/+13
|\
| * handled more error casesiNPUTmice2014-11-151-0/+1
| * fixed description in notifications and conversation overviewiNPUTmice2014-11-151-0/+2
| * made file transfers cancelableiNPUTmice2014-11-151-1/+2
| * adepted conversationadapter to deal with filesiNPUTmice2014-11-151-0/+2
| * some mime and pgp fixes for file transferiNPUTmice2014-11-151-0/+1
| * progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-151-1/+2
| * basic arbitrary file transferiNPUTmice2014-11-151-1/+5
* | Merge branch 'feature/foreground_service' into developmentiNPUTmice2014-11-151-0/+4
|\ \
| * | turn on foreground service in expert settingsiNPUTmice2014-11-151-0/+4
| |/
* | Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-151-0/+17
|\ \ | |/ |/|
| * added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-111-0/+2
| * initial smp supportiNPUTmice2014-11-111-0/+15
* | Make licenses info untranslatableSam Whited2014-11-141-1/+1
|/
* formatingiNPUTmice2014-11-091-9/+9
* add libidn to pref_about_message.Michael2014-11-091-0/+1
* add all used libs to the pref_about_message.Michael2014-11-091-15/+23
* reformated license a bitiNPUTmice2014-11-041-19/+13
* Shorten license text and fix height of scrollviewSam Whited2014-11-041-18/+5
* Make links clickable in about textSam Whited2014-11-041-3/+4
* Convert about dialog to activitySam Whited2014-11-042-12/+15
* Use real copyright symbol ©Sam Whited2014-11-041-3/+3
* Add about dialog with license infoSam Whited2014-11-041-0/+37
* show avatar in editaccountiNPUTmice2014-11-041-0/+1
* unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-031-1/+2
* Merge branch 'gradle' into developmentSam Whited2014-10-302-7/+17
* Make conversations the root projectSam Whited2014-10-226-0/+383