Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Merge pull request #1821 from kriztan/patch-1 | Daniel Gultsch | 2016-04-24 | 1 | -10/+0 |
| |\ | | | | | | | Update build.gradle | ||||
| | * | Update build.gradle | Christian S | 2016-04-23 | 1 | -10/+0 |
| | | | | | | | | | this seems be be never used and could be removed | ||||
| * | | 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 |
| |/ | |||||
* | | version 1.12.0 | Christian S | 2016-04-23 | 2 | -3/+3 |
| | | |||||
* | | clean up | Christian S | 2016-04-23 | 1 | -10/+0 |
| | | |||||
* | | Update README.md | Christian S | 2016-04-23 | 1 | -136/+2 |
| | | |||||
* | | changlog for upcoming version | Christian S | 2016-04-23 | 2 | -1/+7 |
| | | |||||
* | | 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 |
| | | |||||
* | | started 1.11.8-beta | Christian S | 2016-04-23 | 2 | -2/+2 |
| | | |||||
* | | 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 |
| | | |||||
* | | Merge branch 'refs/heads/welcome-screen' into development | Christian S | 2016-04-21 | 19 | -66/+363 |
|\ \ | |||||
| * | | 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 | 16 | -6/+348 |
|/| | | |/ | |||||
| * | added magic create welcome screen | Daniel Gultsch | 2016-04-19 | 16 | -7/+349 |
| | | |||||
* | | updated changelog | Christian S | 2016-04-16 | 1 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-16 | 2 | -2/+7 |
|\| | |||||
| * | version bump to 1.11.7 + changelog | Daniel Gultsch | 2016-04-14 | 2 | -2/+7 |
| | | |||||
* | | 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 |
| | |