Code

Update froala to v2#355

Code

Open

macrozone wants to merge 9 commits intoorionjs:masterorionjs/orioncms:masterfrom panter:masterpanter/orion:masterCopy head branch name to clipboard

+66-12

Commits

Commits on Nov 14, 2015

• update to froala 2.0.0-rc.3-2

  macrozone

  committed
  922104c

• readd missing semicolon

  macrozone

  committed
  60428fe

• add line break:

  macrozone

  committed
  fe0fa16

Commits on Dec 5, 2015

• show images from orion:filesystem in the image-manager

  macrozone

  committed
  8ceb4ad

• show images that are uploaded by froala

  macrozone

  committed
  d8b0f35

• Merge remote-tracking branch 'upstream/master'

  macrozone

  committed
  30e9cd1

Commits on Dec 6, 2015

• update version

  macrozone

  committed
  5ca7e43

• fix height of froala editor

  macrozone

  committed
  05fd4ae

Commits on Dec 8, 2015

• add icons to sidebar

  macrozone

  committed
  8779fec