aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* changed some stringsChristian S2016-04-151-2/+2
|
* added missing stringsChristian S2016-04-151-0/+4
|
* corrected stringsChristian S2016-04-151-1/+0
|
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-156-25/+64
|\
| * 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-143-17/+51
| |
* | added condition to show 'disable foreground service' buttonChristian S2016-04-151-1/+1
| |
* | disallow account deactivationChristian S2016-04-157-63/+10
| | | | | | | | added reconnect to account context menu
* | make foreground service always enabledChristian S2016-04-155-14/+4
| | | | | | | | and don't let the user choose the foreground settings
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-1424-65/+233
|\|
| * 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-1215-14/+43
| |
| * 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
| | | | | | | | This reverts commit b8ec4663db7fb597ec4a4030ac9ea508e885d9e5.
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-1111-54/+80
|\|
| * version bump to 1.11.6 + changelogDaniel Gultsch2016-04-102-2/+6
| |
| * pulled translations from transifexDaniel Gultsch2016-04-1029-86/+27
| |
| * add entries to gitignoreDaniel Gultsch2016-04-101-0/+2
| |
| * 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 ↵Daniel Gultsch2016-04-101-38/+44
| | | | | | | | changing status
| * introduced setting to turn of notification ledDaniel Gultsch2016-04-093-5/+15
| |
| * update gradle and gradle pluginDaniel Gultsch2016-04-093-4/+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-0911-26/+97
|\|
| * 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
| |
| * increase version code to fix nasty bug in 1.11.5 betaDaniel Gultsch2016-04-081-1/+1
| |
| * removed ernoexception in exchange for a regular exeption to prevent verify ↵Daniel Gultsch2016-04-081-3/+2
| | | | | | | | error on <5.0
| * version bump to 1.11.5 + changelogDaniel Gultsch2016-04-082-2/+5
| |
| * pulled translations from transifexDaniel Gultsch2016-04-082-3/+23
| |
| * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-074-2/+55
| |
| * 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 'siacs/master' into developmentChristian S2016-04-072-2/+4
|\|
| * tell people to build debug instead of releaseDaniel Gultsch2016-04-061-1/+1
| |
| * version bump to 1.11.4 + changelogDaniel Gultsch2016-04-052-2/+6
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-074-6/+21
|\|
| * better detect broken pepDaniel Gultsch2016-04-052-2/+10
| | | | | | | | | | mark pep as broken when publishing bundle or device list failed reset 'brokenness' when account is getting disabled
| * fixing travisDaniel Gultsch2016-04-042-4/+11
| |