glitchier-soc

Commit Graph

Author	SHA1	Message	Date
ThibG	fd7a37c371	[Glitch] Add explanation as to why unlocked accounts may have follow requests Port `d3ff06a320` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Eugen Rochko	7d5b43d8bb	[Glitch] Add ability to filter audit log in admin UI Port `f65568f1d4` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	8fef96cbf5	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	d3ff06a320	Add explanation as to why unlocked accounts may have follow requests (#13385 ) * Add explanation as to why unlocked accounts may have follow requests * Change wording to avoid “silenced”	5 years ago
Eugen Rochko	f65568f1d4	Add ability to filter audit log in admin UI (#13381 )	5 years ago
Sasha Sorokin	b367dd713e	[Glitch] Improve polls: option lengths & redesign Port `37b3985bfa` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Mélanie Chauvel (ariasuni)	2e337d850f	[Glitch] Improve toot clicking areas Port part of `1fb92037e4` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	9175ebf20c	[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW Port `cf1fa73347` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Mélanie Chauvel (ariasuni)	dcf841545d	[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI Port `be2f1597cf` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	3eede6f64b	[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI Port front-end changes from `0d117c106a` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	f3eff922a3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.	5 years ago
Sasha Sorokin	37b3985bfa	Improve polls: option lengths & redesign (#13257 ) This commit redesign the polls and increases characters limit for the options from 25 to 50 characters, giving pollsters more freedom. Summarizing, the redesign is making the polls more adaptive for upcoming changes to the options characters limit: the bar, or a "chart", is now displayed separately from the option itself; vote check mark is moved next to the option text, making the percentages take less space. Option lengths are taken into account and text is wrapped to multiple lines if necessary to avoid overflow.	5 years ago
Eugen Rochko	4bf5aeae83	Fix pinning a column in web UI sometimes redirecting out of web UI (#13376 ) Fix #13216	5 years ago
Mélanie Chauvel (ariasuni)	1fb92037e4	Improve toot clicking areas (#13327 ) * Make the area to the left “Show Thread” also expand the toot in Web UI * Clicking the left part of a conversation with the avatars now opens it in Web UI	5 years ago
ThibG	cf1fa73347	Fix content warning being unnecessarily cleared when enabling/disabling CW (#13348 )	5 years ago
Mélanie Chauvel (ariasuni)	be2f1597cf	Fix wrong color for ellipsis in boost confirmation dialog in Web UI (#13355 )	5 years ago
ThibG	0d117c106a	Fix 404 and 410 API errors being silently discarded in WebUI (#13279 ) * Fix 404 and 410 API errors being silently discarded in WebUI Fixes #13278 * Return more appropriate error when user replies to a deleted toot * Please CodeClimate * Fix 404/410 errors on fetching account timelines & identity proofs * Refactor error handling * Move error message string to statuses.errors	5 years ago
ThibG	faa56643b8	[Glitch] Fix frontend crash when deleting announcements Port `858d0dd168` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	60338b2bee	[Glitch] Change poll option hover/active styling to be less confusing Port `beb80adb51` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	7b435fd9bf	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.	5 years ago
Eugen Rochko	260eb6f2e6	New Crowdin translations (#13064 ) * New translations en.yml (Russian) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations devise.en.yml (Icelandic) [ci skip] * New translations en.json (Italian) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Icelandic) [ci skip] * New translations simple_form.en.yml (Italian) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Swedish) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Portuguese) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations devise.en.yml (Kabyle) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Icelandic) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Portuguese) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (German) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Galician) [ci skip] * New translations simple_form.en.yml (Icelandic) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations en.yml (French) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations simple_form.en.yml (Asturian) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations simple_form.en.yml (Italian) [ci skip] * New translations devise.en.yml (Kabyle) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (French) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations activerecord.en.yml (Occitan) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations activerecord.en.yml (Kabyle) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations devise.en.yml (Breton) [ci skip] * New translations en.json (Breton) [ci skip] * New translations doorkeeper.en.yml (Breton) [ci skip] * New translations simple_form.en.yml (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations devise.en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * i18n-tasks normalize * yarn manage:translations	5 years ago
ThibG	858d0dd168	Fix frontend crash when deleting announcements (#13312 ) Refactor and fix #13283, which only worked in some cases.	5 years ago
ThibG	beb80adb51	Change poll option hover/active styling to be less confusing (#13313 )	5 years ago
Daniel Sockwell	9da4bd098c	[Glitch] Fix frontend crash when deleting announcements Port `8758221e73` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	0ff78befc6	[Glitch] Fix regression in “Edit media” modal in web UI Port `90f3a00062` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
mayaeh	912f4a2eba	[Glitch] Change the string "hidden" to "blocked" in WebUI Port `310d729745` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Eugen Rochko	295dadc9f0	[Glitch] Change local media attachments to perform heavy processing asynchronously Port front-end part of `9660aa4543` to glitch-soc [API] This makes use of a new media posting API (/api/v2/media), supporting background processing of uploaded files. For Pleroma's purposes, this could be handled the same as /api/v1/media since afaik Pleroma doesn't do any transcoding. Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	9abb227250	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.	5 years ago
Shlee	221eda646b	Migrate Rails ujs as required for Rails 6 Upgrade. (#13280 ) * Update yarn.lock * Update package.json * Update public.js * Update admin.js * Update log_out.js * Update common.js	5 years ago
mayaeh	44292a6952	Add link to bookmarks in web UI dropdown (#13273 )	5 years ago
Daniel Sockwell	8758221e73	Fix frontend crash when deleting announcements (#13283 ) This two-line change fixes a crash in the front end that occurred under the following circumstances: * A server had more than one announcement, * A user was displaying the announcements, and * An announcement was deleted (or unpublished, which amounts to the same thing.) As might be expected, the bug was caused by attempting to access a notification using an index value outside the bounds of the existing announcements. Specifically, in two places. First, `_markAnnouncementAsRead` attempts to modify announcements based on the current index. This is what caused the front end crash. Second, when rendering the `Announcements` component, the code paginates the announcements and displays the current one. This did not cause a crash, but caused the front end to confusingly display a blank announcement (in situations that would have caused a crash) with no way for the user to navigate back to previous announcements. This commit fixes both issues by adding a check to ensure that the code never attempts to access an announcement with an index greater than or equal to the number of announcements present.	5 years ago
ThibG	b998ec7c72	Fix WebUI crash in single-column mode on prehistoric browsers (#13267 ) Fixes #13266	5 years ago
Thibaut Girka	7115b0b8c9	Fix missing media description dialog when sending toots with keyboard shortcuts	5 years ago
Thibaut Girka	531658d6cf	Fix posting privacy on secondary button with missing description confirmation dialog	5 years ago
Thibaut Girka	e53622442c	Fix privacy icon being displayed twice in glitch-soc Web UI Fixes #1298	5 years ago
ThibG	aeebbe90dc	Fix detailed view of direct messages displaying a 0 boost count (#13244 ) The boost count is already removed from private toots, do the same with direct messages.	5 years ago
ThibG	90f3a00062	Fix regression in “Edit media” modal in web UI (#13243 )	5 years ago
mayaeh	310d729745	Change the string "hidden" to "blocked" in WebUI (#13221 ) * Change the string "hidden" to "blocked" in WebUI. * update	5 years ago
Eugen Rochko	9660aa4543	Change local media attachments to perform heavy processing asynchronously (#13210 ) Fix #9106	5 years ago
ThibG	9c29229587	[Glitch] Add support for links to statuses in announcements to be opened in web UI Port `aa67036b41` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Mélanie Chauvel (ariasuni)	669cf49c54	[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI Port `5e4b649655` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Bèr Kessels	fc53d9cc76	[Glitch] Code style improvements in JavaScript Port `fd76955f39` to glitch-soc * JS-linter: fix trailing comma's * Configure eslinter to ignore this onchange error. Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Mélanie Chauvel (ariasuni)	35d2189ac8	[Glitch] Change description of privacy levels to be more intuitive in web UI Port `4063f9f278` to glitch-soc Co-authored-by: Thibaut Girka <thib@sitedethib.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Mélanie Chauvel (ariasuni)	bdb06f50ec	[Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI Port `2e18b1a2a2` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	3c96a0c21d	[Glitch] Fix too large announcements not being scrollable in web UI Port `503eab1c1f` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
koyu	6211eff739	[Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI Port `e69a3f54a1` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	c8f36a71ea	[Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI Port `39453de232` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Mélanie Chauvel (ariasuni)	eae96cb204	[Glitch] Add tooltips to audio/video player buttons Port `036ba3f510` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	c790ecb14d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.	5 years ago
ThibG	aa67036b41	Add support for links to statuses in announcements to be opened in web UI (#13212 ) * Add support for links to public statuses in announcements to be opened in WebUI * Please CodeClimate	5 years ago

1 2 3 4 5 ...

4176 Commits (6e426267a762f3cd1efa2c5fb120a13543567775)