aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2015-09-151-6/+20
|\
| * added possibiltiy to set conferences as moderated (only visible in advanced m...Daniel Gultsch2015-09-131-6/+20
| * added mp4 to well known extensions. fixes #1403Daniel Gultsch2015-09-121-1/+1
* | Merge pull request #34 from siacs/masterChristian S.2015-09-051-7/+15
|\|
| * Issues with URLs with multiple dots in file. fixes #1373Daniel Gultsch2015-09-041-7/+15
* | Merge pull request #33 from siacs/masterChristian S.2015-09-041-1/+4
|\|
| * added special error state for dns timeoutDaniel Gultsch2015-09-011-1/+4
* | Merge pull request #31 from siacs/masterChristian S.2015-08-301-0/+4
|\|
| * fixed bug that prevented newly opened conversations to load the entire histor...Daniel Gultsch2015-08-301-0/+4
* | Version 1.6.5Christian S2015-08-261-5/+16
|\|
| * be more restrictive about marking messages as sent_received in muc parserDaniel Gultsch2015-08-261-5/+16
* | Merge pull request #27 from siacs/developmentChristian S.2015-08-241-2/+2
|\|
| * bugfix: next encryption is now being properly detectedDaniel Gultsch2015-08-231-2/+2
* | removed duplicatesChristian S2015-08-191-13/+0
* | Merge pull request #23 from kriztan/SubtitleChristian S.2015-08-181-0/+13
|\ \
| * | add subtitle to ActionBar in chatviewsChristian S2015-08-181-0/+13
| |/
* | added 'ics' to well-known extentionsChristian S.2015-08-151-1/+3
* | added one more well-known file typeChristian S2015-08-081-0/+1
* | copy commitsChristian S2015-08-023-150/+133
|\|
| * Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub2015-08-011-2/+2
| * enable axolotl encryption for jingle supported file transfersDaniel Gultsch2015-08-011-17/+17
| * improved 'next encryption' selectionDaniel Gultsch2015-07-312-28/+37
| * Fix session logic: enforce same type of encryptionAndreas Straub2015-07-301-0/+31
| * use gcm for file encryption over httpDaniel Gultsch2015-07-291-89/+8
| * Tag carbon messages in parser, adapt session logicAndreas Straub2015-07-291-3/+21
| * Refactor out inner classes, cache trust storeAndreas Straub2015-07-291-2/+2
| * removed recursion in message.getMerged*()Daniel Gultsch2015-07-281-13/+19
* | changed subtitle a bitChristian S2015-07-231-1/+2
* | add subtitle to ActionBar in chatviewsChristian S2015-07-231-0/+13
|\ \
| * | move typing info to ActionBar subtitleChristian S2015-07-201-1/+1
* | | added more well known file typesChristian S2015-07-231-3/+49
* | | copy commitsChristian S2015-07-232-0/+16
|\ \ \ | | |/ | |/|
| * | show warning when trying to highlight users that have left the conferenceDaniel Gultsch2015-07-221-0/+9
| * | treat private, non-anonymous mucs like 1:1 chats notification wiseDaniel Gultsch2015-07-221-0/+7
* | | copy commitsChristian S2015-07-206-77/+118
|\| | | |/ |/|
| * Optimize importsAndreas Straub2015-07-203-10/+4
| * Don't merge messages with different trust statusesAndreas Straub2015-07-191-1/+7
| * Show trust status of messages' originating sessionAndreas Straub2015-07-191-0/+4
| * Overhauled Message taggingAndreas Straub2015-07-191-9/+10
| * Fix displaying Contact IdentityKeysAndreas Straub2015-07-191-64/+0
| * Tag messages with originating sessionAndreas Straub2015-07-191-0/+4
| * Fetch bundles on-demand, encrypt in backgroundAndreas Straub2015-07-191-3/+3
| * Reformat code to use tabsAndreas Straub2015-07-191-10/+10
| * Reworked axolotl protocol layerAndreas Straub2015-07-193-29/+54
| * CryptoNext persistance layer mockupAndreas Straub2015-07-193-64/+135
* | Version 1.5.0Christian S2015-07-181-8/+18
|\|
| * account for downloaded http files in dup checkerDaniel Gultsch2015-07-181-8/+18
* | deleted old filesChristian S2015-07-142-62/+0
* | Merge branch 'development' of https://github.com/siacs/Conversations into sia...Christian S2015-07-145-15/+77
|\|
| * renamed downloadable to transferableDaniel Gultsch2015-07-103-15/+15
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 01:38:18 +0000