Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'stable' into feature/8740-new-signing-key-phase-2feature/8740-new-signing-key-phase-2 | intrigeri | 2015-03-18 | 56 | -83/+979 |
|\ | |||||
| * | Merge branch 'test/8001-8002-pidgin-xmp-otr' into stable | intrigeri | 2015-03-17 | 46 | -35/+667 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/stable' into test/8001-8002-pidgin-xmp-otr | intrigeri | 2015-03-17 | 0 | -0/+0 |
| | |\ | | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'origin/stable' into stable | intrigeri | 2015-03-17 | 101 | -3202/+6834 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/test/7820-pidgin-irc-ctcp' into stable | intrigeri | 2015-03-15 | 5 | -26/+159 |
| |\ \ \ | |||||
| | | | * | Merge remote-tracking branch 'origin/test/9062-otr-bot-with-python-potr' into... | Tails developers | 2015-03-17 | 4 | -72/+130 |
| | | | |\ | |||||
| | | | | * | Kill dead code. | Tails developers | 2015-03-17 | 1 | -4/+0 |
| | | | | * | Convert old OTR keys to the new format. | Tails developers | 2015-03-17 | 2 | -0/+61 |
| | | | | * | Migrate to python-potr. | Tails developers | 2015-03-16 | 2 | -72/+73 |
| | | | * | | Use existing random_*_string() functions. | Tails developers | 2015-03-17 | 1 | -6/+1 |
| | | | * | | Merge branch 'stable' into test/8001-8002-pidgin-xmp-otr | Tails developers | 2015-03-17 | 106 | -3234/+6993 |
| | | | |\ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge remote-tracking branch 'origin/test/7820-pidgin-irc-ctcp' into stable | Tails developers | 2015-03-17 | 5 | -26/+159 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/stable' into test/7820-pidgin-irc-ctcp | intrigeri | 2015-03-15 | 5 | -11/+91 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Deal with the case when we randomly pick an existing IRC nick. | Tails developers | 2015-03-12 | 1 | -0/+12 |
| | * | | | | Completely rework the CTCP test and helper class. | Tails developers | 2015-03-12 | 2 | -62/+96 |
| | * | | | | Do not accept CTCP replies from anyone but our target. | Tails developers | 2015-03-12 | 1 | -1/+1 |
| | * | | | | Improve instance variable name. | Tails developers | 2015-03-12 | 1 | -11/+11 |
| | * | | | | Reduce chance to be flood banned. | Tails developers | 2015-03-12 | 1 | -1/+1 |
| | * | | | | Improve error message. | Tails developers | 2015-03-12 | 1 | -1/+2 |
| | * | | | | Rename to CtcpChecker to clarify what it actually does. | Tails developers | 2015-03-12 | 2 | -4/+4 |
| | * | | | | Define alias to clarify what CtcpSpammer does on start. | Tails developers | 2015-03-12 | 2 | -1/+4 |
| | * | | | | Merge branch 'stable' into test/7820-pidgin-irc-ctcp | intrigeri | 2015-03-09 | 8 | -27/+59 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' into test/7820-pidgin-irc-ctcp | Tails developers | 2015-03-07 | 81 | -581/+1983 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Also check if we can handle the CTCP reply. | Tails developers | 2015-03-06 | 1 | -1/+2 |
| | * | | | | | | Test that Pidgin only responds to the expected CTCP requests. | Tails developers | 2015-02-27 | 5 | -26/+107 |
| | | | | * | | | Merge remote-tracking branch 'origin/stable' into stable | intrigeri | 2015-03-16 | 1 | -5/+44 |
| | | | | |\ \ \ | |||||
| | | | | | * \ \ | Merge remote-tracking branch 'origin/test/8894-log-file' into stable | Tails developers | 2015-03-16 | 1 | -5/+44 |
| | | | | | |\ \ \ | |||||
| | | | | | | * | | | Document --log-to-file in the usage function. | Tails developers | 2015-02-14 | 1 | -0/+2 |
| | | | | | | * | | | run_test_suite: remove control chars from the log file. | Tails developers | 2015-02-13 | 1 | -0/+21 |
| | | | | | | * | | | Have `script' continuously flush the test suite output to the log file. | Tails developers | 2015-02-13 | 1 | -1/+1 |
| | | | | | | * | | | Have `script' return the cucumber's exit code. | Tails developers | 2015-02-13 | 1 | -1/+1 |
| | | | | | | * | | | Enable pipefail option in run_test_suite. | Tails developers | 2015-02-13 | 1 | -1/+2 |
| | | | | | | * | | | Use long argument names, and clearer arguments ordering. | Tails developers | 2015-02-13 | 1 | -1/+1 |
| | | | | | | * | | | Add a --log-to-file option to run_test_suite. | Tails developers | 2015-02-13 | 1 | -4/+19 |
| | | | | | | * | | | Merge remote-tracking branch 'origin/testing' into devel | Tails developers | 2015-02-12 | 1 | -0/+6 |
| | | | | | | |\ \ \ | |||||
| | | | | | | * \ \ \ | Merge branch 'testing' into devel | Tails developers | 2015-02-12 | 14 | -71/+934 |
| | | | | | | |\ \ \ \ | |||||
| | | | | | | * \ \ \ \ | Merge remote-tracking branch 'origin/devel' into devel | Tails developers | 2015-02-12 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ | Merge branch 'testing' into devel | Tails developers | 2015-02-12 | 74 | -3496/+7624 |
| | | | | | | | |\ \ \ \ \ | |||||
| | | | | * | | | \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into stable | intrigeri | 2015-03-16 | 97 | -3191/+6780 |
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | | | |||||
| | | | | * | | | | | | | | | Merge remote-tracking branch 'kytv/bugfix/8952-bump-gnome-screenshot-timeout'... | Tails developers | 2015-03-16 | 1 | -1/+1 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | Bump screenshot. | kytv | 2015-03-02 | 1 | -1/+1 |
| | | | | * | | | | | | | | | | Merge remote-tracking branch 'kytv/bugfix/8951-new-signing-key' into stable | Tails developers | 2015-03-16 | 3 | -5/+9 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | Move fingerprints to config.rb | Tails developers | 2015-03-02 | 2 | -4/+8 |
| | | | | * | | | | | | | | | | Switch to the new signing key in config/amnesia. | Tails developers | 2015-03-02 | 1 | -1/+1 |
| | | | | |/ / / / / / / / / | |||||
| | | | | | | | | | | | * | | Document known-good XMPP servers for the pidgin tests. | Tails developers | 2015-03-16 | 1 | -0/+7 |
| | | | | | | | | | | | |/ | |||||
| | | | | | | | | | | | * | Reduce risk for confusion. | Tails developers | 2015-03-16 | 1 | -8/+7 |
| | | | | | | | | | | | * | Add support for using a Connect Server. | Tails developers | 2015-03-16 | 4 | -10/+48 |
| | | | | | | | | | | | * | Do proper option parsing. | Tails developers | 2015-03-16 | 2 | -11/+16 |
| | | | | | | | | | | | * | Merge branch 'stable' into test/8001-8002-pidgin-xmp-otr | intrigeri | 2015-03-14 | 5 | -11/+91 |
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/bugfix/8941-start-remote-shell-before-gr... | intrigeri | 2015-03-12 | 5 | -11/+91 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | |