Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Fixes FS#157: Trigger loading messages from MAM in MUC does not end | steckbrief | 2016-03-10 | 3 | -37/+45 | |
| | | ||||||
| * | Fixes FS#158: user decision dialog heading configurable and translateable | steckbrief | 2016-03-10 | 3 | -12/+6 | |
| | | ||||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-08 | 1 | -1/+2 | |
|/ | | | | | Conflicts: build.gradle | |||||
* | Merge remote branch 'master' | steckbrief | 2016-03-08 | 4 | -22/+21 | |
| | ||||||
* | Fixes FS#145: Dialog for decision in Android 5 | steckbrief | 2016-03-08 | 1 | -1/+2 | |
* | reset link and highlight colors to system default | steckbrief | 2016-03-08 | 3 | -21/+20 | |
* | Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquare | steckbrief | 2016-03-08 | 1 | -1/+1 | |
| | ||||||
* | Fixed merge issue with AxolotlService (differentiation between impl and ↵ | steckbrief | 2016-03-08 | 3 | -133/+171 | |
interface) | ||||||
* | Version bump to 0.0.6 | steckbrief | 2016-03-06 | 1 | -2/+2 | |
* | Fixes FS#147: Disable OMEMO | steckbrief | 2016-03-02 | 20 | -981/+1331 | |
| | ||||||
* | Readme updated | steckbrief | 2016-03-02 | 1 | -0/+5 | |
| | ||||||
* | Fixes FS#146: Remove Tor-Support | steckbrief | 2016-03-02 | 34 | -142/+13 | |
| | ||||||
* | Fixes FS#148: Remove 'store' hint from chat-markers | steckbrief | 2016-03-02 | 1 | -2/+1 | |
| | ||||||
* | externalized string 'Retry decryption' | steckbrief | 2016-02-28 | 3 | -1/+3 | |
| | ||||||
* | Merge tag '1.10.1' into trz/merge_1.10.1 | steckbrief | 2016-02-28 | 26 | -100/+238 | |
Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/res/menu/message_context.xml src/main/res/xml/preferences.xml | ||||||
* | Unused imports / methods removed | steckbrief | 2016-02-24 | 3 | -27/+0 | |
| | ||||||
* | Fixes FS#89 after merge conflict | steckbrief | 2016-02-24 | 1 | -3/+6 | |
| | ||||||
* | Fixed merge issue for resolving FS#47 (preferences involved in the decision ↵ | steckbrief | 2016-02-24 | 2 | -11/+1 | |
| | | | | for auto downloading image links moved to global Utility Class) | |||||
* | Readded MessageDetailsDialog to message context menu after merge | steckbrief | 2016-02-24 | 1 | -0/+4 | |
| | ||||||
* | Reviewed commit for FS#34 after merge | steckbrief | 2016-02-24 | 2 | -2/+2 | |
| | ||||||
* | Packet sending helper moved to XmppSendUtil and methods in ↵ | steckbrief | 2016-02-23 | 2 | -18/+17 | |
| | | | | XmppConnectionService marked as deprecated | |||||
* | Removed stupid message correction | steckbrief | 2016-02-23 | 34 | -167/+10 | |
| | ||||||
* | Removed useless 'button-message' to load more messages. Implementation ↵ | steckbrief | 2016-02-23 | 21 | -92/+8 | |
| | | | | already done with a more convenient method | |||||
* | Changed access to presences according to new Presence representation in C | steckbrief | 2016-02-23 | 3 | -14/+15 | |
| | ||||||
* | Removed non-existing member variable | steckbrief | 2016-02-23 | 1 | -1/+1 | |
| | ||||||
* | Explicit applicationId removed | steckbrief | 2016-02-23 | 1 | -1/+0 | |
| | ||||||
* | Fix visibility of updateStatusMessages method that LoadMoreMessages can work | steckbrief | 2016-02-23 | 1 | -1/+1 | |
| | ||||||
* | Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError) | steckbrief | 2016-02-23 | 1 | -0/+15 | |
| | ||||||
* | Removed unnecessary dependencies to XmppConnectionService and added ↵ | steckbrief | 2016-02-23 | 5 | -43/+11 | |
| | | | | allowMessageCorrection to preferences | |||||
* | merged string resources | steckbrief | 2016-02-23 | 2 | -6/+0 | |
* | Fixes FS#105: XHTML par for images added | steckbrief | 2016-02-13 | 1 | -0/+12 | |
| | ||||||
* | Fix flagging no more messages on server for conversation | steckbrief | 2016-02-13 | 1 | -16/+18 | |
| | ||||||
* | Implements FS#64: Show who wrote last message in conversation overview | steckbrief | 2016-02-13 | 1 | -2/+13 | |
| | ||||||
* | Partially implements FS#6: Conference ID changed to ↵ | steckbrief | 2016-02-13 | 1 | -2/+2 | |
| | | | | c+bugs@conference.thedevstack.de | |||||
* | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵ | steckbrief | 2016-02-13 | 1 | -1/+1 | |
| | | | | should be shown for a message | |||||
* | Unused preference 'picture_compression'. This feature is configured in our ↵ | steckbrief | 2016-02-13 | 20 | -56/+0 | |
| | | | | variant via 'resize_picture' | |||||
* | Fixed overwriting of changes for fixing FS#70. Unused method removed from ↵ | steckbrief | 2016-02-13 | 6 | -79/+5 | |
| | | | | generator classes. | |||||
* | Fixed settings synchronization | steckbrief | 2016-02-12 | 1 | -60/+66 | |
| | ||||||
* | Imports organized | steckbrief | 2016-02-12 | 73 | -293/+56 | |
| | ||||||
* | Fixed parent activity for logoutput activity | steckbrief | 2016-02-12 | 1 | -3/+3 | |
| | ||||||
* | Simplification of DNS requests. | steckbrief | 2016-02-12 | 3 | -254/+130 | |
| | | | | Originally introduced for FS#92, but now extended with retrieval for XEP-0368 (http://xmpp.org/extensions/xep-0368.html) | |||||
* | green bubbles and setting to choose green or white bubbles removed | steckbrief | 2016-02-12 | 24 | -67/+5 | |
| | ||||||
* | Fixed placeholder string for message input box | steckbrief | 2016-02-12 | 2 | -2/+2 | |
| | ||||||
* | Fixed layout issue with emojicon tastatur button | steckbrief | 2016-02-12 | 1 | -1/+0 | |
| | ||||||
* | Fixed NPE while loading messages via MAM | steckbrief | 2016-02-12 | 1 | -1/+1 | |
| | ||||||
* | Fixed runtime errors with axolotl libraries. | steckbrief | 2016-02-12 | 6 | -0/+1 | |
| | | | | Now the libraries from maven are added. | |||||
* | database error while upgrading from db version 14 fixed | steckbrief | 2016-02-12 | 1 | -1/+1 | |
| | ||||||
* | axolotl resources changed from maven to jcenter | steckbrief | 2016-02-12 | 5 | -2/+2 | |
| | ||||||
* | Compilation errors and merge mixups fixed | steckbrief | 2016-02-11 | 24 | -728/+358 | |
| | ||||||
* | Some runtime dependencies added | steckbrief | 2016-02-11 | 3 | -1/+4 | |
| |