660 Commits (00fcdebed758f031b486ec239fd425fc54a180b3)

Author	SHA1	Message	Date
Thibaut Girka	c91d9b7389	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb	8 years ago
Masoud Abkenar	df2f4052b8	RTL: fix margins: public-layout.header.nav-button (#8823) ... * RTL: fix margins: public-layout.header.nav-button * add empty line to meet style guides	8 years ago
Eugen Rochko	3d7f68c273	Revert Font Awesome 5 upgrade (#8810) ... * Revert "Fix some icon names changed by the Font Awesome 5. (#8796)" This reverts commit 3f9ec3de82. * Revert "Migrate to font-awesome 5.0. (#8799)" This reverts commit 8bae14591b. * Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)" This reverts commit b9c727a945. * Revert "Update the icon name changed by the Font Awesome 5. (#8776)" This reverts commit 17af4d27da. * Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)" This reverts commit 4b794e134d.	8 years ago
Naoki Kosaka	8bae14591b	Migrate to font-awesome 5.0. (#8799)	8 years ago
Haelwenn Monnier	15fc2b76f9	Show "read more" link on overly long in-stream statuses (#8205) ... Show "read more" link on overly long in-stream statuses	8 years ago
rhoio	c6e765f81e	remove meta label in settings column (#8704)	8 years ago
Maciek Baron	4b794e134d	Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484) ... * Migrate to newer version of Font Awesome * Add bot icon to bot avatars	8 years ago
Masoud Abkenar	9f6662fcc9	RTL: fix statubar action buttons/counter margins (#8767) ... * RTL: fix statubar action buttons/counter margins * remove trailing whitespaces	8 years ago
Minku Lee	d0d65b5a28	Separate font-family into variable (#8763) ... This will allow easier customization of font family instead of going through all occurrences of 'mastodon-font-sans-serif'.	8 years ago
Masoud Abkenar	ef11347281	RTL: fix settings button margins in column headers (#8764)	8 years ago
Thibaut Girka	91bef4759f	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js	8 years ago
Eugen Rochko	f4d549d300	Redesign forms, verify link ownership with rel="me" (#8703) ... * Verify link ownership with rel="me" * Add explanation about verification to UI * Perform link verifications * Add click-to-copy widget for verification HTML * Redesign edit profile page * Redesign forms * Improve responsive design of settings pages * Restore landing page sign-up form * Fix typo * Support <link> tags, add spec * Fix links not being verified on first discovery and passive updates	8 years ago
Eugen Rochko	011437dcb5	Group reports by target account (#8674) ... * Group reports by target account * Improve CSS	8 years ago
rhoio	7b7c26063e	Highlight active tab in action bar (#8673) ... * NavLinks with activeclass instead of Link in actionbar to highlight active tab * highlight border-bottom in action bar consistent to public view	8 years ago
Thibaut Girka	cd99255698	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.	8 years ago
ThibG	bda0f7ac73	Add a few black emojis that are to have a white outline (#8597)	8 years ago
Sorin Davidoi	8fefcb86ea	feat(css): Styled scrollbars in Firefox Nightly (#8653) ... You currently need to enable `layout.css.scrollbar-colors.enabled` in `about:config` in Firefox Nightly.	8 years ago
ThibG	0c5db3163a	Fix dropdown arrow position (#8637)	8 years ago
Thibaut Girka	6f75a9001f	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml	8 years ago
takayamaki	f5c052b5e6	refactor: getting-started__wrapper should contained in getting-started (#8532)	8 years ago
M Somerville	1bfe735d57	Inactive header in main profile to match column. (#8520)	8 years ago
Thibaut Girka	c24491a8df	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Mélanie Chauvel (ariasuni)	9463bba5fb	Reduce padding of profile metadata boxes to allow more text (#8491)	8 years ago
Thibaut Girka	246c313d45	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.	8 years ago
Eugen Rochko	a2cabf3f4a	Add admin custom CSS setting (#8399) ... Fix #3894	8 years ago
Eugen Rochko	5b5ae01824	Update light theme (#8392) ... Fix #8209 Fix #7566	8 years ago
Thibaut Girka	e70fc059a9	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	2374a00c10	Add confirmation step to account suspensions (#8353) ... * Add confirmation page for suspensions * Suspension confirmation closes reports, linked from report UI * Fix tests	8 years ago
Thibaut Girka	8b4abaa90d	Merge branch 'master' into glitch-soc/master ... Conflicts: config/routes.rb Added the “endorsements” route from upstream.	8 years ago
NecroTechno	6a0d4d36ad	reorder simple form ul to list vertically (fixes #8236) (#8322) ... * reorder simple form ul to list vertically (fixes #8236) * remove browser specific prefixes	8 years ago
cpsdqs	8fe1f8d4ce	Make dropdown animations respect their placement (#8292) ... * Make dropdown animations respect their placement Also fix the corner radius on the privacy dropdown button when using top placement * Fix code style issue	8 years ago
mayaeh	0d1d9b9a33	Fix report text color. (#8288)	8 years ago
Thibaut Girka	88a0395a58	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	19b07ba260	Make unfollow button light up red when hovered (#8286) ... Fix #8284	8 years ago
Thibaut Girka	bfeac6747a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.	8 years ago
Eugen Rochko	85bb32c410	Add "sign in to participate" message to public toot page (#8200)	8 years ago
Eugen Rochko	78fa926ed5	Add remote interaction dialog for toots (#8202) ... * Add remote interaction dialog for toots * Change AuthorizeFollow into AuthorizeInteraction, support statuses * Update brakeman.ignore * Adjust how interaction buttons are display on public pages * Fix tests	8 years ago
Thibaut Girka	280d7b1df8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).	8 years ago
ThibG	625b5a567b	Get rid of the Content Warning rainbows (#8129) ... * Disable the animated rainbow text when the “Reduce motion” setting is set * Get rid of the Content Warning rainbows * Revert to default color for CWs in admin view Since that colorscheme is apparently broken for some colorblind people. * Use HTML5's details and summary for statuses with CWs in admin interface	8 years ago
Eugen Rochko	4df9cabb22	Display replies count in web UI (#8181)	8 years ago
Thibaut Girka	e5a603206d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.	8 years ago
Eugen Rochko	5b8603879f	Adjust responsive design for /about/more and /terms (#8158) ... Follow-up to #8142	8 years ago
Eugen Rochko	0dcc1950d1	Update /terms and /about/more to use public layout (#8142)	8 years ago
Eugen Rochko	f2404de871	Public profile endorsements (accounts picked by profile owner) (#8146)	8 years ago
Thibaut Girka	c1c514ca70	Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.	8 years ago
Eugen Rochko	13ac8ca66a	Do not hide hashtag timeline in mobile view, make it full-window (#8093)	8 years ago
Eugen Rochko	60df87f6f0	Compensate for scrollbar disappearing when media modal visible (#8100) ... * Compensate for scrollbar disappearing when media modal visible Make auth pages backgrounds lighter * Fix typo	8 years ago
Eugen Rochko	1d773b3a46	Add missing formatting to the text in hero widget (#8089)	8 years ago
Mélanie Chauvel (ariasuni)	2ccef52a4f	Improve account bar css (#8087) ... * Remove superfluous span tags * Make account bar items (except dropdown) flexible to work well with custom CSS * Fix CSS lint warning (0px → 0)	8 years ago
Eugen Rochko	bb71538bb5	Redesign public profiles and toots (#8068)	8 years ago