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
*	restore yarnlock	Henry Jameson	2019-04-10
\|
*	Merge branch 'issue-436-mastoapi-notifications' into 'develop'	HJ	2019-04-10
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	#436: integrate mastoAPI notifications Closes #436 See merge request pleroma/pleroma-fe!678
\| *	#436 - remove yarn.lock	dave	2019-04-10
\| \|
\| *	#436 - merge develop	dave	2019-04-10
\| \|\ \| \|/ \|/\|
* \|	Merge branch 'fix-local' into 'develop'	HJ	2019-04-10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong property read in pleroma object See merge request pleroma/pleroma-fe!747
\| * \|	Fix wrong local	Henry Jameson	2019-04-10
\|/ /
* \|	Merge branch 'mastoapi/update-extension-support' into 'develop'	Shpuld Shpludson	2019-04-10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update entity normalizer to include more pleroma-specific fields See merge request pleroma/pleroma-fe!745
\| * \|	revert, it's still missing	Henry Jameson	2019-04-09
\| \| \|
\| * \|	add support for pleroma-specific fields	Henry Jameson	2019-04-09
\| \| \|
* \| \|	Merge branch 'fix-emoji-picker' into 'develop'	Shpuld Shpludson	2019-04-10
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	support new custom emoji format Closes #484 See merge request pleroma/pleroma-fe!746
\| * \|	support new custom emoji format	Henry Jameson	2019-04-09
\|/ /
\| *	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵	dave	2019-04-09
\| \|\ \| \|/ \|/\| \| \|	issue-436-mastoapi-notifications
* \|	Merge branch '486-expand-button' into 'develop'	Shpuld Shpludson	2019-04-09
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#486 - remove expand button on conversation page Closes #486 See merge request pleroma/pleroma-fe!742
\| * \|	#486 - remove expand button on conversation page	jared	2019-04-09
\| \| \|
* \| \|	Merge branch 'fix/prevent-repeated-fetching' into 'develop'	Shpuld Shpludson	2019-04-09
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#485 Prevent repeated fetching Closes #485 See merge request pleroma/pleroma-fe!738
\| * \| \|	fix small bug	jasper	2019-04-09
\| \| \| \|
\| * \| \|	Add await to login befor redirect to friends timeline	jasper	2019-04-09
\| \| \| \|
\| * \| \|	Prevent repeated fetching	jasper	2019-04-09
\| \| \| \|
* \| \| \|	Merge branch 'fix/notification-bugs' into 'develop'	Shpuld Shpludson	2019-04-09
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#474 Fix notification bugs Closes #474 See merge request pleroma/pleroma-fe!728
\| * \| \|	Add space	jasper	2019-04-04
\| \| \| \|
\| * \| \|	Separate timeline and notification	jasper	2019-04-04
\| \| \| \|
\| * \| \|	Remove useless codes	jasper	2019-04-03
\| \| \| \|
\| * \| \|	Fix notification bugs	jasper	2019-04-03
\| \| \| \|
\| \| \| *	#436 - merge develop	dave	2019-04-08
\| \| \| \|\ \| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge branch 'moderation-menu' into 'develop'	Shpuld Shpludson	2019-04-08
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moderation menu #310 See merge request pleroma/pleroma-fe!595
\| * \| \| \|	Added moderation menu	eugenijm	2019-04-01
\| \|/ / /
\| \| \| *	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵	dave	2019-04-08
\| \| \| \|\ \| \|_\|_\|/ \|/\| \| \| \| \| \| \|	issue-436-mastoapi-notifications
* \| \| \|	Merge branch 'debug_message' into 'develop'	Shpuld Shpludson	2019-04-08
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	remove debug message See merge request pleroma/pleroma-fe!735
\| * \| \|	remove debug message	Maksim	2019-04-08
\|/ / /
* \| \|	Merge branch 'issue-469-safe-dm-from-BE' into 'develop'	Shpuld Shpludson	2019-04-04
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue 469 safe dm from be Closes #469 See merge request pleroma/pleroma-fe!726
\| * \|	#469 - update text copy	dave	2019-04-02
\| \| \|
\| * \|	#469 - update behavior of safe_dm	dave	2019-04-02
\| \| \|
\| * \|	#469 - clean up	dave	2019-04-02
\| \| \|
\| * \|	#469 - DM warning text should vary based on BE setting	dave	2019-04-02
\|/ /
\| *	#436 - revert stripe html for notification	dave	2019-04-03
\| \|
\| *	#436 - notification html to text content	dave	2019-04-03
\| \|
\| *	#436 - revert notification silience config	dave	2019-04-03
\| \|
\| *	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵	dave	2019-04-02
\| \|\ \| \|/ \|/\| \| \|	issue-436-mastoapi-notifications
* \|	Merge branch 'feature/mobile-improvements-3' into 'develop'	Shpuld Shpludson	2019-04-01
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Mobile notifications in nav bar, separate mobile navbar to its own component See merge request pleroma/pleroma-fe!703
\| * \	fix conflict	shpuld	2019-04-01
\| \|\ \
\| * \ \	Merge branch 'develop' into feature/mobile-improvements-3	shpuld	2019-04-01
\| \|\ \ \
\| * \| \| \|	remove window width copypasta	shpuld	2019-04-01
\| \| \| \| \|
\| * \| \| \|	add gesture to close notifications drawer	shpuld	2019-03-28
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' into feature/mobile-improvements-3	shpuld	2019-03-28
\| \|\ \ \ \
\| * \ \ \ \	merge develop in	shpuld	2019-03-23
\| \|\ \ \ \ \
\| * \| \| \| \| \|	make notifications close on navigation	shpuld	2019-03-23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	make mobile notifs drawer more like an actual drawer, make mobile nav ↵	shpuld	2019-03-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	buttons bigger to press, fix alert dot
\| * \| \| \| \| \|	remove notifications from sidebar, make notifications appear on login only	shpuld	2019-03-14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	make nav bar slide, move mobile post status to mobile nav	shpuld	2019-03-14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	merge develop, add mobile nav component	shpuld	2019-03-12
\| \|\ \ \ \ \ \