Code

Keeping sync#185

Code

Merged

engelgabriel merged 24 commits intosave-encoded-msgRocketChat/Rocket.Chat:save-encoded-msgfrom masterRocketChat/Rocket.Chat:masterCopy head branch name to clipboardJun 14, 2015

+1,391-72

Commits

Commits on Jun 10, 2015

• fixed markdown regex and added code

  engelgabriel

  committed
  a139120

  Copy full SHA for a139120

• added style for inline code

  engelgabriel

  committed
  e41a59d

  Copy full SHA for e41a59d

• formatting tips

  engelgabriel

  committed
  c9b056c

  Copy full SHA for c9b056c

• Adding strike instruction

  engelgabriel

  committed
  08dab8e

  Copy full SHA for 08dab8e

• Adding strike instruction

  engelgabriel

  committed
  46525f7

  Copy full SHA for 46525f7

Commits on Jun 11, 2015

• Adding rocketchat:tmpembed

  engelgabriel

  committed
  1a14e6f

  Copy full SHA for 1a14e6f

• fixing new render

  engelgabriel

  committed
  f88f591

  Copy full SHA for f88f591

• adding _id to message divs and removing old code

  engelgabriel

  committed
  154f96a

  Copy full SHA for 154f96a

• Merge pull request #1 from RocketChat/master

  Show description for a886fc6
  shahar3012

  committed
  a886fc6

  Copy full SHA for a886fc6

• RTL Support first submit - WIP

  Show description for 924a11e
  shahar3012

  committed
  924a11e

  Copy full SHA for 924a11e

• Updating mixing

  shahar3012

  committed
  73950b6

  Copy full SHA for 73950b6

• adding dispatch:kernel

  engelgabriel

  committed
  5c82681

  Copy full SHA for 5c82681

Commits on Jun 12, 2015

• adding embedded hubot

  engelgabriel

  committed
  29f503a

  Copy full SHA for 29f503a

• adding embedded hubot

  engelgabriel

  committed
  f4560af

  Copy full SHA for f4560af

• adding embedded hubot

  engelgabriel

  committed
  d1d6017

  Copy full SHA for d1d6017

• fixed adding external scripts

  engelgabriel

  committed
  df08bdc

  Copy full SHA for df08bdc

• RTL Support second submit - WIP

  Show description for 7bdb322
  shahar3012

  committed
  7bdb322

  Copy full SHA for 7bdb322

• log only if debug true

  engelgabriel

  committed
  083a34e

  Copy full SHA for 083a34e

Commits on Jun 14, 2015

• meteor update

  engelgabriel

  committed
  a40b5a2

  Copy full SHA for a40b5a2

• make it disable by default until its fully working

  engelgabriel

  committed
  58e412f

  Copy full SHA for 58e412f

• Merge pull request #184 from RocketChat/integrated-hubot

  Show description for 71b78dc
  engelgabriel

  committed
  71b78dc

  Copy full SHA for 71b78dc

• Merge pull request #181 from MiHuevos/master

  Show description for 396187d
  engelgabriel

  committed
  396187d

  Copy full SHA for 396187d

• Turned off RTL until we have it as an option

  engelgabriel

  committed
  43cd3ca

  Copy full SHA for 43cd3ca

• preparing for official emojuone packaged

  engelgabriel

  committed
  fb2528a

  Copy full SHA for fb2528a