6508 Commits (8383222026354d97560825c23ed115b3c0ce3574)

Author	SHA1	Message	Date
Thibaut Girka	c92ab35b19	Inline DrawerSearchPopout in DrawerSearch	6 years ago
Thibaut Girka	c19b983986	Refactor a bit DrawerSearch to make it closer to upstream	6 years ago
Thibaut Girka	eed2c9dd44	Rename flavours/glitch/features/drawer to flavours/glitch/features/compose	6 years ago
ThibG	0e78862b61	Allow switching between singe-option and multiple-option polls (#10603)	6 years ago
kedama	d763d39d26	Fix modal items cannot scroll on touch devices (#10605)	6 years ago
ThibG	bdec58b514	Minor code cleanup (#10613)	6 years ago
Ben Lubar	be8692b938	Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565)	6 years ago
Yamagishi Kazutoshi	80c9cb0eb3	Add hi.json (#10573)	6 years ago
partev	d210d0a655	Update hy.json (#10591)	6 years ago
Daniel Aleksandersen	10bdd912d6	Treat meta[property] as a space-separated list (#10604) ... The @property attribute in HTML is a space-separated list of values. This change normalizes whitespace and finds the desired value in the list instead of requiring an exact single-value match. More details: https://www.ctrl.blog/entry/rdfa-socialmedia-metadata.html	6 years ago
Jessica	01b1c377b1	Animate avatar GIFs on-hover on public profiles (#10549) ... * Third time is the charm? * Use full asset URL for data-static and data-original ̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host	6 years ago
jeroenpraat	951f8d5b44	Update NL (Dutch) translation (#10601) ... * Update NL language strings Have to do it this way, cause this file is locked on Weblate * fix * Update simple_form.nl.yml * Update nl.yml	6 years ago
ThibG	6e620dcab1	Use correct local names for fonts (#10594)	6 years ago
Sho Kusano	3e6c7f3617	Configrationable repository url (#10600) ... * config: Add GITHUB_REPOSITORY for repository name * config: Add SOURCE_BASE_URL for repository url * Show source_url and repository name on getting started	6 years ago
Thibaut Girka	8b7b65e995	[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals ... Port 7f75792bf3 to glitch-soc	6 years ago
Thibaut Girka	268417daf3	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	93199c9566	Fix keybase indication on dashboard	6 years ago
Thibaut Girka	d83068016b	Allow turning keybase off instance-wide	6 years ago
Thibaut Girka	e3c1472040	Shift+click on column Back button to return to last pinable column	6 years ago
Thibaut Girka	8d57c0e70e	When selecting a toot via keyboard, ensure it is scrolled into view	6 years ago
Thibaut Girka	fbec0edf08	Fix opening/closing gifv sometimes making the timeline scroll	6 years ago
ThibG	7f75792bf3	Allow modal secondary button to shrink and allow wider confirmation modals (#10586) ... Fixes #10531	6 years ago
Renato "Lond" Cerqueira	d305d8747d	Add new pt-br translations (#10564)	6 years ago
Thibaut Girka	2f422b708f	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Evgeny Petrov	5dd14dfded	i18n: Russian localization update (#10515) ... * i18n: Updated ru.json for Russian language * i18n: Updated ru.yml * Normalize ru.yml * i18n: Updated simple_form.ru.yml * i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings * Added new strings to ru.json * Deleted unused (?) string * i18n: Added recent strings (Settings refactor)	6 years ago
Eugen Rochko	a9f130b8d8	Fix Keybase verification using wrong domain for remote accounts (#10547)	6 years ago
Eugen Rochko	793b0513eb	Weblate translations (2019-04-10) (#10545) ... * Translated using Weblate (Occitan) Currently translated at 95.7% (780 of 815 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Greek) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (French) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/ * Translated using Weblate (French) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (Dutch) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Galician) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ * Translated using Weblate (Dutch) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Arabic) Currently translated at 97.4% (372 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (French) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Thai) Currently translated at 75.4% (288 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/ * Translated using Weblate (Slovak) Currently translated at 100.0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ * Translated using Weblate (German) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/ * Translated using Weblate (Slovak) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ * Translated using Weblate (Kazakh) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/ * Translated using Weblate (Persian) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Kazakh) Currently translated at 99.0% (378 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/ * i18n-tasks normalize * yarn manage:translations * Fix empty string in Occitan	6 years ago
Alex Gessner	d431c810d3	increase allowable length of remote proof username (#10546)	6 years ago
Alex Gessner	154106c0c3	compare usernames case-insensitively on new proof creation flow (#10544) ... * compare usernames case-insensitively on new proof creation flow * Fix code style issue	6 years ago
Aditoo17	4e59f709aa	I18n: Final Czech translation 🇨🇿 (#10542) ... * I18n: Update Czech translation * I18n: Why do you want to join translation * I18n: Translating a bunch of more stuff	6 years ago
Marek Ľach	3dea62bfa2	Updates the grammar of the SK translation (#10541)	6 years ago
Eugen Rochko	92e1950194	[Glitch] Fix glitched out "not found" message for non-existing profiles in web UI ... Port 56f29c38b6 to glitch-soc	6 years ago
Eugen Rochko	fa4b51a110	[Glitch] Add "why do you want to join" field to invite requests ... Port SCSS changes from 8b69a66380 to glitch-soc	6 years ago
Thibaut Girka	5085559b15	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	6 years ago
Eugen Rochko	9b0d8f74cb	Change the groupings of menu items in settings navigation (#10533) ... * Change the groupings of menu items in settings navigation Fix #10307 * Remove unused translations	6 years ago
Eugen Rochko	400397c0c7	Change HTML validator to ignore all errors except unmatched tags (#10534)	6 years ago
Eugen Rochko	46cb36fd2c	Add invite request to pending account notification e-mail (#10528) ... Fix sorting of the pending accounts page	6 years ago
Eugen Rochko	36b39fbac5	Add preference to disable e-mails about new pending accounts (#10529)	6 years ago
Yağızhan	2cb16c20a6	Fixed terrible grammar and translated the most (#10527) ... The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon. I'll come back and finish the translation.	6 years ago
Hinaloe	48f466daf1	Allow set the voting period to just 5 minutes (#10525) ... * Add spec of PollValidator for #10190 * Raise fraction less than 1 second * format * simplify time initialize	6 years ago
Eugen Rochko	8b69a66380	Add "why do you want to join" field to invite requests (#10524) ... * Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted	6 years ago
Eugen Rochko	654f79d2b1	Fix permission denied bug on approve all/reject all pending accounts (#10519)	6 years ago
Eugen Rochko	56f29c38b6	Fix glitched out "not found" message for non-existing profiles in web UI (#10517)	6 years ago
Quentí	ba1a78d168	[i18n] Update and correction (#10511) ... * [i18n] Update and correction * Update oc.json * Update oc.json	6 years ago
Thibaut Girka	cb410f80a4	Add column title to “Favourited by” and “Boosted by” columns	6 years ago
ThibG	5247ea4efd	Fix batch actions not working on pending accounts (#10508)	6 years ago
Thibaut Girka	63837a4b78	Fix pending accounts management	6 years ago
ashleyhull-versent	ac071d65de	[Glitch] Duplicate values ... Port bd365cc38b to glitch-soc	6 years ago
Eugen Rochko	df42de68e5	[Glitch] Port SCSS changes from "Improve blocked view of profiles" ... Port public pages SCSS changes from 67b3b62b98	6 years ago
Thibaut Girka	f5f6d23d55	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.	6 years ago
koyu	3f036ac6b8	Updated German locales (#10505) ... * Updated German locales * Added account approval locales (German) * Updated JSON locales (German)	6 years ago
Alix Rossi	6e111152e0	i18n: Update Corsican translations (#10504)	6 years ago
Aditoo17	ae58bbd705	i18n: Update Czech translation (#10506)	6 years ago
Takeshi Umeda	a4d5e15327	Fix config serializer regex (#10487)	6 years ago
ThibG	cb71c95e22	Export and import show_reblogs together with following list (#10495) ... * Refactor imports * Export show_reblogs when exporting list of followed users * Add support for importing show_reblogs with following collection * Fix tests	6 years ago
Jeong Arm	619bbc23ef	Translate Korean (#10499)	6 years ago
mayaeh	a265696991	i18n: Update Japanese translations (#10494) ... * Update Japanese translations * Update Japanese translations.	6 years ago
Eugen Rochko	67b3b62b98	Improve blocked view of profiles (#10491) ... * Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 120544067f. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 62bafa20a1. * Improve blocked view of profiles - Change "You are blocked" to "Profile unavailable" - Hide following/followers in API when blocked - Disable follow button and show "Profile unavailable" on public profile as well	6 years ago
Eugen Rochko	e1d0390e29	Add batch actions for approving and rejecting pending accounts (#10469)	6 years ago
Eugen Rochko	2c63e0292a	Fix admin validation being too strict about usernames (#10449) ... * Fix admin validation being too strict about usernames Fix #10446 * Strip Setting.site_contact_username consistently throughout the codebase	6 years ago
Marek Ľach	78a8a99b0b	Improve sk translation further (#10484) ... * Further improving Slovak translation * Update sk.json	6 years ago
ashleyhull-versent	2b68fe5442	tinyfix 2: unrequired arguments (#10471) ... * unrequired argument * unrequired argument	6 years ago
marcin mikołajczak	4be7952892	i18n: Update Polish translation (#10479) ... Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>	6 years ago
Marek Ľach	e0137c5884	Updates the Slovak translation (#10477) ... * Update sk.json * Update sk.json * Update sk.json	6 years ago
jeroenpraat	48a52c9372	Dutch (nl) translation (#10474) ... * Translation Dutch * Update activerecord.nl.yml * Update devise.nl.yml * Update nl.yml * Update nl.yml * Update devise.nl.yml * Update nl.yml	6 years ago
ashleyhull-versent	bd365cc38b	Duplicate values (#10470)	6 years ago
ThibG	30500dff7c	Merge pull request #981 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
ThibG	be6885eb93	[Glitch] Update poll remaining time just like with status timestamps ... Port daab45d4ae to glitch-soc	6 years ago
Thibaut Girka	1682ac5717	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.	6 years ago
spla	26bd9fa508	i18n: update Catalan translation (#10458) ... * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations	6 years ago
ThibG	cc6e3c3900	Cache featured collections, as well as outbox, followers and following (#10467)	6 years ago
Thibaut Girka	14bad3f472	Do not handle clicks in detailed status content	6 years ago
ThibG	d4882aa64a	Export and import `hide_notifications` alongside user mutes (#10335) ... * Export hide_notifications along with user mutes * Import hide_notifications along with muted users list * Add headers for CSV exports	6 years ago
ThibG	daab45d4ae	Update poll remaining time just like with status timestamps (#10466)	6 years ago
ThibG	d07b0c038f	Hopefully fix input text selection quirks on iOS (#10463) ... Fix #10448 (hopefully)	6 years ago
Jeong Arm	f984f2ea4e	Esperanto translations (#10461) ... * Esperanto translations * Translate untranslated Esperanto strings * Normalize eo translation	6 years ago
Renato "Lond" Cerqueira	83190fffc7	Re-dd PT-br translations (#10459)	6 years ago
spla	3f75b0929e	i18n: update catalan translations (#10455) ... * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations	6 years ago
Aditoo17	0705e4b177	I18n: Improve Czech translation (#10454)	6 years ago
Thibaut Girka	12dae9d583	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml	6 years ago
ThibG	120544067f	Fix filtering of favourited_by, reblogged_by, followers and following (#10447)	6 years ago
ThibG	62bafa20a1	Hide blocking accounts from blocked users (#10442) ... * Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commit bd02ec6daa. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit 9745de883b. * Hide blocking accounts from search results * Filter blocking accouts from account followers * Filter blocking accouts from account's following accounts * Filter blocking accounts from “reblogged by” and “favourited by” lists * Remove blocking account from URL search * Return 410 on trying to fetch user data from a user who blocked us * Return 410 in /api/v1/account/statuses for suspended or blocking accounts * Fix status filtering when performing URL search * Restore some React improvements Restore some cleanup from bd02ec6daa * Refactor by adding `without_blocking` scope	6 years ago
slice	85973f4f37	Improvements to image upload validation and creation (#10431) ... * Check if image value is nil? before creating an image Check if uploaded images aren't nil before creating SiteUpload models for them. * Validate presence of file in SiteUpload * Fix file presence validation * Fabricate SiteUpload#file * Add link to Creative Commons license	6 years ago
mayaeh	abdf225353	i18n: Update Japanese translations (#10427) ... * Update Japanese translations. run yarn manage:translations && i18n-tasks add-missing * Update Japanese translations. * Fix mistake * Change to be concise.	6 years ago
ThibG	68c797bece	Ensure request.body isn't emptied out before signature verification (#10432) ... Fixes #10429	6 years ago
slice	59cce07601	Add thumbnail, hero, and mascot back to Form::AdminSettings::KEYS (#10430) ... These will allow these images to be uploaded again on the admin settings page.	6 years ago
Eugen Rochko	b9b472d519	[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile ... Port 79227d153b to glitch-soc	6 years ago
Eugen Rochko	59551ece31	[Glitch] Fix search in web UI not setting a limit, restore limit of 10 ... Port 379c3e237f to glitch-soc, but changing the 5 limit to 10, since that's what we had previously	6 years ago
Thibaut Girka	4444d8f9b3	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Jeong Arm	51625d3423	Remove unused code (#10426)	6 years ago
Eugen Rochko	1714ea5978	Add ActivityPub representation for identity proofs (#10414) ... * Add ActivityPub representation for identity proofs * Add tests	6 years ago
Eugen Rochko	8fb69f1366	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) ... Fix #10315 This reverts commit db06b25376.	6 years ago
Eugen Rochko	79227d153b	Fix transparent avatars showing underlying elements in avatar stack and profile (#10422)	6 years ago
Eugen Rochko	379c3e237f	Fix search in web UI not setting a limit, restore limit of 5 (#10421) ... The search API now supports returning more results and pagination, but until the web UI implements pagination, it makes no sense to dump so many results at once. This fix restores the behaviour before the API change	6 years ago
Eugen Rochko	bd02ec6daa	Add indication that you have been blocked in web UI (#10420)	6 years ago
Aditoo17	1d62b88f8d	I18n: Update Czech translation (#10419)	6 years ago
Jeong Arm	e5d79d1635	Add missing Korean translations (#10416) ... * Fix Korean translation * Add missing translation	6 years ago
Alix Rossi	34090a85e4	Update Corsican translations (#10418) ... * Update Corsican translation * Update Corsican YML * Corsican JSON fix * Update co.yml	6 years ago
Masoud Abkenar	2a326940e8	l10n update: fa (#10417)	6 years ago
Alex Gessner	b6fa500806	[Glitch] squashed identity proof updates ... Port JS from 69141dca26 to glitch-soc	6 years ago
Thibaut Girka	a74d300b68	Fix background color transition in destructive buttons	6 years ago
ThibG	f4b038f779	[Glitch] Fix opacity of relationship tags ... Port 58667072d9 to glitch-soc	6 years ago
Thibaut Girka	0318b23395	Fix left border of profile navigation tab	6 years ago
Thibaut Girka	ab39ffb175	Add fa-info-circle to disclaimer	6 years ago
Thibaut Girka	6c58367f36	Fix double border for account disclaimer	6 years ago
slice	6fdd829d8c	[Glitch] Add rel='noopener' to redesigned profile column header avatar link ... Port 73f5711fb8 to glitch-soc	6 years ago
ThibG	841d2c9f23	[Glitch] Move the account dropdown menubar to the right, make sure it doesn't move ... Port a91acf79b5 to glitch-soc	6 years ago
Aditoo17	37ad0478ef	[Glitch] Make clicking on avatar open public profile in new tab ... Port 6f6abc369f to glitch-soc	6 years ago
mayaeh	cf3f063e10	[Glitch] Fix menu items that don't action ... Port 186f7bcbb6 to glitch-soc	6 years ago
Eugen Rochko	00f251b8fe	[Glitch] Redesign profile column in web UI to match design on public pages ... Port a96181f16f to glitch-soc	6 years ago
Thibaut Girka	abb53fa338	Fix centering on public pages	6 years ago
Thibaut Girka	60fc04756a	Fix padding and centering of display names	6 years ago
Thibaut Girka	58da5e93c0	Port search results styling to glitch-soc	6 years ago
Thibaut Girka	ce7d055d3c	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	58667072d9	Fix opacity of relationship tags (#10411)	6 years ago
Aditoo17	1a7d1f4a42	I18n: Update Czech translation (#10410)	6 years ago
Alex Gessner	69141dca26	squashed identity proof updates (#10375)	6 years ago
Thibaut Girka	050efbc126	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml	6 years ago
Eugen Rochko	f1bc90ab50	Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401) ... Also, fix some n+1 queries Resolve #10365	6 years ago
Eugen Rochko	08ec7435ce	Add order options to relationship manager UI (#10404)	6 years ago
Eugen Rochko	683013756e	Revert locales touched by automated translations (#10399) ... * Revert ruined translations Regression from #10362 * yarn manage:translations	6 years ago
Eugen Rochko	e86663b1da	Fix alternative relay support regression (#10398) ... Fix #10324	6 years ago
slice	73f5711fb8	Add rel='noopener' to redesigned profile column header avatar link (#10393)	6 years ago
Eugen Rochko	11fe293e1b	Remove unused ActivityPub `@context` values depending on response (#10378) ... Fix #8078	6 years ago
Thibaut Girka	3a2f646cb1	Revert "fix: update to emoji-mart 2.10.0 (#10281)" ... This reverts commit db06b25376.	6 years ago
Thibaut Girka	355d384d8d	Revert "[Glitch] fix: update to emoji-mart 2.10.0" ... This reverts commit 49bea8c46b.	6 years ago
Thibaut Girka	497a958297	Revert "Fix compilation after emoji-picker change" ... This reverts commit 8ea344fed4.	6 years ago
Thibaut Girka	48230b57d2	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	a91acf79b5	Move the account dropdown menubar to the right, make sure it doesn't move (#10390) ... * Move the account dropdown menubar to the right, make sure it doesn't move * Fix margin	6 years ago
ThibG	9e80b34a95	[Glitch] Add a “Block & Report” button to the block confirmation dialog ... Port 6df4a82969 to glitch-soc	6 years ago
Thibaut Girka	fae53e1a39	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	6df4a82969	Add a “Block & Report” button to the block confirmation dialog (#10360)	6 years ago
ThibG	0c46bd11aa	Fix HTML validation (#10354) ... * Fix HTML validation * Report first HTML error instead on validation error	6 years ago
Aditoo17	6f6abc369f	Make clicking on avatar open public profile in new tab (#10387)	6 years ago
Hinaloe	872eab5784	[Glitch] Do not set CSRF Token when no csrf header ... Port 68f2211f00 to glitch-soc	6 years ago
Eugen Rochko	89a0fa3053	[Glitch] Change icons of features on admin dashboard to remove bias ... Port SCSS changes from e117964325 to glitch-soc	6 years ago
Eugen Rochko	614bd3f8d4	[Glitch] Add `lang` attribute to statuses in web UI ... Port JS changes from e6cfa7ab89 to glitch-soc	6 years ago
ThibG	d680c61993	[Glitch] Do not empty timeline of blocked users on block ... Port 94aceb85ad to glitch-soc	6 years ago
Thibaut Girka	b9f314bba7	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml	6 years ago
Eugen Rochko	648cf8bfd5	[Glitch] Add custom closed registrations message to landing page when set ... Port SCSS changes from 55a9658ad8 to glitch-soc	6 years ago
Thibaut Girka	fcce135d27	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.	6 years ago
Hinaloe	68f2211f00	Do not set CSRF Token when no csrf header (#10383)	6 years ago
mayaeh	186f7bcbb6	Fix menu items that don't action (#10379)	6 years ago
Eugen Rochko	e117964325	Change icons of features on admin dashboard to remove bias (#10366) ... Red crosses implied that it was bad/unexpected that certain features were not enabled. In reality, they are options, so showing a green or grey power-off icon is more appropriate. Add status of timeline preview as well Fix sample accounts changing too frequently due to wrong query Sample accounts are intended to be sorted by popularity	6 years ago
Eugen Rochko	9745de883b	Add `blocked_by` relationship to the REST API (#10373)	6 years ago
Eugen Rochko	e6cfa7ab89	Change language detector threshold from 140 characters to 4 words (#10376) ... Add `lang` attribute to statuses in web UI	6 years ago
Eugen Rochko	94e5e834f2	Improve performance of list of blocked domains by caching counts (#10374)	6 years ago
Eugen Rochko	a96181f16f	Redesign profile column in web UI to match design on public pages (#10337) ... * Redesign profile column in web UI to match design on public pages * Make the tab links text bolder	6 years ago
rinsuki	d8b6431aa7	Add allowfullscreen attribute to oembed iframe (#10370) ... for video player full screen button.	6 years ago
ThibG	94aceb85ad	Do not empty timeline of blocked users on block (#10359) ... Fixes #10226	6 years ago