aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * moved authentication into seperate method. force close socket before changing...Daniel Gultsch2016-04-101-38/+44
| * introduced setting to turn of notification ledDaniel Gultsch2016-04-091-1/+4
* | don't show contact details when in conversations with selfChristian S2016-04-111-26/+23
* | Insert /me on long click send buttonArtem Shipovskiy2016-04-091-0/+11
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-098-24/+91
|\|
| * use startdate as lower bound when querying archive with after=xDaniel Gultsch2016-04-091-13/+3
| * don't show contact details when in conversations with selfDaniel Gultsch2016-04-093-1/+8
| * use last received message id when querying archiveDaniel Gultsch2016-04-091-7/+17
| * transform nimbuzz workaround into a more general 'waitForDisco' conditionDaniel Gultsch2016-04-091-6/+11
| * add required disco#items query to timeout listDaniel Gultsch2016-04-081-1/+4
| * removed ernoexception in exchange for a regular exeption to prevent verify er...Daniel Gultsch2016-04-081-3/+2
| * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-073-2/+54
| * prevent null pointer when checking http upload max sizeDaniel Gultsch2016-04-071-6/+6
* | chnaged avatar format to match XEPChristian S2016-04-091-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-072-2/+10
|\|
| * better detect broken pepDaniel Gultsch2016-04-052-2/+10
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-042-19/+25
|\|
| * switched around info and items query to avoid race conditionDaniel Gultsch2016-04-041-1/+1
| * removed unnecessary wait for disconnectDaniel Gultsch2016-04-041-6/+0
| * made sure the disco#items query has returned before finalizing the bindDaniel Gultsch2016-04-041-12/+24
* | add option to only allow one account and set it to trueChristian S2016-04-042-5/+4
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-0317-54/+184
|\|
| * don't ask for resource when server uses http upload v0.1Daniel Gultsch2016-04-023-6/+8
| * check max http file size when attaching filesDaniel Gultsch2016-04-016-12/+83
| * add methods to check max file size for http uploadDaniel Gultsch2016-03-315-12/+41
| * save otr fingerprint in messageDaniel Gultsch2016-03-316-12/+15
| * include form fields into caps hash calculationDaniel Gultsch2016-03-312-6/+25