aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | Pluginify this thing a little bit. Not so much in the dynamically loadableWilmer van der Gaast2010-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 Gaast2010-08-31-386/+321
| |\ \
| * | | Added root_command_add() and use it to create the "otr" command.Wilmer van der Gaast2010-08-31-17/+53
| | | |
| * | | It compiles, including otr.c. Time to hook it up with the rest again.Wilmer van der Gaast2010-08-26-180/+143
| | | |
| * | | First step in this merge. Mostly a bzr merge and then a cleanup of conflictsWilmer van der Gaast2010-08-24-35/+2170
| |\ \ \ | | | | | | | | | | | | | | | | | | | | and parts I want to/have to redo (because of ui-fix).
| | * \ \ merge with upstraem bitlbee 1.2.8Sven Moritz Hallberg2010-07-11-52/+205
| | |\ \ \
| | * \ \ \ merge in bitlbee headSven Moritz Hallberg2010-06-04-144/+198
| | |\ \ \ \
| | * | | | | add an option to disable otr on twitter (and other unsuitable protocols)Sven Moritz Hallberg2010-06-03-4/+21
| | | | | | |
| | * | | | | merge in bitlbee 1.2.7Sven Moritz Hallberg2010-06-03-220/+908
| | |\ \ \ \ \
| | * | | | | | fix a double freeSven Moritz Hallberg2010-06-03-2/+2
| | | | | | | |
| | * | | | | | merge in bitlbee 1.2.6Sven Moritz Hallberg2010-06-03-216/+2170
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ merge in bitlbee 1.2.5Sven Moritz Hallberg2010-06-03-660/+808
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merge in bitlbee 1.2.4Sven Moritz Hallberg2010-06-03-92/+600
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | dont specify a background when coloring encrypted messagesSven Moritz Hallberg2009-03-13-1/+8
| | | | | | | | | | |
| | * | | | | | | | | pretty blind try at merging in the latest trunkSven Moritz Hallberg2009-03-12-360/+1008
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | commit updates by ashish shukla <wahjava@gmail.com>Sven Moritz Hallberg2009-03-12-284/+445
| | | | | | | | | | | |
| | * | | | | | | | | | local mergeSven Moritz Hallberg2008-07-17-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | silence a warningSven Moritz Hallberg2008-03-22-1/+1
| | | | | | | | | | | | |
| | | * | | | | | | | | | fix a syntax error in ssl_openssl.cSven Moritz Hallberg2008-03-22-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | merge in latest trunkSven Moritz Hallberg2008-07-17-867/+2308
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | minor bugfixesSven Moritz Hallberg2008-07-16-2/+2
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | fix "purple background" bug *sigh* :PSven Moritz Hallberg2008-02-18-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | fix "purple message" bug ;)Sven Moritz Hallberg2008-02-18-4/+4
| | | | | | | | | | | | |
| | * | | | | | | | | | | tabidy some indentationSven Moritz Hallberg2008-02-17-5/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | remove gthread dependencySven Moritz Hallberg2008-02-17-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | don't unnecessarily duplicate otr userstate in keygen slaveSven Moritz Hallberg2008-02-17-10/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | fix an uninitialized valueSven Moritz Hallberg2008-02-17-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | fix compilation without otr supportSven Moritz Hallberg2008-02-17-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | remove debugging outputSven Moritz Hallberg2008-02-17-53/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | more upstream changesSven Moritz Hallberg2008-02-17-4/+32
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | add TODO note about erasing forgotten keysSven Moritz Hallberg2008-02-17-0/+3
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | put 'otr forget key' back in, which now worksSven Moritz Hallberg2008-02-17-1/+39
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | free query strings after query_addSven Moritz Hallberg2008-02-17-0/+3
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | explicitly initialize ssl in order to avoid gnutls and libotr fighting over ↵Sven Moritz Hallberg2008-02-17-19/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the global state of libgcrypt
| | * | | | | | | | | | | | indent fingerprints in 'otr info <buddy>'Sven Moritz Hallberg2008-02-16-3/+3
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | merge in upstream changesSven Moritz Hallberg2008-02-16-125/+332
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | read root's welcome message from a file (like tho MOTD)Sven Moritz Hallberg2008-02-16-4/+45
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | remove (broken) 'otr forget key' command againSven Moritz Hallberg2008-02-16-45/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | show keys being generated in 'otr info'Sven Moritz Hallberg2008-02-16-2/+9
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | rework keygen messages and add some noticesSven Moritz Hallberg2008-02-16-9/+38
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | keep track of which keys are queued for generationSven Moritz Hallberg2008-02-16-78/+198
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | implement background keygen via child processSven Moritz Hallberg2008-02-15-28/+153
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | remove thread-based keygenSven Moritz Hallberg2008-02-15-168/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace it with a process-based stub
| | * | | | | | | | | | | | | otr_load error handling + stonedcoder copyright noticeSven Moritz Hallberg2008-02-15-3/+10
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | revert keygen behaviour to old (lax) behaviorSven Moritz Hallberg2008-02-14-15/+21
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | chmod 0600 otr save filesSven Moritz Hallberg2008-02-14-0/+2
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | interpret &apos;Sven Moritz Hallberg2008-02-14-0/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | fix a bug in set_eval_mode_buddiesSven Moritz Hallberg2008-02-13-0/+2
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | update settings documentationSven Moritz Hallberg2008-02-12-5/+83
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | document otr commandsSven Moritz Hallberg2008-02-12-0/+149
| | | | | | | | | | | | | | |