aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Removed unnecessary importsteckbrief2016-03-291-1/+0
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-296-70/+103
|\|
| * Avoid unnecessary text change on activate account buttonsteckbrief2016-03-291-2/+3
| * Introduction of a TextViewUtil to easily set attributes for TextViewssteckbrief2016-03-296-69/+99
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-2917-102/+246
|\|
| * Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-2917-102/+239
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-283-5/+9
|/
* Merge branch 'master' of repos.thedevstack.de:conversations-plussteckbrief2016-03-287-6/+68
* Fixes FS#170: Message Details: Status display has different Text colorsteckbrief2016-03-282-4/+2
* Implements FS#176: error logging for httpupload improvedsteckbrief2016-03-281-1/+7
* Fixes FS#167: Resized images are larger than original imagessteckbrief2016-03-181-2/+2
* Merge branch 'master' of git.fucktheforce.de:conversations-plussteckbrief2016-03-187-39/+96
* Refs FS#140: Rework message displaysteckbrief2016-03-131-1/+2
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-125-97/+16
| |\ | |/ |/|
* | Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-125-97/+16
/
* Merge commit 'remotes/origin/trz/rename~1' into trz/rebasesteckbrief2016-03-120-0/+0
* 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