Joey3000
|
bdc28b9453
|
Cherry-picking cleanup of use operator usage
Picked c9a80ff748 to the 2.0 branch and resolved conflicts.
|
2016-01-21 19:41:41 +01:00 |
|
terrafrost
|
ba6fb78f72
|
Merge branch '1.0' into 2.0
|
2016-01-18 11:07:21 -06:00 |
|
terrafrost
|
f60e365be2
|
README: update download link
|
2016-01-18 11:07:12 -06:00 |
|
terrafrost
|
91690c773b
|
Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0
|
2016-01-18 10:28:48 -06:00 |
|
terrafrost
|
4500b93ba7
|
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
|
2016-01-18 10:28:19 -06:00 |
|
terrafrost
|
7b57a869e9
|
Merge branch '1.0' into 2.0
|
2016-01-18 10:27:55 -06:00 |
|
Prayag Verma
|
008b628548
|
Update license year range to 2016
|
2016-01-18 10:27:43 -06:00 |
|
terrafrost
|
9ce04a78d7
|
Merge branch '1.0' into 2.0
|
2016-01-18 07:45:38 -06:00 |
|
terrafrost
|
1d1592b6d0
|
CHANGELOG: add 1.0.1 changes
|
2016-01-18 07:45:13 -06:00 |
|
terrafrost
|
feb721fa3d
|
Merge branch '1.0' into 2.0
|
2016-01-17 09:35:23 -06:00 |
|
terrafrost
|
75cc73f07a
|
TravisCI: drop 5.3.3 due to compose errors on it
|
2016-01-17 09:35:18 -06:00 |
|
terrafrost
|
b6899d9e79
|
Merge branch '1.0' into 2.0
|
2016-01-13 16:51:33 -06:00 |
|
terrafrost
|
0905143fc1
|
SSH/Agent: fix possible PHP Warning
|
2016-01-13 16:51:12 -06:00 |
|
terrafrost
|
6cfd101701
|
Merge branch '1.0' into 2.0
|
2016-01-12 09:37:59 -06:00 |
|
Michele Locati
|
c24ee966ad
|
Exclude some dirs and files from repository auto-generated ZIP archives
|
2016-01-12 09:37:17 -06:00 |
|
Matthieu Napoli
|
74c40a7cbe
|
#842 Add 2.0.0 changelog
|
2016-01-08 13:28:39 -06:00 |
|
terrafrost
|
e4461e8659
|
Merge branch '1.0' into 2.0
|
2016-01-08 10:43:04 -06:00 |
|
terrafrost
|
62fc4bbc88
|
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
|
2016-01-08 10:42:59 -06:00 |
|
terrafrost
|
1e15ef5a55
|
Merge branch 'bitwise-not-1.0' into 2.0
|
2016-01-08 10:42:20 -06:00 |
|
terrafrost
|
7ad9eade2d
|
BigInteger: fix issue with doing bitwise not on 0
|
2016-01-08 10:31:48 -06:00 |
|
terrafrost
|
001ad99d73
|
Merge branch '1.0' into 2.0
|
2015-12-23 23:32:20 -06:00 |
|
terrafrost
|
1be0ac9f7f
|
SFTP/Stream: fix issue with filenames with hash in them
|
2015-12-23 13:13:06 -06:00 |
|
terrafrost
|
d86550f5de
|
Merge remote-tracking branch 'origin/authenticated-2.0' into 2.0
|
2015-12-16 21:03:27 -06:00 |
|
terrafrost
|
600f9c4e4b
|
SSH2: update isAuthenticated to work with 2.0 / master branches
|
2015-12-16 09:21:37 -06:00 |
|
terrafrost
|
d17aeffc04
|
Merge branch 'authenticated-1.0' into authenticated-2.0
|
2015-12-16 09:20:27 -06:00 |
|
terrafrost
|
57063f3604
|
SSH2: add isAuthenticated() method
|
2015-12-15 23:19:05 -06:00 |
|
terrafrost
|
eac8613c75
|
BigInteger: 2.0 specific updates for __debuginfo
|
2015-12-14 13:56:07 -06:00 |
|
terrafrost
|
89af727f32
|
Merge branch '1.0' into 2.0
|
2015-12-14 13:28:10 -06:00 |
|
terrafrost
|
cae579a19b
|
Tests/BigInteger: update testDebugInfo test
|
2015-12-14 13:26:56 -06:00 |
|
terrafrost
|
2d2f359300
|
Tests/BigInteger: fix for 2.0 branch
|
2015-12-14 13:03:07 -06:00 |
|
terrafrost
|
6d2c25b954
|
Merge branch 'identifier-update-2.0' into 2.0
|
2015-12-14 11:08:04 -06:00 |
|
terrafrost
|
786cecf309
|
Merge branch '1.0' into identifier-update-1.0
|
2015-12-14 11:07:42 -06:00 |
|
terrafrost
|
b95504ac8f
|
Merge branch 'rsa-pkcs8-fix-2.0-2' into 2.0
|
2015-12-14 11:02:49 -06:00 |
|
terrafrost
|
8448f63d76
|
Merge branch '1.0' into 2.0
|
2015-12-14 11:01:51 -06:00 |
|
terrafrost
|
b9ce54aae9
|
Travis: re-add hhvm and use zenovich github repo only
|
2015-12-13 16:16:50 -06:00 |
|
terrafrost
|
f17f1b2baf
|
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into small-tweaks-2
|
2015-12-11 13:44:39 -06:00 |
|
terrafrost
|
1c9ee4ef28
|
RSA: fix PKCS8 key handling (again)
|
2015-12-07 23:53:09 -06:00 |
|
terrafrost
|
d8b74a7ee0
|
SSH2: update unit test
|
2015-12-07 22:02:02 -06:00 |
|
terrafrost
|
c655b16f75
|
BigInteger: add engine to __debugInfo output and add unit test
|
2015-12-07 15:22:53 -06:00 |
|
terrafrost
|
09786e2f17
|
Merge branch '2.0' into identifier-update-2.0
|
2015-12-07 15:21:05 -06:00 |
|
terrafrost
|
faa977c587
|
Merge branch '1.0' into identifier-update-1.0
|
2015-12-07 15:20:45 -06:00 |
|
terrafrost
|
8eb581a430
|
Merge branch 'travis-fix-1.0' into 2.0
Conflicts:
.travis.yml
|
2015-12-07 15:18:21 -06:00 |
|
terrafrost
|
fe6e60c5bd
|
Travis: rm hhvm
|
2015-12-07 15:00:17 -06:00 |
|
terrafrost
|
c0632bb8af
|
Travis: compile GNU Parallel
|
2015-12-06 23:30:37 -06:00 |
|
terrafrost
|
ddf55b8009
|
Merge branch 'identifier-update-1.0' into identifier-update-2.0
Conflicts:
phpseclib/Net/SSH2.php
|
2015-12-05 10:35:30 -06:00 |
|
terrafrost
|
ee0f45fea6
|
update identifier to current version
|
2015-12-05 10:33:28 -06:00 |
|
Andreas Fischer
|
9f0f8fd7e5
|
Correct indentation on pvno array definition.
|
2015-12-05 10:33:28 -06:00 |
|
terrafrost
|
041ece8b6c
|
Merge branch 'identifier-update-1.0' into 2.0
Conflicts:
phpseclib/Net/SSH2.php
|
2015-12-05 10:30:08 -06:00 |
|
terrafrost
|
fe404065f1
|
update identifier to current version
|
2015-12-05 10:27:51 -06:00 |
|
terrafrost
|
b5ac556213
|
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
|
2015-12-05 10:27:07 -06:00 |
|