6a13b52d80
Merge branch '1.0' into 2.0
2020-07-07 23:35:07 -05:00
6537e74746
1.0.19 release
2020-07-07 23:31:58 -05:00
7cbeb7df48
Merge branch '2.0' into 3.0
2019-10-05 19:56:57 -05:00
cf8a7ef715
Merge branch '1.0' into 2.0
2019-10-05 19:56:28 -05:00
e37b7a7e48
Remove obsolete code coverage upload solution.
2019-10-05 09:43:08 +02:00
2fee8e22c1
Merge branch '2.0' into 3.0
2019-09-16 23:12:19 -05:00
dc075281ba
Merge branch '1.0' into 2.0
2019-09-16 23:12:11 -05:00
ec1fcfe648
1.0.18 release
2019-09-16 23:11:10 -05:00
853649320b
Merge branch '2.0'
2019-09-15 18:24:00 -05:00
30ae777ef6
Merge branch '1.0' into 2.0
2019-09-15 18:23:49 -05:00
db324e5d01
1.0.17 release
2019-09-15 18:22:55 -05:00
113f8dec08
Merge branch '2.0'
2019-07-02 07:12:24 -05:00
c583406f18
Merge branch '1.0' into 2.0
2019-07-02 07:04:02 -05:00
e942f9b1c3
README: misc updates
2019-07-02 07:03:46 -05:00
39eda40ed7
Merge branch '2.0'
2019-06-13 01:16:37 -05:00
60519001db
Merge branch '1.0' into 2.0
2019-06-13 01:15:54 -05:00
d77bb6e42b
1.0.16 release
2019-06-13 01:15:36 -05:00
47280b4e44
Merge branch '2.0'
2019-03-10 11:53:57 -05:00
11cf67cf78
Merge branch '1.0' into 2.0
2019-03-10 11:53:45 -05:00
849f997633
1.0.15 release
2019-03-10 11:51:38 -05:00
ee742d4edb
Merge branch '2.0'
2019-02-05 23:31:20 -06:00
8ebfcadbf3
Merge branch '1.0' into 2.0
2019-01-27 13:37:29 -06:00
7432a6959a
1.0.14 release
2019-01-27 13:35:10 -06:00
92f0ee0464
Merge branch '2.0'
2018-11-20 07:52:04 -06:00
7538b9c403
Merge branch '1.0' into 2.0
2018-11-20 07:50:46 -06:00
403f756c82
README: Declare 2.0 branch as LTS. #1310
2018-11-14 21:42:06 +01:00
451949a5f3
Merge branch '2.0'
2018-11-04 00:46:10 -05:00
8814dc7841
Merge branch '1.0' into 2.0
2018-11-04 00:45:48 -05:00
20c35d9c75
1.0.12 release
2018-11-04 00:38:52 -05:00
cc6131a329
Fix composer require syntax in readme
...
According to https://getcomposer.org/doc/03-cli.md#require
2018-05-10 15:51:30 +02:00
03d59d73c0
Merge branch '2.0'
2018-04-15 11:55:13 -05:00
7053f06f91
Merge branch '1.0' into 2.0
2018-04-15 11:55:05 -05:00
fd33675e48
1.0.11 release
2018-04-15 11:51:35 -05:00
1669e24269
Merge branch '2.0'
2018-02-18 22:29:37 -06:00
d305b78082
Merge branch '1.0' into 2.0
2018-02-18 22:29:13 -06:00
894ac25e17
1.0.10 release
2018-02-18 22:25:41 -06:00
7ed7ff2277
README: rm merge conflict code
2018-01-30 00:45:27 -06:00
489627f803
Merge branch '2.0'
2018-01-30 00:40:20 -06:00
2165445f39
Merge branch '1.0' into 2.0
2018-01-30 00:39:52 -06:00
6e9e61c7ca
README: rm patron link
2018-01-30 00:39:13 -06:00
0a58b73037
Merge branch '2.0'
2017-11-29 00:38:20 -06:00
c9a3fe35e2
Merge branch '1.0' into 2.0
2017-11-29 00:38:08 -06:00
2bab4e4bd6
1.0.9 release
2017-11-29 00:37:04 -06:00
12f7358c67
Merge branch '2.0'
2017-10-23 00:09:07 -05:00
f4b6a522df
Merge branch '1.0' into 2.0
2017-10-23 00:04:54 -05:00
817bebef47
README: update latest 1.0 version to 1.0.8
2017-10-23 00:03:25 -05:00
a2182d503f
Merge branch '2.0'
2017-09-09 20:40:25 -05:00
bcdb4b6c4a
Merge branch '1.0' into 2.0
2017-09-09 20:40:00 -05:00
76070ff5e2
README: add patreon link
2017-09-09 20:39:11 -05:00
f5e0cab82d
Merge branch '2.0'
2017-06-05 01:33:15 -05:00
6ecf69b201
Merge branch '1.0' into 2.0
2017-06-05 01:25:41 -05:00
55623933f3
1.0.7 release
2017-06-05 01:22:53 -05:00
7882249a14
Merge branch '2.0'
2017-05-08 00:58:42 -05:00
f8dd0e18d2
Merge branch '1.0' into 2.0
2017-05-08 00:58:35 -05:00
aa8368ed12
README: add 1.0.6 release
2017-05-08 00:58:24 -05:00
74abcb45ed
Merge branch '2.0'
...
* 2.0:
README: Fix typos.
2016-12-25 16:50:17 +01:00
00325a3050
Merge branch '1.0' into 2.0
...
* 1.0:
README: Fix typos.
2016-12-25 16:50:17 +01:00
a0e6bd87f2
README: Fix typos.
2016-12-25 16:09:17 +01:00
68b5a8896f
Merge branch '2.0'
2016-12-24 20:06:51 -06:00
f74ba2c581
Merge branch '1.0' into 2.0
2016-12-24 19:49:30 -06:00
c7390e26f5
README: Reword 1.0 PEAR installation instructions.
2016-12-18 11:08:04 +01:00
804cade3c0
README: Add branches section.
2016-12-18 11:02:41 +01:00
bd5b8809e8
README: Merge 'Installing Development Dependencies' into 'Contributing'.
2016-12-18 10:40:25 +01:00
d0d26cd29f
README: Remove pipe into php.
2016-12-18 10:38:28 +01:00
3cebd4ec59
README: Update Coverage and API URLs.
2016-12-18 10:32:35 +01:00
2d2bf2990e
Merge branch '2.0'
2016-11-08 09:23:53 -06:00
9e15d0c583
Merge branch '1.0' into 2.0
2016-10-22 13:11:38 -05:00
38fa7332e9
update for 1.0.5 release..
2016-10-22 12:53:16 -05:00
d66b6c251c
Merge branch '2.0'
2016-10-03 19:57:11 -05:00
ab8028c93c
Merge branch '1.0' into 2.0
2016-10-03 19:57:04 -05:00
2dfe9c5de7
README: update download link to 1.0.4
2016-10-03 19:56:50 -05:00
5416b9eddc
Merge branch '2.0'
2016-08-28 10:45:37 -05:00
41f85e9c25
Merge branch '1.0' into 2.0
2016-08-18 13:49:14 -05:00
c27fd2e66f
updates for 1.0.3 release
2016-08-18 13:43:04 -05:00
a3fdde757d
Merge branch '2.0'
2016-05-07 19:01:46 -05:00
511a7b77ba
Merge branch '1.0' into 2.0
2016-05-07 19:01:31 -05:00
b8f3a76632
README: update download link
2016-05-07 19:01:00 -05:00
398a795e1f
Revert "undo merging of master to 2.0 branch"
...
This reverts commit 8fb4c3363d
2016-04-30 16:23:35 -05:00
8fb4c3363d
undo merging of master to 2.0 branch
2016-04-28 15:34:10 -05:00
b4cf10fc94
Revert "Merge branch '2.0'"
...
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c
2016-04-10 11:30:59 -05:00
4b69dcb1ca
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
...
This reverts commit ef04c870e9cd57bf31ae
2016-04-10 11:25:31 -05:00
0f1eca35ac
Merge branch '2.0'
2016-01-18 11:07:26 -06:00
ba6fb78f72
Merge branch '1.0' into 2.0
2016-01-18 11:07:21 -06:00
f60e365be2
README: update download link
2016-01-18 11:07:12 -06:00
e7cf8ae383
Merge branch '2.0'
...
* 2.0:
README: Use the svg Travis image
2015-11-19 09:38:20 +01:00
43e8bb8273
Merge branch '1.0' into 2.0
...
* 1.0:
README: Use the svg Travis image
2015-11-19 09:37:14 +01:00
e9e5c412ad
README: Use the svg Travis image
2015-11-19 09:22:46 +01:00
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
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
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
fa41c5cac6
Fixed readme
2015-09-15 17:32:08 +01:00
7d11c830ce
Fixed readme
2015-09-15 17:30:33 +01:00
783a07fecd
Fixed readme links
2015-09-15 17:28:41 +01:00
2d1becc950
Merge branch '2.0'
2015-08-03 23:23:49 -05:00
33685080fb
Merge branch '1.0' into 2.0
...
Conflicts:
composer.json
2015-08-03 23:23:10 -05:00
844134df95
update phpseclib to 1.0.0
2015-08-03 21:22:12 -05:00
b241f50335
README: update links
2015-05-07 08:20:59 -05:00
4c4c8554a6
Merge branch '1.0' into 2.0
...
Conflicts:
README.md
2015-05-07 08:19:02 -05:00
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
2fee2d4f98
backport e3betht's PR to 1.0
2015-05-07 00:26:39 -05:00
terrafrost
terrafrost
Andreas Fischer
henk23
Kevin Ji
Mark McEver
Graham Campbell