Skip to content

Commit

Permalink
Merge branch 'next' into demo
Browse files Browse the repository at this point in the history
* next:
  3.5.5
  add autocomplete='off' for show mode checkboxes. fix #2185
  composer upgrade
  Fixed image edit bug with tinymce ImageTools (#2197)
  fix next step display not following ordering
  don't restrict events to the team for an item
  fix permissions on database items in some cases
  yarn upgrade
  Fix unfinished steps sorting in todo list (#2169)
  add referal link and plant more trees badge
  add carbon offset and trees badges to README
  fix unselectable single column layout option in ucp. fix #2167
  filter out invisible teams from anon login on login page
  • Loading branch information
NicolasCARPi committed Sep 27, 2020
2 parents e3cd936 + 409d6ac commit 4ee6dbc
Show file tree
Hide file tree
Showing 30 changed files with 861 additions and 586 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
[![License](https://img.shields.io/badge/license-AGPL-blue.svg)](https://www.gnu.org/licenses/agpl-3.0.en.html)
[![Release](https://img.shields.io/github/release/elabftw/elabftw.svg)](https://github.com/elabftw/elabftw/releases/latest)
[![StackShare](https://img.shields.io/badge/tech-stack-0690fa.svg?style=flat)](https://stackshare.io/elabftw/elabftw)
[![Joss](http://joss.theoj.org/papers/10.21105/joss.00146/status.svg)](http://joss.theoj.org/papers/10.21105/joss.00146)
[![Joss](http://joss.theoj.org/papers/10.21105/joss.00146/status.svg)](http://joss.theoj.org/papers/10.21105/joss.00146)<br>
[![Carbon offset](https://img.shields.io/ecologi/carbon/deltablot)](https://ecologi.com/deltablot)
[![Trees](https://img.shields.io/ecologi/trees/deltablot)](https://ecologi.com/deltablot)
[![Plant more](https://img.shields.io/badge/trees-plant%20more%20trees-brightgreen)](https://ecologi.com/?r=5f668f69232cc100192fbd04)

# Description

Expand Down

0 comments on commit 4ee6dbc

Please sign in to comment.