Code

Emoji encoding 3123#3161

Code

Merged

jywarren merged 13 commits intopubliclab:masterpubliclab/plots2:masterfrom cheneyshreve01:emoji-encoding-3123cheneyshreve01/plots2:emoji-encoding-3123Copy head branch name to clipboardAug 7, 2018

+49-52

Commits

Commits on Jun 8, 2018

• initial setup commit

  cheneyshreve

  committed
  278243b

  Copy full SHA for 278243b

Commits on Jun 21, 2018

• Merge remote-tracking branch 'upstream/master'

  cheneyshreve

  committed
  c71b392

  Copy full SHA for c71b392

Commits on Jun 23, 2018

• merge upstream changes

  cheneyshreve

  committed
  1e08b0b

  Copy full SHA for 1e08b0b

Commits on Jun 29, 2018

• Merge branch 'master' of https://github.com/publiclab/plots2

  cheneyshreve

  committed
  953c96e

  Copy full SHA for 953c96e

Commits on Jul 19, 2018

• Merge remote-tracking branch 'upstream/master'

  Show description for bcc07ef
  cheneyshreve

  committed
  bcc07ef

  Copy full SHA for bcc07ef

Commits on Jul 23, 2018

• Merge branch 'master' of https://github.com/publiclab/plots2

  cheneyshreve

  committed
  6d294ed

  Copy full SHA for 6d294ed

Commits on Jul 26, 2018

• [WIP] refactoring atwho code, moved primary code to assets/javascripts and added script to comments form and rich text editor, but not working yet in markdown editor

  cheneyshreve

  committed
  012a920

  Copy full SHA for 012a920

Commits on Jul 30, 2018

• removed script from rich text editor, removed emoji file from public folder

  cheneyshreve

  committed
  b0377da

  Copy full SHA for b0377da

Commits on Aug 3, 2018

• reverting file config/database.yml.sqlite

  cheneyshreve

  committed
  5ecdc9d

  Copy full SHA for 5ecdc9d

• renamed emoji script to atwho_autocomplete, modified to read var emoji from /lib/emoji.js, modified comments form and assets to reflect these changes, removed reference to comment-autocomplete

  cheneyshreve

  committed
  83a0ffb

  Copy full SHA for 83a0ffb

Commits on Aug 4, 2018

• moved error code to script file

  cheneyshreve

  committed
  a3a2514

  Copy full SHA for a3a2514

Commits on Aug 7, 2018

• moved error code out of script to form, wrapped it in a function

  cheneyshreve

  committed
  ceb6b67

  Copy full SHA for ceb6b67

• amended git workflow regarding public/lib/emoji.js

  cheneyshreve

  committed
  b012269

  Copy full SHA for b012269