101 commits

Author	SHA1	Message	Date
Hakaba Hitoyo	a81c3b1324	fix typo	2018-08-26 06:54:03 +09:00
tsukada-ecsec	dfc5f170c6	update	2018-08-24 18:46:14 +09:00
ensra	3ec8e43a97	Rename expandCW to collapseMessageWithSubject. ... Add option to config.json, disabled by default.	2018-08-20 03:41:40 +01:00
Henry Jameson	99f849bd8c	Revert "storing entire config instead of each separate thing of it, so that future" ... This reverts commit 18117c3bfa. b/c something else uses same field but i want to fix that in another MR	2018-08-18 13:56:45 +03:00
Henry Jameson	18117c3bfa	storing entire config instead of each separate thing of it, so that future ... options won't be lost during reloads because developer forgot to update that list of settings to be persisted	2018-08-13 16:17:00 +03:00
lambda	ce88f351f7	Merge branch 'invites' into 'develop' ... FE part of invites system See merge request pleroma/pleroma-fe!297	2018-08-12 16:15:27 +00:00
Henry	27adde9887	Merge branch 'develop' into 'feature/accountHighlight' ... # Conflicts: # src/components/user_card_content/user_card_content.vue	2018-08-12 12:05:08 +00:00
Henry Jameson	976444064f	Fixes broken custom emoji in autocomplete when proxying to remote BE	2018-08-06 09:45:22 +03:00
Henry Jameson	9cebb00faa	the missing piece for invites system	2018-08-05 10:01:38 +03:00
lambda	17f6eb18e7	Revert "Merge branch 'cw-clickthrough' into 'develop'" ... This reverts merge request !291	2018-07-12 07:20:39 +00:00
Henry Jameson	f911182a2f	working, somewhat	2018-07-06 20:12:09 +03:00
Vivian Lim	b0cf050797	Add configuration option to enable click-through content warnings	2018-06-28 23:39:55 -07: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
Roger Braun	d64293506c	Make scope options optional, refactoring.	2018-06-08 15:25:48 +02:00
William Pitcock	f3a27764aa	add follow requests UI	2018-06-07 00:58:44 +00:00
Hakaba Hitoyo	2ade177d5a	configurable who to follow panel	2018-05-05 00:20:19 +09:00
Hakaba Hitoyo	77ffa89464	Merge remote-tracking branch 'origin/feature/who-to-follow-panel-2' into feature/who-to-follow-panel-configurable	2018-05-04 23:50:14 +09:00
Hakaba Hitoyo	150b815407	lint	2018-04-29 18:09:49 +09:00
Hakaba Hitoyo	b1d1c7cfc4	lint	2018-04-29 18:07:40 +09:00
Hakaba Hitoyo	2a6721ea56	redirect root by login or not	2018-04-29 17:55:23 +09:00
Hakaba Hitoyo	b32573138b	Add who-to-follow-panel	2018-02-24 23:04:44 +09:00
Hakaba Hitoyo	fe1044dfdf	Update main.js	2018-02-10 01:25:51 +00:00
Hakaba Hitoyo	ebd8300e36	slove conflict	2018-02-10 10:17:58 +09:00
dtluna	e49cf7b67a	Add textlimit	2018-02-09 16:37:32 +03:00
dtluna	e2248bcf4f	Use name and closed from the backend	2018-02-09 16:02:26 +03:00
Hakaba Hitoyo	5dd4631860	debug	2018-02-04 08:43:31 +09:00
Hakaba Hitoyo	013f11497f	slove-conflict	2018-02-04 08:36:10 +09:00
hakabahitoyo	95cba854f3	add instance specific panel	2018-02-04 00:27:33 +09:00
eal	36e68fba96	Merge branch 'develop' into feature/normal-emoji-completion	2018-02-01 18:19:36 +02:00
eal	90175a1872	Fix name clash on unicode and custom emoji	2018-02-01 18:12:23 +02:00
Roger Braun	92289e545a	Move chat to sidebar.	2018-01-26 15:11:34 +01:00
eal	b67c506062	Merge branch 'develop' into feature/normal-emoji-completion	2017-12-23 19:52:16 +02:00
eal	8f3926a096	Detect backend.	2017-12-23 11:31:43 +02:00
eal	fe269b2cf9	Merge branch 'fix/gs-emoji-error' into 'develop' ... Suppress emoji fetch error on gs. See merge request pleroma/pleroma-fe!183	2017-12-07 21:42:00 +00:00
eal	1db1529dec	Suppress emoji fetch error on gs.	2017-12-07 23:37:05 +02:00
eal	612fb18367	Add option for disabling chat.	2017-12-07 18:20:44 +02:00
Roger Braun	27be1e0fa3	Move chat to own module.	2017-12-05 11:47:10 +01:00
Roger Braun	fbee80474b	Basic frontend changes for chat.	2017-12-04 19:08:33 +01:00
Roger Braun	2691579ab7	Make default path configurable.	2017-11-22 16:28:05 +01:00
eal	581e3e836a	Add completion for normal emoji.	2017-11-20 20:32:51 +02:00
shpuld	d65d6e5da4	Clean up, use translations, persist theme, add more presets.	2017-11-18 13:13:51 +02:00
eal	29e32416bc	Persist streaming setting between sessions.	2017-11-13 11:44:28 +02:00
eal	26416ed15c	Revert to English timeago for latin script languages.	2017-11-09 09:45:02 +02:00
eal	ceb13a6405	Add timeago locales.	2017-11-08 22:20:50 +02:00
Roger Braun	74b513122e	Set locale from browser settings.	2017-11-07 15:23:00 +01:00
Roger Braun	7516cd859f	Prepare for i18n.	2017-11-07 15:14:37 +01:00
eal	ba9b04a8ba	Use the API endpoint for emoji completion.	2017-10-19 23:39:21 +03:00
eal	447ec91176	Actually actually fix image url.	2017-09-19 22:58:15 +03:00
eal	f4b1319eff	Actually fix image url.	2017-09-19 22:54:54 +03:00
eal	2162ef20b0	Add emoji completion.	2017-09-19 22:43:20 +03:00