aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Update arrays.xmlChristian S2015-11-251-2/+2
| | | | | | | | * changed file size for never from 0 to 1 to show the download button instead of link * changed resource Conversations to Pix-Art Messender
* | modified some stringsChristian S2015-11-152-9/+10
| | | | | | | | * added fork infos to about activity
* | changed message background to light yellowChristian S2015-11-142-3/+6
| |
* | rename Conversations to Pix-Art MessengerChristian S2015-11-142-24/+25
| |
* | delete language strings except of English and GermanChristian S2015-11-1428-10200/+0
| |
* | added german strings for crop libraryChristian S2015-11-141-0/+5
| |
* | copy Avatar Crop patchChristian S2015-11-071-0/+1
|\ \
| * | users are now able to crop their avatar picturesPhilip Flohr2015-11-061-0/+1
| |/
* | Merge pull request #47 from siacs/masterChristian S2015-11-011-0/+3
|\| | | | | copy commits
| * indicate cbe in chat message hintDaniel Gultsch2015-10-311-2/+3
| |
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-0/+2
| |
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-316-5/+20
|\|
| * Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-301-1/+2
| |\ | | | | | | PGP messages background decryption
| | * Show PGP "please wait" message only when actually decryptingfiaxh2015-10-281-1/+2
| | |
| * | load avatars in message adapter in background taskDaniel Gultsch2015-10-292-4/+4
| | |
| * | show encryption type in warned/red messagesDaniel Gultsch2015-10-281-0/+11
| |/
| * Reset the margins manually after rotatingsaqura2015-10-263-0/+3
| |
* | corrected german stringsChristian S2015-10-221-2/+2
| |
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-201-1/+1
|\|
| * open manage account + certificate chooser when cbe mode is enabledDaniel Gultsch2015-10-201-0/+1
| |
* | move received tick setttings from expert options into ui optionsChristian S2015-10-171-5/+5
| |
* | copy commitsChristian S2015-10-171-0/+2
|\|
| * improved error reporting in trust keys activityDaniel Gultsch2015-10-171-0/+2
| |
* | corrected strings-deChristian S2015-10-161-11/+1
| |
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-1631-478/+999
|\|
| * pulled translations from transifexDaniel Gultsch2015-10-1426-26/+61
| |
| * changed some source stringsDaniel Gultsch2015-10-141-2/+2
| |
| * pulled translations from transifexDaniel Gultsch2015-10-137-453/+913
| |
| * add config variable to enable x509 verificationDaniel Gultsch2015-10-122-3/+3
| |
| * add menu item in account details to renew certificateDaniel Gultsch2015-10-112-1/+11
| |
| * make add account from key visibleDaniel Gultsch2015-10-111-1/+1
| |
| * Captcha support.Armin Novak2015-10-111-0/+3
| |
| * Fixed a typo in string.xmlSafwat Halaby2015-10-101-1/+1
| |
| * initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-092-0/+9
| |
* | updated german stringsChristian S2015-10-101-2/+2
| |
* | update missing stringsChristian S2015-10-102-0/+10
| |
* | updated AppUpdater a bitChristian S2015-10-101-9/+5
| |
* | copy commitsChristian S2015-10-102-2/+18
|\|
| * introduced expert options to set status to away and xa if screen is off or ↵Daniel Gultsch2015-10-082-0/+17
| | | | | | | | if phone is silenced
* | Merge branch 'Update_Startup' into developmentChristian S2015-10-072-2/+2
|\ \
| * | update UpdaterChristian S2015-10-061-1/+0
| | |
| * | Update strings.xmlChristian S.2015-10-061-1/+1
| | |
| * | Update strings.xmlChristian S.2015-10-061-1/+1
| | |
| * | updated strings for updaterChristian S.2015-10-061-0/+1
| | |
| * | updated German strings for updaterChristian S.2015-10-061-1/+1
| | |
* | | Merge branch 'siacs/master' into developmentChristian S2015-10-077-132/+181
|\ \ \ | |/ / |/| / | |/
| * Show whether MAM is supported in MUCssaqura2015-10-061-1/+30
| | | | | | | | | | The conference details in "Advanced Mode" now indicate whether MAM is supported by the conference server.
| * pulled translations from transifexDaniel Gultsch2015-10-056-132/+153
| |
* | changed message ticksChristian S2015-10-036-5/+4
| |
* | modified read indicator a bitChristian S2015-09-261-4/+4
| |