Merge remote-tracking branch 'tusooa/from/develop/tusooa/grouped-emoji-picker' into ilja_space
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- build/build.js 3 additions, 0 deletionsbuild/build.js
- build/dev-server.js 3 additions, 0 deletionsbuild/dev-server.js
- build/update-emoji.js 27 additions, 0 deletionsbuild/update-emoji.js
- package.json 2 additions, 0 deletionspackage.json
- src/components/emoji_input/emoji_input.js 0 additions, 1 deletionsrc/components/emoji_input/emoji_input.js
- src/components/emoji_input/emoji_input.vue 1 addition, 0 deletionssrc/components/emoji_input/emoji_input.vue
- src/components/emoji_input/suggestor.js 1 addition, 1 deletionsrc/components/emoji_input/suggestor.js
- src/components/emoji_picker/emoji_picker.js 169 additions, 91 deletionssrc/components/emoji_picker/emoji_picker.js
- src/components/emoji_picker/emoji_picker.scss 42 additions, 8 deletionssrc/components/emoji_picker/emoji_picker.scss
- src/components/emoji_picker/emoji_picker.vue 37 additions, 13 deletionssrc/components/emoji_picker/emoji_picker.vue
- src/components/post_status_form/post_status_form.js 3 additions, 3 deletionssrc/components/post_status_form/post_status_form.js
- src/components/react_button/react_button.js 2 additions, 2 deletionssrc/components/react_button/react_button.js
- src/components/settings_modal/tabs/profile_tab.js 2 additions, 2 deletionssrc/components/settings_modal/tabs/profile_tab.js
- src/components/still-image/still-image.js 25 additions, 2 deletionssrc/components/still-image/still-image.js
- src/components/still-image/still-image.vue 3 additions, 2 deletionssrc/components/still-image/still-image.vue
- src/i18n/en.json 11 additions, 0 deletionssrc/i18n/en.json
- src/modules/instance.js 66 additions, 8 deletionssrc/modules/instance.js
- static/emoji.json 0 additions, 1431 deletionsstatic/emoji.json
- yarn.lock 10 additions, 0 deletionsyarn.lock
Loading
Please register or sign in to comment