Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'refs/heads/news' into development | Christian S | 2016-05-04 | 15 | -99/+175 |
|\ | |||||
| * | changed avatar format to JPEG and increased size to 720px | Christian S | 2016-05-04 | 1 | -2/+2 |
| | | |||||
| * | set manually_change_presence to true as default | Christian S | 2016-05-04 | 2 | -19/+20 |
| | | | | | | | | and hide option to set presence for all accounts | ||||
| * | merge upstream changes | Christian S | 2016-05-04 | 3 | -10/+45 |
| | | |||||
| * | removed duplicate strings | Christian S | 2016-05-04 | 1 | -4/+0 |
| | | |||||
| * | Merge remote-tracking branch 'refs/remotes/siacs/master' into HEAD | Christian S | 2016-05-04 | 62 | -319/+1096 |
| |\ | |||||
| | * | 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 |
| | | | |||||
| | * | pulled translations from transifex | Daniel Gultsch | 2016-05-04 | 4 | -2/+21 |
| | | | |||||
| | * | 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 |
| | | | |||||
| | * | use app name in resource suggestions | Daniel Gultsch | 2016-05-03 | 1 | -1/+1 |
| | | | |||||
| | * | ping all accounts at the same time | Daniel Gultsch | 2016-05-02 | 1 | -5/+17 |
| | | | |||||
| | * | pulled translations from transifex | Daniel Gultsch | 2016-05-02 | 15 | -41/+353 |
| | | | |||||
| | * | 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 |
| | | | |||||
* | | | changed avatar format to JPEG and increased size to 720 px | Christian S | 2016-04-30 | 1 | -2/+2 |
| | | | |||||
* | | | set manually_change_presence to true as default | Christian S | 2016-04-30 | 2 | -2/+3 |
| | | | | | | | | | | | | and hide option to set presence for all accounts | ||||
* | | | use old ChangePassword activity | Christian S | 2016-04-30 | 2 | -125/+73 |
| | | | |||||
* | | | remove old config variable | Christian S | 2016-04-30 | 2 | -7/+2 |
| | | | |||||
* | | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-30 | 57 | -261/+1004 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | properly cancel avatar tasks | Daniel Gultsch | 2016-04-29 | 3 | -5/+8 |
| | | |||||
| * | catch ActivityNotFoundException when requesting battery op | Daniel Gultsch | 2016-04-29 | 3 | -2/+13 |
| | | |||||
| * | 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 | 3 | -53/+69 |
| | | |||||
| * | 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 |
| | | |||||
| * | renamed welcome header to untranslatable 'Start your Conversations' | Daniel Gultsch | 2016-04-27 | 1 | -1/+1 |
| | | |||||
| * | prevent user from accidentally changing password after using magic create | Daniel Gultsch | 2016-04-26 | 7 | -23/+84 |
| | | |||||
| * | 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 | 3 | -3/+16 |
| | | |||||
| * | show status messages in contact details | Daniel Gultsch | 2016-04-23 | 3 | -17/+56 |
| | | |||||
| * | expert setting to manually change presence | Daniel Gultsch | 2016-04-22 | 40 | -79/+683 |
| | | |||||
* | | changlog for upcoming version | Christian S | 2016-04-23 | 1 | -1/+1 |
| | | |||||
* | | increased disco timeout | Christian S | 2016-04-23 | 1 | -1/+1 |
| | | |||||
* | | optimized UI | Christian S | 2016-04-23 | 5 | -10/+18 |
| | | |||||
* | | 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 |
| | |