aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-1110-140/+14
|\
| * Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-1110-139/+13
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-118-149/+28
|\|
| * Fixes FS#139: Do not merge messages at allsteckbrief2016-03-118-149/+28
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-106-49/+52
|\|
| * Fixes FS#157: Trigger loading messages from MAM in MUC does not endsteckbrief2016-03-103-37/+45
| * Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-103-12/+6
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
|/
* Merge remote branch 'master'steckbrief2016-03-084-22/+21
* Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
* reset link and highlight colors to system defaultsteckbrief2016-03-083-21/+20
* Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquaresteckbrief2016-03-081-1/+1
* Fixed merge issue with AxolotlService (differentiation between impl and inter...steckbrief2016-03-083-133/+171
* Version bump to 0.0.6steckbrief2016-03-061-2/+2
* Fixes FS#147: Disable OMEMOsteckbrief2016-03-0220-981/+1331
* Readme updatedsteckbrief2016-03-021-0/+5
* Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-0234-142/+13
* Fixes FS#148: Remove 'store' hint from chat-markerssteckbrief2016-03-021-2/+1
* externalized string 'Retry decryption'steckbrief2016-02-283-1/+3
* Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-2826-100/+238
* Unused imports / methods removedsteckbrief2016-02-243-27/+0
* Fixes FS#89 after merge conflictsteckbrief2016-02-241-3/+6
* Fixed merge issue for resolving FS#47 (preferences involved in the decision f...steckbrief2016-02-242-11/+1
* Readded MessageDetailsDialog to message context menu after mergesteckbrief2016-02-241-0/+4
* Reviewed commit for FS#34 after mergesteckbrief2016-02-242-2/+2
* Packet sending helper moved to XmppSendUtil and methods in XmppConnectionServ...steckbrief2016-02-232-18/+17
* Removed stupid message correctionsteckbrief2016-02-2334-167/+10
* Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-2321-92/+8
* Changed access to presences according to new Presence representation in Csteckbrief2016-02-233-14/+15
* Removed non-existing member variablesteckbrief2016-02-231-1/+1
* Explicit applicationId removedsteckbrief2016-02-231-1/+0
* Fix visibility of updateStatusMessages method that LoadMoreMessages can worksteckbrief2016-02-231-1/+1
* Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError)steckbrief2016-02-231-0/+15
* Removed unnecessary dependencies to XmppConnectionService and added allowMess...steckbrief2016-02-235-43/+11
* merged string resourcessteckbrief2016-02-232-6/+0
* Fixes FS#105: XHTML par for images addedsteckbrief2016-02-131-0/+12
* Fix flagging no more messages on server for conversationsteckbrief2016-02-131-16/+18
* Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-02-131-2/+13
* Partially implements FS#6: Conference ID changed to c+bugs@conference.thedevs...steckbrief2016-02-131-2/+2
* Fixes FS#135: condition NOT message.isRead() added to check if notification s...steckbrief2016-02-131-1/+1
* Unused preference 'picture_compression'. This feature is configured in our va...steckbrief2016-02-1320-56/+0
* Fixed overwriting of changes for fixing FS#70. Unused method removed from gen...steckbrief2016-02-136-79/+5
* Fixed settings synchronizationsteckbrief2016-02-121-60/+66
* Imports organizedsteckbrief2016-02-1273-293/+56
* Fixed parent activity for logoutput activitysteckbrief2016-02-121-3/+3
* Simplification of DNS requests.steckbrief2016-02-123-254/+130
* green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-1224-67/+5
* Fixed placeholder string for message input boxsteckbrief2016-02-122-2/+2
* Fixed layout issue with emojicon tastatur buttonsteckbrief2016-02-121-1/+0
* Fixed NPE while loading messages via MAMsteckbrief2016-02-121-1/+1