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
*	Merge branch 'feature/separate-reply-form-from-inside-status' into 'develop'	lambadalambda	2017-03-10
\|\ \| \| \| \| \| \| \| \|	Make reply window not part of the inner status. See merge request !60
\| *	Use conditional class for reply icon color.	shpuld	2017-03-10
\| \|
\| *	Separate reply form from inside status to make it resistant to hilighting, ↵	shpuld	2017-03-09
\|/ \| \| \|	make the reply button light up when reply window is open.
*	Merge branch 'fix/no-border-on-last-notif' into 'develop'	Shpuld Shpuldson	2017-03-09
\|\ \| \| \| \| \| \| \| \|	Fix red border not appearing on the last notification. See merge request !59
\| *	Fix red border not appearing on the last notification.	shpuld	2017-03-09
\| \|
* \|	Merge branch 'fix/mentions-timeline' into 'develop'	Shpuld Shpuldson	2017-03-09
\|\ \ \| \|/ \|/\| \| \| \| \|	Fix/mentions timeline See merge request !58
\| *	Remove unused fetchMentions()	wakarimasen	2017-03-09
\| \|
\| *	Let timeline component fetch mentions	wakarimasen	2017-03-09
\|/
*	Merge branch 'feature/timeline-fetch-error' into 'develop'	Shpuld Shpuldson	2017-03-09
\|\ \| \| \| \| \| \| \| \|	Use one error variable for all timelines See merge request !57
\| *	Use one error variable for all timelines	wakarimasen	2017-03-09
\| \|
* \|	Merge branch 'feature/borders-pleasing-to-the-eye' into 'develop'	lambadalambda	2017-03-09
\|\ \ \| \|/ \|/\| \| \| \| \|	Feature/borders pleasing to the eye See merge request !56
\| *	lint fix	shpuld	2017-03-09
\| \|
\| *	Merged with changes in develop & fixed conflicts.	shpuld	2017-03-09
\| \|\ \| \|/ \|/\|
* \|	Merge branch 'feature/nav-panel-hover-state' into 'develop'	lambadalambda	2017-03-09
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	themeable hover states for nav-panel See merge request !53
\| * \|	themeable hover states for nav-panel	xj9	2017-03-08
\| \| \|
* \| \|	Merge branch 'feature/animated-favorite-and-boost' into 'develop'	lambadalambda	2017-03-09
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add a spin animation to favorite and boost actions See merge request !52
\| * \| \|	fix cursor style	xj9	2017-03-08
\| \| \| \|
\| * \| \|	add a spin animation to favorite and boost actions	xj9	2017-03-08
\| \|/ /
* \| \|	Merge branch 'cleanups' into 'develop'	lambadalambda	2017-03-09
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanups See merge request !54
\| * \| \|	Add linter.	Roger Braun	2017-03-09
\| \| \| \|
\| * \| \|	Remove redirect on login	Roger Braun	2017-03-09
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is to enable this workflow: 1. Open conversation in new tab 2. Login 3. Interact with the conversation We can add this again once we have persistent logins.
* \| \|	Merge branch 'xj9/pleroma-fe-feature/even-better-nsfw-image-loading' into ↵	Roger Braun	2017-03-09
\|\ \ \ \| \|/ / \|/\| \| \| \| \|	develop
\| * \|	Merge branch 'develop' into ↵	Roger Braun	2017-03-09
\| \|\ \ \| \|/ / \|/\| \| \| \| \|	xj9/pleroma-fe-feature/even-better-nsfw-image-loading
* \| \|	Merge branch 'feature/failed-login-error' into 'develop'	Shpuld Shpuldson	2017-03-08
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Visual feedback on failed login See merge request !49
\| * \| \|	Make the error into a div instead of a button to get rid of the hover effects.	shpuld	2017-03-09
\| \| \| \|
\| * \| \|	Fix typo	wakarimasen	2017-03-08
\| \| \| \|
\| * \| \|	Give more specific reason for failed login	wakarimasen	2017-03-08
\| \| \| \|
\| * \| \|	Clear username and password field on failed login	wakarimasen	2017-03-08
\| \| \| \|
\| * \| \|	Show visual feedback on login error, redirect on success	wakarimasen	2017-03-08
\| \| \| \|
* \| \| \|	Merge branch 'feature/timeline-fetch-error' into 'develop'	Shpuld Shpuldson	2017-03-08
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move rejection handler See merge request !48
\| * \| \| \|	Move rejection handler	wakarimasen	2017-03-07
\| \| \| \| \|
\| \| \| * \|	improvements on fature/better-nsfw-image-loading	xj9	2017-03-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- loading indicator - avoid hitting the cache if we already know the image was loaded - more responsive toggle
\| \| \| \| *	Add base03 border to timeline bottom fetcher too.	shpuld	2017-03-09
\| \| \| \| \|
\| \| \| \| *	Make style setter create an often used base03-border class, use that class ↵	shpuld	2017-03-09
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	in notifications, navpanel and statuses.
* \| \| \|	Merge branch 'feature/performance' into 'develop'	lambadalambda	2017-03-08
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Feature/performance See merge request !50
\| * \| \|	Add caching system to statuses.	Roger Braun	2017-03-08
\| \| \| \|
\| * \| \|	Use user cache in users module.	Roger Braun	2017-03-08
\| \| \| \|
\| * \| \|	Use cache to quickly access users.	Roger Braun	2017-03-08
\| \| \| \|
\| * \| \|	eslint fixes.	Roger Braun	2017-03-08
\|/ / /
* \| \|	Don't redirect after login.	Roger Braun	2017-03-08
\| \| \|
* \| \|	Merge branch 'feature/timeline-fetch-error' into 'develop'	Shpuld Shpuldson	2017-03-07
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Visual feedback on failure to fetch new statuses See merge request !47
\| * \|	Visual feedback on failure to fetch new statuses	wakarimasen	2017-03-07
\| \| \|
* \| \|	Merge branch 'feature/more-visible-notifications' into 'develop'	lambadalambda	2017-03-07
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notifications inside a red circle and the red line more visible See merge request !46
\| * \| \|	Put the number of notifications inside a red circle (kinda like qvitter and ↵	shpuld	2017-03-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	everyone else does), make the red notification line slightly less transparent.
* \| \| \|	Merge branch 'fix/collapse-on-same-line' into 'develop'	lambadalambda	2017-03-07
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Put conversation 'Collapse' back on the same line with the rest of the heading.' See merge request !45
\| * \| \|	Put conversation 'Collapse' back on the same line with the rest of the heading.'	shpuld	2017-03-07
\|/ / /
* \| \|	Merge branch 'fix/highlight-expanded-retweets' into 'develop'	lambadalambda	2017-03-07
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Highlight original notice when expanding retweets See merge request !43
\| * \|	Highlight original notice when expanding retweets	wakarimasen	2017-03-06
\| \| \|
* \| \|	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop	Roger Braun	2017-03-07
\|\ \ \
\| * \ \	Merge branch 'fix/overlapping-styles-user-card' into 'develop'	Shpuld Shpuldson	2017-03-06
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix overlapping styles in timeline and notifications that screwed up user-card. See merge request !44