Skip to content

Commit

Permalink
## [2.2.1] - 2018-02-16
Browse files Browse the repository at this point in the history
### Added
- Link to attachment [525](#525)

### Fixed
- Base64 URL Safe  [525](tabuna/tutorial_create_profile_for_orchid#1)
- Double file extension  [525](#526)

### Changed
- Font Awesome replaced by ORCHID icons
- config "slog" is default

### Removed
- Icon for group
  • Loading branch information
tabuna committed Feb 16, 2018
1 parent 711e849 commit 6acdecd
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 5 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [2.2.1] - 2018-02-16

### Added
- Link to attachment [525](https://github.com/orchidsoftware/platform/issues/525)

### Fixed
- Base64 URL Safe [525](https://github.com/tabuna/tutorial_create_profile_for_orchid/issues/1)
- Double file extension [525](https://github.com/orchidsoftware/platform/issues/526)

### Changed
- Base64 URL Safe
- Font Awesome replaced by ORCHID icons
- config "slog" is default

Expand Down
2 changes: 1 addition & 1 deletion public/js/orchid.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"/js/orchid.js": "/js/orchid.js?id=6fbc22988eb87e017c67",
"/js/orchid.js": "/js/orchid.js?id=4a39baeec11eb4435ca8",
"/css/orchid.css": "/css/orchid.css?id=3226c4b75f4d20018143"
}
2 changes: 2 additions & 0 deletions resources/assets/js/components/attachment.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ document.addEventListener('turbolinks:load', function() {
loadInfo: function(data) {
let name = data.name + data.id;

data.url = '/storage/' + data.path + data.name + '.' + data.extension;

if (!this.attachment.hasOwnProperty(name)) {
this.attachment[name] = data;
}
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/post/uploads.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'name' => 'Display Name',
'alt' => 'Alternative Text',
'description' => 'Description',
'link' => 'Link',
],

];
1 change: 1 addition & 0 deletions resources/lang/ru/post/uploads.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'name' => 'Отображаемое имя',
'alt' => 'Альтернативный текст',
'description' => 'Описание',
'link' => 'Ссылка',
],

];
5 changes: 5 additions & 0 deletions resources/views/container/posts/modules/upload.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ class="fa fa-times"></i>
rows="3"></textarea>
</div>


<p class="text-right">
<a v-bind:href="attachment[active].url" target="_blank" class="btn btn-link pull-left"><i class="icon-link"></i>
{{trans('dashboard::post/uploads.information.link')}}
</a>

<button type="button" v-on:click="save"
class="btn btn-default">{{trans('dashboard::common.Apply')}}</button>
</p>
Expand Down
2 changes: 1 addition & 1 deletion src/Platform/Http/Controllers/Systems/MediaController.php
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function upload(Request $request)
{
try {
foreach ($request->files as $file) {
$path = $file->move(Storage::disk($this->filesystem)->getDriver()->getAdapter()->getPathPrefix(), $file->getClientOriginalName().'.'.$file->getClientOriginalExtension());
$path = $file->move(Storage::disk($this->filesystem)->getDriver()->getAdapter()->getPathPrefix(), $file->getClientOriginalName());
}
$success = true;
$message = trans('dashboard::systems/media.success_uploaded_file');
Expand Down
2 changes: 1 addition & 1 deletion src/Platform/Kernel/Dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Dashboard
/**
* ORCHID Version.
*/
const VERSION = '2.2.0';
const VERSION = '2.2.1';

/**
* @var
Expand Down

0 comments on commit 6acdecd

Please sign in to comment.