Skip to content
This repository was archived by the owner on Jul 27, 2023. It is now read-only.

Commit e7aab45

Browse files
schoradtschoradt
committed
Merge tag '1.0.8'
version 1.0.8
2 parents 8a565c1 + 2fd078f commit e7aab45

21 files changed

+170
-44
lines changed

‎.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
language: php
22

33
php:
4-
- 5.5
54
- 5.6
6-
- hhvm
5+
- 7.0
6+
- 7.1
77

88
install:
99
- composer self-update
10-
- composer global require "fxp/composer-asset-plugin:^1.2.0"
10+
- composer global require "fxp/composer-asset-plugin:~1.3"
1111
- composer install
1212

1313
before_script:

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
175175
## Credits
176176

177177
- [Antonio Ramirez](https://github.com/tonydspaniard)
178-
- [Alexander Kochetov](https://github.com/creocoder)
179178
- [All Contributors](https://github.com/2amigos/yii2-file-upload-widget/graphs/contributors)
180179

181180
## License

‎composer.json

+8-9
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
"license": "BSD-3-Clause",
1414
"homepage": "https://github.com/2amigos/yii2-file-upload-widget",
1515
"authors": [
16-
{
17-
"name": "Alexander Kochetov",
18-
"email": "[email protected]",
19-
"role": "Developer"
20-
},
2116
{
2217
"name": "2amigOS! Consulting Group",
2318
"email": "[email protected]",
@@ -39,11 +34,15 @@
3934
"dosamigos\\fileupload\\": "src"
4035
}
4136
},
37+
"config": {
38+
"fxp-asset": {
39+
"installer-paths": {
40+
"npm-asset-library": "vendor/npm",
41+
"bower-asset-library": "vendor/bower"
42+
}
43+
}
44+
},
4245
"extra": {
43-
"asset-installer-paths": {
44-
"npm-asset-library": "vendor/npm",
45-
"bower-asset-library": "vendor/bower"
46-
},
4746
"branch-alias": {
4847
"dev-master": "1.0-dev"
4948
}

‎src/BaseUpload.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77

@@ -15,7 +15,7 @@
1515
/**
1616
* Base class for both uploaders.
1717
*
18-
* @author Alexander Kochetov <[email protected]>
18+
* @author Antonio Ramirez <[email protected]>
1919
*/
2020
class BaseUpload extends InputWidget
2121
{

‎src/BlueimpCanvasToBlobAsset.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77

@@ -12,7 +12,7 @@
1212
/**
1313
* FileUploadPlusAsset
1414
*
15-
* @author Alexander Kochetov <[email protected]>
15+
* @author Antonio Ramirez <[email protected]>
1616
*/
1717
class BlueimpCanvasToBlobAsset extends AssetBundle
1818
{

‎src/BlueimpLoadImageAsset.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77

@@ -12,7 +12,7 @@
1212
/**
1313
* FileUploadPlusAsset
1414
*
15-
* @author Alexander Kochetov <[email protected]>
15+
* @author Antonio Ramirez <[email protected]>
1616
*/
1717
class BlueimpLoadImageAsset extends AssetBundle
1818
{

‎src/BlueimpTmplAsset.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77

@@ -12,7 +12,7 @@
1212
/**
1313
* FileUploadUIAsset
1414
*
15-
* @author Alexander Kochetov <[email protected]>
15+
* @author Antonio Ramirez <[email protected]>
1616
*/
1717
class BlueimpTmplAsset extends AssetBundle
1818
{

‎src/FileUpload.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77

@@ -16,7 +16,7 @@
1616
*
1717
* Widget to render the jQuery File Upload Basic Uploader
1818
*
19-
* @author Alexander Kochetov <[email protected]>
19+
* @author Antonio Ramirez <[email protected]>
2020
*/
2121
class FileUpload extends BaseUpload
2222
{

‎src/FileUploadAsset.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77

@@ -12,7 +12,7 @@
1212
/**
1313
* FileUploadAsset
1414
*
15-
* @author Alexander Kochetov <[email protected]>
15+
* @author Antonio Ramirez <[email protected]>
1616
*/
1717
class FileUploadAsset extends AssetBundle
1818
{

‎src/FileUploadPlusAsset.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77

@@ -12,7 +12,7 @@
1212
/**
1313
* FileUploadPlusAsset
1414
*
15-
* @author Alexander Kochetov <[email protected]>
15+
* @author Antonio Ramirez <[email protected]>
1616
*/
1717
class FileUploadPlusAsset extends AssetBundle
1818
{

‎src/FileUploadUI.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77

@@ -17,7 +17,7 @@
1717
* Widget to render the jQuery File Upload UI plugin as shown in
1818
* [its demo](http://blueimp.github.io/jQuery-File-Upload/index.html)
1919
*
20-
* @author Alexander Kochetov <[email protected]>
20+
* @author Antonio Ramirez <[email protected]>
2121
*/
2222
class FileUploadUI extends BaseUpload
2323
{

‎src/FileUploadUIAsset.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77

@@ -12,7 +12,7 @@
1212
/**
1313
* FileUploadUIAsset
1414
*
15-
* @author Alexander Kochetov <[email protected]>
15+
* @author Antonio Ramirez <[email protected]>
1616
*/
1717
class FileUploadUIAsset extends AssetBundle
1818
{

‎src/actions/FileDeleteAction.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77
namespace dosamigos\fileupload\actions;

‎src/actions/FileListAction.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77
namespace dosamigos\fileupload\actions;

‎src/actions/FileUploadAction.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @link https://github.com/2amigos/yii2-file-upload-widget
4-
* @copyright Copyright (c) 2013-2016 2amigOS! Consulting Group LLC
4+
* @copyright Copyright (c) 2013-2017 2amigOS! Consulting Group LLC
55
* @license http://opensource.org/licenses/BSD-3-Clause
66
*/
77
namespace dosamigos\fileupload\actions;

‎src/messages/de/fileupload.php

+28-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,30 @@
1+
<?php
2+
/**
3+
* Message translations.
4+
*
5+
* This file is automatically generated by 'yii message' command.
6+
* It contains the localizable messages extracted from source code.
7+
* You may modify this file by translating the extracted messages.
8+
*
9+
* Each array element represents the translation (value) of a message (key).
10+
* If the value is empty, the message is considered as not translated.
11+
* Messages that no longer need translation will have their translations
12+
* enclosed between a pair of '@@' marks.
13+
*
14+
* Message string can be used with plural forms format. Check i18n section
15+
* of the guide for details.
16+
*
17+
* NOTE: this file must be saved in UTF-8 encoding.
18+
*/
19+
120
return [
2-
'Add files' => 'Dateien hochladen',
3-
'Start upload' => 'Upload starten',
4-
'Cancel upload' => 'Upload abbrechen',
5-
'Start' => 'Anfang',
6-
'Cancel' => 'Abbrechen',
7-
'Error' => 'Feheler',
8-
'Delete' => 'Löschen',
9-
'Processing' => 'Verarbeitung',
10-
'Select file...' => 'Dateien auswählen'
21+
'Add files' => 'Dateien hochladen',
22+
'Start upload' => 'Upload starten',
23+
'Cancel upload' => 'Upload abbrechen',
24+
'Start' => 'Anfang',
25+
'Cancel' => 'Abbrechen',
26+
'Error' => 'Feheler',
27+
'Delete' => 'Löschen',
28+
'Processing' => 'Verarbeitung',
29+
'Select file...' => 'Dateien auswählen'
1130
];

‎src/messages/el/fileupload.php

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
3+
/**
4+
* Message translations.
5+
*
6+
* This file is automatically generated by 'yii message' command.
7+
* It contains the localizable messages extracted from source code.
8+
* You may modify this file by translating the extracted messages.
9+
*
10+
* Each array element represents the translation (value) of a message (key).
11+
* If the value is empty, the message is considered as not translated.
12+
* Messages that no longer need translation will have their translations
13+
* enclosed between a pair of '@@' marks.
14+
*
15+
* Message string can be used with plural forms format. Check i18n section
16+
* of the guide for details.
17+
*
18+
* NOTE: this file must be saved in UTF-8 encoding.
19+
*/
20+
return [
21+
'Add files' => 'Προσθήκη αρχείων',
22+
'Start upload' => 'Έναρξη μεταφόρτωσης',
23+
'Cancel upload' => 'Ακύρωση μεταφόρτωσης',
24+
'Start' => 'Έναρξη',
25+
'Cancel' => 'Ακύρωση',
26+
'Error' => 'Λάθος',
27+
'Delete' => 'Διαγραφή',
28+
'Processing' => 'Επεξεργασία',
29+
'Select file...' => 'Επιλέξτε αρχείο...'
30+
];

‎src/messages/fa-IR/fileupload.php

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
3+
/**
4+
* Message translations.
5+
*
6+
* This file is automatically generated by 'yii message' command.
7+
* It contains the localizable messages extracted from source code.
8+
* You may modify this file by translating the extracted messages.
9+
*
10+
* Each array element represents the translation (value) of a message (key).
11+
* If the value is empty, the message is considered as not translated.
12+
* Messages that no longer need translation will have their translations
13+
* enclosed between a pair of '@@' marks.
14+
*
15+
* Message string can be used with plural forms format. Check i18n section
16+
* of the guide for details.
17+
*
18+
* NOTE: this file must be saved in UTF-8 encoding.
19+
*/
20+
return [
21+
'Add files' => 'افزودن فایل‌ها',
22+
'Start upload' => 'شروع آپلود',
23+
'Cancel upload' => 'لغو آپلود',
24+
'Start' => 'شروع',
25+
'Cancel' => 'لغو',
26+
'Error' => 'خطا',
27+
'Delete' => 'حذف',
28+
'Processing' => 'در حال پردازش',
29+
'Select file...' => 'انتخاب فایل ...'
30+
];

‎src/messages/it/fileupload.php

+19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
<?php
2+
3+
/**
4+
* Message translations.
5+
*
6+
* This file is automatically generated by 'yii message' command.
7+
* It contains the localizable messages extracted from source code.
8+
* You may modify this file by translating the extracted messages.
9+
*
10+
* Each array element represents the translation (value) of a message (key).
11+
* If the value is empty, the message is considered as not translated.
12+
* Messages that no longer need translation will have their translations
13+
* enclosed between a pair of '@@' marks.
14+
*
15+
* Message string can be used with plural forms format. Check i18n section
16+
* of the guide for details.
17+
*
18+
* NOTE: this file must be saved in UTF-8 encoding.
19+
*/
120
return [
221
'Add files' => 'Aggiungi file',
322
'Start upload' => 'Inizia Upload',

0 commit comments

Comments
 (0)