697 Commits (b3ff35a75cf04e4aba2712a9d0897257cf79af82)

Author	SHA1	Message	Date
Thibaut Girka	9201398507	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	dd00cd19d2	Use local instead of global loading indicator for timelines, account timelines (#9224) ... So that opening a profile feels faster. Also, pinned toots are not shown before other toots have loaded. Also, if no toots are loaded, added empty message	7 years ago
Eugen Rochko	ccbdf689e8	Fix form validation flash message color and input borders (#9235) ... * Fix form validation flash message color and input borders * Fix typo	7 years ago
Eugen Rochko	b22db8162a	Increase default column width from 330px to 350px (#9227)	7 years ago
Thibaut Girka	36dab188fd	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
James Kiesel	4c03e05a4e	Allow joining several hashtags in a single column (#8904) ... * Nascent tag menu on frontend * Hook up frontend to search * Tag intersection backend first pass * Update yarnlock * WIP * Fix for tags not searching correctly * Make radio buttons function * Simplify radio buttons with modeOption * Better naming * Rearrange options * Add all/any/none functionality on backend * Small PR cleanup * Move to service from scope * Small cleanup, add proper service tests * Don't use send with user input :D * Set appropriate column header * Handle auto updating timeline * Fix up toggle function * Use tag value correctly * A bit more correct to use 'self' rather than 'all' in status scope * Fix some style issues * Fix more code style issues * Style select dropdown more better * Only use to_id'ed value to ensure no SQL injection * Revamp frontend to allow for multiple selects * Update backend / col header to account for more flexible tagging * Update brakeman ignore * Codeclimate suggestions * Fix presenter tag_url * Implement initial PR feedback * Handle additional tag streaming * CodeClimate tweak	7 years ago
namelessGonbai	bb5558de62	Implement adding a user to a list from their profile (#9062) ... * Add add user to list from thier profile * Fix listAdderCss	7 years ago
Sorin Davidoi	d6c7b01d08	fix(reset): Property name for styled scrollbars (#9210) ... https://webplatform.news/issues/2018-10-26	7 years ago
Thibaut Girka	94ad76a5b9	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Masoud Abkenar	e961a763a2	RTL: fix toot privacy preferences radio buttonss (#9146)	7 years ago
Masoud Abkenar	5ee0b51ac8	RTL: fix preferences page checkbox margins (#9145) ... * RTL: fix preferences page checkbox margins * Update rtl.scss	7 years ago
Thibaut Girka	b00f60f1d3	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
kedama	678f5ed296	Set z-index of dropdown to 9999. (#9126)	7 years ago
Eugen Rochko	795f0107d2	Include preview cards in status entity in REST API (#9120) ... * Include preview cards in status entity in REST API * Display preview card in-stream * Improve in-stream display of preview cards	7 years ago
Thibaut Girka	c13cfeac09	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Masoud Abkenar	6e1a4f85ad	RTL: fix column-back-button__icon margins/content (#9112) ... * RTL: fix column-back-button__icon margins/content * Update rtl.scss * Update rtl.scss	7 years ago
Thibaut Girka	5bb8563f6c	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.	7 years ago
Eugen Rochko	d723f2a0a8	Fix RTL layout of status display names (#9075) ... Fix #2350	7 years ago
Thibaut Girka	dcded13a99	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.	7 years ago
Masoud Abkenar	c73864c137	RTL: fix cardbar margins and alignment (#9044)	7 years ago
Masoud Abkenar	3a157210c8	RTL: fix admin account avatar margin in about page (#9039) ... * RTL: fix admin account avatar margin in about page * fix code style	7 years ago
Masoud Abkenar	bf58461d36	RTL: fix column settings toggle label (#9037)	7 years ago
kedama	25f9ead041	Fix domain label position and color (#9033) ... * Fix position of the domain label * Fix position of the domain label for RTL - Fix color mismatch of linear gradient which assigned to "::after" pseudo class	7 years ago
Eugen Rochko	eb1b9903a6	Redesign direct messages column (#9022)	7 years ago
Masoud Abkenar	029943d59b	RTL: fix preferences layout (#9021)	7 years ago
bsky	065b39e7a4	Fix admin account avatar margin (#9020)	7 years ago
Masoud Abkenar	301cbcc980	RTL: fix user stats in about page (#9018)	7 years ago
Eugen Rochko	a38a452481	Add unread indicator to conversations (#9009)	7 years ago
Masoud Abkenar	65b3804a6c	RTL: fix domain append at signup form (#9007)	7 years ago
Masoud Abkenar	f8c1b32541	RTL: fix admin account margins in about page (#9005)	7 years ago
Masoud Abkenar	d35801aaa2	Fixes 8987 broken alignment at "Remote interaction dialog" (#8988)	7 years ago
Masoud Abkenar	efd09e2ebb	undo part of PR 8202 to fix RTL (#8979)	7 years ago
Eugen Rochko	b972478812	Improve style of notice/alert messages (#8973)	7 years ago
Thibaut Girka	d17844e6d1	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	774ac47373	Add conversations API (#8832) ... * Add conversations API * Add web UI for conversations * Add test for conversations API * Add tests for ConversationAccount * Improve web UI * Rename ConversationAccount to AccountConversation * Remove conversations on block and mute * Change last_status_id to be a denormalization of status_ids * Add optimistic locking	7 years ago
Thibaut Girka	611740ce81	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Masoud Abkenar	185cb2dc3a	RTL: fix margins of public-account-header__tabs (#8897) ... * RTL: fix margins of public-account-header__tabs * fix style * even more stylish code :)	7 years ago
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	7 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	7 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.	7 years ago
Naoki Kosaka	8bae14591b	Migrate to font-awesome 5.0. (#8799)	7 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	7 years ago
rhoio	c6e765f81e	remove meta label in settings column (#8704)	7 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	7 years ago
Masoud Abkenar	9f6662fcc9	RTL: fix statubar action buttons/counter margins (#8767) ... * RTL: fix statubar action buttons/counter margins * remove trailing whitespaces	7 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'.	7 years ago
Masoud Abkenar	ef11347281	RTL: fix settings button margins in column headers (#8764)	7 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	7 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	7 years ago
Eugen Rochko	011437dcb5	Group reports by target account (#8674) ... * Group reports by target account * Improve CSS	7 years ago