c0dc247bce
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
6 years ago
89d600bedb
Move signature verification stoplight to the requests themselves ( #10813 )
...
* Move signature verification stoplight to the requests themselves
This avoids blocking messages from known keys for 5 minutes when only one fails…
* Put the stoplight on the actual client IP, not a potential reverse proxy
6 years ago
9efcca3c54
Retry ActivityPub inbox delivery on HTTP 401 and 408 errors ( #10812 )
...
HTTP 401 responses returned by Mastodon's inbox controller may
be temporary if, for instance, the requesting user's actor/key json
could not be retrieved in a timely fashion. This changes allow retries
instead of dropping the message entirely.
Also added HTTP 408 as that error is by nature temporary.
6 years ago
0744d6e571
Make headers font size proportional
6 years ago
7c609bdab9
Allow rel=tag in status text
...
Fixes tag links in local Markdown or HTML-authored statuses
6 years ago
9ddeb30f90
Add `forceSingleColumn` prop to `<UI />` ( #10807 )
...
* Move TabsBar rendering logic from CSS to the ColumnsArea component
* Add forceSingleColumn mode
* Add unread notifications counter to tabs bar
* Add toggle to control `forceSingleColumn`
* Increase paddings in mobile layout responsively at large sizes
6 years ago
8a378d4c3d
Fix stacking order of emoji picker ( #10801 )
6 years ago
ee0e68e97a
i18n: Complete frontend Bengali translation ( #10800 )
...
* i18n: Complete frontend Bengali translation
* run yarn manage:translations
6 years ago
2332b3f146
Fix local text/html toots not being sanitized
6 years ago
0c933c1b8c
Add `account_id` param to `GET /api/v1/notifications` ( #10796 )
...
* Add `from_account` to notifications API
this adds the ability to filter notifications by the account they
originated from
* passing a non-existent user should cause none to be returned
* Fix codeclimate warnings
* fix more codeclimate warnings
* make requested changes:
* use account id instead of user@domain
* name the param `account_id` instead of `from_account`
* Don't use `return` in a lambda
6 years ago
4fbce23992
Refactor contentType selection in glitch composer
6 years ago
2cd7bfac23
Use glitch-soc's poll component instead of upstream's
6 years ago
a6caf919e2
Change bio limit from 160 to 500 ( #10790 )
...
* Change note_length validator from 160 to 500
* Change input maxlength from 160 to 500
* update bio test from 160 to 500
* Multiply a string 30 times instead of 10
6 years ago
08a2af27c3
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ae18386558
Fix “invited by” not showing up for invited accounts in admin interface ( #10791 )
6 years ago
bb9d7fad9f
fix `isSubmitting` prop case ( #10785 )
6 years ago
f509815379
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
2f3e4a64be
add og:image:alt for media attachments in embeds ( #10779 )
6 years ago
6fe474837c
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
6 years ago
6e227ecb04
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
a1519a8ef5
Prevent from publicly boosting one's own private toots ( #10775 )
6 years ago
9ca21e93cc
Minor optimization
6 years ago
56245a2a72
Export fallback content type and use it as default in WebUI
6 years ago
dd5bf40b97
Properly escape HTML in code blocks
6 years ago
a6b7c23f6f
Add option for default toot content-type
6 years ago
0be93820f3
Fix autolinking, and newlines in code blocks
...
Autolinking is now performed *after* the Markdown pass, by replacing HTML
tags with zero-width spaces and running the twitter-text extractor as usual,
except it does not auto-link URLs to avoid links in links…
6 years ago
9df1ef87c2
Hide content-type dropdown by default
6 years ago
c2fa36bbae
Content-Type Dropdown: use the selected option icon for the menu
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
93d98f62a8
Support proper content-type in Delete & Redraft
6 years ago
f34a402a94
Add status content type dropdown to compose box.
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
14d7ddcb1c
Add API support for setting status content-type
6 years ago
b3e68de4d2
Serialize content-type on Delete & Redraft
6 years ago
d7520f8175
Add support for HTML-formatted toots
6 years ago
94aef563b9
Add support for markdown-formatted toots
6 years ago
bfc509f44a
Add database row to hold status content type
6 years ago
c1cf8c1636
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
6badf2d252
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
c1c8c7b2c8
Minor performance improvements and cleanup in formatter ( #10765 )
6 years ago
4ab094d35e
Adds click-able div that expands status ( #10733 ) ( #10766 )
...
The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status.
6 years ago
14f6ce2885
Record account suspend/silence time and keep track of domain blocks ( #10660 )
...
* Record account suspend/silence time and keep track of domain blocks
* Also unblock users who were suspended/silenced before dates were recorded
* Add tests
* Keep track of suspending date for users suspended through the CLI
* Show accurate number of accounts that would be affected by unsuspending an instance
* Change migration to set silenced_at and suspended_at
* Revert "Also unblock users who were suspended/silenced before dates were recorded"
This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c.
* Switch from using suspended and silenced to suspended_at and silenced_at
* Add post-deployment migration script to remove `suspended` and `silenced` columns
* Use Account#silence! and Account#suspend! instead of updating the underlying property
* Add silenced_at and suspended_at migration to post-migration
* Change account fabricator to translate suspended and silenced attributes
* Minor fixes
* Make unblocking domains always retroactive
6 years ago
4bab7d7640
Fix rich text style in reply indicator
6 years ago
87d16698c2
Fix rich text styling on public pages
6 years ago
cd534830ad
Fix text color of some formatted elements in notifications
6 years ago
3e15a845c1
Fix some colors in light theme ( #10754 )
...
* Fix typo in light theme
* Fix background color of empty column
6 years ago
dd118449c2
Fix incorrect reference to raw_content (it is raw_text instead) ( #10753 )
6 years ago
93085c273c
[Glitch] Use raw content if available on Delete & Redraft
...
Port front-end changes from 6d44f2441b
6 years ago
2b97d9d780
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
3ea5c045d7
Use a checkbox for the “Mark media as sensitive” composer button
...
Fixes #1039
6 years ago
fe00f7a7e4
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
6d44f2441b
Add toot source to delete result to ease Delete & Redraft ( #10669 )
...
* Return Status with raw text in raw_content when deleting a status
* Use raw content if available on delete & redraft
* Rename raw_content to text; do not serialize formatted content when source is requested
6 years ago
be851321c0
Use local time in audit log ( #10751 )
6 years ago
14d855c429
[Glitch] Improve poll link accessibility
...
Port 0402c52f28
6 years ago
78ff7e3821
[Glitch] Fix some colors of high contrast theme
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
96f0747afe
[Glitch] Add confirm modal for unboosting toots
...
Port fe8a8f779e
6 years ago
775ee63b71
i18n: Update French translations ( #10747 )
...
* Update French JSON
* i18n: Update fr.yml
* i18n: Update simple_form.fr.yml
* Update simple_form.fr.yml
* Update fr.yml
6 years ago
d25e358f9f
i18n: Update Corsican translations ( #10746 )
...
* i18n: Update Corsican translations
* Update co.yml
* Fix a translation in co.yml
6 years ago
6dc9baad2a
Change icon and label depending on whether media is marked as sensitive ( #10748 )
...
* Change icon and label depending on whether media is marked as sensitive
* WiP use a checkbox
6 years ago
68629f2773
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
minor conflict because of glitch-soc's theming system
6 years ago
d4d4e84324
Fix media description confirmation modal
...
Fixes #1040
6 years ago
fe8a8f779e
Add confirm modal for unboosting toots ( #10287 )
...
[#3815 ]
Display the boost modal also when unboosting toots.
6 years ago
f2be71c293
Add emoji suggestions to CW and poll option fields ( #10555 )
...
* Refactor selectComposeSuggestion so that different paths can be updated
* Add suggestions in CW field
* Add emoji suggestion to poll options
* Attempt to fix CSS
* Hide suggestions by default
They will be enabled if the input has focus
6 years ago
62f5235b6f
Prevent silenced local users from notifying remote users not following them ( #10575 )
...
* Prevent silenced local users from notifying remote users not following them
This is an attempt to extend the local restrictions of silenced users to the
federation.
* Add tests
* Add tests for making sure private status don't get sent over OStatus
6 years ago
26fc21c188
Add some caching for HTML versions of statuses pages ( #10701 )
6 years ago
0402c52f28
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
6 years ago
ce8635605c
Record deleted(by mod) status to prevent re-appear ( #10732 )
...
* Record deleted(by mod) status to prevent re-appear
* Move to Tombstone
* Add missing migration script
6 years ago
09eea46631
Bring back crossed eye icon on gallery ( #10715 )
6 years ago
3191c3b349
Fix tabs bar on mobile
...
Fixes #1037
6 years ago
5c82d660d1
Fix some colors of high contrast theme ( #10711 )
...
* Fix "nothing here" text color of high contrast
* Fix counter border color of high contrast
6 years ago
2c767f44bf
Fix front-end crash when a video has a blurhash and is hidden behind a CW
6 years ago
7562602df8
i18n Update Catalan translation ( #10719 )
...
* 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
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translation
* i18n Update Catalan translation
6 years ago
b2f5b1045f
Add description on hover in media gallery ( #10713 )
6 years ago
89d2859296
Fix content warning button displaying a link icon when no status card is set
6 years ago
1eb14ef774
i18n: Update Japanese translations ( #10706 )
...
* Update Japanese translations.
run yarn manage:translations
This commit includes translations by some users that were done at the transifex.
* Reduce translation text because it becomes two lines.
6 years ago
e742bff19b
1 NL string update ( #10709 )
...
* 1 NL string update
No that weblate isn't used anymore, it would be fine if, or the english strings are update, or there is somewhere an explanation how to generate new strings for a language
* Update nl.json
6 years ago
8383222026
fix pinned columns ’s Media-only button
...
Media-only toggles could not be used on pinned columns.
The commit fixes this problem.
6 years ago
eef8802325
[Glitch] Make sure the instance banner is never cropped
...
Port 21209c2b52
6 years ago
832cf92c74
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
b7741ed732
I18n: Update Czech translation 🇨🇿 ( #10704 )
...
* I18n: Update Czech translation
* Tiny fix
6 years ago
21209c2b52
Make sure the instance banner is never cropped ( #10702 )
6 years ago
f2cf8144b4
Minor style fixes
6 years ago
9b1ef58c95
[Glitch] Change font weight of sensitive button to 500
...
Port 63b1388fef
6 years ago
f59973cc85
[Glitch] Make the "mark media as sensitive" button more obvious in web UI
...
Port 05ef3462ba
6 years ago
b1ab4d5ebe
Add visibility icon back in media gallery
6 years ago
cbda1b8b66
Add back description on hover
6 years ago
8e221cd22b
[Glitch] Fix transition: all
...
Port 7aa749ab46
6 years ago
b7f69beebe
[Glitch] Make the cursor icon consistant across media types in account media gallery
6 years ago
52a4284fe5
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
bc97fd641f
[Glitch] Add button to view context to media modal
...
Port eb63217210
6 years ago
209c080280
[Glitch] Fix alignment of items in the account gallery in web UI and load more per page
...
Port 967e419f8f
6 years ago
a5da59f140
[Glitch] Change account gallery in web UI
...
Port 3f143606fa
6 years ago
373dd1fdf1
Minor CSS fixes
6 years ago
ccf4f3240a
[Glitch] Add blurhash
...
Port front-end changes from fba96c808d
6 years ago
7aa749ab46
Fix transition: all ( #10699 )
6 years ago
4f73cde4e1
Minor account media gallery fixes ( #10695 )
...
* Make the cursor icon consistant across media types in account media gallery
* Fix the video player modal causing scroll position to reset
6 years ago
1149ddd3da
Fix glitch SCSS for links in error messages in admin interface
...
Port SCSS changes from 011b032300
6 years ago
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
6 years ago
b85f216cbc
Do not retry processing ActivityPub jobs raising validation errors ( #10614 )
...
* Do not retry processing ActivityPub jobs raising validation errors
Jobs yielding validation errors most probably won't ever be accepted,
so it makes sense not to clutter the queues with retries.
* Lower RecordInvalid error reporting to debug log level
* Remove trailing whitespace
6 years ago
7cb369d4c6
Change e-mail whitelist/blacklist to not be checked when invited ( #10683 )
...
* Change e-mail whitelist/blacklist to not be checked when invited
And only when creating an account, not when updating it later
Fix #10648
* Fix test
6 years ago
9f25ab9792
Fix polls icon not showing in CW button in detailed statuses
6 years ago
63b1388fef
Change font weight of sensitive button to 500 ( #10682 )
6 years ago
91634947f8
Explicitly disable storage of REST API results ( #10655 )
...
Fixes #10652
6 years ago
011b032300
Provide a link to existing domain block when trying to block an already-blocked domain ( #10663 )
...
* When trying to block an already-blocked domain, provide a link to the block
* Fix styling for links in flash messages
* Allow blocks to be upgraded but not downgraded
6 years ago
7617f78359
Fix crash in onboarding modal
...
Fixes #1027
6 years ago
eb63217210
Add button to view context to media modal ( #10676 )
...
* Add "view context" button to media modal when opened from gallery
* Add "view context" button to video modal
Allow closing the video modal by navigating back in the browser,
just like the media modal
6 years ago
5121d9c12f
When selecting a toot via keyboard, ensure it is scrolled into view ( #10593 )
6 years ago
05ef3462ba
Make the "mark media as sensitive" button more obvious in web UI ( #10673 )
...
* Make the "mark media as sensitive" button more obvious in web UI
* Use eye-slash icon instead of eye icon to mean "hide"
6 years ago
967e419f8f
Fix alignment of items in the account gallery in web UI and load more per page ( #10674 )
6 years ago
3f143606fa
Change account gallery in web UI ( #10667 )
...
- 3 items per row instead of 2
- Use blurhash for previews
- Animate/hover-to-play GIFs and videos
- Open media modal instead of opening status
- Allow opening status instead with ctrl+click and open in new tab
6 years ago
21a73c52a7
Check that an invite link is valid before bypassing approval mode ( #10657 )
...
* Check that an invite link is valid before bypassing approval mode
Fixes #10656
* Add tests
* Only consider valid invite links in registration controller
* fixup
6 years ago
fcbf557bd2
Add site-wide options to show reblogs and replies in local/public timelines
...
Fixes #1021
6 years ago
cc5a81b7d8
Make hi-color privacy icons opt-in instead of opt-out
6 years ago
ac54292d69
Add high color privacy icons
...
Fixes #1015
6 years ago
be6ef1947e
changed pinned status count operator
...
changed default pinned count to 5 to preserve default behavior
6 years ago
5616200ed4
added documentation into .env.production.sample
...
moved max pin count into constant
6 years ago
a36affb9d6
add env var for max pinned toots
6 years ago
d4c95e6a8a
When selecting a toot via keyboard, ensure it is scrolled into view
...
Fixes detailed status column
6 years ago
3e095cab83
Add support for missing formatting tags
6 years ago
67fb9a8679
Add keyboard shortcut to collapse/uncollapse toots
6 years ago
f3acf8f414
Add hotkey for bookmarking a toot
6 years ago
5e79dd3f17
Update hy.json ( #10644 )
6 years ago
e18786dec7
Fix approved column being set to nil instead of false ( #10642 )
...
Fix https://github.com/tootsuite/mastodon/pull/10621#issuecomment-487316619
6 years ago
cd9a284702
Fix regression with textarea's caret position when selecting a suggestion
6 years ago
fba96c808d
Add blurhash ( #10630 )
...
* Add blurhash
* Use fallback color for spoiler when blurhash missing
* Federate the blurhash and accept it as long as it's at most 5x5
* Display unknown media attachments as blurhash placeholders
* Improve style of embed actions and spoiler button
* Change blurhash resolution from 3x3 to 4x4
* Improve dependency definitions
* Fix code style issues
6 years ago
aa1832ac4d
Hide suggestions by default
...
They will be enabled if the input has focus
6 years ago
fddd8251dd
Attempt to fix CSS
6 years ago
d7e4be285a
Add emoji suggestion to poll options
6 years ago
df52004fe6
Add suggestions in CW field
6 years ago
3a671470ec
Refactor selectComposeSuggestion so that different paths can be updated
6 years ago
e451ba0e83
Fix LDAP/PAM/SAML/CAS users not being approved instantly ( #10621 )
6 years ago
f27d709351
Fix not being able to save e-mail preference for new pending accounts ( #10622 )
6 years ago
852ccea676
Fix upload progressbar when image resizing is involved ( #10632 )
6 years ago
b1a0322a06
Reject follow requests of blocked users ( #10633 )
6 years ago
1c0402c103
Do not ask to register web intent handler
6 years ago
b13c90f3e3
Fix color of muted statuses content not wrapped in a p tag
6 years ago
e4b65e6349
Redesign blockquote styling
6 years ago
8753e5317f
Better distinguish titles from text
6 years ago
3631c3314a
Remove extra margin in paragraphs inside blockquotes
6 years ago
9b86707b1e
Make bold text bolder
6 years ago
5a8495dabe
Remove margins around `p` tags in lists
6 years ago
ef249a2718
Rename status__text to status__content__text for consistency with upstream
6 years ago
adbb174c9c
Fix status header display in toot mobile menu
6 years ago
ef1504d625
Fix upload progressbar when image resizing is involved
6 years ago
ffab9d626a
Hide media upload form if no media are attached
6 years ago
7783ec921b
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
416aa832e5
Fix file upload
6 years ago
3d722b0c4e
Fix settings modal
6 years ago
041fb0e840
Fix sign up button not saying sign up when invite is used ( #10623 )
...
Fix #10616
6 years ago
08afd6b69c
Do not leak local-only toots to remote mentioned users
6 years ago
2db0506226
Load custom CSS rules after standard ones
...
Fixes #933
Due to glitch-soc's theming system, JS and CSS files are imported in a slightly
different order, and custom CSS rules were loaded *before* everything else.
They will now be loaded *after* everything else, which is a bit different from
upstream but should work better overall.
6 years ago
27e8354914
Add support for lists in statuses
6 years ago
659f972bed
Do not switch to italic for status media buttons
6 years ago
2e3640ecbb
Accept richer text from remote statuses
...
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
6 years ago
039e35560c
[Glitch] Fix modal items cannot scroll on touch devices
...
Port d763d39d26
6 years ago
a9eaa780f5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
6 years ago
c3fa4e8e07
Fix ReferenceError in dropdown
6 years ago
d779ec1f0e
Fix broken reference to handleSubmit
6 years ago
e949861176
Cleanup
6 years ago
faff152ae5
Move ComposerPublisher to Compose
6 years ago
df951c319c
Add OptionsContainer
6 years ago
14028655df
Move composer Dropdown from features/composer to features/compose
6 years ago
4c6221929f
Move ComposerTextareaIcons to TextareaIcons
6 years ago
47faf47ed5
ComposerTextarea → AutosuggestTextarea
6 years ago
a243567a3e
ComposerUploadForm → UploadForm + UploadFormContainer
6 years ago
c5f49a92dc
Move PollForm from features/composer to features/compose
6 years ago
f1a22e33e2
Inline spoiler input
6 years ago
8fd599fb40
ComposerReply → ReplyIndicator
6 years ago
f72af5794d
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
6 years ago
1bc4b8a0a5
features/composer/index.js → ComposeForm
6 years ago
281a82d878
DrawerHeader → Header + HeaderContainer
6 years ago
9a2f10fe8b
DrawerAccount → NavigationBar + NavigationContainer
6 years ago
9b9816aba6
[Glitch] Show suggested follows on search screen in mobile layout
...
Port ad510db3a1
6 years ago
149aa07409
DrawerResults → SearchResults + SearchResultsContainer
6 years ago
67771e6d65
Rework DrawerResults to make them closer to upstream
6 years ago
ab3e8fc542
Move DrawerSearch to Search + SearchContainer
6 years ago
c92ab35b19
Inline DrawerSearchPopout in DrawerSearch
6 years ago
c19b983986
Refactor a bit DrawerSearch to make it closer to upstream
6 years ago
eed2c9dd44
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
6 years ago
0e78862b61
Allow switching between singe-option and multiple-option polls ( #10603 )
6 years ago
d763d39d26
Fix modal items cannot scroll on touch devices ( #10605 )
6 years ago
bdec58b514
Minor code cleanup ( #10613 )
6 years ago
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
80c9cb0eb3
Add hi.json ( #10573 )
6 years ago
d210d0a655
Update hy.json ( #10591 )
6 years ago
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
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
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
6e620dcab1
Use correct local names for fonts ( #10594 )
6 years ago
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
8b7b65e995
[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals
...
Port 7f75792bf3
6 years ago
268417daf3
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
93199c9566
Fix keybase indication on dashboard
6 years ago
d83068016b
Allow turning keybase off instance-wide
6 years ago
e3c1472040
Shift+click on column Back button to return to last pinable column
6 years ago
8d57c0e70e
When selecting a toot via keyboard, ensure it is scrolled into view
6 years ago
fbec0edf08
Fix opening/closing gifv sometimes making the timeline scroll
6 years ago
7f75792bf3
Allow modal secondary button to shrink and allow wider confirmation modals ( #10586 )
...
Fixes #10531
6 years ago
d305d8747d
Add new pt-br translations ( #10564 )
6 years ago
2f422b708f
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
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
a9f130b8d8
Fix Keybase verification using wrong domain for remote accounts ( #10547 )
6 years ago
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
d431c810d3
increase allowable length of remote proof username ( #10546 )
6 years ago
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
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
3dea62bfa2
Updates the grammar of the SK translation ( #10541 )
6 years ago
92e1950194
[Glitch] Fix glitched out "not found" message for non-existing profiles in web UI
...
Port 56f29c38b6
6 years ago
fa4b51a110
[Glitch] Add "why do you want to join" field to invite requests
...
Port SCSS changes from 8b69a66380
6 years ago
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
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
400397c0c7
Change HTML validator to ignore all errors except unmatched tags ( #10534 )
6 years ago
46cb36fd2c
Add invite request to pending account notification e-mail ( #10528 )
...
Fix sorting of the pending accounts page
6 years ago
36b39fbac5
Add preference to disable e-mails about new pending accounts ( #10529 )
6 years ago
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
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
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
654f79d2b1
Fix permission denied bug on approve all/reject all pending accounts ( #10519 )
6 years ago
56f29c38b6
Fix glitched out "not found" message for non-existing profiles in web UI ( #10517 )
6 years ago
ba1a78d168
[i18n] Update and correction ( #10511 )
...
* [i18n] Update and correction
* Update oc.json
* Update oc.json
6 years ago
cb410f80a4
Add column title to “Favourited by” and “Boosted by” columns
6 years ago
5247ea4efd
Fix batch actions not working on pending accounts ( #10508 )
6 years ago
63837a4b78
Fix pending accounts management
6 years ago
ac071d65de
[Glitch] Duplicate values
...
Port bd365cc38b
6 years ago
df42de68e5
[Glitch] Port SCSS changes from "Improve blocked view of profiles"
...
Port public pages SCSS changes from 67b3b62b98
6 years ago
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
3f036ac6b8
Updated German locales ( #10505 )
...
* Updated German locales
* Added account approval locales (German)
* Updated JSON locales (German)
6 years ago
6e111152e0
i18n: Update Corsican translations ( #10504 )
6 years ago
ae58bbd705
i18n: Update Czech translation ( #10506 )
6 years ago
a4d5e15327
Fix config serializer regex ( #10487 )
6 years ago
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
619bbc23ef
Translate Korean ( #10499 )
6 years ago
a265696991
i18n: Update Japanese translations ( #10494 )
...
* Update Japanese translations
* Update Japanese translations.
6 years ago
67b3b62b98
Improve blocked view of profiles ( #10491 )
...
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447 )"
This reverts commit 120544067f#10442 )"
This reverts commit 62bafa20a1
6 years ago
e1d0390e29
Add batch actions for approving and rejecting pending accounts ( #10469 )
6 years ago
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
78a8a99b0b
Improve sk translation further ( #10484 )
...
* Further improving Slovak translation
* Update sk.json
6 years ago
2b68fe5442
tinyfix 2: unrequired arguments ( #10471 )
...
* unrequired argument
* unrequired argument
6 years ago
4be7952892
i18n: Update Polish translation ( #10479 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
6 years ago
e0137c5884
Updates the Slovak translation ( #10477 )
...
* Update sk.json
* Update sk.json
* Update sk.json
6 years ago
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
bd365cc38b
Duplicate values ( #10470 )
6 years ago
30500dff7c
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
be6885eb93
[Glitch] Update poll remaining time just like with status timestamps
...
Port daab45d4ae
6 years ago
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
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
cc6e3c3900
Cache featured collections, as well as outbox, followers and following ( #10467 )
6 years ago
14bad3f472
Do not handle clicks in detailed status content
6 years ago
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
daab45d4ae
Update poll remaining time just like with status timestamps ( #10466 )
6 years ago
d07b0c038f
Hopefully fix input text selection quirks on iOS ( #10463 )
...
Fix #10448 (hopefully)
6 years ago
f984f2ea4e
Esperanto translations ( #10461 )
...
* Esperanto translations
* Translate untranslated Esperanto strings
* Normalize eo translation
6 years ago
83190fffc7
Re-dd PT-br translations ( #10459 )
6 years ago
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
0705e4b177
I18n: Improve Czech translation ( #10454 )
6 years ago
12dae9d583
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
6 years ago
120544067f
Fix filtering of favourited_by, reblogged_by, followers and following ( #10447 )
6 years ago
62bafa20a1
Hide blocking accounts from blocked users ( #10442 )
...
* Revert "Add indication that you have been blocked in web UI (#10420 )"
This reverts commit bd02ec6daa#10373 )"
This reverts commit 9745de883bbd02ec6daa
6 years ago
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
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
68c797bece
Ensure request.body isn't emptied out before signature verification ( #10432 )
...
Fixes #10429
6 years ago
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
b9b472d519
[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile
...
Port 79227d153b
6 years ago
59551ece31
[Glitch] Fix search in web UI not setting a limit, restore limit of 10
...
Port 379c3e237f
6 years ago
4444d8f9b3
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
51625d3423
Remove unused code ( #10426 )
6 years ago
1714ea5978
Add ActivityPub representation for identity proofs ( #10414 )
...
* Add ActivityPub representation for identity proofs
* Add tests
6 years ago
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
79227d153b
Fix transparent avatars showing underlying elements in avatar stack and profile ( #10422 )
6 years ago
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
bd02ec6daa
Add indication that you have been blocked in web UI ( #10420 )
6 years ago
1d62b88f8d
I18n: Update Czech translation ( #10419 )
6 years ago
e5d79d1635
Add missing Korean translations ( #10416 )
...
* Fix Korean translation
* Add missing translation
6 years ago
34090a85e4
Update Corsican translations ( #10418 )
...
* Update Corsican translation
* Update Corsican YML
* Corsican JSON fix
* Update co.yml
6 years ago
2a326940e8
l10n update: fa ( #10417 )
6 years ago
b6fa500806
[Glitch] squashed identity proof updates
...
Port JS from 69141dca26
6 years ago
a74d300b68
Fix background color transition in destructive buttons
6 years ago
f4b038f779
[Glitch] Fix opacity of relationship tags
...
Port 58667072d9
6 years ago
0318b23395
Fix left border of profile navigation tab
6 years ago
ab39ffb175
Add fa-info-circle to disclaimer
6 years ago
6c58367f36
Fix double border for account disclaimer
6 years ago
6fdd829d8c
[Glitch] Add rel='noopener' to redesigned profile column header avatar link
...
Port 73f5711fb8
6 years ago
841d2c9f23
[Glitch] Move the account dropdown menubar to the right, make sure it doesn't move
...
Port a91acf79b5
6 years ago
37ad0478ef
[Glitch] Make clicking on avatar open public profile in new tab
...
Port 6f6abc369f
6 years ago
cf3f063e10
[Glitch] Fix menu items that don't action
...
Port 186f7bcbb6
6 years ago
00f251b8fe
[Glitch] Redesign profile column in web UI to match design on public pages
...
Port a96181f16f
6 years ago
abb53fa338
Fix centering on public pages
6 years ago
60fc04756a
Fix padding and centering of display names
6 years ago
58da5e93c0
Port search results styling to glitch-soc
6 years ago
ce7d055d3c
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
58667072d9
Fix opacity of relationship tags ( #10411 )
6 years ago
1a7d1f4a42
I18n: Update Czech translation ( #10410 )
6 years ago
69141dca26
squashed identity proof updates ( #10375 )
6 years ago
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
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
08ec7435ce
Add order options to relationship manager UI ( #10404 )
6 years ago
683013756e
Revert locales touched by automated translations ( #10399 )
...
* Revert ruined translations
Regression from #10362
* yarn manage:translations
6 years ago
e86663b1da
Fix alternative relay support regression ( #10398 )
...
Fix #10324
6 years ago
73f5711fb8
Add rel='noopener' to redesigned profile column header avatar link ( #10393 )
6 years ago
11fe293e1b
Remove unused ActivityPub `@context` values depending on response ( #10378 )
...
Fix #8078
6 years ago
3a2f646cb1
Revert "fix: update to emoji-mart 2.10.0 ( #10281 )"
...
This reverts commit db06b25376
6 years ago
355d384d8d
Revert "[Glitch] fix: update to emoji-mart 2.10.0"
...
This reverts commit 49bea8c46b
6 years ago
Thibaut Girka
Eugen Rochko
nzws
dxwc
Paul Woolcock
trwnh
Hinaloe
Ben Lubar
Haelwenn (lanodan) Monnier
KokaKiwi
Neil Moore
Maciek Baron
nzws
Aurélien Reeves
Alix Rossi
Jeong Arm
spla
mayaeh
jeroenpraat
Kirishima21
Baptiste Gelez
Aditoo17
Zac
partev
kedama
Ben Lubar
Yamagishi Kazutoshi
Daniel Aleksandersen
Jessica
Sho Kusano
Renato "Lond" Cerqueira
Evgeny Petrov
Alex Gessner
Marek Ľach
Yağızhan
Quentí
ashleyhull-versent
koyu
Takeshi Umeda
marcin mikołajczak
slice
Masoud Abkenar