Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added trigger to Config.java to always enable aes encryption for uploaded files | Daniel Gultsch | 2015-06-29 | 2 | -0/+15 |
| | |||||
* | make quick actions available in conferences when file attachment is available | Daniel Gultsch | 2015-06-29 | 1 | -23/+28 |
| | |||||
* | show attach button in conferences when http upload is available | Daniel Gultsch | 2015-06-29 | 4 | -7/+14 |
| | |||||
* | initial http upload support | Daniel Gultsch | 2015-06-29 | 14 | -95/+278 |
| | | | | be careful: little error handling and no encryption | ||||
* | version bump to 1.4.51.4.5 | Daniel Gultsch | 2015-06-29 | 1 | -2/+2 |
| | |||||
* | don't parse body from muc status messages | Daniel Gultsch | 2015-06-28 | 1 | -6/+7 |
| | |||||
* | fixed parsing of muc status messages in new message parser | Daniel Gultsch | 2015-06-28 | 1 | -6/+18 |
| | |||||
* | pulled new translations from transifex | Daniel Gultsch | 2015-06-23 | 2 | -3/+20 |
| | |||||
* | Merge branch 'development'1.4.4 | Daniel Gultsch | 2015-06-23 | 68 | -803/+985 |
|\ | |||||
| * | don't perform dns lookups on domain parts that obviously look like ip addresses | Daniel Gultsch | 2015-06-19 | 2 | -53/+67 |
| | | |||||
| * | changed paragraph divider | Daniel Gultsch | 2015-06-10 | 1 | -1/+1 |
| | | |||||
| * | pulled new translations from transifex | Daniel Gultsch | 2015-06-10 | 2 | -0/+10 |
| | | |||||
| * | made i/o and memory intensive operations execute in serial order | Daniel Gultsch | 2015-06-05 | 2 | -11/+52 |
| | | |||||
| * | version bump | Daniel Gultsch | 2015-06-04 | 1 | -2/+2 |
| | | |||||
| * | fixed obvious bug in dns helper | Daniel Gultsch | 2015-06-04 | 1 | -2/+2 |
| | | |||||
| * | streamlined dns helper by ignoring weight | Daniel Gultsch | 2015-06-04 | 1 | -55/+10 |
| | | |||||
| * | send_received muc messages will mark a conversation a read | Daniel Gultsch | 2015-06-04 | 1 | -1/+1 |
| | | |||||
| * | reworked handeling of system contacts | Daniel Gultsch | 2015-06-03 | 4 | -32/+51 |
| | | |||||
| * | properly calculate remaining size. should fix #1243 | Daniel Gultsch | 2015-06-03 | 1 | -2/+7 |
| | | |||||
| * | really update build tools | Daniel Gultsch | 2015-06-02 | 3 | -3/+3 |
| | | |||||
| * | upgrade build tools | Daniel Gultsch | 2015-06-02 | 1 | -2/+0 |
| | | |||||
| * | avoid unnessary muc mam queries when message count is 0 after subject | Daniel Gultsch | 2015-06-02 | 2 | -1/+7 |
| | | |||||
| * | stick with 1.4.x | Daniel Gultsch | 2015-06-02 | 1 | -1/+1 |
| | | |||||
| * | fixed more edge cases in muc message parser | Daniel Gultsch | 2015-06-02 | 1 | -3/+3 |
| | | |||||
| * | improved compatibility with muc components that change the message id | Daniel Gultsch | 2015-06-02 | 1 | -2/+3 |
| | | |||||
| * | let dns library take care of no-srv style hosts as well | Daniel Gultsch | 2015-05-28 | 2 | -12/+16 |
| | | |||||
| * | use dns library to resolve missing ipv6 or ipv4 addresses | Daniel Gultsch | 2015-05-28 | 1 | -1/+30 |
| | | |||||
| * | parse nick and avatar only from available presences to avoid potential error ↵ | Daniel Gultsch | 2015-05-27 | 1 | -47/+26 |
| | | | | | | | | reflection | ||||
| * | removed unnecessary / inacurate debug logging | Daniel Gultsch | 2015-05-26 | 1 | -2/+1 |
| | | |||||
| * | deduplicate private muc messages | Daniel Gultsch | 2015-05-26 | 1 | -1/+3 |
| | | |||||
| * | update unread count badge only when necessary | Daniel Gultsch | 2015-05-26 | 1 | -7/+11 |
| | | |||||
| * | added default iq handler to print some iq error messages | Daniel Gultsch | 2015-05-26 | 1 | -4/+16 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-05-26 | 4 | -0/+20 |
| | | |||||
| * | added choose picture as another quick action. fixes #1221 | Daniel Gultsch | 2015-05-26 | 28 | -1/+249 |
| | | |||||
| * | renamed OtrEngine to OtrService | Daniel Gultsch | 2015-05-26 | 4 | -16/+16 |
| | | |||||
| * | Merge branch 'master' into development | Daniel Gultsch | 2015-05-25 | 3 | -6/+13 |
| |\ | |||||
| * \ | Merge branch 'development' of github.com:siacs/Conversations into development | Daniel Gultsch | 2015-05-21 | 1 | -2/+8 |
| |\ \ | |||||
| | * \ | Merge pull request #1212 from emdete/add_jid_to_show_location | Daniel Gultsch | 2015-05-20 | 1 | -3/+8 |
| | |\ \ | | | | | | | | | | | fix to detect the sender jid correctly | ||||
| | | * | | fix to detect the sender jid correctly | M. Dietrich | 2015-05-20 | 1 | -3/+8 |
| | | | | | |||||
| | * | | | Merge pull request #1211 from emdete/add_jid_to_show_location | Daniel Gultsch | 2015-05-20 | 1 | -0/+1 |
| | |\| | | | | | | | | | | | | add extra jid to intend "show location" | ||||
| | | * | | add extra jid to intend "show location" | M. Dietrich | 2015-05-20 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into development | Daniel Gultsch | 2015-05-21 | 2 | -2/+2 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | added ShortcutBadger as a dependency to create unread counts on launcher icon | Daniel Gultsch | 2015-05-20 | 3 | -8/+22 |
| | | | | | |||||
| * | | | | pulled translations from transifex | Daniel Gultsch | 2015-05-20 | 7 | -0/+35 |
| | | | | | |||||
| * | | | | Merge branch 'master' into development | Daniel Gultsch | 2015-05-20 | 2 | -6/+5 |
| |\ \ \ \ | |||||
| * | | | | | proper error parsing. some clean up | Daniel Gultsch | 2015-05-20 | 1 | -41/+49 |
| | | | | | | |||||
| * | | | | | fixed npe in new message parser | Daniel Gultsch | 2015-05-20 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | fixed muc mam. added a few security checks | Daniel Gultsch | 2015-05-20 | 2 | -25/+35 |
| | | | | | | |||||
| * | | | | | fixed read/unread markers | Daniel Gultsch | 2015-05-20 | 1 | -10/+9 |
| | | | | | | |||||
| * | | | | | added mam stuff to new message parser | Daniel Gultsch | 2015-05-20 | 3 | -9/+28 |
| | | | | | |