aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* happy hanukkahiNPUTmice2014-11-165-1/+30
|
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-163-5/+28
|
* Update Spanish Translationskruks232014-11-151-3/+38
|
* 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-153-3/+17
|\ | | | | | | | | Conflicts: src/main/res/values/strings.xml
| * handled more error casesiNPUTmice2014-11-151-0/+1
| |
| * fixed description in notifications and conversation overviewiNPUTmice2014-11-151-0/+2
| |
| * made file transfers cancelableiNPUTmice2014-11-152-1/+5
| |
| * 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-152-3/+6
| |
* | Merge branch 'feature/foreground_service' into developmentiNPUTmice2014-11-156-0/+9
|\ \ | | | | | | | | | | | | Conflicts: src/main/res/values/strings.xml
| * | turn on foreground service in expert settingsiNPUTmice2014-11-156-0/+9
| |/
* | Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-153-60/+206
|\ \ | |/ |/|
| * added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-112-0/+14
| |
| * initial smp supportiNPUTmice2014-11-113-60/+192
| |
* | Merge pull request #666 from SamWhited/localefixesDaniel Gultsch2014-11-152-3/+3
|\ \ | | | | | | Spelling fixes
| * | Spelling fixes in Italian translationSam Whited2014-11-141-2/+2
| | |
| * | Spelling fix in German translationSam Whited2014-11-141-1/+1
| | |
* | | Make licenses info untranslatableSam Whited2014-11-141-1/+1
|/ /
* | Update German languagekriztan2014-11-121-24/+0
| | | | | | deleted 'pref_about_message'
* | Update German languagekriztan2014-11-121-5/+34
|/
* formatingiNPUTmice2014-11-092-24/+9
|
* Merge pull request #645 from betheg/about_all_libsDaniel Gultsch2014-11-091-15/+24
|\ | | | | add all used libs to the pref_about_message
| * 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
| | | | | | | | also improve the notice a bit.
* | Update Spanish Translationskruks232014-11-091-1/+21
|/
* reformated license a bitiNPUTmice2014-11-042-22/+16
|
* Shorten license text and fix height of scrollviewSam Whited2014-11-042-20/+7
|
* Use normal text size and colorSam Whited2014-11-041-1/+4
|
* Make links clickable in about textSam Whited2014-11-042-4/+7
|
* Convert about dialog to activitySam Whited2014-11-045-18/+40
|
* Use real copyright symbol ©Sam Whited2014-11-041-3/+3
|
* Add about dialog with license infoSam Whited2014-11-042-0/+44
|
* show avatar in editaccountiNPUTmice2014-11-042-4/+15
|
* made qr code available from muc and contact details as welliNPUTmice2014-11-042-0/+8
|
* unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-033-7/+20
|
* Wrap "last seen" time.Sam Whited2014-11-031-2/+1
| | | | Fixes #611
* Merge branch 'gradle' into developmentSam Whited2014-10-3013-23/+90
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-22210-0/+6157