Skip to content

Commit

Permalink
Merge pull request #505 from koillection/1.3
Browse files Browse the repository at this point in the history
1.3
  • Loading branch information
benjaminjonard authored Sep 12, 2022
2 parents bde4075 + 49a3646 commit 21d1225
Show file tree
Hide file tree
Showing 31 changed files with 1,588 additions and 343 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ jobs:
with:
context: .
push: true
build-args: GITHUB_RELEASE=1.3.12
tags: docker.io/koillection/koillection:latest,docker.io/koillection/koillection:1.3.12
build-args: GITHUB_RELEASE=1.3.13
tags: docker.io/koillection/koillection:latest,docker.io/koillection/koillection:1.3.13
platforms: linux/amd64,linux/arm64
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# Changelog
All notable changes to this project will be documented in this file.

## [1.3.13] / 2022-09-12
### Features
- Add possibility to order columns in list display mode (benjaminjonard)
- Add possibility to hide actions and visibility in list display mode (benjaminjonard)

### Fixes
- Fix sql export in admin panel (benjaminjonard)
- Fix error on collection edit (benjaminjonard)

### Miscellaneous
- Make table headers sticky (benjaminjonard)

## [1.3.12] / 2022-08-29
### Fixes
- Fix empty logs in production environment (benjaminjonard)
Expand Down
14 changes: 0 additions & 14 deletions assets/controllers/items-display-mode-list-columns_controller.js

This file was deleted.

17 changes: 17 additions & 0 deletions assets/controllers/list-properties_controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { Controller } from 'stimulus';

export default class extends Controller {
static targets = ['property'];

displayProperties(event) {
if (event.target.value == 'list') {
this.propertyTargets.forEach((property) => {
property.classList.remove('hidden')
});
} else {
this.propertyTargets.forEach((property) => {
property.classList.add('hidden')
});
}
}
}
9 changes: 8 additions & 1 deletion assets/styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ html {
height: 100%;
}

thead th {
position: sticky;
top: 74px;
z-index: 1;
background-color: #fff;
}

body:not(.error) {
margin-left: 230px;
outline: none;
Expand Down Expand Up @@ -2247,7 +2254,7 @@ input[type="text"]:not(.browser-default).password-input {
top: -41px;
}

.items-table td, .items-table th {
.items-table td {
padding: 10px 5px;
}

Expand Down
1 change: 1 addition & 0 deletions assets/styles/themes/dark-mode.css
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ body, .btn-dark-grey, input, select, textarea, .setting-input label, h2.statisti
.select2-container--default .select2-results__option[aria-selected="true"],
.select2-dropdown, .autocomplete-content,
header #search_term, .sidebar-wrapper .header-logo,
thead th,
.nav-wrapper #search_term, body {
background-color: #2a2a2a;
}
Expand Down
351 changes: 173 additions & 178 deletions assets/yarn.lock

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,18 @@
"hautelook/alice-bundle": "^2.11",
"justinrainbow/json-schema": "^5.2",
"phpunit/phpunit": "^9.5",
"psalm/plugin-phpunit": "^0.17",
"psalm/plugin-symfony": "^3.1",
"rector/rector": "^0.14.0",
"symfony/browser-kit": "^6.1",
"symfony/css-selector": "^6.1",
"symfony/maker-bundle": "^1.43",
"symfony/phpunit-bridge": "^6.1",
"symfony/stopwatch": "^6.1",
"symfony/var-dumper": "^6.1",
"symfony/web-profiler-bundle": "^6.1"
"symfony/web-profiler-bundle": "^6.1",
"vimeo/psalm": "^4.24",
"weirdan/doctrine-psalm-plugin": "^2.3"
},
"repositories": [
{
Expand Down
Loading

0 comments on commit 21d1225

Please sign in to comment.