Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | little layout improvements | Christian S | 2015-11-29 | 2 | -4/+8 |
| | |||||
* | try out a lower connection timeout | Christian S | 2015-11-29 | 1 | -1/+1 |
| | |||||
* | reordered settings menu | Christian S | 2015-11-29 | 1 | -18/+21 |
| | |||||
* | Merge branch 'refs/heads/siacs-master' into development | Christian S | 2015-11-29 | 68 | -2036/+330 |
|\ | |||||
| * | copy commits | Christian S | 2015-11-29 | 68 | -2036/+330 |
|/| | |||||
| * | increment version code | Daniel Gultsch | 2015-11-26 | 1 | -1/+1 |
| | | |||||
| * | hide subject edit button if not editable by user | Daniel Gultsch | 2015-11-26 | 4 | -5/+30 |
| | | |||||
| * | encrypt pgp messages to self | Daniel Gultsch | 2015-11-26 | 1 | -8/+8 |
| | | |||||
| * | detect server identity and added muc-workaround for slack | Daniel Gultsch | 2015-11-26 | 3 | -5/+49 |
| | | |||||
| * | version bump to 1.7.3 | Daniel Gultsch | 2015-11-26 | 1 | -2/+2 |
| | | |||||
| * | removed unnecessary configuration fetch after join | Daniel Gultsch | 2015-11-26 | 1 | -1/+1 |
| | | |||||
| * | removed unecessary chat state | Daniel Gultsch | 2015-11-26 | 1 | -1/+1 |
| | | |||||
| * | fail jingle file transfer if axolotl key message could not be created. fixes ↵ | Daniel Gultsch | 2015-11-26 | 1 | -1/+5 |
| | | | | | | | | #1576 | ||||
| * | pgp fixes and revert configuration changes | Daniel Gultsch | 2015-11-25 | 16 | -134/+91 |
| | | |||||
| * | Merge pull request #1569 from fiaxh/conference_one_other_occupant | Daniel Gultsch | 2015-11-24 | 1 | -20/+48 |
| |\ | | | | | | | Show own avatar in tile for conferences with only one other occupant next to theirs | ||||
| * \ | Merge pull request #1558 from fiaxh/pgp_api_9.0 | Daniel Gultsch | 2015-11-24 | 53 | -1875/+138 |
| |\ \ | | | | | | | | | Use OpenPGP-API 9.0 | ||||
| | * | | Sign empty status | fiaxh | 2015-11-09 | 2 | -3/+1 |
| | | | | |||||
| | * | | Use OpenPGP-API 9.0 | fiaxh | 2015-11-09 | 52 | -1874/+139 |
| | | | | |||||
| * | | | Merge pull request #1570 from fiaxh/pgp_pgpengine_nullpointer_fix | Daniel Gultsch | 2015-11-24 | 1 | -3/+3 |
| |\ \ \ | | |/ / | |/| | | PGP fix | ||||
| | * | | PgpEngine: Get account from conversation instead of from contact. fixes ↵ | fiaxh | 2015-11-15 | 1 | -3/+3 |
| |/ / | | | | | | | | | | #1568, fixes #1544 | ||||
* | | | version 1.7.4 beta | Christian S | 2015-11-29 | 2 | -2/+7 |
| | | | |||||
* | | | typo | Christian S | 2015-11-29 | 1 | -1/+1 |
| | | | |||||
* | | | added plugin loader in settings | Christian S | 2015-11-25 | 1 | -0/+11 |
| | | | |||||
* | | | added strings for plugin loader | Christian S | 2015-11-25 | 1 | -0/+4 |
| | | | |||||
* | | | added German strings for plugin loader | Christian S | 2015-11-25 | 1 | -0/+4 |
| | | | |||||
* | | | Update arrays.xml | Christian S | 2015-11-25 | 1 | -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 | ||||
* | | | change IDENTITY_NAME | Christian S | 2015-11-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #52 from fiaxh/conference_one_other_occupant | Christian S | 2015-11-15 | 1 | -20/+48 |
|\ \ \ | | |/ | |/| | Own contact picture in tile for conferences with only one other occupant | ||||
| * | | Own contact picture in tile for conferences with only one other occupant | fiaxh | 2015-11-15 | 1 | -20/+48 |
| |/ | |||||
* | | added full changelog as button... | Christian S | 2015-11-15 | 1 | -1/+11 |
| | | | | | | | | ...in updater dialog | ||||
* | | modified some strings | Christian S | 2015-11-15 | 2 | -9/+10 |
| | | | | | | | | * added fork infos to about activity | ||||
* | | Version 1.7.3 + changelog | Christian S | 2015-11-14 | 2 | -2/+7 |
| | | |||||
* | | changed message background to light yellow | Christian S | 2015-11-14 | 2 | -3/+6 |
| | | |||||
* | | rename Conversations to Pix-Art Messenger | Christian S | 2015-11-14 | 3 | -25/+26 |
| | | |||||
* | | delete language strings except of English and German | Christian S | 2015-11-14 | 28 | -10200/+0 |
| | | |||||
* | | show own name in sent locations | Christian S | 2015-11-14 | 1 | -0/+2 |
| | | |||||
* | | Version 1.7.2 + Changelog | Christian S | 2015-11-14 | 2 | -2/+6 |
| | | |||||
* | | added german strings for crop library | Christian S | 2015-11-14 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #51 from philipflohr/master | Christian S | 2015-11-14 | 1 | -3/+34 |
|\ \ | | | | | | | scale the image to avoid OOM Execptions | ||||
| * | | scale the image to avoid OOM Execptions | Philip Flohr | 2015-11-13 | 1 | -3/+34 |
| | | | |||||
* | | | Merge pull request #50 from philipflohr/master | Christian S | 2015-11-08 | 1 | -4/+12 |
|\| | | | | | | | | don't use the imagepicker provided by android-crop | ||||
| * | | don't use the imagepicker provided by android-crop | Philip Flohr | 2015-11-07 | 1 | -4/+12 |
| | | | |||||
* | | | Merge branch 'refs/heads/philipflohr-master' into development | Christian S | 2015-11-07 | 4 | -16/+32 |
|\ \ \ | |||||
| * | | | copy Avatar Crop patch | Christian S | 2015-11-07 | 4 | -16/+32 |
|/| | | | |/ / | |||||
| * | | use Config.AVATAR_SIZE as size for cropping avatar picture | Philip Flohr | 2015-11-06 | 1 | -1/+1 |
| | | | |||||
| * | | set the avatar image size to 384x384 | Philip Flohr | 2015-11-06 | 1 | -1/+1 |
| | | | |||||
| * | | users are now able to crop their avatar pictures | Philip Flohr | 2015-11-06 | 4 | -17/+32 |
| | | | |||||
* | | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-11-07 | 1 | -3/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | Move migration 19 before 17 | Andreas Straub | 2015-11-06 | 1 | -3/+6 |
| |/ | | | | | | | | | | | | | | | | | Migration 17 depends on Account deserialization, so any migrations that touch the accounts table need to be applied beforehand. Re-writing the migration to work directly on the database would lead to a lot of code duplication, so it's not worth it at this time, but might become necessary later on to avoid dependency cycles. | ||||
| * | updated FAQ to account for incompatible server | Daniel Gultsch | 2015-11-01 | 1 | -0/+12 |
| | |