terrafrost
8d41749d9e
Merge branch '2.0'
2016-10-22 13:10:38 -05:00
terrafrost
db7b8ad48f
Merge branch '1.0' into 2.0
2016-10-22 13:10:21 -05:00
terrafrost
38fa7332e9
update for 1.0.5 release..
2016-10-22 12:53:16 -05:00
terrafrost
d66b6c251c
Merge branch '2.0'
2016-10-03 19:57:11 -05:00
terrafrost
ab8028c93c
Merge branch '1.0' into 2.0
2016-10-03 19:57:04 -05:00
terrafrost
2dfe9c5de7
README: update download link to 1.0.4
2016-10-03 19:56:50 -05:00
terrafrost
5416b9eddc
Merge branch '2.0'
2016-08-28 10:45:37 -05:00
terrafrost
41f85e9c25
Merge branch '1.0' into 2.0
2016-08-18 13:49:14 -05:00
terrafrost
c27fd2e66f
updates for 1.0.3 release
2016-08-18 13:43:04 -05:00
terrafrost
a3fdde757d
Merge branch '2.0'
2016-05-07 19:01:46 -05:00
terrafrost
511a7b77ba
Merge branch '1.0' into 2.0
2016-05-07 19:01:31 -05:00
terrafrost
b8f3a76632
README: update download link
2016-05-07 19:01:00 -05:00
terrafrost
398a795e1f
Revert "undo merging of master to 2.0 branch"
...
This reverts commit 8fb4c3363d
2016-04-30 16:23:35 -05:00
terrafrost
8fb4c3363d
undo merging of master to 2.0 branch
2016-04-28 15:34:10 -05:00
terrafrost
b4cf10fc94
Revert "Merge branch '2.0'"
...
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c
2016-04-10 11:30:59 -05:00
terrafrost
4b69dcb1ca
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
...
This reverts commit ef04c870e9cd57bf31ae
2016-04-10 11:25:31 -05:00
terrafrost
0f1eca35ac
Merge branch '2.0'
2016-01-18 11:07:26 -06: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
Andreas Fischer
e7cf8ae383
Merge branch '2.0'
...
* 2.0:
README: Use the svg Travis image
2015-11-19 09:38:20 +01:00
Andreas Fischer
43e8bb8273
Merge branch '1.0' into 2.0
...
* 1.0:
README: Use the svg Travis image
2015-11-19 09:37:14 +01:00
Kevin Ji
e9e5c412ad
README: Use the svg Travis image
2015-11-19 09:22:46 +01:00
Andreas Fischer
ac7c4b83e4
Merge branch '2.0'
...
* 2.0:
Removed the deprecated "--dev" argument from the recommended composer command. When that argument is specified, composer prints the following:
2015-11-10 09:45:42 +01:00
Andreas Fischer
98ae83482b
Merge branch '1.0' into 2.0
...
* 1.0:
Removed the deprecated "--dev" argument from the recommended composer command. When that argument is specified, composer prints the following:
2015-11-10 09:45:42 +01:00
Mark McEver
c1659a5842
Removed the deprecated "--dev" argument from the recommended composer command. When that argument is specified, composer prints the following:
...
You are using the deprecated option "dev". Dev packages are installed by default now.
2015-11-08 09:30:22 -06:00
Graham Campbell
fa41c5cac6
Fixed readme
2015-09-15 17:32:08 +01:00
Graham Campbell
7d11c830ce
Fixed readme
2015-09-15 17:30:33 +01:00
Graham Campbell
783a07fecd
Fixed readme links
2015-09-15 17:28:41 +01:00
terrafrost
2d1becc950
Merge branch '2.0'
2015-08-03 23:23:49 -05:00
terrafrost
33685080fb
Merge branch '1.0' into 2.0
...
Conflicts:
composer.json
2015-08-03 23:23:10 -05:00
terrafrost
844134df95
update phpseclib to 1.0.0
2015-08-03 21:22:12 -05:00
terrafrost
b241f50335
README: update links
2015-05-07 08:20:59 -05:00
terrafrost
4c4c8554a6
Merge branch '1.0' into 2.0
...
Conflicts:
README.md
2015-05-07 08:19:02 -05:00
terrafrost
ae41aca610
README: rm codeclimate badge
...
it's giving us a low score for code who's complexity can't easily be changed
and dinging us for "short variables" that are based on the RFC's of the undyling
encryption algorithms
2015-05-07 08:16:03 -05:00
terrafrost
2fee2d4f98
backport e3betht's PR to 1.0
2015-05-07 00:26:39 -05:00
terrafrost
becb9524ff
Merge branch '1.0' into 2.0
2015-02-05 07:50:55 -06:00
terrafrost
c047e69d3e
README: update download link to latest version
2015-02-05 07:50:26 -06:00
Andreas Fischer
7030e8502b
Merge branch 'master' into php5
...
* master:
update download version in README.me
add CHANGELOG.md
2014-11-14 00:35:35 +01:00
terrafrost
76c1c6607f
update download version in README.me
2014-11-09 21:08:08 -06:00
Andreas Fischer
eff5f64560
Merge branch 'master' into php5
...
* master:
ASN1: fix unit test
ASN1: add unit test for non-constructed context-specific change
ASN1: fix issue with non-constructed context-specific tags
README: update download link to 0.3.8
2014-09-24 16:50:12 +02:00
terrafrost
5085202f1f
README: update download link to 0.3.8
2014-09-12 21:42:45 -05:00
Andreas Fischer
69edbc9794
Merge branch 'master' into php5
...
* master:
Add "Documentation" section to README. Add link to Sami.
Conflicts:
README.md
2014-08-01 18:10:30 +02:00
Andreas Fischer
9bafd88174
Add "Documentation" section to README. Add link to Sami.
2014-08-01 18:00:35 +02:00
Andreas Fischer
237e238268
Merge branch 'master' into php5
...
* master:
Add Support section to README.
Conflicts:
README.md
2014-07-17 02:47:04 +02:00
Andreas Fischer
48b9d3ccfb
Add Support section to README.
2014-07-14 20:21:37 +02:00
Andreas Fischer
8e0b9b2d64
Merge branch 'master' into php5
...
* master:
SFTP: fix an issue with the stat cache
README: update download link to latest version
2014-07-12 12:08:36 +02:00
terrafrost
8b8c62f278
README: update download link to latest version
2014-07-05 11:36:21 -05:00
Andreas Fischer
d22dfbff20
Merge branch 'master' into php5
...
* master:
Use "Development Dependencies" instead of "Dependencies" for less confusion.
Capitalisation improvements.
Add Contributing section to README.md
Add section about Dependency Installation to README.md
2014-04-18 16:44:57 +02:00
Andreas Fischer
4fece986e3
Use "Development Dependencies" instead of "Dependencies" for less confusion.
...
There are currently no production dependencies.
2014-04-15 16:51:50 +02:00
Andreas Fischer
9653e3c70f
Capitalisation improvements.
2014-04-12 20:42:15 +02:00
