summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable' into feature/8740-new-signing-key-phase-2feature/8740-new-signing-key-phase-2intrigeri2015-03-1856-83/+979
|\
| * Merge branch 'test/8001-8002-pidgin-xmp-otr' into stableintrigeri2015-03-1746-35/+667
| |\
| | * Merge remote-tracking branch 'origin/stable' into test/8001-8002-pidgin-xmp-otrintrigeri2015-03-170-0/+0
| | |\ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/stable' into stableintrigeri2015-03-17101-3202/+6834
| |\ \
| * \ \ Merge remote-tracking branch 'origin/test/7820-pidgin-irc-ctcp' into stableintrigeri2015-03-155-26/+159
| |\ \ \
| | | | * Merge remote-tracking branch 'origin/test/9062-otr-bot-with-python-potr' into...Tails developers2015-03-174-72/+130
| | | | |\
| | | | | * Kill dead code.Tails developers2015-03-171-4/+0
| | | | | * Convert old OTR keys to the new format.Tails developers2015-03-172-0/+61
| | | | | * Migrate to python-potr.Tails developers2015-03-162-72/+73
| | | | * | Use existing random_*_string() functions.Tails developers2015-03-171-6/+1
| | | | * | Merge branch 'stable' into test/8001-8002-pidgin-xmp-otrTails developers2015-03-17106-3234/+6993
| | | | |\ \ | | | | |/ / | | | |/| |
| | | * | | Merge remote-tracking branch 'origin/test/7820-pidgin-irc-ctcp' into stableTails developers2015-03-175-26/+159
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge remote-tracking branch 'origin/stable' into test/7820-pidgin-irc-ctcpintrigeri2015-03-155-11/+91
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Deal with the case when we randomly pick an existing IRC nick.Tails developers2015-03-121-0/+12
| | * | | | Completely rework the CTCP test and helper class.Tails developers2015-03-122-62/+96
| | * | | | Do not accept CTCP replies from anyone but our target.Tails developers2015-03-121-1/+1
| | * | | | Improve instance variable name.Tails developers2015-03-121-11/+11
| | * | | | Reduce chance to be flood banned.Tails developers2015-03-121-1/+1
| | * | | | Improve error message.Tails developers2015-03-121-1/+2
| | * | | | Rename to CtcpChecker to clarify what it actually does.Tails developers2015-03-122-4/+4
| | * | | | Define alias to clarify what CtcpSpammer does on start.Tails developers2015-03-122-1/+4
| | * | | | Merge branch 'stable' into test/7820-pidgin-irc-ctcpintrigeri2015-03-098-27/+59
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/master' into test/7820-pidgin-irc-ctcpTails developers2015-03-0781-581/+1983
| | |\ \ \ \ \
| | * | | | | | Also check if we can handle the CTCP reply.Tails developers2015-03-061-1/+2
| | * | | | | | Test that Pidgin only responds to the expected CTCP requests.Tails developers2015-02-275-26/+107
| | | | | * | | Merge remote-tracking branch 'origin/stable' into stableintrigeri2015-03-161-5/+44
| | | | | |\ \ \
| | | | | | * \ \ Merge remote-tracking branch 'origin/test/8894-log-file' into stableTails developers2015-03-161-5/+44
| | | | | | |\ \ \
| | | | | | | * | | Document --log-to-file in the usage function.Tails developers2015-02-141-0/+2
| | | | | | | * | | run_test_suite: remove control chars from the log file.Tails developers2015-02-131-0/+21
| | | | | | | * | | Have `script' continuously flush the test suite output to the log file.Tails developers2015-02-131-1/+1
| | | | | | | * | | Have `script' return the cucumber's exit code.Tails developers2015-02-131-1/+1
| | | | | | | * | | Enable pipefail option in run_test_suite.Tails developers2015-02-131-1/+2
| | | | | | | * | | Use long argument names, and clearer arguments ordering.Tails developers2015-02-131-1/+1
| | | | | | | * | | Add a --log-to-file option to run_test_suite.Tails developers2015-02-131-4/+19
| | | | | | | * | | Merge remote-tracking branch 'origin/testing' into develTails developers2015-02-121-0/+6
| | | | | | | |\ \ \
| | | | | | | * \ \ \ Merge branch 'testing' into develTails developers2015-02-1214-71/+934
| | | | | | | |\ \ \ \
| | | | | | | * \ \ \ \ Merge remote-tracking branch 'origin/devel' into develTails developers2015-02-120-0/+0
| | | | | | | |\ \ \ \ \
| | | | | | | | * \ \ \ \ Merge branch 'testing' into develTails developers2015-02-1274-3496/+7624
| | | | | | | | |\ \ \ \ \
| | | | | * | | | \ \ \ \ \ Merge remote-tracking branch 'origin/master' into stableintrigeri2015-03-1697-3191/+6780
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | Merge remote-tracking branch 'kytv/bugfix/8952-bump-gnome-screenshot-timeout'...Tails developers2015-03-161-1/+1
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | Bump screenshot.kytv2015-03-021-1/+1
| | | | | * | | | | | | | | | Merge remote-tracking branch 'kytv/bugfix/8951-new-signing-key' into stableTails developers2015-03-163-5/+9
| | | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | Move fingerprints to config.rbTails developers2015-03-022-4/+8
| | | | | * | | | | | | | | | Switch to the new signing key in config/amnesia.Tails developers2015-03-021-1/+1
| | | | | |/ / / / / / / / /
| | | | | | | | | | | | * | Document known-good XMPP servers for the pidgin tests.Tails developers2015-03-161-0/+7
| | | | | | | | | | | | |/
| | | | | | | | | | | | * Reduce risk for confusion.Tails developers2015-03-161-8/+7
| | | | | | | | | | | | * Add support for using a Connect Server.Tails developers2015-03-164-10/+48
| | | | | | | | | | | | * Do proper option parsing.Tails developers2015-03-162-11/+16
| | | | | | | | | | | | * Merge branch 'stable' into test/8001-8002-pidgin-xmp-otrintrigeri2015-03-145-11/+91
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/bugfix/8941-start-remote-shell-before-gr...intrigeri2015-03-125-11/+91
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
generated by cgit v1.1 at 2019-06-25 09:51:21 +0000