Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changed some strings and added licences | Christian S | 2016-05-05 | 2 | -31/+35 |
| | |||||
* | some layout fixes | Christian S | 2016-05-05 | 1 | -16/+22 |
| | |||||
* | go directly to the user account via menu | Christian S | 2016-05-05 | 2 | -2/+6 |
| | |||||
* | set 'manually_change_presence' to true as default in preferences.xml | Christian S | 2016-05-05 | 1 | -1/+1 |
| | |||||
* | added audio player | Christian S | 2016-05-05 | 16 | -2/+889 |
| | |||||
* | little layout improvement | Christian S | 2016-05-04 | 1 | -3/+1 |
| | |||||
* | bug fixes | Christian S | 2016-05-04 | 2 | -68/+112 |
| | |||||
* | Merge branch 'refs/heads/news' into development | Christian S | 2016-05-04 | 16 | -102/+181 |
|\ | |||||
| * | 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 | 63 | -322/+1102 |
| |\ | |||||
| | * | 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 |
| | | | |||||
| | * | Merge pull request #1827 from ka7/spelling_fix_no_translations | Daniel Gultsch | 2016-05-04 | 6 | -9/+9 |
| | |\ | | | | | | | | | spelling fixes | ||||
| | | * | spelling fixes | klemens | 2016-05-04 | 6 | -9/+9 |
| | |/ | |||||
| | * | Merge pull request #1826 from sebastianv89/patch-1 | Daniel Gultsch | 2016-05-04 | 1 | -6/+6 |
| | |\ | | | | | | | | | Renaming of variable | ||||
| | | * | Renaming of variable | Sebastian | 2016-05-03 | 1 | -6/+6 |
| | |/ | | | | | | | Was probably just a copy/paste typo. | ||||
| | * | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-05-03 | 1 | -1/+1 |
| | |\ | |||||
| | | * | fixed spelling in readme | Daniel Gultsch | 2016-05-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | 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 |
| | |/ | |||||
| | * | update 'create account' faq entry | Daniel Gultsch | 2016-05-02 | 1 | -8/+1 |
| | | | |||||
| | * | ping all accounts at the same time | Daniel Gultsch | 2016-05-02 | 1 | -5/+17 |
| | | | |||||
| | * | version bump to 1.12.0 + changelog | Daniel Gultsch | 2016-05-02 | 2 | -2/+6 |
| | | | |||||
| | * | 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 |
| | | |||||
| * | 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 |