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 remote-tracking branch 'upstream/develop' into async_follow	Henry Jameson	2018-12-14
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (45 commits) fix chrome Prevent html-minifier to remove placeholder comment in index.html template Add placeholder to insert server generated metatags. Related to #430 added condition to check for logined user fix gradients and minor artifacts keep track of new instance options fix old MR oof get rid of slots fix timeago font added hide_network option, fixed properties naming Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link. improve notification subscription Refactor arrays to individual options Reset enableFollowsExport to true after 2 sec when an export file is available to download Write a unit test for fileSizeFormatService add checkbox to disable web push I am dumb Handle errors from server Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n ...
\| *	Merge branch 'feature/file-size-checking' into 'develop'	HJ	2018-12-13
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	[pleroma#36] Add errors when file uploading fails See merge request pleroma/pleroma-fe!405
\| \| *	oof	Rinpatch	2018-12-13
\| \| \|
\| \| *	get rid of slots	rinpatch	2018-12-13
\| \| \|
\| \| *	Resolve merge conflict	Rinpatch	2018-12-13
\| \| \|\
\| \| * \|	Refactor arrays to individual options	Rinpatch	2018-12-13
\| \| \| \|
\| \| * \|	I am dumb	Rinpatch	2018-12-12
\| \| \| \|
\| \| * \|	Handle errors from server	Rinpatch	2018-12-12
\| \| \| \|
\| \| * \|	Moved upload errors in user_settings to an array. Moved upload error strings ↵	Rinpatch	2018-12-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to its separate section in i18n
\| \| * \|	Avatar, background, banner filesize errors	Rinpatch	2018-12-11
\| \| \| \|
\| \| * \|	Count in binary bytes and remove i18 from file size format service	Rinpatch	2018-12-10
\| \| \| \|
\| \| * \|	Lint	Rinpatch	2018-12-10
\| \| \| \|
\| \| * \|	Add file size formating	Rinpatch	2018-12-10
\| \| \| \|
\| \| * \|	Fix formating	rinpatch	2018-12-08
\| \| \| \|
\| \| * \|	Improve error messages	rinpatch	2018-12-08
\| \| \| \|
\| \| * \|	[pleroma#36] Add upload errors	Rinpatch	2018-12-08
\| \| \| \|
\| * \| \|	added condition to check for logined user	ValD	2018-12-13
\| \| \| \|
\| * \| \|	fix gradients and minor artifacts	Henry Jameson	2018-12-13
\| \| \| \|
\| * \| \|	Merge branch 'mobile-back' into 'develop'	Shpuld Shpludson	2018-12-13
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Back button for mobile Closes #197 See merge request pleroma/pleroma-fe!403
\| \| * \ \	Merge remote-tracking branch 'upstream/develop' into mobile-back	Henry Jameson	2018-12-13
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (142 commits) fix timeago font added hide_network option, fixed properties naming Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link. improve notification subscription Fix typo that prevented scope copy from working. added check for activatePanel is function or not addressed PR comments activate panel on user screen click added not preload check so hidden toggles asap removed counters from left panel added router-links to all relavent links added activatePanel onclick for timeago button added PR comments add checkbox to disable web push removed brackets from condition resolved lint issue renamed config to preload images and add ident to config added config for preload and made attachment responsive to it preload nsfw image fix ...
\| \| * \| \| \|	back button for mobile	Henry Jameson	2018-12-05
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'fix/reset-follows-export' into 'develop'	Shpuld Shpludson	2018-12-13
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset enableFollowsExport when an export file is available to download See merge request pleroma/pleroma-fe!412
\| \| * \| \| \| \|	Reset enableFollowsExport to true after 2 sec when an export file is ↵	link0ff	2018-12-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	available to download
\| * \| \| \| \| \|	Merge branch 'feature/configurable-nsfw-censor-image' into 'develop'	Shpuld Shpludson	2018-12-13
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make nsfw censor image configurable See merge request pleroma/pleroma-fe!243
\| \| * \| \| \| \| \|	make nsfw censor image configurable	William Pitcock	2018-04-22
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix_loading_flicker' into 'develop'	Shpuld Shpludson	2018-12-13
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Throttle fetching old statuses to prevent spam, especially during scroll Closes #176 See merge request pleroma/pleroma-fe!393
\| \| * \| \| \| \| \|	throttle fetching old statuses to prevent spam, especially during scroll	Henry Jameson	2018-12-04
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix_empty_profiles' into 'develop'	Shpuld Shpludson	2018-12-13
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved user profile display Closes #82 See merge request pleroma/pleroma-fe!414
\| \| * \ \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into fix_empty_profiles	Henry Jameson	2018-12-13
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (121 commits) improve notification subscription Fix typo that prevented scope copy from working. added check for activatePanel is function or not addressed PR comments activate panel on user screen click added not preload check so hidden toggles asap removed counters from left panel added router-links to all relavent links added activatePanel onclick for timeago button added PR comments add checkbox to disable web push removed brackets from condition resolved lint issue renamed config to preload images and add ident to config added config for preload and made attachment responsive to it preload nsfw image fix fixed wrong height for selects better layouting for import-export, error display fixes added keep-colors option ...
\| \| * \| \| \| \| \| \|	Fix fetching new users, add storing local users in usersObjects with their	Henry Jameson	2018-12-13
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	screen_name as well as id, so that they could be fetched zero-state with screen-name link.
\| * \| \| \| \| \| \|	Merge branch 'hide_network' into 'develop'	Shpuld Shpludson	2018-12-13
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FE part of pleroma!490 See merge request pleroma/pleroma-fe!415
\| \| * \| \| \| \| \| \|	added hide_network option, fixed properties naming	Henry Jameson	2018-12-13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix timeago font	Henry Jameson	2018-12-13
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into ↵	Egor Kislitsyn	2018-12-13
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/push-subscriptions # Conflicts: # src/i18n/en.json # src/modules/interface.js # src/modules/users.js # yarn.lock
\| * \| \| \| \| \| \|	add checkbox to disable web push	Egor Kislitsyn	2018-12-13
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into async_follow	Henry Jameson	2018-12-13
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (131 commits) Fix typo that prevented scope copy from working. added check for activatePanel is function or not addressed PR comments activate panel on user screen click added not preload check so hidden toggles asap removed counters from left panel added router-links to all relavent links added activatePanel onclick for timeago button added PR comments removed brackets from condition resolved lint issue renamed config to preload images and add ident to config added config for preload and made attachment responsive to it preload nsfw image fix fixed wrong height for selects better layouting for import-export, error display fixes added keep-colors option separated preview and exported from style_switcher revert that, it's actually used, i'm an idiot ...
\| * \| \| \| \| \|	Merge branch 'fix-scope-copy' into 'develop'	HJ	2018-12-13
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo that prevented scope copy from working. Closes #214 See merge request pleroma/pleroma-fe!413
\| \| * \| \| \| \|	Fix typo that prevented scope copy from working.	Henry Jameson	2018-12-13
\| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'dev_vald_fe/user_name_panel' into 'develop'	HJ	2018-12-12
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	activate panel on user screen click See merge request pleroma/pleroma-fe!408
\| \| * \| \| \| \|	added check for activatePanel is function or not	ValD	2018-12-13
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	addressed PR comments	ValD	2018-12-13
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	activate panel on user screen click	ValD	2018-12-13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'dev_vald_fe/nsfw_preload' into 'develop'	HJ	2018-12-12
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	preload nsfw image Closes #193 See merge request pleroma/pleroma-fe!411
\| \| * \| \| \| \| \|	added not preload check so hidden toggles asap	ValD	2018-12-13
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	added PR comments	ValD	2018-12-12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	removed brackets from condition	ValD	2018-12-12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	resolved lint issue	ValD	2018-12-12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	renamed config to preload images and add ident to config	ValD	2018-12-12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	added config for preload and made attachment responsive to it	ValD	2018-12-12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	preload nsfw image	ValD	2018-12-12
\| \| \|/ / / / /