glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	b368d3c15d	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mayaeh	770e337497	Fixed error occurrence when pinning the DM column. (#8922 )	6 years ago
Thibaut Girka	d17844e6d1	Merge branch 'master' into glitch-soc/merge-upstream	6 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	6 years ago
Thibaut Girka	611740ce81	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	28401962ca	Change documentation URL (#8898 ) * Change documentation URL * Fix hardcoded documentation URL in locales	6 years ago
Thibaut Girka	98bb6815a7	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	42aecb4c13	Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893 ) * Add a confirmation dialog when hitting reply and the compose box isn't empty Fixes #878 * Performance improvement	6 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	6 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`.	6 years ago
mayaeh	3f9ec3de82	Fix some icon names changed by the Font Awesome 5. (#8796 )	6 years ago
Colin Dean	330e320b40	Adds follow action timestamp to notification (#8756 ) Fixes #8755	6 years ago
Naoki Kosaka	8bae14591b	Migrate to font-awesome 5.0. (#8799 )	6 years ago
theboss	b9c727a945	Fix some icons names, unavailable in fontawesome5 (free license). (#8792 ) - pencil => pencil-alt - sliders => sliders-h related: #8484 #8776	6 years ago
rhoio	c6e765f81e	remove meta label in settings column (#8704 )	6 years ago
mayaeh	17af4d27da	Update the icon name changed by the Font Awesome 5. (#8776 )	6 years ago
ふぁぼ原	f7a6f9489d	Add a new preference to always hide all media (#8569 )	6 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	6 years ago
ThibG	05f90e3695	Adjust beforeUnload conditions (#8746 ) Fixes #8701	6 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	6 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	6 years ago
ThibG	f8b54d229f	Fix “Toots” tab highlighting for replies and media timelines (#8715 )	6 years ago
Yamagishi Kazutoshi	0ddbccf7e6	Upgrade Babel to version 7.0.0 (#5925 )	6 years ago
luzpaz	40dd19be37	Misc. typos (#8694 ) Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`	6 years ago
ThibG	4959ead07c	Fix media description in various media modals (#8678 )	6 years ago
ThibG	09a87b2cdb	Auto-focus emoji picker's search field (#8688 ) Fixes #6056	6 years ago
ThibG	661a89ea74	Autofocus comment textarea in report modal (#8689 )	6 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	6 years ago
Thibaut Girka	6c233a04a0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: README.md Discarded upstream changes to the README, kept our version.	6 years ago
Frederic Hemberger	7c12c7b124	Add aria-label to floatingActionButton (#8574 )	6 years ago
M Somerville	a060beee72	Skip VS15 (Emoji textual presentation). (#8553 ) Mastodon converts all Emoji to images, whether they have a VS15 after them or not, but leaves the VS15 in the string, which is displayed as a black box in Safari.	6 years ago
Thibaut Girka	a74a7d5fe3	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
trwnh	6a147f8377	Fix the display of missing lists (#8523 ) * Fix the display of missing lists See #6786 -- this fixes part of the issue pertaining to lists that don't exist. I copied the Column being returned from the missing status logic, which works fine. Prior to this, the missing lists logic would generate a column with no back button and with a broken layout. This doesn't fix the broken display of missing accounts -- the column construction pertaining to that logic happens in multiple external functions. * import ColumnBackButton missed the import with the first commit	6 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	6 years ago
takayamaki	f5c052b5e6	refactor: getting-started__wrapper should contained in getting-started (#8532 )	6 years ago
Thibaut Girka	c24491a8df	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Jakub Mendyk	ceed1ebe5b	Fix followers/follows layout issues from #8418 (#8505 ) * Add alwaysShowScrollbar prop to ScrollableList * Fix followers/follows layout issues from #8418	6 years ago
Thibaut Girka	53b7bb9d04	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml	6 years ago
M Somerville	81697997a3	Include MOV in upload button tooltip. (#8480 )	6 years ago
Marcin Mikołajczak	b534249a8d	Add more hotkeys to legend (#8469 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	6 years ago
Thibaut Girka	be20eb4b2f	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	a791bac153	Add aria-label to notifications (#8460 ) Fix #8192	6 years ago
Jakub Mendyk	5129f6f2aa	Add messages informing that collections are empty (fixes #4115 ) (#8418 ) * Add messages informing that collections are empty Adds empty messages to blocked users, domain blocks, favourited statuses, users that favourited toot, follow requests, followers of given user, user's being followed by given user, lists, muted users, toots' boosts. Switched from using ScrollContainer to ScrollableList and/or added empty message's text. Fixes #4115 * Update localization files with strings for #4115 * Fix whitespace issues pointed out by codeclimate	6 years ago
Thibaut Girka	36393e1d2b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.	6 years ago
M Somerville	df06f53f9b	Specify allowed media in upload button tooltip. (#8443 )	6 years ago
Eugen Rochko	cd049454be	Wait until relationship is loaded before showing follow button (#8440 ) Fix #8410	6 years ago
Yamagishi Kazutoshi	800325f452	Weblate translations (2018-08-25) (#8420 ) * Translated using Weblate (Georgian) Currently translated at 99.8% (674 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ka/ * Translated using Weblate (Korean) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 96.8% (654 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Japanese) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Danish) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * Translated using Weblate (Danish) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Danish) Currently translated at 87.2% (589 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Galician) Currently translated at 100.0% (680 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Czech) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.4% (676 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Danish) Currently translated at 88.0% (599 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Arabic) Currently translated at 97.6% (664 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.7% (678 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Occitan) Currently translated at 99.5% (677 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Arabic) Currently translated at 97.9% (668 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Persian) Currently translated at 99.7% (680 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Dutch) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Occitan) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Japanese) Currently translated at 0.0% (0 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 0.1% (1 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 0.1% (676 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (682 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Greek) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.8% (674 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Danish) Currently translated at 89.2% (609 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (French) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (French) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Korean) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Occitan) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * yarn manage:translations * i18n-tasks normalize && i18n-tasks remove-unused * revert * Add defaultMessage	6 years ago
M Somerville	ac092d03e7	Add missing video descriptions (#8416 ) * Pass through video description as necessary. * Add title to video, matching aria-label.	6 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.	6 years ago
Eugen Rochko	248df68c36	Give focused status a sensible aria-label for screen readers (#8387 ) * Give focused status a sensible aria-label for screen readers Fix #8192 * Use content warning in aria-label unless expanded	6 years ago

1 2 3 4 5 ...

502 Commits (5f308a7f05a067211417307f249870d0b3fb8ebd)