Henry Jameson db086fe1fd Merge remote-tracking branch 'upstream/develop' into emoji-selector-update ... * upstream/develop: (116 commits) Password reset page add a comment force img updating immediately Fixed "sequimiento" to "seguimiento". Replace `/api/externalprofile/show.json` with a MastoAPI equialent Use mastodon api in follow requests "Optional" in lowercase. Update es.json fix pin/unpin status logic rename a mutation update fix user avatar fallback logic remove dead code Corrected "Media Proxy" translation. Update es.json make bio textarea resizable vertically only remove dead code Make image orientation consistent on FF, fix videos w/ modal remove dead code fix crazy watch logic in conversation ...		2019-09-08 13:44:29 +03:00
..
assets	Use an existing image served by backend instead	2019-02-03 13:30:54 -05:00
boot	Merge remote-tracking branch 'upstream/develop' into emoji-selector-update	2019-09-08 13:44:29 +03:00
components	Merge remote-tracking branch 'upstream/develop' into emoji-selector-update	2019-09-08 13:44:29 +03:00
hocs	npm eslint --fix .	2019-07-05 10:02:14 +03:00
i18n	Merge remote-tracking branch 'upstream/develop' into emoji-selector-update	2019-09-08 13:44:29 +03:00
lib	make sure to clear old token when logout	2019-06-20 11:48:29 -04:00
modules	fix pin/unpin status logic	2019-09-01 13:07:43 -04:00
services	Merge branch 'mastoapi-externalprofile' into 'develop'	2019-09-06 04:13:21 +00:00
_variables.scss	Make role badge visible only on user profile page	2019-02-06 18:07:37 +03:00
App.js	hide ISP if the panel content is empty	2019-08-12 14:29:11 -04:00
App.scss	remove dead code	2019-08-26 14:29:40 -04:00
App.vue	do not unmount post status modal in desktop	2019-08-06 20:53:09 -04:00
main.js	install v-tooltip	2019-07-15 21:22:40 -04:00
sw.js	add checkbox to disable web push	2018-12-13 00:03:50 +07:00