| 
								
								
									 shpuld | c44c048356 | add title and alt for avatars, fix console errors in avatarlist | 2019-05-01 17:33:56 +03:00 |  | 
				
					
						| 
								
								
									 Shpuld Shpludson | b1bd5bd08e | Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users' # Conflicts:
#   src/services/api/api.service.js | 2019-04-30 15:11:30 +00:00 |  | 
				
					
						| 
								
								
									 HJ | 0f7f685c5e | Merge branch '437-user-profile-settings' into 'develop' Transition to MastoAPI: user profile settings
Closes #437
See merge request pleroma/pleroma-fe!682 | 2019-04-30 06:05:52 +00:00 |  | 
				
					
						| 
								
								
									 shpuld | da08388d6a | filter outside of component | 2019-04-29 22:36:39 +03:00 |  | 
				
					
						| 
								
								
									 HJ | d94fdd0617 | Merge branch '220-import-export-blocks-mutes' into 'develop' Allow import/export of blocks
See merge request pleroma/pleroma-fe!717 | 2019-04-29 18:15:58 +00:00 |  | 
				
					
						| 
								
								
									 taehoon | 5b16e36828 | remove & | 2019-04-29 13:57:44 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | a793835566 | add a comment | 2019-04-29 13:53:21 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | b1f8221a0a | show ellipsis for long user name and screen name | 2019-04-29 13:27:10 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 3665c86d70 | use default_scope parameter | 2019-04-27 21:51:17 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 2c4af6693a | clean up | 2019-04-27 14:04:30 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | ab19669bf1 | refactoring | 2019-04-27 08:31:06 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 95bc2d727b | add “export blocks” feature | 2019-04-27 08:31:06 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 13abe64f87 | fix wrong function binding | 2019-04-27 08:31:06 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 08eaf9bd33 | make reusable Exporter component | 2019-04-27 08:31:06 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 0ab2f9dfa5 | add “block import” feature | 2019-04-27 08:31:06 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 6ea4154084 | change api function name | 2019-04-27 08:31:06 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 6d0e98a1c2 | make Importer component reusable | 2019-04-27 08:31:06 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 18bb209ace | add uploading icon css | 2019-04-27 08:31:06 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 903bce40c3 | move formData generating logic to api.service | 2019-04-27 08:31:06 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 562120ae48 | split out follow’s importer as a separate component | 2019-04-27 08:31:06 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | ac0b45fa14 | Update avatar uploading | 2019-04-27 08:30:08 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | e14720419f | Switch to mastoapi for updating user profile | 2019-04-27 08:30:08 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 909d11825d | Switch to mastoapi for updating banner | 2019-04-27 08:30:08 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 808e1ac11c | Switch to mastoapi for updating avatar # Conflicts:
#	src/services/api/api.service.js | 2019-04-27 08:30:08 -04:00 |  | 
				
					
						| 
								
								
									 shpuld | 8af8f719e4 | fix i18n | 2019-04-22 21:37:27 +03:00 |  | 
				
					
						| 
								
								
									 shpuld | 3e23b34168 | fix overflow behavior | 2019-04-22 21:07:29 +03:00 |  | 
				
					
						| 
								
								
									 taehoon | 445b54c553 | fix follow button not updating bug in follow-card | 2019-04-22 11:17:01 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | f2f3fa81d8 | refer searched user objects from the global user rep | 2019-04-22 11:17:01 -04:00 |  | 
				
					
						| 
								
								
									 shpuld | d417945427 | Merge branch 'develop' into brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users | 2019-04-22 17:24:35 +03:00 |  | 
				
					
						| 
								
								
									 Shpuld Shpludson | c8f967d5c0 | Merge branch '500' into 'develop' Set max-width of textarea in settings page
Closes #500
See merge request pleroma/pleroma-fe!761 | 2019-04-22 14:00:09 +00:00 |  | 
				
					
						| 
								
								
									 Shpuld Shpludson | 98742979c8 | Merge branch '501' into 'develop' Remove space in the timeline setting copy
Closes #501
See merge request pleroma/pleroma-fe!763 | 2019-04-22 13:15:07 +00:00 |  | 
				
					
						| 
								
								
									 Shpuld Shpludson | 9183c9e845 | Merge branch 'change-pencil-to-wrentch' into 'develop' Change pencil icon to wrentch
See merge request pleroma/pleroma-fe!764 | 2019-04-22 13:11:14 +00:00 |  | 
				
					
						| 
								
								
									 taehoon | f7baa6e190 | set max-width of textarea in settings page | 2019-04-21 14:06:32 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | aefd4551a3 | Remove space in the timeline setting copy | 2019-04-21 14:06:10 -04:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 14d506154e | user_card.vue: Fix .emoji to apply to img | 2019-04-20 21:12:56 +02:00 |  | 
				
					
						| 
								
								
									 Brenden Bice | 6aee2ed63f | replace pencil with wrench icon # Conflicts:
#	src/components/user_card/user_card.vue | 2019-04-19 13:24:35 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | de945e5f88 | Revert "recover border between basic-user-card using list component" This reverts commit 1d56d486f1f679e793e710969ad54cce5fdb1ebc.
# Conflicts:
#	src/components/follow_requests/follow_requests.vue
#	src/components/user_search/user_search.vue
#	src/components/who_to_follow/who_to_follow.vue | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | bd88a481c6 | remove extra spacing | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | e67fecff0a | code readability | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | bb38a43117 | fix typos | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | a89236f67c | clean up | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 10ecc2c816 | make sure to use filtered selected keys | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | ecff6acf2d | support indeterminate checkbox state | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 3f5e798de7 | render span tag only if it has content | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 988849116d | update model and props properties | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 8088043a0c | import scss variables | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 1144025f30 | update checkbox importing path | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 468aec0de1 | rewrite checkbox component as non-functional | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | ac9ddfb1e2 | support i18n | 2019-04-17 11:32:49 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 7f6bd538f3 | ui improvements | 2019-04-17 11:32:49 -04:00 |  |