Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changed updater a bit | Christian S | 2016-04-23 | 5 | -74/+71 |
| | |||||
* | hide disable account via config switch | Christian S | 2016-04-23 | 1 | -3/+5 |
| | |||||
* | Prevent presences from being cleared on connection | Christian S | 2016-04-23 | 1 | -2/+1 |
| | | | | | | | | Sometimes when enabling/reenabling accounts the initial presences that the server sends get cleared shortly after connecting. This might also be what caused siacs/Conversations#1705. This commit fixes the status inconsistencies I have experienced, though there might be more causes for the problems described in that issue. | ||||
* | disable suggestions in password field | Christian S | 2016-04-23 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-23 | 3 | -64/+77 |
|\ | |||||
| * | put welcome screen in scrollview | Daniel Gultsch | 2016-04-22 | 1 | -62/+67 |
| | | |||||
* | | changed hidden password field | Christian S | 2016-04-23 | 1 | -2/+3 |
| | | |||||
* | | changed some strings | Christian S | 2016-04-23 | 2 | -13/+13 |
| | | |||||
* | | make password invisible in edit account view | Christian S | 2016-04-22 | 1 | -0/+4 |
| | | |||||
* | | display mam settings as icon | Christian S | 2016-04-22 | 6 | -0/+2 |
| | | |||||
* | | added multiple ports to connect to... | Christian S | 2016-04-22 | 2 | -5/+8 |
| | | | | | | | | ...and choose a random port to connect | ||||
* | | use IP/port to connect to server | Christian S | 2016-04-21 | 2 | -1/+14 |
| | | |||||
* | | remove hostname and port settings | Christian S | 2016-04-21 | 1 | -5/+0 |
| | | |||||
* | | changed and added some strings | Christian S | 2016-04-21 | 2 | -13/+19 |
| | | |||||
* | | modified welcome screen | Christian S | 2016-04-21 | 4 | -52/+6 |
| | | |||||
* | | Merge branch 'refs/heads/siacs/master' into welcome-screen | Christian S | 2016-04-21 | 15 | -6/+347 |
|\| | |||||
| * | added magic create welcome screen | Daniel Gultsch | 2016-04-19 | 15 | -7/+348 |
| | | |||||
* | | use material design icons for android < lollipop | Christian S | 2016-04-16 | 2 | -23/+23 |
| | | |||||
* | | also show sent/received images with rounded corners | Christian S | 2016-04-16 | 2 | -2/+4 |
| | | |||||
* | | increased actionbar padding | Christian S | 2016-04-16 | 1 | -2/+4 |
| | | |||||
* | | make image corners more rounded | Christian S | 2016-04-16 | 11 | -12/+12 |
| | | |||||
* | | changed default values to match preferences.xml | Christian S | 2016-04-16 | 2 | -4/+4 |
| | | |||||
* | | increase font size | Christian S | 2016-04-16 | 2 | -9/+10 |
| | | |||||
* | | 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 | 6 | -48/+68 |
|\| | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-04-10 | 29 | -86/+27 |
| | | |||||
| * | 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 |
| | | |||||
* | | don't show contact details when in conversations with self | Christian S | 2016-04-11 | 1 | -26/+23 |
| | |