aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* catch all exceptions thrown by xml pull parserDaniel Gultsch2016-05-131-11/+2
* handle invalid base64 is SASl SCRAM responseDaniel Gultsch2016-05-131-5/+9
* Ask to uninstall the plugins because the features are directly integratedChristian S2016-05-061-3/+70
* Merge remote-tracking branch 'refs/remotes/origin/share_location' into develo...Christian S2016-05-063-1/+274
|\
| * add share locationChristian S2016-05-053-1/+274
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-064-11/+21
|\ \ | |/ |/|
| * Merge pull request #1829 from sebastianv89/patch-1Daniel Gultsch2016-05-051-1/+0
| |\
| | * Remove copy of innerkeySebastian2016-05-051-1/+0
| * | report bind failure as account stateDaniel Gultsch2016-05-052-9/+13
| * | log more information about HTTP’s max upload sizeDaniel Gultsch2016-05-052-1/+8
| |/
* | add audio recorderChristian S2016-05-052-5/+164
|\ \
| * | add audio recorderChristian S2016-05-052-5/+164
* | | change storage pathsChristian S2016-05-051-2/+2
|/ /
* | bug fix in audio playerChristian S2016-05-051-95/+93
* | changed LED notification color to blueChristian S2016-05-051-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-0511-60/+120
|\|
| * republish pgp signature when changing statusDaniel Gultsch2016-05-059-25/+95
| * refactor captcha response handling to avoid network on main thread exceptionDaniel Gultsch2016-05-053-35/+25
* | blue themeMatthias Rieber2016-05-052-9/+13
* | bug fix in audioplayerChristian S2016-05-051-1/+2
* | go directly to the user account via menuChristian S2016-05-051-1/+5
* | added audio playerChristian S2016-05-051-1/+45
* | bug fixesChristian S2016-05-042-68/+112
* | Merge branch 'refs/heads/news' into developmentChristian S2016-05-049-40/+90
|\ \
| * | changed avatar format to JPEG and increased size to 720pxChristian S2016-05-041-2/+2
| * | set manually_change_presence to true as defaultChristian S2016-05-041-1/+1
| * | merge upstream changesChristian S2016-05-042-8/+22
| * | Merge remote-tracking branch 'refs/remotes/siacs/master' into HEADChristian S2016-05-0438-281/+804
| |\|
| | * clear password field before setting new oneDaniel Gultsch2016-05-041-0/+1
| | * fixed npe when calling changepassword activity directlyDaniel Gultsch2016-05-041-2/+4
| | * spelling fixesklemens2016-05-044-5/+5
| | * Renaming of variableSebastian2016-05-031-6/+6
| | * fixed presence template dedup for 'online' statusDaniel Gultsch2016-05-031-1/+2
| | * ping all accounts at the same timeDaniel Gultsch2016-05-021-5/+17
| | * show only username when registering account with magic createDaniel Gultsch2016-05-022-13/+22
| | * removed unnecessary loggingDaniel Gultsch2016-04-301-1/+0
* | | changed avatar format to JPEG and increased size to 720 pxChristian S2016-04-301-2/+2
* | | set manually_change_presence to true as defaultChristian S2016-04-301-1/+1
* | | use old ChangePassword activityChristian S2016-04-302-125/+73
* | | remove old config variableChristian S2016-04-302-7/+2
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-3034-247/+745
|\ \ \ | |/ / |/| / | |/
| * properly cancel avatar tasksDaniel Gultsch2016-04-293-5/+8
| * catch ActivityNotFoundException when requesting battery opDaniel Gultsch2016-04-292-2/+12
| * port all android drop down list items to our ownDaniel Gultsch2016-04-293-10/+9
| * catch rare NPE when determining max http sizeDaniel Gultsch2016-04-291-3/+3
| * synchronize around thumbnail cache to avoid loading images twiceDaniel Gultsch2016-04-281-12/+21
| * cancel potential tasks when receiving image preview from cacheDaniel Gultsch2016-04-281-3/+7
| * cleaned up captcha dialogDaniel Gultsch2016-04-281-51/+41
| * don't request disco from selfDaniel Gultsch2016-04-282-3/+1
| * removed unused config variablesDaniel Gultsch2016-04-2710-64/+14