Angelina Filippova 61d14e1f8f Merge branch 'master' into 'feature/update-and-move-emoji-packs' ... # Conflicts: # src/utils/request.js		2019-10-22 23:29:49 +00:00
..
api	Merge branch 'master' into 'feature/update-and-move-emoji-packs'	2019-10-22 23:29:49 +00:00
assets	remove unnecessary assets	2018-09-19 10:05:10 +08:00
components	Generate invite tokens from admin-fe	2019-09-23 19:00:28 +00:00
directive	tweak spelling mistake	2018-09-03 15:03:00 +08:00
filters	tweak spelling mistake	2018-09-03 15:03:00 +08:00
icons	Add forms for configuring server-settings	2019-08-09 16:45:25 +00:00
lang	Add ability to delete pack, download an archive and download a pack	2019-10-09 18:24:27 +03:00
router	Remove emoji packs from router and add it to Settings tab	2019-10-05 02:15:26 +03:00
services	Add "login-pleroma" link	2019-09-13 20:50:21 +00:00
store	Merge branch 'master' into 'feature/update-and-move-emoji-packs'	2019-10-22 23:29:49 +00:00
styles	fix[SIdebar]: fixed bug in mobile #1567 (#1569)	2019-01-30 13:38:01 +08:00
utils	Merge branch 'master' into 'feature/update-and-move-emoji-packs'	2019-10-22 23:29:49 +00:00
vendor	feature[Excel]: support bookType option (#1144)	2018-09-29 13:23:00 +08:00
views	Merge branch 'master' into 'feature/update-and-move-emoji-packs'	2019-10-22 23:29:49 +00:00
App.vue	refactor: add eslint-plugin-vue && lint code (#976)	2018-08-19 16:55:24 +08:00
errorLog.js	chore: in dev disable errorLog	2018-08-29 11:12:15 +08:00
main.js	Load fonts from a file instead of inline	2019-05-08 21:52:33 +00:00
permission.js	Add "login-pleroma" link	2019-09-13 20:50:21 +00:00