about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-01-10[Glitch] Only consider mouse move in scrolling on item insertionThibaut Girka
Port cc1f13dfd0d9fee7d568918af031f1cd6d1441f4 to glitch-soc
2019-01-10[Glitch] Identify manual scrolling to cancel scroll to top reset on mouse idleThibaut Girka
Port 2f86fc5e0a45eb2002d4b481ae093197ad523479 to glitch-soc
2019-01-10[Glitch] Cancel list scroll reset after mouse move on wheel scrollThibaut Girka
Port 9cfd610484541c14bcde3c368a158b9b5d2a6499 to glitch-soc
2019-01-10[Glitch] Temporarily hold timeline if mouse moved recentlyThibaut Girka
Port 6a1216d2cd1c26c22baf86ae618a62aa66817239 to glitch-soc
2019-01-08Fix how flavour screenshots are displayed in the vanilla flavourThibaut Girka
2019-01-08Update glitch-soc admin page style from upstreamThibaut Girka
Port SCSS changes from e55dce3176b7ac0a23a8a652c2626707a1b74dbb to glitch-soc
2019-01-06add list title editingash lea
2019-01-05Add local setting to disable swipe-to-change-columnsThibaut Girka
2019-01-02Merge pull request #878 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-01-02[Glitch] Update dependencies for Node.js (2018-12-31)Thibaut Girka
Port compatibility changes from 8f5fdab5bf681ff45a07965940bc45c9061a2f89 to glitch-soc
2019-01-02[Glitch] Improve admin UI for account viewThibaut Girka
Port SCSS changes from 6e49907ecfc7036b6bf2dd91b9ebf4ba62d16080 to glitch-soc
2019-01-02[Glitch] Update emoji codepoint mappings to v11.0Thibaut Girka
Port 2ee779dcd3aaec4f1384400ba68e2422ea878156 to glitch-soc
2019-01-02Revert "Add handler for Move activity (#9629)"Thibaut Girka
This reverts commit 0f938ff29c2e9bf92e3eb9c23be8d4ba3a1b97f7.
2019-01-02Fix some image paths in SCSS filesThibaut Girka
2019-01-02Fix syntax errors in win95 SCSS fileThibaut Girka
2019-01-02Fix CircleCIThibaut Girka
2019-01-02Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
2019-01-02Improve e-mail digest (#9689)Eugen Rochko
- Reduce time-to-digest from 20 to 7 days - Fetch mentions starting from +1 day since last login - Fix case when last login is more recent than last e-mail - Do not render all mentions, only 40, but show number in subject - Do not send digest to moved accounts - Do send digest to silenced accounts
2019-01-02Upgrade ESLint to v5.x (#9694)Yamagishi Kazutoshi
2019-01-02Ensure blocked user unfollows blocker if Block/Undo Block are processed out ↵ThibG
of order (#9687) * Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order * Add specs for Block causing unfollow and for out-of-order Block + Undo
2019-01-01Upgrade default Ruby version to 2.6.0 (#9688)Eugen Rochko
2019-01-01Add tootctl accounts follow ACCT (#9414)Eugen Rochko
Fix #9369
2019-01-01Fix icon alignment in onboarding interaction screen (#9686)ThibG
2019-01-01Add CSV export for lists and domain blocks (#9677)Eugen Rochko
Fix #6893 Fix #9268
2019-01-01Restore ReplyDistributionWorker to allow existing jobs to be processed (#9676)ThibG
2019-01-01Installing libxml2 and libxslt on Docker (#9680)Yamagishi Kazutoshi
2018-12-31Remove visible timestamps for notifications (#9675)Eugen Rochko
Revert #9423. Issues with line breaks / clutter.
2018-12-31Update dependencies for Node.js (2018-12-31) (#9669)Yamagishi Kazutoshi
* Update react-* to v16.7.0 * Upgrade react-hotkeys to v1.1.4 * Update react-intl to v2.7.2 * Update react-select to v2.2.0 * Update react-swipeable-views to v0.13.0 * Upgrade react-textarea-autosize to v7.1.0 * Upgrade redux to v4.0.1 * Upgrade reselect to v4.0.0 * Update raf to v3.4.1 * Update enzyme to v3.8.0 * Update rails-ujs to v5.2.2 * Update axios to v0.18.0 * Update http-link-header to v1.0.2 * Update rellax to v1.7.1 * Update intersection-observer to v0.5.1 * Update stringz to v1.0.0 * Upgrade babel-eslint to v10.0.1 * Update @babel/* to v7.2.x * Update babel-plugin-react-intl to v3.0.1 * Update babel-plugin-transform-react-remove-prop-types to v0.4.21 * Upgrade dotenv to v6.2.0 * Update express to v4.16.4 * Update webpack to v4.28.3 * Upgrade autoprefixer to v9.4.3 * Update babel-loader to v8.0.4 * Upgrade css-loader to v2.1.0 * Upgrade file-loader to v3.0.1 * Update marky to v1.2.1 * Update mini-css-extract-plugin to v0.5.0 * Update offline-plugin to v5.0.6 * Update style-loader to v0.23.1 * Update eslint-plugin-jsx-a11y to v6.1.2 * yarn upgrade * fix * Replace webpack-manifest-plugin to webpack-assets-manifest * Replace node-zopfli to @gfz/zopfli * Remove monkey-patch for http-link-header
2018-12-31Fix links not being verified (#9673)kodai
Fix #9365
2018-12-31Install both rvm gpg keys in vagrant (#9670)Fred Wenzel
2018-12-30Skip full text search if failed (#9654)Jeong Arm
* Skip full text search if failed * Move rescue block to "perform_statuses_search!"
2018-12-30Avoid duplicate work by merging ReplyDistributionWorker into ↵ThibG
DistributionWorker (#9660)
2018-12-30Do not ignore federated reports targetting already-reported accounts (#9534)ThibG
2018-12-30Immediately go back in browser history upon successfully sending toot (#9663)ThibG
Avoids possible misleading delay before redirection during which the composer would be cleared and redrawn.
2018-12-30If it is disabled, remove the link of the profile directory (#9665)Takeshi Umeda
2018-12-30Fix crash when clearing uninitialized timeline (#9662)ThibG
2018-12-30Fix crash when clearing uninitialized timelineThibaut Girka
Fixes #875
2018-12-30Immediately go back in browser history upon successfully sending tootThibaut Girka
2018-12-30Reduce usage of LD signatures (#9659)ThibG
* Do not LDS-sign Follow, Accept, Reject, Undo, Block * Do not use LDS for Create activities of private toots * Minor cleanup * Ignore unsigned activities instead of misattributing them * Use status.distributable? instead of querying visibility directly
2018-12-29Add specs for FollowLimitValidator (#9655)ysksn
2018-12-29Add specs for BlackListedEmailValidator (#9651)ysksn
* Add specs for BlackListedEmailValidator * Use instance variable
2018-12-29Replace Ruby 2.3 with 2.6 in CircleCI (#9652)ashleyhull-versent
* Update config.yml * Update Gemfile * dropping ruby 2.3 2.3 EOL date: scheduled for 2019-03-31 * Updating docker containers * Update Gemfile
2018-12-29Add specs for DisallowedHashtagsValidator (#9653)ysksn
In order to implement tests easier, `#select_tags` created.
2018-12-29Add handler for Move activity (#9629)Eugen Rochko
2018-12-29Add healthcheck commands to docker-compose.yml (#9143)Ben Lubar
This will allow Docker to be automatically check the health of services. Docker won't do anything other than showing the state in the output of "docker-compose ps" by default, but some management tools may watch for container health events. Here's what my local instance looks like right now: Name Command State Ports ------------------------------------------------------------------------------------------------------------- mastodon_db_1 docker-entrypoint.sh postgres Up (healthy) mastodon_es_1 /usr/local/bin/docker-entr ... Up (healthy) mastodon_redis_1 docker-entrypoint.sh redis ... Up (healthy) mastodon_redis_cache_1 docker-entrypoint.sh redis ... Up (healthy) mastodon_sidekiq_1 /sbin/tini -- bundle exec ... Up 3000/tcp, 4000/tcp mastodon_streaming_1 /sbin/tini -- yarn start Up (healthy) 3000/tcp, 127.0.0.1:4000->4000/tcp mastodon_web_1 /sbin/tini -- bash -c rm - ... Up (healthy) 127.0.0.1:3000->3000/tcp, 4000/tcp
2018-12-28Rename hide_followers_count helper to hide_followers_count?Thibaut Girka
2018-12-28Do not leak followers count on public pagesThibaut Girka
Fixes #873
2018-12-28Add specs for StatusPinValidator (#9648)ysksn
2018-12-28Add pending specs for StatusLengthValidator (#9647)ysksn
* Add pending specs of StatusLengthValidator * Use instance variable
2018-12-28Change the icon to "reply-all" when reply to other accounts (#9378)mayaeh