Skip to content

Commit c77d16c

Browse files
committed
Integrate changes of v1.1.5
1 parent 4f37ac5 commit c77d16c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+89
-80
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015 Threema GmbH
3+
Copyright (c) 2015-2016 Threema GmbH
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

+1-1

source/Threema/Console/Command/Base.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/Capability.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/Credits.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/Decrypt.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/DerivePublicKey.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/Encrypt.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/GenerateKeyPair.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/HashEmail.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/HashPhone.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/LookupIdByEmail.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/LookupIdByPhoneNo.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/LookupPublicKeyById.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/ReceiveMessage.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/SendE2EFile.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/SendE2EImage.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/SendE2EText.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Command/SendSimple.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Common.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Console/Run.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Core/AssocArray.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Core/Exception.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Core/KeyPair.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/Core/Url.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/Capability.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/CommandInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/Credits.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/DownloadFile.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/FetchPublicKey.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/LookupEmail.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/LookupPhone.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/MultiPartCommandInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/Results/CapabilityResult.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/Results/CreditsResult.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/Results/DownloadFileResult.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/Results/FetchPublicKeyResult.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/Results/LookupIdResult.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/Results/Result.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/Results/SendE2EResult.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/Results/SendSimpleResult.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/Results/UploadFileResult.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/SendE2E.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

source/Threema/MsgApi/Commands/SendSimple.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @author Threema GmbH
4-
* @copyright Copyright (c) 2015 Threema GmbH
4+
* @copyright Copyright (c) 2015-2016 Threema GmbH
55
*/
66

77

0 commit comments

Comments
 (0)