5683 Commits

Author	SHA1	Message	Date
Thibaut Girka	480f938511	[Glitch] Fix various things in the directory ... Port ecd303c097 to glitch-soc	2018-12-09 16:08:10 +01:00
Thibaut Girka	0b1bc66695	Port directory CSS changes from upstream ... Port 73be8f38c1 to glitch-soc	2018-12-09 16:08:10 +01:00
Thibaut Girka	e7f1bfdc2d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.	2018-12-09 16:08:04 +01:00
ThibG	81bda7d67c	Add setting to not aggregate reblogs (#9248) ... * Add setting to not aggregate reblogs Fixes #9222 * Handle cases where user is nil in add_to_home and add_to_list * Add hint for setting_aggregate_reblogs option * Reword setting_aggregate_reblogs label	2018-12-09 13:03:01 +01:00
Eugen Rochko	6b78e5b5ab	Cache hashtag sample accounts, and exclude ineligible ones (#9465)	2018-12-08 01:32:26 +01:00
Eugen Rochko	4638b16822	Make notification time smaller and reduce contrast (#9464)	2018-12-08 00:40:11 +01:00
Paweł Ngei	5c7f641565	Escape HTML in profile name preview in profile settings (#9446) ... * fix non-escaped html in the profile settings * provide a default profile text in case if there's no custom one * update haml syntax * simplify default profile name to username * sanitize user-input html but display emojified icons	2018-12-07 16:42:22 +01:00
Eugen Rochko	ecd303c097	Fix various things in the directory (#9449) ... * Fix missing variable in directory page title * Order hashtags by number of people instead of alphabetically * Add icon to OpenGraph preview of directory page * Prevent line breaks in hashtags and ensure lowercase in the table	2018-12-07 16:37:32 +01:00
Takeshi Umeda	c1c0f7c516	Fix tag mb_chars comparison of profile directory (#9448)	2018-12-07 04:18:37 +01:00
ThibG	e3682c9c17	Merge pull request #848 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2018-12-06 17:40:43 +01:00
Eugen Rochko	73be8f38c1	Add profile directory (#9427) ... Fix #5578	2018-12-06 17:36:11 +01:00
Thibaut Girka	4167ed375b	Fix mention links in detailed statuses not opening in the WebUI	2018-12-06 15:31:21 +01:00
Thibaut Girka	1df392819d	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-06 12:44:38 +01:00
ThibG	1a22eff1e0	Attempt fixing deadlocks by moving account stats update outside transaction (#9437) ... * Use `update_column` instead of `update_attribute` in callback `update_attribute` would normally cause callbacks to be called. Called from a callback, it seems to stop further callbacks from executing. `update_column` does the same work, but without calling callbacks or preventing other callbacks from executing. * Fix deadlocks by moving account stats update outside transaction	2018-12-05 22:51:12 +01:00
Paweł Ngei	9897cf0701	Add visible dates for notifications in Notification column (#9423) ... * add RelativeTimestamp elements * style the elements properly with CSS	2018-12-05 05:08:43 +01:00
ThibG	e88c6a5c3c	Fix thread depth computation in statuses_controller (#9426) ... * Add test that should currently fail * Fix depth computation (will still fail if statuses have been filtered out) * Fix handling of broken threads	2018-12-05 02:12:29 +01:00
Eugen Rochko	6ddf0432e7	Improve account suspension speed and completeness (#9290) ... - Some associations were missing from the clean-up - Some attributes were not reset on suspension - Skip federation and streaming deletes when purging a dead domain - Move account association definitions to concern	2018-12-03 01:32:08 +01:00
David Yip	fe9340d95e	Merge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-entries ... Display a double reply arrow on public pages for toots that are replies	2018-12-02 16:30:52 -06:00
Thibaut Girka	a07e37cc17	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
Thibaut Girka	4b85bf12ab	Fix since_id	2018-12-01 18:59:24 +01:00
ThibG	5648b30d6c	Fix last_status parameter for notifications and conversations (#9407)	2018-12-01 18:36:41 +01:00
Quentí	6a285f0a15	[i18n] update and corrections for Occitan locale (#9404) ... * Update + correction Colomna and not columna Pòt, verb missing * Correction D’aquí is followed by a time period, and dins by a season. Read : https://github.com/briannesbitt/Carbon/pull/1403 for more details. * Correction admin zone * Correction Reïnicializacion, with the funny ï	2018-12-01 17:39:13 +01:00
Paweł Ngei	b9ec34de57	Add a tooltip explaining what a locked account is (#9403) ... * create a title tooltip explaining what a locked account is * improve phrasing * minor phrasing fix to unify default and english	2018-12-01 14:25:15 +01:00
ThibG	3cbe0c26bb	Merge pull request #837 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2018-11-30 22:37:58 +01:00
Thibaut Girka	76320bf6d8	Scroll to selected toot even if the ancestors happen to be loaded	2018-11-30 22:37:38 +01:00
Thibaut Girka	a10fee3c09	Scroll to detailed status when new ancestors get inserted	2018-11-30 22:37:38 +01:00
Thibaut Girka	31599ad91c	[Glitch] Fix bug in order of conversations in web UI ... Port e18390cfe6 to glitch-soc	2018-11-30 22:37:38 +01:00
Thibaut Girka	837ea32c88	[Glitch] Replace recursion in status mapStateToProps ... Port dfbadd6837 to glitch-soc	2018-11-30 22:37:38 +01:00
Thibaut Girka	a28f5695f3	[Glitch] Fix context building in the reducer ... Port 7706ed038f to glitch-soc	2018-11-30 22:37:38 +01:00
Thibaut Girka	1624a95b2b	[Glitch] Introduce flat layout to contexts reducer ... Port 023fe5181b to glitch-soc	2018-11-30 22:37:38 +01:00
Thibaut Girka	1a5de04789	Display a double reply arrow on public pages for toots that are replies	2018-11-30 22:09:52 +01:00
Thibaut Girka	bc8411ec87	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-30 20:16:26 +01:00
mayaeh	bfec030a4e	Fix that translation is not applied to "joining hashtags" (#9397)	2018-11-30 19:36:09 +01:00
Eugen Rochko	3948b6fa52	Remove npm-run-all dependency (#9401) ... Fix #9359	2018-11-30 19:16:32 +01:00
Thibaut Girka	ad7a3974cc	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-29 19:22:52 +01:00
Thibaut Girka	6a264c9379	Improve detailed status component lifecycle ... - Move componentWillMount and componentWillReceiveProps logic to getDerivedStateFromProps. - Compute CW auto-unfold status earlier	2018-11-29 18:32:42 +01:00
ThibG	fa9f28f52d	Swap avatar and header input fields in profile page (#9271) ... Fixes #9211	2018-11-29 02:56:09 +01:00
Thibaut Girka	7e63fb26e0	Do not hardcode preferences link, pleroma doesn't have it	2018-11-28 22:36:01 +01:00
Thibaut Girka	922d05864f	Add error boundary component to catch Web UI crashes	2018-11-28 22:36:01 +01:00
Thibaut Girka	39c8a71df8	Do not crash the whole UI when loading an invalid column	2018-11-28 22:36:01 +01:00
Thibaut Girka	c18bb5d245	Switch “cycling” reply policy link to set of radio inputs ... Fixes #832	2018-11-28 22:35:42 +01:00
Thibaut Girka	f17a61a916	Add basic UI to set list replies setting in glitch-soc	2018-11-28 14:46:07 +01:00
Thibaut Girka	06c7fb8015	Add backend support to read and update list-specific show_replies settings	2018-11-28 14:46:07 +01:00
Thibaut Girka	53d0293d25	Add database support for list show-reply preferences	2018-11-28 14:46:07 +01:00
David Yip	74a281475a	Merge pull request #829 from ThibG/glitch-soc/features/volume-sliders ... [Glitch] Volume sliders for videos	2018-11-27 15:27:21 -06:00
Eugen Rochko	c39d7e7b2b	Fix TLS handshake timeout not being enforced (#9381) ... Follow-up to #9329	2018-11-27 19:46:05 +01:00
Eugen Rochko	11955600ad	Skip deliveries to inboxes that have already been marked as unavailable (#9358)	2018-11-27 19:15:08 +01:00
Eugen Rochko	81f96c973a	Don't count suspended users in user count (#9380) ... Fix #7637	2018-11-27 18:49:37 +01:00
Eugen Rochko	43c311b3a1	Fix nil error when no DNS addresses are found for host (#9379)	2018-11-27 18:13:36 +01:00
Thibaut Girka	3b707bdc12	[Glitch] Volume sliders for videos ... Port f978afa487 to glitch-soc	2018-11-27 15:21:57 +01:00