Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ask to uninstall the plugins because the features are directly integrated | Christian S | 2016-05-06 | 3 | -3/+75 |
* | changes for upcoming version | Christian S | 2016-05-06 | 1 | -1/+3 |
* | Merge remote-tracking branch 'refs/remotes/origin/share_location' into develo... | Christian S | 2016-05-06 | 9 | -2/+445 |
|\ | |||||
| * | increased heapsize | Christian S | 2016-05-06 | 1 | -0/+1 |
| * | added missing strings | Christian S | 2016-05-06 | 2 | -2/+11 |
| * | bug fix in manifest | Christian S | 2016-05-06 | 1 | -3/+4 |
| * | add share location | Christian S | 2016-05-05 | 9 | -1/+434 |
* | | ignore api_keys.xml | Christian S | 2016-05-06 | 1 | -0/+1 |
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-05-06 | 5 | -11/+22 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #1829 from sebastianv89/patch-1 | Daniel Gultsch | 2016-05-05 | 1 | -1/+0 |
| |\ | |||||
| | * | Remove copy of innerkey | Sebastian | 2016-05-05 | 1 | -1/+0 |
| * | | report bind failure as account state | Daniel Gultsch | 2016-05-05 | 3 | -9/+14 |
| * | | log more information about HTTP’s max upload size | Daniel Gultsch | 2016-05-05 | 2 | -1/+8 |
| |/ | |||||
* | | remove plugin section from settings | Christian S | 2016-05-05 | 1 | -17/+0 |
* | | add audio recorder | Christian S | 2016-05-05 | 6 | -5/+235 |
|\ \ | |||||
| * | | add audio recorder | Christian S | 2016-05-05 | 6 | -5/+235 |
* | | | catch exceptions | Christian S | 2016-05-05 | 1 | -2/+2 |
* | | | change storage paths | Christian S | 2016-05-05 | 1 | -2/+2 |
|/ / | |||||
* | | bug fix in audio player | Christian S | 2016-05-05 | 1 | -95/+93 |
* | | changed LED notification color to blue | Christian S | 2016-05-05 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-05-05 | 14 | -62/+127 |
|\| | |||||
| * | republish pgp signature when changing status | Daniel Gultsch | 2016-05-05 | 10 | -25/+97 |
| * | refactor captcha response handling to avoid network on main thread exception | Daniel Gultsch | 2016-05-05 | 3 | -35/+25 |
| * | version bump to 1.12.1 + changelog | Daniel Gultsch | 2016-05-04 | 2 | -2/+5 |
* | | blue theme | Matthias Rieber | 2016-05-05 | 198 | -53/+225 |
* | | bug fix in audioplayer | Christian S | 2016-05-05 | 1 | -1/+2 |
* | | 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 |
| * | | 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 | 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 | Sebastian | 2016-05-03 | 1 | -6/+6 |
| | |/ | |||||
| | * | 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 |
| | |/ |