Permalink
Browse files

Revert "🐛 fix emoji 404"

This reverts commit c8c9129.
  • Loading branch information...
1 parent c8c9129 commit d7c21eb613e843de6d9b9360626f785d3352be78 @ZephyrJung ZephyrJung committed Dec 19, 2016
Showing with 4 additions and 3 deletions.
  1. +0 −1 .gitignore
  2. +1 −1 src/main/resources/local.properties
  3. +3 −1 src/main/webapp/emoji/index.html
View
@@ -6,4 +6,3 @@ node_modules/
.idea/
symphony.iml
nb-configuration.xml
-src/main/resources/local.properties
@@ -29,7 +29,7 @@ runtimeDatabase=MYSQL
jdbc.driver=com.mysql.jdbc.Driver
jdbc.URL=jdbc:mysql://localhost:3306/b3log_symphony?useUnicode=yes&characterEncoding=utf8
jdbc.username=root
-jdbc.password=admin
+jdbc.password=
# database connection pool
jdbc.pool=druid
# The specific table name prefix
@@ -582,6 +582,7 @@
<li><div><img src="graphics/house_with_garden.png">:<span class="name" data-alternative-name="building, home, plant, nature">house_with_garden</span>:</div></li>
<li><div><img src="graphics/school.png">:<span class="name" data-alternative-name="building, student, education, learn, teach">school</span>:</div></li>
<li><div><img src="graphics/office.png">:<span class="name" data-alternative-name="building, unit, bureau, work">office</span>:</div></li>
+ <li><div><img src="graphics/post_office.png">:<span class="name" data-alternative-name="building, email, communication">post_office</span>:</div></li>
<li><div><img src="graphics/hospital.png">:<span class="name" data-alternative-name="building, health, surgery, doctor">hospital</span>:</div></li>
<li><div><img src="graphics/bank.png">:<span class="name" data-alternative-name="building, money, sales, cash, business, enterprise">bank</span>:</div></li>
<li><div><img src="graphics/convenience_store.png">:<span class="name" data-alternative-name="building, shopping, groceries">convenience_store</span>:</div></li>
@@ -681,6 +682,7 @@
<li><div><img src="graphics/it.png">:<span class="name" data-alternative-name="italy, italia, flag, nation, country, banner">it</span>:</div></li>
<li><div><img src="graphics/ru.png">:<span class="name" data-alternative-name="russia, russian, nation, flag, country, banner">ru</span>:</div></li>
<li><div><img src="graphics/gb.png">:<span class="name" data-alternative-name="great britain, united kingdom, banner, nation, flag, british, UK, country, english, england, union jack">gb</span>:</div></li>
+ <li><div><img src="graphics/uk.png">:<span class="name" data-alternative-name="great britain, united kingdom">uk</span>:</div></li>
<li><div><img src="graphics/de.png">:<span class="name" data-alternative-name="germany, deutschland, german, nation, flag, country, banner">de</span>:</div></li>
</ul>
<h2>Symbols</h2>
@@ -871,7 +873,7 @@
<li><div><img src="graphics/white_medium_small_square.png">:<span class="name" data-alternative-name="shape, stone, icon, button">white_medium_small_square</span>:</div></li>
<li><div><img src="graphics/black_medium_square.png">:<span class="name" data-alternative-name="shape, button, icon">black_medium_square</span>:</div></li>
<li><div><img src="graphics/white_medium_square.png">:<span class="name" data-alternative-name="shape, stone, icon">white_medium_square</span>:</div></li>
- <li><div><img src="graphics/black_large_square.png">:<span class="name" data-alternative-name="shape, icon, button">black_large_square</span>:</div></li>
+ <li><div><img src="graphics/black_square.png">:<span class="name" data-alternative-name="shape, icon, button">black_large_square</span>:</div></li>
<li><div><img src="graphics/white_large_square.png">:<span class="name" data-alternative-name="shape, icon, stone, button">white_large_square</span>:</div></li>
<li><div><img src="graphics/white_check_mark.png">:<span class="name" data-alternative-name="green-square, ok, agree, vote, election">white_check_mark</span>:</div></li>
<li><div><img src="graphics/black_square_button.png">:<span class="name" data-alternative-name="shape, input, frame">black_square_button</span>:</div></li>

0 comments on commit d7c21eb

Please sign in to comment.