about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-02-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-02-06Add environment variable to specify extra data hostsThibaut Girka
Fixes #1276
2020-02-03Fix typo in about page (#13038)ThibG
2020-02-03Fix punycode being returned in some entities instead of unicode in REST API ↵Eugen Rochko
(#13035)
2020-02-03Fix remote convertible media attachments not being saved (#13032)Eugen Rochko
Because the file name was set after loading the file, Paperclip was flagging the differing file extension as content type spoofing Fix #12938
2020-02-03Fix punycode being rendered instead of unicode in some places (#13030)Eugen Rochko
2020-02-03Fix dates (without time) being rendered as datetimes in public pages (#13034)ThibG
2020-02-03Change signature verification to ignore signatures with invalid host (#13033)Eugen Rochko
Instead of returning a signature verification error, pretend there was no signature (i.e., this does not allow access to resources that need a valid signature), so public resources can still be fetched Fix #13011
2020-02-03New Crowdin translations (#12953)Eugen Rochko
* New translations en.json (Romanian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Urdu (Pakistan)) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations simple_form.en.yml (Kabyle) [ci skip] * New translations doorkeeper.en.yml (Kabyle) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations doorkeeper.en.yml (Norwegian) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations doorkeeper.en.yml (Occitan) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations simple_form.en.yml (Finnish) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations doorkeeper.en.yml (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations simple_form.en.yml (Esperanto) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations doorkeeper.en.yml (Dutch) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations simple_form.en.yml (Estonian) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations simple_form.en.yml (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations doorkeeper.en.yml (Asturian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Persian) [ci skip] * New translations devise.en.yml (Persian) [ci skip] * New translations devise.en.yml (Persian) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations doorkeeper.en.yml (Kabyle) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations devise.en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Occitan) [ci skip] * i18n-tasks normalize * yarn manage:translations
2020-02-03Don't display toggle reveal button in video modal when full screen (#13026)fuyu
2020-02-03Fix poll compose form being broken on single-column layoutThibaut Girka
2020-02-03Merge pull request #1274 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-02-03[Glitch] Change how unread announcements are handledThibG
Port 3adc722d1cdd28d87d2724b8952d7ec52d241b52 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03[Glitch] Add "Show thread" button to public profilesSasha Sorokin
Port 50cd73e5d7e39600203c9c3f591f04289f41e297 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03[Glitch] Fix mascot being too large, and a code style issueEugen Rochko
Port bba0269d9741c8c4daaa9048c265a1321d93fbba to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-03Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-02-03Change how unread announcements are handled (#13020)ThibG
* Change meaning of /api/v1/announcements/:id/dismiss to mark an announcement as read * Change how unread announcements are counted in UI * Add unread marker to announcements and mark announcements as unread as they are displayed * Fixups
2020-02-01When submitting markers, use last displayed notification, not last received oneThibaut Girka
2020-02-01Fetch last read notification id to update unread notification count on loadThibaut Girka
2020-02-01Search account domain in lowercase (#13016)abcang
* Search account domain in lowercase * fix rubocop error * fix spec/models/account_spec.rb
2020-02-01Fix error when sending moderation notification (#13014)Renato "Lond" Cerqueira
Since the statuses helper is not loaded, the rtl helper cannot be found and the email cannot be sent.
2020-01-30Fix Node version in Vagrant (#13008)Даниил Пронин
2020-01-29Fix english wording (#13003)ThibG
2020-01-29Add "Show thread" button to public profiles (#13000)Sasha Sorokin
This adds "Show thread" button to the status view which is used in profiles. The logic to display the button is mimicking logic in web app available at app/javascript/mastodon/components/status.js#L439. * The little change in components CSS required to remove enforced underline for all links on public pages on our button.
2020-01-29Fix mascot being too large, and a code style issue (#13002)Eugen Rochko
2020-01-28Bump version to 3.1.0rc2 (#12999)Eugen Rochko
2020-01-28Update Dockerfile (#12997)Shlee
2020-01-28Add missing translations (#12996)Sasha Sorokin
This commit adds missing translations for #12966 and #12954.
2020-01-28Add support for xmpp: and magnet: URIs to misleading link detection codeThibaut Girka
2020-01-28Merge pull request #1272 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-01-28[Glitch] Fix design of announcements in admin UIEugen Rochko
Port 305abc9e05ddb2db6a40a6eda01578e01e58791f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-28[Glitch] Change announcements to be collapsed on page load in web UIEugen Rochko
Port 0fcc4b1c566e4365e07ce5a1c87743db76c07fe6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-01-28Fix Gemfile.lock (#12995)ThibG
* Use bundle install in deployment mode for Continuous Integration to catch Gemfile.lock issues * Fix deprecation warnings * Fix Gemfile.lock * More changes to catch Gemfile.lock issues
2020-01-28Update changelog for 3.1.0rc1 (#12992)Eugen Rochko
2020-01-28Bump Rack from 2.0.8 to 2.1.2 (#12991)Shlee
* Update Gemfile * Update Gemfile.lock
2020-01-28Fix regressions caused by #12961 (#12961)Sasha Sorokin
This commit attempts to fix most of regressions caused by #12961 pull request which added even spread of space between tabs. The following fixes were done: - Don't hide overflow in tabs As tabs use ::after and ::before pseudo-elements to create arrow on the bottom of selected tab, "overflow: hidden" will cause this arrow to look split from the bottom container. For the future we probably should use slider element instead, which would align according to currently selected tab, instead of relying on pseudo-elements. Such method would also allow smooth transitions. - Disallow wrapping tab text on insufficient space This would fix some unwanted behavior[1] when on insufficient width, renderer might attempt wrapping text to not overtake others' space. [1]: https://mastodon.social/@Gargron/103546083813829165
2020-01-28Fix design of announcements in admin UI (#12989)Eugen Rochko
2020-01-28Change announcements to be collapsed on page load in web UI (#12990)Eugen Rochko
2020-01-27Merge pull request #1271 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-01-27[Glitch] Change number animations direction based on decrease or increaseEugen Rochko
Port 10e209d8e0601ded06e05df573e76935e175cb1c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27[Glitch] Add animations to announcement reactionsEugen Rochko
Port dd4eec6bf647a082b9bac2bed09a0105fe14c733 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27[Glitch] Change last_status_at to be a date, not datetimeThibG
Port 42d2a915e4aa31533032e37aaa46354cee2386da to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27[Glitch] Fix link colors in announcementsEugen Rochko
Port 2f8c3c17ee26dc21ce94959b0ea18984e7bc5560 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27[Glitch] Add streaming API updates for announcements being modified or deletedEugen Rochko
Port b9d74d407673a6dbdc87c3310618b22c85358c85 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27[Glitch] Fix status overflowing in report dialogThibG
Port 389e3f6094bfcc4d0338947d29434113320c8142 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-01-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.
2020-01-27Revert "Avoid using uppercase text-transform (#12684)" (#12987)Eugen Rochko
This reverts commit 7da54001fe21d1fd10ede5ac78e5c76f25afc08e.
2020-01-27Explicitly install rack gem (#12972)Daigo 3 Dango
Pin rack version to 2.0.8. Rack-2.1.0 and 2.1.1 are known to record error below upon requests to `/sidekiq`: ``` NoMethodError - undefined method `transform_keys' for #<ActionDispatch::Request::Session:0x...> ```
2020-01-27Add publish/unpublish controls to announcements in admin UI (#12967)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-24 20:33:55 +0000