scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-11 14:45:59 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3249 from biosistemika/develop

Browse source 
Release of 1.21.7, April 2021
This commit is contained in:
Miha Mencin 2021-04-07 07:48:23 +02:00 • committed by GitHub
commit c70588a473
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1.21.6
1.21.7

6
app/assets/stylesheets/repositories.scss
View file

@ -133,12 +133,12 @@
display: flex;
flex-grow: 1;
flex-wrap: nowrap;
height: 5em;
height: 6em;
left: var(--repository-sidebar-margin);
overflow: hidden;
padding: 0 2em;
padding: 1em 2em 0;
position: fixed;
top: calc(5em + var(--navbar-height));
top: calc(4em + var(--navbar-height));
transition: .4s $timing-function-sharp;
width: calc(100% - var(--repository-sidebar-margin));
z-index: 90;

1
app/controllers/api/v1/inventory_items_controller.rb
View file

@ -17,6 +17,7 @@ module Api
.preload(repository_cells: @inventory.cell_preload_includes)
.page(params.dig(:page, :number))
.per(params.dig(:page, :size))
.order(:id)
render jsonapi: items, each_serializer: InventoryItemSerializer, include: include_params
end

2
config/initializers/kaminari_config.rb
View file

@ -2,7 +2,7 @@
Kaminari.configure do |config|
config.default_per_page = 10
# config.max_per_page = nil
config.max_per_page = 100
# config.window = 4
# config.outer_window = 0
# config.left = 0

6
yarn.lock
View file

@ -10331,9 +10331,9 @@ xtend@^4.0.0, xtend@~4.0.1:
integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
y18n@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
version "3.2.2"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
version "4.0.0"