aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
* Ask to uninstall the plugins because the features are directly integratedChristian S2016-05-061-3/+70
* add share locationChristian S2016-05-052-0/+272
* add audio recorderChristian S2016-05-052-5/+164
* bug fix in audio playerChristian S2016-05-051-95/+93
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-056-17/+84
|\
| * republish pgp signature when changing statusDaniel Gultsch2016-05-056-17/+84
* | 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-042-22/+60
|\ \
| * | 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-0420-176/+485
| |\|
| | * clear password field before setting new oneDaniel Gultsch2016-05-041-0/+1
| | * fixed npe when calling changepassword activity directlyDaniel Gultsch2016-05-041-2/+4
| | * show only username when registering account with magic createDaniel Gultsch2016-05-021-12/+21
* | | 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-3020-156/+454
|\ \ \ | |/ / |/| / | |/
| * 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
| * cancel potential tasks when receiving image preview from cacheDaniel Gultsch2016-04-281-3/+7
| * cleaned up captcha dialogDaniel Gultsch2016-04-281-51/+41
| * removed unused config variablesDaniel Gultsch2016-04-276-51/+11
| * made it possible to go back to welcome screen from edit accountDaniel Gultsch2016-04-272-4/+7
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-263-13/+69
| * add change prescence to manage account context menuDaniel Gultsch2016-04-232-3/+13
| * show status messages in contact detailsDaniel Gultsch2016-04-231-1/+23
| * expert setting to manually change presenceDaniel Gultsch2016-04-2211-23/+247
* | changed updater a bitChristian S2016-04-231-66/+64
* | changed hidden password fieldChristian S2016-04-231-2/+3
* | make password invisible in edit account viewChristian S2016-04-221-0/+4
* | modified welcome screenChristian S2016-04-212-28/+3
* | Merge branch 'refs/heads/siacs/master' into welcome-screenChristian S2016-04-214-4/+163
|\|
| * added magic create welcome screenDaniel Gultsch2016-04-194-4/+163
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-151-2/+25
|\|
| * add setting for quick sharingDaniel Gultsch2016-04-141-2/+25
* | disallow account deactivationChristian S2016-04-152-38/+2
* | make foreground service always enabledChristian S2016-04-151-2/+0
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-142-2/+19
|\|
| * hacky workaround to determine if uri points to private file on < lolipopDaniel Gultsch2016-04-131-2/+2
| * added share uri button to conference detailsDaniel Gultsch2016-04-121-0/+17
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-111-3/+6
|\|
| * fixed 'connecting…' buttonDaniel Gultsch2016-04-101-3/+6
* | don't show contact details when in conversations with selfChristian S2016-04-111-26/+23