about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-10-24Merge pull request #792 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-23Keep back own DMs in Home timelineThibaut Girka
Follow-up to e45a6edd6574c86409333cc64f9fb87e1b0a196e, fixes inconsistencies in glitch-soc behavior.
2018-10-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-23Bump parallel_tests from 2.23.0 to 2.24.0 (#9064)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.23.0 to 2.24.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.23.0...v2.24.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-23Update Dockerfile (#9026)ashleyhull-versent
2018-10-23Fix public timelines not instantly updating on compose (#9050)Eugen Rochko
Fix #9034
2018-10-23Show suggested follows on search screen in mobile layout (#9010)Eugen Rochko
Reminder: Suggestions were added in #7918 and are based on who you interact with who you do not follow. E.g. if you boost someone a lot from seeing other people's boosts of that person, it makes sense you might be interested in following the original source; or if you reply to someone a lot, maybe you'd want to follow them Each suggestion can be dismissed
2018-10-23Persist volumes by default in docker-compose (#9055)Eugen Rochko
Too many databases were lost to this
2018-10-22Revert "RTL: remove blank character inside bdi (#9038)" (#9056)Eugen Rochko
This reverts commit c7e9f9ff1ed1def7f14f6ca4ac2836005eeefa47.
2018-10-22[Glitch] Surround mid-text display names with bdi tagsThibaut Girka
Port 7861c5f108a8f8cb0450f3b1ef865b1177c706fc to glitch-soc
2018-10-22[Glitch] fix: initial state of PrivacyDropdown is should not be nullThibaut Girka
Port bebe8ec887ba67c51353e09d7758819b117bf62d to glitch-soc
2018-10-22[Glitch] RTL: fix cardbar margins and alignmentThibaut Girka
Port c73864c1373330f2ef75006d639f90a1debcce6d to glitch-soc
2018-10-22[Glitch] RTL: fix admin account avatar margin in about pageThibaut Girka
Port 3a157210c87e6fe034f70d922cf7fc70fb533ad1 to glitch-soc
2018-10-22[Glitch] RTL: fix column settings toggle labelThibaut Girka
Port bf58461d365b5cee0d8a80a019a64e84c841f32f to glitch-soc
2018-10-22[Glitch] Fix domain label position and colorThibaut Girka
Port 25f9ead041a3087993059a1398f37dfa21a62610 to glitch-soc
2018-10-22[Glitch] RTL: fix preferences layoutThibaut Girka
Port 029943d59b222e96a2f7839390a5628888249bf6 to glitch-soc
2018-10-22[Glitch] Fix admin account avatar marginThibaut Girka
Port 065b39e7a460e088fd5afcd48dfc425d0006fee9 to glitch-soc
2018-10-22[Glitch] RTL: fix user stats in about pageThibaut Girka
Port 301cbcc9802ed85c519e67a01133968bc074c8af to glitch-soc
2018-10-22[Glitch] RTL: fix domain append at signup formThibaut Girka
Port 65b3804a6ccd40d359616b6157682ff88f85462f to glitch-soc
2018-10-22[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"Thibaut Girka
Port d35801aaa2ad9d06345efa45cf524113469fdd02 to glitch-soc
2018-10-22[Glitch] RTL: fix admin account margins in about pageThibaut Girka
Port f8c1b325410369806eb77a5c8d259971a87a6852 to glitch-soc
2018-10-22[Glitch] undo part of PR 8202 to fix RTLThibaut Girka
Port efd09e2ebba7e9f0135bd47c44a77e2fc421aa67 to glitch-soc
2018-10-22[Glitch] Improve style of notice/alert messagesThibaut Girka
Port b972478812316da2f5c0d24c60386d408e027424 to glitch-soc
2018-10-22Keep new DMs in home feeds and in the old DM timelineThibaut Girka
Revert server-side part of 87fdd139b890e60f752bf71e3b09d79eaefcf7b5
2018-10-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2018-10-22Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049)Eugen Rochko
Fix #8889
2018-10-22Fix cull tripping on nil in last_webfingered_at (#9051)Eugen Rochko
Fix #8741
2018-10-22RTL: remove blank character inside bdi (#9038)Masoud Abkenar
* RTL: remove blank character inside bdi * Update app/javascript/mastodon/components/display_name.js Co-Authored-By: mabkenar <ampbox@gmail.com>
2018-10-21Fix tootctl cull on dead servers (#9041)Jeong Arm
* Delete first 9 accounts on dead servers * Clean up code by moving dead server culling to the end
2018-10-21Fix og:url on toots' public view (#9047)ThibG
Fixes #9045
2018-10-21RTL: fix cardbar margins and alignment (#9044)Masoud Abkenar
2018-10-21RTL: fix admin account avatar margin in about page (#9039)Masoud Abkenar
* RTL: fix admin account avatar margin in about page * fix code style
2018-10-21Handle if username is not found on tootctl feeds build (#9040)Jeong Arm
2018-10-21Fix crash when using UNIX socket (#9036)Gomasy
2018-10-21Put a video camera emoji or a picture frame emoji instead of “.”Thibaut Girka
This uses the same logic as the status icons in the glitch flavor.
2018-10-21Do not move CWs to toot body when toot body is emptyThibaut Girka
Fixes #395 Instead of leaving the toot body blank, it replaces it with a single “.” in order for the fold/unfold CW behavior to not look *too* weird on upstream Mastodon. Note that this does not fix upstream's CW-dropping behavior, as that is decided at the time the toot is posted, not received.
2018-10-21Attempt at fixing inline video playerThibaut Girka
2018-10-21Update mediaGallery component's width when opening CWsThibaut Girka
2018-10-21RTL: fix column settings toggle label (#9037)Masoud Abkenar
2018-10-21Fix domain label position and color (#9033)kedama
* 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
2018-10-21Bump version to 2.6.0rc1 (#9025)Eugen Rochko
* Bump version to 2.6.0rc1 * Update AUTHORS.md * Update CHANGELOG.md
2018-10-20fix: Execute PAM authentication tests on CircleCI (#9029)takayamaki
and use 'if' option of context block
2018-10-20Force sensitive content flag when posting a toot with a CWThibaut Girka
Indeed, when the “Always enable the Content Warning field” setting is enabled, sending a content-less toot with a CW would move the CW to the toot's content and leave the toot not marked as sensitive.
2018-10-20Focus the UI when pressing Escape in the CW fieldThibaut Girka
2018-10-20Add option to block reports from domain (#8830)Eugen Rochko
2018-10-20Do not test PAM authentication by default (#9027)Eugen Rochko
* Do not test PAM authentication by default * Disable PAM tests if PAM is not enabled
2018-10-20Add "disable" button to report screen (#9024)Eugen Rochko
* Add "disable" button to report screen * i18n-tasks remove-unused
2018-10-20Check if port/socket is available before forking in Streaming API (#9023)Eugen Rochko
Previously, the server would attempt taking port/socket in worker process, and if it was taken, fail, which made the master process create a new worker. This led to really high CPU usage if the streaming API was started when the port or socket were not available. Now, before clustering (forking) into worker processes, a test server is created and then removed to check if it can be done.
2018-10-20Redesign direct messages column (#9022)Eugen Rochko
2018-10-20RTL: fix preferences layout (#9021)Masoud Abkenar
generated by cgit-pink (git 2.37.1) at 2024-07-06 03:24:33 +0000