Skip to content

Get up to date with upstream#2

Merged
erdgeist merged 357 commits intoerdgeist:masterfrom
frab:master
Nov 5, 2019
Merged

Get up to date with upstream#2
erdgeist merged 357 commits intoerdgeist:masterfrom
frab:master

Conversation

@erdgeist
Copy link
Owner

@erdgeist erdgeist commented Nov 5, 2019

No description provided.

erdgeist and others added 30 commits October 29, 2018 10:07
Fix typo in Identifié
Downgrading to an old version of the mail gems, fixes problems with
umlauts.
Should use proper ERB syntax
Flakiness maybe due to fresh database?
erdgeist and others added 29 commits November 2, 2019 13:24
normalize (alphabetize) translations
Change creation date display to conference timezone

see #490
Event list pages recognize filters such as
event_type=demo|poster to match either
demo or poster.

A couple of models are changed to make sure the symbol "|"
is ised only as seperator and never as operand.
Add a modal window for multi-option filtering

Conflicts:
	app/assets/stylesheets/frab.css
Allow clicking on filter pane to edit filter details;

If multiple options are selected, the filter pane will
show "multiple" instead of enumerating the options
enabled.
Add "Clear filter" button to the filter modal
Before this change, a review metric starting with a digit will
convert to an sql term starting with a digit, which is not
acceptable SQL.
…arting_with_digit

allow review metrics starting with digit
This changes "my events" to be a special case of "all events",
with an additional query parameter "events=my"

The old URL for "my events" is now a redirection, for some backward
compatability. Old URLs for "my events" with filter or sort will
lose the filter/sort.

The benefit is that it will make bulk actions works seamlessly for
both views.
@erdgeist erdgeist merged commit 26aaa9f into erdgeist:master Nov 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants