Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
| | * | | bump copyright year to 2010 in the right place | Sven Moritz Hallberg | 2010-09-19 | -2/+2 | |
| | | | | |||||
| | * | | complain when trying smp without an otr channel | Sven Moritz Hallberg | 2010-09-19 | -3/+7 | |
| | | | | |||||
| | * | | cosmetics | Sven Moritz Hallberg | 2010-09-19 | -1/+1 | |
| | | | | |||||
| | * | | let 'otr smpq' only work for smp init, not reply | Sven Moritz Hallberg | 2010-09-19 | -16/+19 | |
| | | | | |||||
| | * | | help entry for 'otr smpq' | Sven Moritz Hallberg | 2010-09-19 | -0/+17 | |
| | | | | |||||
| | * | | add 'otr smpq' command for q&a-style smp authentication | Sven Moritz Hallberg | 2010-09-19 | -43/+67 | |
| | | | | |||||
| | * | | call storage_save before freeing plugins, avoids segfault in otr.c | Sven Moritz Hallberg | 2010-09-19 | -4/+4 | |
| | | | | |||||
| | * | | handle SMP1Q packets (smp init with question) | Sven Moritz Hallberg | 2010-09-19 | -0/+16 | |
| | | | | |||||
| * | | | Allow building OTR support as a plugin. Fairly simple, let's hope I can get | Wilmer van der Gaast | 2010-09-29 | -19/+33 | |
| |/ / | | | | | | | | | | | | | away with doing this without libtool (eep). | ||||
| * | | Load/save code. It'd be better if the OTR module would just save its info | Wilmer van der Gaast | 2010-09-01 | -0/+40 | |
| | | | | | | | | | | | | | | | | | | in BitlBee settings that automatically end up in the existing .xml files (or whatever storage is used), but I realise this is non-trivial. | ||||
| * | | Do encryption and decryption. Somehow SMP and other things aren't working | Wilmer van der Gaast | 2010-09-01 | -63/+102 | |
| | | | | | | | | | | | | | | | | | | so well yet, at least when testing with Pidgin on the other side. Not sure where the bug is. | ||||
| * | | Pluginify this thing a little bit. Not so much in the dynamically loadable | Wilmer van der Gaast | 2010-09-01 | -57/+108 | |
| | | | | | | | | | | | | | | | sense of the word, more in a way that core files don't have to include otr.h. | ||||
| * | | Merge mainline stuff. | Wilmer van der Gaast | 2010-08-31 | -386/+321 | |
| |\ \ | |||||
| * | | | Added root_command_add() and use it to create the "otr" command. | Wilmer van der Gaast | 2010-08-31 | -17/+53 | |
| | | | | |||||
| * | | | It compiles, including otr.c. Time to hook it up with the rest again. | Wilmer van der Gaast | 2010-08-26 | -180/+143 | |
| | | | | |||||
| * | | | First step in this merge. Mostly a bzr merge and then a cleanup of conflicts | Wilmer van der Gaast | 2010-08-24 | -35/+2170 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | and parts I want to/have to redo (because of ui-fix). | ||||
| | * \ \ | merge with upstraem bitlbee 1.2.8 | Sven Moritz Hallberg | 2010-07-11 | -52/+205 | |
| | |\ \ \ | |||||
| | * \ \ \ | merge in bitlbee head | Sven Moritz Hallberg | 2010-06-04 | -144/+198 | |
| | |\ \ \ \ | |||||
| | * | | | | | add an option to disable otr on twitter (and other unsuitable protocols) | Sven Moritz Hallberg | 2010-06-03 | -4/+21 | |
| | | | | | | | |||||
| | * | | | | | merge in bitlbee 1.2.7 | Sven Moritz Hallberg | 2010-06-03 | -220/+908 | |
| | |\ \ \ \ \ | |||||
| | * | | | | | | fix a double free | Sven Moritz Hallberg | 2010-06-03 | -2/+2 | |
| | | | | | | | | |||||
| | * | | | | | | merge in bitlbee 1.2.6 | Sven Moritz Hallberg | 2010-06-03 | -216/+2170 | |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge in bitlbee 1.2.5 | Sven Moritz Hallberg | 2010-06-03 | -660/+808 | |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge in bitlbee 1.2.4 | Sven Moritz Hallberg | 2010-06-03 | -92/+600 | |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | dont specify a background when coloring encrypted messages | Sven Moritz Hallberg | 2009-03-13 | -1/+8 | |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | pretty blind try at merging in the latest trunk | Sven Moritz Hallberg | 2009-03-12 | -360/+1008 | |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | commit updates by ashish shukla <wahjava@gmail.com> | Sven Moritz Hallberg | 2009-03-12 | -284/+445 | |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | local merge | Sven Moritz Hallberg | 2008-07-17 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | silence a warning | Sven Moritz Hallberg | 2008-03-22 | -1/+1 | |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | fix a syntax error in ssl_openssl.c | Sven Moritz Hallberg | 2008-03-22 | -1/+1 | |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | merge in latest trunk | Sven Moritz Hallberg | 2008-07-17 | -867/+2308 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | minor bugfixes | Sven Moritz Hallberg | 2008-07-16 | -2/+2 | |
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | fix "purple background" bug *sigh* :P | Sven Moritz Hallberg | 2008-02-18 | -1/+1 | |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | fix "purple message" bug ;) | Sven Moritz Hallberg | 2008-02-18 | -4/+4 | |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | tabidy some indentation | Sven Moritz Hallberg | 2008-02-17 | -5/+5 | |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | remove gthread dependency | Sven Moritz Hallberg | 2008-02-17 | -2/+2 | |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | don't unnecessarily duplicate otr userstate in keygen slave | Sven Moritz Hallberg | 2008-02-17 | -10/+3 | |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | fix an uninitialized value | Sven Moritz Hallberg | 2008-02-17 | -0/+1 | |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | fix compilation without otr support | Sven Moritz Hallberg | 2008-02-17 | -1/+1 | |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | remove debugging output | Sven Moritz Hallberg | 2008-02-17 | -53/+0 | |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | more upstream changes | Sven Moritz Hallberg | 2008-02-17 | -4/+32 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | add TODO note about erasing forgotten keys | Sven Moritz Hallberg | 2008-02-17 | -0/+3 | |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | put 'otr forget key' back in, which now works | Sven Moritz Hallberg | 2008-02-17 | -1/+39 | |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | free query strings after query_add | Sven Moritz Hallberg | 2008-02-17 | -0/+3 | |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | explicitly initialize ssl in order to avoid gnutls and libotr fighting over ↵ | Sven Moritz Hallberg | 2008-02-17 | -19/+58 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the global state of libgcrypt | ||||
| | * | | | | | | | | | | | | indent fingerprints in 'otr info <buddy>' | Sven Moritz Hallberg | 2008-02-16 | -3/+3 | |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | merge in upstream changes | Sven Moritz Hallberg | 2008-02-16 | -125/+332 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | read root's welcome message from a file (like tho MOTD) | Sven Moritz Hallberg | 2008-02-16 | -4/+45 | |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | remove (broken) 'otr forget key' command again | Sven Moritz Hallberg | 2008-02-16 | -45/+1 | |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | show keys being generated in 'otr info' | Sven Moritz Hallberg | 2008-02-16 | -2/+9 | |
| | | | | | | | | | | | | | | |