Merge branch '1.0.0-rc.4' into 'master'

1.0.0 rc.4

See merge request framasoft/mobilizon!641
This commit is contained in:
Thomas Citharel 2020-10-22 18:35:16 +02:00
commit 35aafa8295
4 changed files with 9 additions and 3 deletions

View File

@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased ## Unreleased
## 1.0.0-rc.4 - 2020-10-22
### Fixed
- Fix an issue with group event listing
## 1.0.0-rc.3 - 2020-10-22 ## 1.0.0-rc.3 - 2020-10-22
### Added ### Added

View File

@ -1,6 +1,6 @@
{ {
"name": "mobilizon", "name": "mobilizon",
"version": "1.0.0-rc.3", "version": "1.0.0-rc.4",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",

View File

@ -425,7 +425,7 @@ defmodule Mobilizon.Events do
|> Page.build_page(page, limit) |> Page.build_page(page, limit)
end end
def list_simple_organized_events_for_group(%Actor{} = actor, page, limit) do def list_simple_organized_events_for_group(%Actor{} = actor, page \\ nil, limit \\ nil) do
list_organized_events_for_group(actor, :all, nil, nil, page, limit) list_organized_events_for_group(actor, :all, nil, nil, page, limit)
end end

View File

@ -1,7 +1,7 @@
defmodule Mobilizon.Mixfile do defmodule Mobilizon.Mixfile do
use Mix.Project use Mix.Project
@version "1.0.0-rc.3" @version "1.0.0-rc.4"
def project do def project do
[ [