942 commits

Author	SHA1	Message	Date
Henry Jameson	d886ab752c	post-rebase fix, backported d7d787b84c	2018-07-06 20:19:02 +03:00
Henry Jameson	38d5226ad1	notifs fix	2018-07-06 20:14:39 +03:00
Henry Jameson	0714391aba	UI update	2018-07-06 20:14:36 +03:00
Henry Jameson	398eaaf79b	fixed the UI	2018-07-06 20:12:09 +03:00
Henry Jameson	8ccebbe156	both bugs fixed. it's reactive and no more conflicting cards	2018-07-06 20:12:09 +03:00
Henry Jameson	fa8c221f3a	moved style generator into separate file. notifications are highlighted too now.	2018-07-06 20:12:09 +03:00
Henry Jameson	f911182a2f	working, somewhat	2018-07-06 20:12:09 +03:00
Henry Jameson	148e691199	initial vers	2018-07-06 20:12:09 +03:00
lambda	c07adb7121	Merge branch 'patch-1' into 'develop' ... Update messages.js / tiny typofix in fr version See merge request pleroma/pleroma-fe!288	2018-06-25 06:07:47 +00:00
goofy	c2f6227092	Update messages.js / tiny typofix in fr version	2018-06-24 14:18:43 +00:00
Haelwenn (lanodan) Monnier	6da86599a9	src/i18n/messages.js: French Translation for Post Scope UI tooltips ... Co-authored-by: goofy	2018-06-24 16:14:47 +02:00
Ole Bertram	44428e8b09	Add warning/info text on appriopriate status scopes	2018-06-23 22:10:15 +02:00
Ole Bertram	05bc6fa8e8	Add title text with description to scope icons	2018-06-23 22:09:13 +02:00
Francis Dinh	556eb4b8a3	add unretweet action to statuses.js	2018-06-14 17:17:36 -04:00
Francis Dinh	d05fcfa1a8	Add unretweet support	2018-06-14 05:00:11 -04:00
Roger Braun	d4f5b3feec	Use parents scope if available.	2018-06-12 19:28:48 +02:00
lambda	7707048bff	Merge branch 'feature/update-de-translation' into 'develop' ... updated german translation See merge request pleroma/pleroma-fe!269	2018-06-12 17:09:02 +00:00
lambda	0683e37fa4	Merge branch 'feature/update-russian-translation' into 'develop' ... Update Russian translation See merge request pleroma/pleroma-fe!270	2018-06-12 17:03:24 +00:00
lambda	97ae186aaa	Merge branch 'improve-settings-ui' into 'develop' ... Improve user settings ui See merge request pleroma/pleroma-fe!273	2018-06-12 17:01:35 +00:00
lambda	5d59028ef7	Merge branch 'patch-1' into 'develop' ... Hebrew Translation of "placeholder" See merge request pleroma/pleroma-fe!278	2018-06-12 16:57:47 +00:00
lambda	6ea5cfe71e	Merge branch 'feature/locked-accounts' into 'develop' ... Feature/locked accounts See merge request pleroma/pleroma-fe!274	2018-06-12 16:57:18 +00:00
William Pitcock	c155110eed	messages: rename content warning to subject	2018-06-08 18:47:21 +00:00
Artik Banana	d766125eca	Update messages.js	2018-06-08 14:08:07 +00:00
lambda	71dcf120ed	Merge branch 'tr-fix' into 'develop' ... Translate username input placeholder See merge request pleroma/pleroma-fe!275	2018-06-08 13:34:07 +00:00
lambda	278321db48	Merge branch 'l10n-french-newsettings' into 'develop' ... Add French translations for the new user settings See merge request pleroma/pleroma-fe!271	2018-06-08 13:33:00 +00:00
lambda	e2c5e4eb46	Merge branch 'develop' into 'develop' ... Hebrew Translation See merge request pleroma/pleroma-fe!277	2018-06-08 13:28:57 +00:00
Roger Braun	8c2a0191a5	Merge branch 'dr1ft/pleroma-fe-develop' into develop	2018-06-08 15:26:13 +02:00
Roger Braun	d64293506c	Make scope options optional, refactoring.	2018-06-08 15:25:48 +02:00
Astra	d62e702994	should resolve a 3/4 things	2018-06-07 17:31:43 -04:00
Artik Banana	72d9322c02	Update messages.js	2018-06-07 20:37:06 +00:00
Artik Banana	24eddeb3e1	Update messages.js	2018-06-07 20:28:43 +00:00
Artik Banana	da0dcdaaf8	Update messages.js	2018-06-07 20:28:16 +00:00
Artik Banana	17aa44862b	Update messages.js	2018-06-07 20:20:20 +00:00
Artik Banana	da444e85ee	Update messages.js	2018-06-07 19:56:25 +00:00
Roger Braun	72d7693f56	Update translation.	2018-06-07 19:53:08 +02:00
Astra	a759378b4d	more lint fixes	2018-06-07 05:18:54 -04:00
Astra	f49229974a	correct linter problems	2018-06-07 05:08:39 -04:00
Astra	92a8ca0011	crt's compose box changes	2018-06-07 05:03:50 -04:00
riking	21868a7f91	Add initial translations of username placeholder	2018-06-06 23:52:28 -07:00
riking	da1112297a	fix: enable translating login form placeholder	2018-06-06 23:44:11 -07:00
William Pitcock	d7d787b84c	user card: show that the account is locked if it is	2018-06-07 02:16:30 +00:00
William Pitcock	7389f07115	follow requests: refactor to properly leverage vuex	2018-06-07 01:24:31 +00:00
William Pitcock	f3a27764aa	add follow requests UI	2018-06-07 00:58:44 +00:00
William Pitcock	b8d0a6a0ba	backend interactor service: add approveUser and denyUser functions	2018-06-07 00:29:13 +00:00
William Pitcock	2cf28acfd1	api: add approveUser and denyUser functions	2018-06-07 00:29:01 +00:00
William Pitcock	4efb528a52	backend interactor service: implement fetchFollowRequests()	2018-06-06 22:29:02 +00:00
William Pitcock	4e64514aa9	api: add fetchFollowRequests()	2018-06-06 22:26:24 +00:00
Artik Banana	8a49174171	Update messages.js	2018-06-06 17:43:36 +00:00
Artik Banana	dd437222d0	Update messages.js	2018-06-05 09:09:30 +00:00
Sebastian Huebner	fb0f9f99af	corrected a typo and changed/shortend delete_account_error text	2018-06-04 10:58:05 +02:00