| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | fixed history deletion. fixed #780 | iNPUTmice | 2014-12-15 | 1 | -0/+10 | |
| | | ||||||
| * | run mam queries only when online | iNPUTmice | 2014-12-14 | 1 | -0/+1 | |
| | | ||||||
| * | refactored the way certain messages are being found within a conversation | iNPUTmice | 2014-12-14 | 1 | -81/+70 | |
| | | ||||||
| * | avoiding concurrent modification | iNPUTmice | 2014-12-13 | 1 | -2/+2 | |
| | | ||||||
| * | reverse through mam history when loading larger chuncks | iNPUTmice | 2014-12-13 | 1 | -0/+3 | |
| | | ||||||
| * | Merge branch 'feature/mam' into development | iNPUTmice | 2014-12-13 | 1 | -31/+32 | |
| |\ | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |||||
| | * | various mam improvments | iNPUTmice | 2014-12-13 | 1 | -4/+13 | |
| | | | ||||||
| | * | changed lastMessageReceived into lastMessageTransmitted to account for sent ↵ | iNPUTmice | 2014-12-10 | 1 | -12/+13 | |
| | | | | | | | | | messages as well. (will trigger on sm ack) | |||||
| | * | added max history age (default 1w). automatically sort newly added mam messages | iNPUTmice | 2014-12-10 | 1 | -21/+4 | |
| | | | ||||||
| | * | very basic mam support | iNPUTmice | 2014-12-10 | 1 | -3/+27 | |
| | | | ||||||
| | * | store last message received date in conversation | iNPUTmice | 2014-12-10 | 1 | -20/+4 | |
| | | | ||||||
| * | | refactored phone contacts merger | iNPUTmice | 2014-12-13 | 1 | -33/+38 | |
| |/ | ||||||
| * | removed unnecessary otr error response | iNPUTmice | 2014-12-10 | 1 | -8/+0 | |
| | | ||||||
| * | more safety checks for listener counts | iNPUTmice | 2014-12-03 | 1 | -88/+29 | |
| | | ||||||
| * | safety net in joinMuc | iNPUTmice | 2014-12-03 | 1 | -4/+6 | |
| | | ||||||
| * | fixed npe for broken bookmarks | iNPUTmice | 2014-11-29 | 1 | -7/+8 | |
| | | ||||||
| * | add an listener for the muc roster update. | Michael | 2014-11-23 | 1 | -0/+42 | |
| | | | | | | this is for the ConferenceDetailsActivity to show precence updates immediately. | |||||
| * | MUC: set from when join muc. | Michael | 2014-11-21 | 1 | -0/+1 | |
| | | ||||||
| * | import fixes | iNPUTmice | 2014-11-20 | 1 | -0/+2 | |
| | | ||||||
| * | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-20 | 1 | -3/+0 | |
| |\ | | | | | | | development | |||||
| | * | Remove broken / unused imports | Sam Whited | 2014-11-19 | 1 | -3/+0 | |
| | | | ||||||
| * | | brought ad hoc conferences back. fixed #688 fixed #367 | iNPUTmice | 2014-11-20 | 1 | -32/+139 | |
| |/ | ||||||
| * | sent read marker to full jid | iNPUTmice | 2014-11-19 | 1 | -7/+8 | |
| | | ||||||
| * | put error notification into notification service | iNPUTmice | 2014-11-18 | 1 | -4/+3 | |
| | | ||||||
| * | better usage of synchronized in some places | iNPUTmice | 2014-11-18 | 1 | -76/+78 | |
| | | ||||||
| * | context menu for muc participants + refactor trueCounterpart to use Jid class | iNPUTmice | 2014-11-17 | 1 | -1/+1 | |
| | | ||||||
| * | Fix fetching accounts by JIDs | Sam Whited | 2014-11-16 | 1 | -1/+1 | |
| | | | | | Fixes a crash when publishing an avatar | |||||
| * | parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵ | iNPUTmice | 2014-11-16 | 1 | -8/+7 | |
| | | | | | shareable uri where ever possible | |||||
| * | Make account status an enum | Sam Whited | 2014-11-15 | 1 | -97/+97 | |
| | | ||||||
| * | Merge branch 'feature/file_transfer' into development | iNPUTmice | 2014-11-15 | 1 | -35/+64 | |
| |\ | | | | | | | | | Conflicts: src/main/res/values/strings.xml | |||||
| | * | fixed description in notifications and conversation overview | iNPUTmice | 2014-11-15 | 1 | -42/+14 | |
| | | | ||||||
| | * | fixed resending for files as well | iNPUTmice | 2014-11-15 | 1 | -3/+3 | |
| | | | ||||||
| | * | made file transfers cancelable | iNPUTmice | 2014-11-15 | 1 | -0/+5 | |
| | | | ||||||
| | * | support for pgp files | iNPUTmice | 2014-11-15 | 1 | -3/+11 | |
| | | | ||||||
| | * | copy non local files to private storage first | iNPUTmice | 2014-11-15 | 1 | -17/+28 | |
| | | | ||||||
| | * | bug fixes and various improvements for file transfer | iNPUTmice | 2014-11-15 | 1 | -1/+1 | |
| | | | ||||||
| | * | basic arbitrary file transfer | iNPUTmice | 2014-11-15 | 1 | -3/+36 | |
| | | | ||||||
| * | | turn on foreground service in expert settings | iNPUTmice | 2014-11-15 | 1 | -5/+14 | |
| |/ | ||||||
| * | temporarliy got rid of some insane work arounds in favor of some maybe less ↵ | iNPUTmice | 2014-11-11 | 1 | -8/+8 | |
| | | | | | insane work arounds | |||||
| * | more refactoring for presence selection. removed getTo, getFrom and getJid ↵ | iNPUTmice | 2014-11-10 | 1 | -208/+231 | |
| | | | | | from Element | |||||
| * | migrated some otr stuff to new jid classes | iNPUTmice | 2014-11-09 | 1 | -7/+9 | |
| | | ||||||
| * | Rework `Account.getJid()' to return full JIDs | Sam Whited | 2014-11-09 | 1 | -17/+17 | |
| | | | | | Remove `Account.getFullJid()' | |||||
| * | refactored code to always contain full jid for counterpart | iNPUTmice | 2014-11-09 | 1 | -25/+41 | |
| | | ||||||
| * | It builds again! | Sam Whited | 2014-11-09 | 1 | -5/+2 | |
| | | ||||||
| * | Update more files to use JID objects | Sam Whited | 2014-11-09 | 1 | -6/+6 | |
| | | ||||||
| * | Move a chunk of classes over to using JID objects | Sam Whited | 2014-11-09 | 1 | -84/+89 | |
| | | ||||||
| * | fixed arrayoutofbounds + spelling | iNPUTmice | 2014-11-01 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -6/+28 | |
| | | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | |||||
| * | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+1927 | |
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |