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
*	Use parents scope if available.	Roger Braun	2018-06-12
\|
*	Merge branch 'feature/update-de-translation' into 'develop'	lambda	2018-06-12
\|\ \| \| \| \| \| \| \| \|	updated german translation See merge request pleroma/pleroma-fe!269
\| *	corrected a typo and changed/shortend delete_account_error text	Sebastian Huebner	2018-06-04
\| \|
\| *	updated german translation	Sebastian Huebner	2018-05-25
\| \|
* \|	Merge branch 'feature/update-russian-translation' into 'develop'	lambda	2018-06-12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update Russian translation See merge request pleroma/pleroma-fe!270
\| * \|	Update Russian translation	dtluna	2018-05-26
\| \|/
* \|	Merge branch 'improve-settings-ui' into 'develop'	lambda	2018-06-12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Improve user settings ui See merge request pleroma/pleroma-fe!273
\| * \|	Fix the height of file inputs	User	2018-05-29
\| \| \|
\| * \|	Visually separate the settings items	User	2018-05-29
\| \|/
* \|	Merge branch 'patch-1' into 'develop'	lambda	2018-06-12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Hebrew Translation of "placeholder" See merge request pleroma/pleroma-fe!278
\| * \|	Update messages.js	Artik Banana	2018-06-08
\| \| \|
* \| \|	Merge branch 'feature/locked-accounts' into 'develop'	lambda	2018-06-12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature/locked accounts See merge request pleroma/pleroma-fe!274
\| * \| \|	user card: show that the account is locked if it is	William Pitcock	2018-06-07
\| \| \| \|
\| * \| \|	follow requests: refactor to properly leverage vuex	William Pitcock	2018-06-07
\| \| \| \|
\| * \| \|	config: fix typo	William Pitcock	2018-06-07
\| \| \| \|
\| * \| \|	add follow requests UI	William Pitcock	2018-06-07
\| \| \| \|
\| * \| \|	backend interactor service: add approveUser and denyUser functions	William Pitcock	2018-06-07
\| \| \| \|
\| * \| \|	api: add approveUser and denyUser functions	William Pitcock	2018-06-07
\| \| \| \|
\| * \| \|	backend interactor service: implement fetchFollowRequests()	William Pitcock	2018-06-06
\| \| \| \|
\| * \| \|	api: add fetchFollowRequests()	William Pitcock	2018-06-06
\| \| \| \|
\| * \| \|	user settings: enable locking/unlocking an account	William Pitcock	2018-05-29
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'i18n/change-content-warning-to-subject' into 'develop'	lambda	2018-06-12
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	messages: rename content warning to subject See merge request pleroma/pleroma-fe!280
\| * \|	messages: rename content warning to subject	William Pitcock	2018-06-08
\|/ /
* \|	Merge branch 'tr-fix' into 'develop'	lambda	2018-06-08
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Translate username input placeholder See merge request pleroma/pleroma-fe!275
\| * \|	Add initial translations of username placeholder	riking	2018-06-06
\| \| \|
\| * \|	fix: enable translating login form placeholder	riking	2018-06-06
\| \|/
* \|	Merge branch 'l10n-french-newsettings' into 'develop'	lambda	2018-06-08
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add French translations for the new user settings See merge request pleroma/pleroma-fe!271
\| * \|	Add French translations for the new user settings	chip	2018-05-26
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Add French translations for the new user settings : - Password change - Follows export - Account deletion
* \|	Merge branch 'develop' into 'develop'	lambda	2018-06-08
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Hebrew Translation See merge request pleroma/pleroma-fe!277
\| * \|	Update messages.js	Artik Banana	2018-06-07
\| \| \|
\| * \|	Update messages.js	Artik Banana	2018-06-07
\| \| \|
\| * \|	Update messages.js	Artik Banana	2018-06-07
\| \| \|
\| * \|	Update messages.js	Artik Banana	2018-06-07
\| \| \|
\| * \|	Update messages.js	Artik Banana	2018-06-07
\| \| \|
\| * \|	Update messages.js	Artik Banana	2018-06-06
\| \| \|
\| * \|	Update messages.js	Artik Banana	2018-06-05
\| \|/
* \|	Merge branch 'dr1ft/pleroma-fe-develop' into develop	Roger Braun	2018-06-08
\|\ \
\| * \|	Make scope options optional, refactoring.	Roger Braun	2018-06-08
\| \| \|
\| * \|	Merge branch 'develop' of https://git.pleroma.social/dr1ft/pleroma-fe into ↵	Astra	2018-06-07
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	develop
\| \| * \|	should resolve a 3/4 things	Astra	2018-06-07
\| \| \| \|
\| * \| \|	should resolve a 3/4 things	Astra	2018-06-07
\| \|/ /
\| * \|	more lint fixes	Astra	2018-06-07
\| \| \|
\| * \|	correct linter problems	Astra	2018-06-07
\| \| \|
\| * \|	crt's compose box changes	Astra	2018-06-07
\| \|/
* /	Update translation.	Roger Braun	2018-06-07
\|/
*	Merge branch 'feature/change-password' into 'develop'	lambda	2018-05-24
\|\ \| \| \| \| \| \| \| \|	Feature/change password See merge request pleroma/pleroma-fe!268
\| *	Fix formatting	Syldexia	2018-05-21
\| \|
\| *	Added change password to user settings	Syldexia	2018-05-21
\|/
*	Display visibility if available.	Roger Braun	2018-05-20
\|
*	Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletion	Roger Braun	2018-05-20
\|\