aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * removed unnecessary call to stopSelf() after logging outDaniel Gultsch2016-04-141-5/+11
| * add setting for quick sharingDaniel Gultsch2016-04-141-2/+25
* | added condition to show 'disable foreground service' buttonChristian S2016-04-151-1/+1
* | disallow account deactivationChristian S2016-04-152-38/+2
* | make foreground service always enabledChristian S2016-04-154-9/+4
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-1410-51/+197
|\|
| * removed unused call to cancel eventsDaniel Gultsch2016-04-141-1/+0
| * create Config varibale to show the disable foreground service buttonDaniel Gultsch2016-04-132-3/+6
| * hacky workaround to determine if uri points to private file on < lolipopDaniel Gultsch2016-04-133-9/+25
| * return own jid as true counterpart on self messages in mucDaniel Gultsch2016-04-131-0/+3
| * added share uri button to conference detailsDaniel Gultsch2016-04-121-0/+17
| * reverse order in contact chooserDaniel Gultsch2016-04-121-1/+1
| * minor code cleanupDaniel Gultsch2016-04-121-3/+1
| * republish avatar if server offers non-persistent pep :-(Daniel Gultsch2016-04-114-37/+144
* | Revert "chnaged avatar format to match XEP"Christian S2016-04-111-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-113-43/+54
|\|
| * don't throw IO exception at end of streamDaniel Gultsch2016-04-101-1/+0
| * fixed 'connecting…' buttonDaniel Gultsch2016-04-101-3/+6