aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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-265-13/+71
| * fixed table creationDaniel Gultsch2016-04-251-10/+14
| * don't create templates for empty status messagesDaniel Gultsch2016-04-231-2/+6
| * add change prescence to manage account context menuDaniel Gultsch2016-04-232-3/+13
| * show status messages in contact detailsDaniel Gultsch2016-04-232-1/+37
| * expert setting to manually change presenceDaniel Gultsch2016-04-2221-77/+479
* | changlog for upcoming versionChristian S2016-04-231-1/+1
* | increased disco timeoutChristian S2016-04-231-1/+1
* | changed updater a bitChristian S2016-04-233-72/+69
* | hide disable account via config switchChristian S2016-04-231-3/+5
* | Prevent presences from being cleared on connectionChristian S2016-04-231-2/+1
* | changed hidden password fieldChristian S2016-04-231-2/+3
* | make password invisible in edit account viewChristian S2016-04-221-0/+4
* | added multiple ports to connect to...Christian S2016-04-222-5/+8
* | use IP/port to connect to serverChristian S2016-04-212-1/+14
* | modified welcome screenChristian S2016-04-212-28/+3
* | Merge branch 'refs/heads/siacs/master' into welcome-screenChristian S2016-04-216-4/+176
|\|
| * added magic create welcome screenDaniel Gultsch2016-04-196-4/+176
* | changed default values to match preferences.xmlChristian S2016-04-162-4/+4
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-154-10/+37
|\|
| * always notify by default in conferencesDaniel Gultsch2016-04-142-3/+1