Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changed some strings | Christian S | 2016-04-15 | 1 | -2/+2 |
| | |||||
* | added missing strings | Christian S | 2016-04-15 | 1 | -0/+4 |
| | |||||
* | corrected strings | Christian S | 2016-04-15 | 1 | -1/+0 |
| | |||||
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-15 | 6 | -25/+64 |
|\ | |||||
| * | always notify by default in conferences | Daniel Gultsch | 2016-04-14 | 2 | -3/+1 |
| | | |||||
| * | removed unnecessary call to stopSelf() after logging out | Daniel Gultsch | 2016-04-14 | 1 | -5/+11 |
| | | |||||
| * | add setting for quick sharing | Daniel Gultsch | 2016-04-14 | 3 | -17/+51 |
| | | |||||
* | | added condition to show 'disable foreground service' button | Christian S | 2016-04-15 | 1 | -1/+1 |
| | | |||||
* | | disallow account deactivation | Christian S | 2016-04-15 | 7 | -63/+10 |
| | | | | | | | | added reconnect to account context menu | ||||
* | | make foreground service always enabled | Christian S | 2016-04-15 | 5 | -14/+4 |
| | | | | | | | | and don't let the user choose the foreground settings | ||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-14 | 24 | -65/+233 |
|\| | |||||
| * | removed unused call to cancel events | Daniel Gultsch | 2016-04-14 | 1 | -1/+0 |
| | | |||||
| * | create Config varibale to show the disable foreground service button | Daniel Gultsch | 2016-04-13 | 2 | -3/+6 |
| | | |||||
| * | hacky workaround to determine if uri points to private file on < lolipop | Daniel Gultsch | 2016-04-13 | 3 | -9/+25 |
| | | |||||
| * | return own jid as true counterpart on self messages in muc | Daniel Gultsch | 2016-04-13 | 1 | -0/+3 |
| | | |||||
| * | added share uri button to conference details | Daniel Gultsch | 2016-04-12 | 15 | -14/+43 |
| | | |||||
| * | reverse order in contact chooser | Daniel Gultsch | 2016-04-12 | 1 | -1/+1 |
| | | |||||
| * | minor code cleanup | Daniel Gultsch | 2016-04-12 | 1 | -3/+1 |
| | | |||||
| * | republish avatar if server offers non-persistent pep :-( | Daniel Gultsch | 2016-04-11 | 4 | -37/+144 |
| | | |||||
* | | Revert "chnaged avatar format to match XEP" | Christian S | 2016-04-11 | 1 | -1/+1 |
| | | | | | | | | This reverts commit b8ec4663db7fb597ec4a4030ac9ea508e885d9e5. | ||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-11 | 11 | -54/+80 |
|\| | |||||
| * | version bump to 1.11.6 + changelog | Daniel Gultsch | 2016-04-10 | 2 | -2/+6 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-04-10 | 29 | -86/+27 |
| | | |||||
| * | add entries to gitignore | Daniel Gultsch | 2016-04-10 | 1 | -0/+2 |
| | | |||||
| * | don't throw IO exception at end of stream | Daniel Gultsch | 2016-04-10 | 1 | -1/+0 |
| | | |||||
| * | fixed 'connecting…' button | Daniel Gultsch | 2016-04-10 | 1 | -3/+6 |
| | | |||||
| * | moved authentication into seperate method. force close socket before ↵ | Daniel Gultsch | 2016-04-10 | 1 | -38/+44 |
| | | | | | | | | changing status | ||||
| * | introduced setting to turn of notification led | Daniel Gultsch | 2016-04-09 | 3 | -5/+15 |
| | | |||||
| * | update gradle and gradle plugin | Daniel Gultsch | 2016-04-09 | 3 | -4/+4 |
| | | |||||
* | | don't show contact details when in conversations with self | Christian S | 2016-04-11 | 1 | -26/+23 |
| | | |||||
* | | Insert /me on long click send button | Artem Shipovskiy | 2016-04-09 | 1 | -0/+11 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-09 | 11 | -26/+97 |
|\| | |||||
| * | use startdate as lower bound when querying archive with after=x | Daniel Gultsch | 2016-04-09 | 1 | -13/+3 |
| | | |||||
| * | don't show contact details when in conversations with self | Daniel Gultsch | 2016-04-09 | 3 | -1/+8 |
| | | |||||
| * | use last received message id when querying archive | Daniel Gultsch | 2016-04-09 | 1 | -7/+17 |
| | | |||||
| * | transform nimbuzz workaround into a more general 'waitForDisco' condition | Daniel Gultsch | 2016-04-09 | 1 | -6/+11 |
| | | |||||
| * | add required disco#items query to timeout list | Daniel Gultsch | 2016-04-08 | 1 | -1/+4 |
| | | |||||
| * | increase version code to fix nasty bug in 1.11.5 beta | Daniel Gultsch | 2016-04-08 | 1 | -1/+1 |
| | | |||||
| * | removed ernoexception in exchange for a regular exeption to prevent verify ↵ | Daniel Gultsch | 2016-04-08 | 1 | -3/+2 |
| | | | | | | | | error on <5.0 | ||||
| * | version bump to 1.11.5 + changelog | Daniel Gultsch | 2016-04-08 | 2 | -2/+5 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-04-08 | 2 | -3/+23 |
| | | |||||
| * | check file owner when attaching files or using them as avatar | Daniel Gultsch | 2016-04-07 | 4 | -2/+55 |
| | | |||||
| * | prevent null pointer when checking http upload max size | Daniel Gultsch | 2016-04-07 | 1 | -6/+6 |
| | | |||||
* | | chnaged avatar format to match XEP | Christian S | 2016-04-09 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-04-07 | 2 | -2/+4 |
|\| | |||||
| * | tell people to build debug instead of release | Daniel Gultsch | 2016-04-06 | 1 | -1/+1 |
| | | |||||
| * | version bump to 1.11.4 + changelog | Daniel Gultsch | 2016-04-05 | 2 | -2/+6 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-07 | 4 | -6/+21 |
|\| | |||||
| * | better detect broken pep | Daniel Gultsch | 2016-04-05 | 2 | -2/+10 |
| | | | | | | | | | | mark pep as broken when publishing bundle or device list failed reset 'brokenness' when account is getting disabled | ||||
| * | fixing travis | Daniel Gultsch | 2016-04-04 | 2 | -4/+11 |
| | |