pleroma-fe.git - This is a fork of pleroma's official FE. Used by vnil.de, we meow meow the meow meow with meow meow

	Commit message (Collapse)	Author	Age
*	Add mutes tab	taehoon	2019-02-20
\|
*	Complete functionality of BlockCard	taehoon	2019-02-20
\|
*	Finally, added BlockCard	taehoon	2019-02-20
\|
*	Add blocks tab with test data to user settings page	taehoon	2019-02-20
\|
*	Merge branch 'tae-hoon/pleroma-fe-323-improve-image-lightbox' into develop	shpuld	2019-02-19
\|\
\| *	Add translation strings	taehoon	2019-02-10
\| \|
* \|	Merge branch '256-avatar-crop-popup' into 'develop'	Shpuld Shpludson	2019-02-19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add avatar cropper Closes #256 See merge request pleroma/pleroma-fe!547
\| * \|	Make embedded image cropper	taehoon	2019-02-15
\| \| \|
\| * \|	Localization of ImageCropper component	taehoon	2019-02-15
\| \| \|
\| * \|	Add back the existing translation string	taehoon	2019-02-15
\| \| \|
\| * \|	Add avatar crop popup	taehoon	2019-02-15
\| \| \|
* \| \|	Merge branch 'edijs/pleroma-fe-fix/followers-ui' into 'develop'	Shpuld Shpludson	2019-02-19
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix followers/follows UI, fix #343 fix #340 Closes #340 and #343 See merge request pleroma/pleroma-fe!590
\| * \| \|	Take over branch and fix some issues	shpuld	2019-02-17
\| \| \|/ \| \|/\|
* \| \|	update japanese translation	Hakaba Hitoyo	2019-02-15
\| \|/ \|/\|
* \|	Update spanish translate - es.json	tarteka	2019-02-11
\|/
*	Merge branch 'patch-2' into 'develop'	Shpuld Shpludson	2019-02-09
\|\ \| \| \| \| \| \| \| \|	Update spanish translate See merge request pleroma/pleroma-fe!549
\| *	Update spanish translate	tarteka	2019-02-08
\| \|
* \|	Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'	Shpuld Shpludson	2019-02-09
\|\ \ \| \|/ \|/\| \| \| \| \|	#254 Add option to hide filtered statuses See merge request pleroma/pleroma-fe!539
\| *	Add german translation for option label	jasper	2019-02-06
\| \|
\| *	Add option to hide filtered statuses	jasper	2019-02-06
\| \|
* \|	Merge branch 'add-admin-and-moderator-fields-to-user-card-view' into 'develop'	HJ	2019-02-07
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add admin and moderator indicators to the user profile See merge request pleroma/pleroma-fe!519
\| * \|	Update user settings text: staff badges are only visible in user profile	eugenijm	2019-02-08
\| \| \| \| \| \| \| \| \| \| \| \|	Use capitalized text in badges
\| * \|	Refactor visibleRole for better readability	eugenijm	2019-02-06
\| \| \| \| \| \| \| \| \| \| \| \|	Improve translation
\| * \|	Allow to configure visibility for admin and moderator badges	eugenijm	2019-02-06
\| \|/
* \|	Merge branch 'feature/add-an-option-for-a-default-formatting' into 'develop'	Shpuld Shpludson	2019-02-07
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	#301 - add an option for a default formatting See merge request pleroma/pleroma-fe!541
\| * \	Merge branch 'develop' into feature/add-an-option-for-a-default-formatting	Xiaofeng An	2019-02-06
\| \|\ \
\| * \| \|	#301 - add an option for default formatting	Xiaofeng An	2019-02-06
\| \| \|/ \| \|/\|
* \| \|	Grammar	Mark Felder	2019-02-06
\| \|/ \|/\|
* \|	Merge branch 'fix/create-a-login-hint-on-mobile' into 'develop'	Shpuld Shpludson	2019-02-06
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	create a login hint on mobile Closes #308 See merge request pleroma/pleroma-fe!530
\| *	Merge branch 'develop' into fix/create-a-login-hint-on-mobile	Xiaofeng An	2019-02-06
\| \|\
\| * \|	fix #308 - show login hint above timeline when user is not logged in	Xiaofeng An	2019-02-05
\| \| \|
* \| \|	Merge branch 'feature/split-hide-network-fixed' into 'develop'	Shpuld Shpludson	2019-02-06
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Split hide_network into hide_followers & hide_followings See merge request pleroma/pleroma-fe!536
\| * \|	Rename "hide_following" to "hide_follows"	Maxim Filippov	2019-02-06
\| \| \|
\| * \|	Split hide_network into hide_followers & hide_followings	Maxim Filippov	2019-02-06
\| \|/
* /	Update es.json	tarteka	2019-02-05
\|/
*	merge develop and fix conflicts AGAIN	shpuld	2019-02-04
\|\
\| *	Revert "Merge branch 'feature/split-hide-network' into 'develop'"	Shpuld Shpludson	2019-02-03
\| \| \| \| \| \|	This reverts merge request !497
* \|	Combine friends/followers	shpuld	2019-02-03
\|/
*	Merge branch '238-add-avatar-size-suggestion' into 'develop'	Shpuld Shpludson	2019-02-03
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add avatar size instruction notice Closes #238 See merge request pleroma/pleroma-fe!512
\| *	Add avatar size instruction notice	taehoon	2019-02-02
\| \|
* \|	Change video playing default without bothering making it an instance ↵	shpuld	2019-01-31
\|/ \| \| \|	configurable
*	Merge branch 'develop' into feat/media-modal	shpuld	2019-01-30
\|\
\| *	Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'	lambda	2019-01-30
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #292 dont show "load more" when bottomed out Closes #292 See merge request pleroma/pleroma-fe!496
\| \| *	Add loading indicator for notifications, make timelines indicate bottoming ↵	shpuld	2019-01-29
\| \| \| \| \| \| \| \| \| \| \| \|	out when no more statuses
\| * \|	Split hide_network into hide_followers & hide_followings	Maxim Filippov	2019-01-30
\| \|/
* \|	Merge branch 'develop' into feat/media-modal	shpuld	2019-01-28
\|\\|
\| *	Merge branch 'develop' into 'develop'	Shpuld Shpludson	2019-01-28
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add Dutch translation See merge request pleroma/pleroma-fe!482
\| \| *	Add Dutch translation	spctrl	2019-01-27
\| \| \|
\| * \|	user profile: add media timeline	William Pitcock	2019-01-26
\| \|/
* \|	Merge develop and fix conflict	shpuld	2019-01-26
\|\\|