Angelina Filippova 411606dc69 Merge branch 'develop' into 'feature/hide-proxy-remote' ... # Conflicts: # CHANGELOG.md		2021-03-11 19:57:05 +00:00
..
api	Remove functions that mock filtering users	2021-01-22 22:13:22 +03:00
assets	Disable pointer events on active menu tab and text selection on all menu tabs.	2020-08-15 12:41:00 +00:00
components	chat show style cleanup and basic message moderation functions	2020-11-29 21:07:48 +03: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 tiptap icons	2020-11-29 20:52:45 +03:00
lang	Merge branch 'feature/update-invite-token-dialog' into 'develop'	2021-03-11 19:40:18 +00:00
router	Rename Moderation log component	2021-03-11 15:21:47 +03:00
services	Add "login-pleroma" link	2019-09-13 20:50:21 +00:00
store	Change user.deactivated field to user.is_active	2021-01-18 15:16:54 -06:00
styles	Remove setting font-size for h1 and h2	2021-03-09 01:55:53 +08:00
utils	Add ability to copy invite link from dialog window	2021-03-11 15:02:01 +03:00
vendor	feature[Excel]: support bookType option (#1144)	2018-09-29 13:23:00 +08:00
views	Merge branch 'develop' into 'feature/hide-proxy-remote'	2021-03-11 19:57:05 +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	Put message in a variable	2020-03-29 22:52:32 +03:00