Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into HEAD | Christian S | 2016-05-04 | 38 | -281/+804 |
|\ | |||||
| * | clear password field before setting new one | Daniel Gultsch | 2016-05-04 | 1 | -0/+1 |
| | | |||||
| * | fixed npe when calling changepassword activity directly | Daniel Gultsch | 2016-05-04 | 1 | -2/+4 |
| | | |||||
| * | spelling fixes | klemens | 2016-05-04 | 4 | -5/+5 |
| | | |||||
| * | Renaming of variable | Sebastian | 2016-05-03 | 1 | -6/+6 |
| | | | | | | Was probably just a copy/paste typo. | ||||
| * | fixed presence template dedup for 'online' status | Daniel Gultsch | 2016-05-03 | 1 | -1/+2 |
| | | |||||
| * | ping all accounts at the same time | Daniel Gultsch | 2016-05-02 | 1 | -5/+17 |
| | | |||||
| * | show only username when registering account with magic create | Daniel Gultsch | 2016-05-02 | 2 | -13/+22 |
| | | |||||
| * | removed unnecessary logging | Daniel Gultsch | 2016-04-30 | 1 | -1/+0 |
| | | |||||
| * | properly cancel avatar tasks | Daniel Gultsch | 2016-04-29 | 3 | -5/+8 |
| | | |||||
| * | catch ActivityNotFoundException when requesting battery op | Daniel Gultsch | 2016-04-29 | 2 | -2/+12 |
| | | |||||
| * | port all android drop down list items to our own | Daniel Gultsch | 2016-04-29 | 3 | -10/+9 |
| | | |||||
| * | catch rare NPE when determining max http size | Daniel Gultsch | 2016-04-29 | 1 | -3/+3 |
| | | |||||
| * | synchronize around thumbnail cache to avoid loading images twice | Daniel Gultsch | 2016-04-28 | 1 | -12/+21 |
| | | |||||
| * | cancel potential tasks when receiving image preview from cache | Daniel Gultsch | 2016-04-28 | 1 | -3/+7 |
| | | |||||
| * | cleaned up captcha dialog | Daniel Gultsch | 2016-04-28 | 1 | -51/+41 |
| | | |||||
| * | don't request disco from self | Daniel Gultsch | 2016-04-28 | 2 | -3/+1 |
| | | |||||
| * | removed unused config variables | Daniel Gultsch | 2016-04-27 | 10 | -64/+14 |
| | | |||||
| * | made it possible to go back to welcome screen from edit account | Daniel Gultsch | 2016-04-27 | 2 | -4/+7 |
| | | |||||
| * | prevent user from accidentally changing password after using magic create | Daniel Gultsch | 2016-04-26 | 5 | -13/+71 |
| | | |||||
| * | fixed table creation | Daniel Gultsch | 2016-04-25 | 1 | -10/+14 |
| | | |||||
| * | don't create templates for empty status messages | Daniel Gultsch | 2016-04-23 | 1 | -2/+6 |
| | | |||||
| * | add change prescence to manage account context menu | Daniel Gultsch | 2016-04-23 | 2 | -3/+13 |
| | | |||||
| * | show status messages in contact details | Daniel Gultsch | 2016-04-23 | 2 | -1/+37 |
| | | |||||
| * | expert setting to manually change presence | Daniel Gultsch | 2016-04-22 | 21 | -77/+479 |
| | | |||||
* | | changlog for upcoming version | Christian S | 2016-04-23 | 1 | -1/+1 |
| | | |||||
* | | increased disco timeout | Christian S | 2016-04-23 | 1 | -1/+1 |
| | | |||||
* | | changed updater a bit | Christian S | 2016-04-23 | 3 | -72/+69 |
| | | |||||
* | | 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. | ||||
* | | changed hidden password field | Christian S | 2016-04-23 | 1 | -2/+3 |
| | | |||||
* | | make password invisible in edit account view | Christian S | 2016-04-22 | 1 | -0/+4 |
| | | |||||
* | | 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 |
| | | |||||
* | | modified welcome screen | Christian S | 2016-04-21 | 2 | -28/+3 |
| | | |||||
* | | Merge branch 'refs/heads/siacs/master' into welcome-screen | Christian S | 2016-04-21 | 6 | -4/+176 |
|\| | |||||
| * | added magic create welcome screen | Daniel Gultsch | 2016-04-19 | 6 | -4/+176 |
| | | |||||
* | | changed default values to match preferences.xml | Christian S | 2016-04-16 | 2 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-15 | 4 | -10/+37 |
|\| | |||||
| * | 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 | 1 | -2/+25 |
| | | |||||
* | | added condition to show 'disable foreground service' button | Christian S | 2016-04-15 | 1 | -1/+1 |
| | | |||||
* | | disallow account deactivation | Christian S | 2016-04-15 | 2 | -38/+2 |
| | | | | | | | | added reconnect to account context menu | ||||
* | | make foreground service always enabled | Christian S | 2016-04-15 | 4 | -9/+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 | 10 | -51/+197 |
|\| | |||||
| * | 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 |
| | |